• P
    Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · 84bdc58c
    Peter Maydell 提交于
    * 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: NPeter Maydell <peter.maydell@linaro.org>
    
    # Conflicts:
    #	hw/rdma/Makefile.objs
    #	hw/riscv/sifive_plic.c
    84bdc58c
Makefile.objs 201 字节