aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHu Tao <hutao@cn.fujitsu.com>2013-04-10 16:43:09 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2013-04-15 15:16:25 +0200
commit35b2028f47eef4e20752f94f7cff650d828bfaee (patch)
tree112777a7ce8fe60bc613410803ca99cb97ac1ad5
parentfd123245b98fd6e13d829878f25b30a9417f4bfc (diff)
Fix failure to create q35 machine
This is a regression introduced by c0907c9e6417c. How to reproduce: $ qemu-system-x86_64 -nodefaults -vnc :0 -M q35 qemu-system-x86_64: Unknown device 'q35-pcihost' for default sysbus Aborted (core dumped) Tested-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--default-configs/i386-softmmu.mak2
-rw-r--r--default-configs/x86_64-softmmu.mak2
2 files changed, 2 insertions, 2 deletions
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 4ac0694470..6d9d364ff8 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -42,6 +42,6 @@ CONFIG_ISA_TESTDEV=y
CONFIG_VMPORT=y
CONFIG_SGA=y
CONFIG_LPC_ICH9=y
-CONFIG_Q35=y
+CONFIG_PCI_Q35=y
CONFIG_APIC=y
CONFIG_IOAPIC=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index bf4091c4dd..3b063101cf 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -42,6 +42,6 @@ CONFIG_ISA_TESTDEV=y
CONFIG_VMPORT=y
CONFIG_SGA=y
CONFIG_LPC_ICH9=y
-CONFIG_Q35=y
+CONFIG_PCI_Q35=y
CONFIG_APIC=y
CONFIG_IOAPIC=y