Commit 84bdc58c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* Kconfig improvements (msi_nonbroken, imply for default PCI devices)
* intel-iommu: sharing passthrough FlatViews (Peter)
* Fix for SEV with VFIO (Brijesh)
* Allow compilation without CONFIG_PARALLEL (Thomas)

# gpg: Signature made Thu 21 Mar 2019 16:42:24 GMT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (23 commits)
  virtio-vga: only enable for specific boards
  config-all-devices.mak: rebuild on reconfigure
  minikconf: fix parser typo
  intel-iommu: optimize nodmar memory regions
  test-announce-self: convert to qgraph
  hw/alpha/Kconfig: DP264 hardware requires e1000 network card
  hw/hppa/Kconfig: Dino board requires e1000 network card
  hw/sh4/Kconfig: r2d machine requires the rtl8139 network card
  hw/ppc/Kconfig: e500 based machines require virtio-net-pci device
  hw/ppc/Kconfig: Bamboo machine requires e1000 network card
  hw/mips/Kconfig: Fulong 2e board requires ati-vga/rtl8139 PCI devices
  hw/mips/Kconfig: Malta machine requires the pcnet network card
  hw/i386/Kconfig: enable devices that can be created by default
  hw/isa/Kconfig: PIIX4 southbridge requires USB UHCI
  hw/isa/Kconfig: i82378 SuperIO requires PC speaker device
  prep: do not select I82374
  hw/i386/Kconfig: PC uses I8257, not I82374
  hw/char/parallel: Make it possible to compile also without CONFIG_PARALLEL
  target/i386: sev: Do not pin the ram device memory region
  memory: Fix the memory region type assignment order
  ...

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

# Conflicts:
#	hw/rdma/Makefile.objs
#	hw/riscv/sifive_plic.c
parents 2fc8d6f8 938912a8

Kconfig.host

+3 −0
Original line number Diff line number Diff line
@@ -31,3 +31,6 @@ config XEN 


config VIRTFS

    bool



config PVRDMA

    bool

Makefile

+4 −3
Original line number Diff line number Diff line
@@ -331,10 +331,10 @@ SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(filter %-softmmu, $(TAR 
SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %.d, $(SUBDIR_DEVICES_MAK))



ifeq ($(SUBDIR_DEVICES_MAK),)

config-all-devices.mak:

config-all-devices.mak: config-host.mak

	$(call quiet-command,echo '# no devices' > $@,"GEN","$@")

else

config-all-devices.mak: $(SUBDIR_DEVICES_MAK)

config-all-devices.mak: $(SUBDIR_DEVICES_MAK) config-host.mak

	$(call quiet-command, sed -n \

             's|^\([^=]*\)=\(.*\)$$|\1:=$$(findstring y,$$(\1)\2)|p' \

             $(SUBDIR_DEVICES_MAK) | sort -u > $@, \
@@ -356,7 +356,8 @@ MINIKCONF_ARGS = \ 
    CONFIG_X11=$(CONFIG_X11) \

    CONFIG_VHOST_USER=$(CONFIG_VHOST_USER) \

    CONFIG_VIRTFS=$(CONFIG_VIRTFS) \

    CONFIG_LINUX=$(CONFIG_LINUX)

    CONFIG_LINUX=$(CONFIG_LINUX) \

    CONFIG_PVRDMA=$(CONFIG_PVRDMA)



MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig

MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \

default-configs/mips-softmmu-common.mak

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ CONFIG_MIPS_CPS=y 
CONFIG_MIPS_ITU=y

CONFIG_R4K=y

CONFIG_MALTA=y

CONFIG_PCNET_PCI=y

CONFIG_MIPSSIM=y

CONFIG_ACPI_SMBUS=y

CONFIG_SMBUS_EEPROM=y

default-configs/mips64el-softmmu.mak

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ CONFIG_RC4030=y 
CONFIG_DP8393X=y

CONFIG_DS1225Y=y

CONFIG_FULONG=y

CONFIG_ATI_VGA=y

CONFIG_RTL8139_PCI=y

CONFIG_JAZZ=y

CONFIG_G364FB=y

CONFIG_JAZZ_LED=y

hw/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ source pci-bridge/Kconfig 
source pci-host/Kconfig

source pcmcia/Kconfig

source pci/Kconfig

source rdma/Kconfig

source scsi/Kconfig

source sd/Kconfig

source smbios/Kconfig