mirror of https://gitee.com/openkylin/qemu.git
84bdc58c06
* intel-iommu: sharing passthrough FlatViews (Peter) * Fix for SEV with VFIO (Brijesh) * Allow compilation without CONFIG_PARALLEL (Thomas) -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAlyTvvAUHHBib256aW5p QHJlZGhhdC5jb20ACgkQv/vSX3jHroNNwwf/RrtjBoqu8Ulu6k+HJczdpkhO44c5 R7sidGaOBHVjT+EsaYZxanXQlsbpDPiXCRoMRMln+O3Kgso/UlVTLBfctIjuf5kp P8Amp8rw843yl3TQ+Xaqat1qtfVVN2xjRDoyRwWrTU5w52MVVsan2j1/XzGX/7Bb Y3gXRxsN7MyjDCXxhxVwQCxKU2ue3ytvnfdCnu1SNZxZEaFAyGprTNCCTXYugehl bVauAs/0qOZWEyvElinNEz+zbqMTm07ULAWBRXgCDcOudsidZFtu0Xl62dXlp1Ou 0zkaoGiOdMM6OXZkLd6vOK8mY9XDuqaUZE3zAeFMJsK1wSnZdGUVCJO1Hw== =Pkcj -----END PGP SIGNATURE----- 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: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # hw/rdma/Makefile.objs # hw/riscv/sifive_plic.c |
||
|---|---|---|
| .. | ||
| aarch64-linux-user.mak | ||
| aarch64-softmmu.mak | ||
| aarch64_be-linux-user.mak | ||
| alpha-linux-user.mak | ||
| alpha-softmmu.mak | ||
| arm-linux-user.mak | ||
| arm-softmmu.mak | ||
| armeb-linux-user.mak | ||
| cris-linux-user.mak | ||
| cris-softmmu.mak | ||
| hppa-linux-user.mak | ||
| hppa-softmmu.mak | ||
| i386-bsd-user.mak | ||
| i386-linux-user.mak | ||
| i386-softmmu.mak | ||
| lm32-softmmu.mak | ||
| m68k-linux-user.mak | ||
| m68k-softmmu.mak | ||
| microblaze-linux-user.mak | ||
| microblaze-softmmu.mak | ||
| microblazeel-linux-user.mak | ||
| microblazeel-softmmu.mak | ||
| mips-linux-user.mak | ||
| mips-softmmu-common.mak | ||
| mips-softmmu.mak | ||
| mips64-linux-user.mak | ||
| mips64-softmmu.mak | ||
| mips64el-linux-user.mak | ||
| mips64el-softmmu.mak | ||
| mipsel-linux-user.mak | ||
| mipsel-softmmu.mak | ||
| mipsn32-linux-user.mak | ||
| mipsn32el-linux-user.mak | ||
| moxie-softmmu.mak | ||
| nios2-linux-user.mak | ||
| nios2-softmmu.mak | ||
| or1k-linux-user.mak | ||
| or1k-softmmu.mak | ||
| ppc-linux-user.mak | ||
| ppc-softmmu.mak | ||
| ppc64-linux-user.mak | ||
| ppc64-softmmu.mak | ||
| ppc64abi32-linux-user.mak | ||
| ppc64le-linux-user.mak | ||
| riscv32-linux-user.mak | ||
| riscv32-softmmu.mak | ||
| riscv64-linux-user.mak | ||
| riscv64-softmmu.mak | ||
| s390x-linux-user.mak | ||
| s390x-softmmu.mak | ||
| sh4-linux-user.mak | ||
| sh4-softmmu.mak | ||
| sh4eb-linux-user.mak | ||
| sh4eb-softmmu.mak | ||
| sparc-bsd-user.mak | ||
| sparc-linux-user.mak | ||
| sparc-softmmu.mak | ||
| sparc32plus-linux-user.mak | ||
| sparc64-bsd-user.mak | ||
| sparc64-linux-user.mak | ||
| sparc64-softmmu.mak | ||
| tilegx-linux-user.mak | ||
| tricore-softmmu.mak | ||
| unicore32-softmmu.mak | ||
| x86_64-bsd-user.mak | ||
| x86_64-linux-user.mak | ||
| x86_64-softmmu.mak | ||
| xtensa-linux-user.mak | ||
| xtensa-softmmu.mak | ||
| xtensaeb-linux-user.mak | ||
| xtensaeb-softmmu.mak | ||