Commit eaefea53 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging 



trivial patches for 2017-12-18

# gpg: Signature made Mon 18 Dec 2017 14:08:51 GMT
# gpg:                using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* remotes/mjt/tags/trivial-patches-fetch: (60 commits)
  misc: drop old i386 dependency
  i386/pc: move vmmouse.c to hw/i386/
  i386/pc: move vmport.c to hw/i386/
  hw/misc/pvpanic: extract public API from i386/pc to "hw/misc/pvpanic.h"
  hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c
  hw/display/vga: extract public API from i386/pc to "hw/display/vga.h"
  hw/display/vga: "vga_int.h" requires "ui/console.h"
  hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h"
  hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc
  hw/acpi: ACPI_PM_* defines are not restricted to i386 arch
  hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init()
  hw/timer/i8254: rename pit_init() -> i8254_pit_init()
  hw/unicore32: restrict hw addr defines to source file
  hw/virtio-balloon: remove old i386 dependency
  hw/tpm: remove old i386 dependency
  hw/i2c: remove old i386 dependency
  hw/ipmi: remove old i386 dependency
  hw/ide: remove old i386 dependency
  misc: remove old i386 dependency
  amd_iommu: avoid needless includes in header file
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 411ad781 c0578de6

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 
/qemu-version.h.tmp

/module_block.h

/scsi/qemu-pr-helper

/vscclient

/vhost-user-scsi

/fsdev/virtfs-proxy-helper

*.tmp

MAINTAINERS

+13 −1
Original line number Diff line number Diff line
@@ -732,7 +732,11 @@ F: hw/ppc/prep.c 
F: hw/ppc/prep_systemio.c

F: hw/ppc/rs6000_mc.c

F: hw/pci-host/prep.[hc]

F: hw/isa/i82378.c

F: hw/isa/pc87312.[hc]

F: hw/dma/i82374.c

F: hw/timer/m48t59-isa.c

F: include/hw/timer/m48t59.h

F: pc-bios/ppc_rom.bin



sPAPR
@@ -861,12 +865,13 @@ F: hw/misc/sga.c 
PC Chipset

M: Michael S. Tsirkin <mst@redhat.com>

M: Paolo Bonzini <pbonzini@redhat.com>

S: Support

S: Supported

F: hw/char/debugcon.c

F: hw/char/parallel.c

F: hw/char/serial*

F: hw/dma/i8257*

F: hw/i2c/pm_smbus.c

F: hw/input/pckbd.c

F: hw/intc/apic*

F: hw/intc/ioapic*

F: hw/intc/i8259*
@@ -875,7 +880,10 @@ F: hw/misc/pc-testdev.c 
F: hw/timer/hpet*

F: hw/timer/i8254*

F: hw/timer/mc146818rtc*

F: hw/watchdog/wdt_ib700.c

F: include/hw/display/vga.h

F: include/hw/i2c/pm_smbus.h

F: include/hw/isa/i8257.h

F: include/hw/timer/hpet.h

F: include/hw/timer/i8254*

F: include/hw/timer/mc146818rtc*
@@ -976,7 +984,9 @@ M: Alexander Graf <agraf@suse.de> 
L: qemu-ppc@nongnu.org

S: Odd Fixes

F: hw/ppc/ppc4*.c

F: hw/i2c/ppc4xx_i2c.c

F: include/hw/ppc/ppc4xx.h

F: include/hw/i2c/ppc4xx_i2c.h



ppce500

M: Alexander Graf <agraf@suse.de>
@@ -995,6 +1005,7 @@ Network devices 
M: Jason Wang <jasowang@redhat.com>

S: Odd Fixes

F: hw/net/

F: include/hw/net/

F: tests/virtio-net-test.c

T: git git://github.com/jasowang/qemu.git net
@@ -1538,6 +1549,7 @@ M: Alistair Francis <alistair.francis@xilinx.com> 
S: Maintained

F: hw/core/register.c

F: include/hw/register.h

F: include/hw/registerfields.h



SLIRP

M: Samuel Thibault <samuel.thibault@ens-lyon.org>

Makefile

+7 −4
Original line number Diff line number Diff line
@@ -6,7 +6,10 @@ BUILD_DIR=$(CURDIR) 
# Before including a proper config-host.mak, assume we are in the source tree

SRC_PATH=.



UNCHECKED_GOALS := %clean TAGS cscope ctags docker docker-% help

UNCHECKED_GOALS := %clean TAGS cscope ctags dist \

    html info pdf txt \

    help check-help \

    docker docker-% vm-test vm-build-%



# All following code might depend on configuration variables

ifneq ($(wildcard config-host.mak),)
@@ -50,7 +53,7 @@ ifneq ($(realpath $(SRC_PATH)),$(realpath .)) 
ifneq ($(wildcard $(SRC_PATH)/config-host.mak),)

$(error This is an out of tree build but your source tree ($(SRC_PATH)) \

seems to have been used for an in-tree build. You can fix this by running \

"make distclean && rm -rf *-linux-user *-softmmu" in your source tree)

"$(MAKE) distclean && rm -rf *-linux-user *-softmmu" in your source tree)

endif

endif
@@ -304,7 +307,7 @@ endif 
	    else \

	      echo "WARNING: $@ out of date.";\

	    fi; \

	    echo "Run \"make defconfig\" to regenerate."; \

	    echo "Run \"$(MAKE) defconfig\" to regenerate."; \

	    rm $@.tmp; \

	  fi; \

	 else \
@@ -934,4 +937,4 @@ ifdef QEMU_GA_MSI_ENABLED 
endif

	@echo  ''

endif

	@echo  '  make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
 
	@echo  '  $(MAKE) V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'

accel/tcg/cpu-exec-common.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include "cpu.h"

#include "sysemu/cpus.h"

#include "exec/exec-all.h"

#include "exec/memory-internal.h"



bool tcg_allowed;

accel/tcg/translate-all.c

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "tcg.h"

#if defined(CONFIG_USER_ONLY)

#include "qemu.h"

#include "exec/exec-all.h"

#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)

#include <sys/param.h>

#if __FreeBSD_version >= 700104
@@ -257,7 +256,7 @@ static target_long decode_sleb128(uint8_t **pp) 
/* Encode the data collected about the instructions while compiling TB.

   Place the data at BLOCK, and return the number of bytes consumed.



   The logical table consisits of TARGET_INSN_START_WORDS target_ulong's,

   The logical table consists of TARGET_INSN_START_WORDS target_ulong's,

   which come from the target's insn_start data, followed by a uintptr_t

   which comes from the host pc of the end of the code implementing the insn.