diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-13 13:19:46 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-13 13:19:46 +0000 |
| commit | be86c53c058d75fc3938b1b54f363259f282b3d5 (patch) | |
| tree | 44e5dd6dd04a7c2b7a2342aa01698dc91a1243f7 /kvm-stub.c | |
| parent | c8d146aecceb560664b112279ffddf6fe1db99db (diff) | |
| parent | 295d51aa6a0d3b9a97200913f58a4d8b0c53ac42 (diff) | |
| download | focaccia-qemu-be86c53c058d75fc3938b1b54f363259f282b3d5.tar.gz focaccia-qemu-be86c53c058d75fc3938b1b54f363259f282b3d5.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging
PowerPC queue for 2.0-rc0 * QEMUMachine include cleanup * SLOF update * XICS reset fix * sPAPR PCI host bridge refactorings # gpg: Signature made Thu 13 Mar 2014 02:50:51 GMT using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber <afaerber@suse.de>" # gpg: aka "Andreas Färber <afaerber@suse.com>" * remotes/afaerber/tags/ppc-for-2.0: spapr-pci: Convert fprintf() to error_report() spapr-pci: Convert to QOM realize xics-kvm: Fix reset function pseries: Update SLOF firmware image to qemu-slof-20140304 Move QEMUMachine typedef to qemu/typedefs.h Revert "KVM: Split QEMUMachine typedef into separate header" Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'kvm-stub.c')
| -rw-r--r-- | kvm-stub.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kvm-stub.c b/kvm-stub.c index 4ef084e84a..ccdba62d67 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -14,7 +14,6 @@ #include "hw/hw.h" #include "cpu.h" #include "sysemu/kvm.h" -#include "sysemu/qemumachine.h" #ifndef CONFIG_USER_ONLY #include "hw/pci/msi.h" |