Patchwork Fix failure to create q35 machine

login
register
mail settings
Submitter Hu Tao
Date April 10, 2013, 2:59 a.m.
Message ID <1365562743-6831-1-git-send-email-hutao@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/235275/
State New
Headers show

Comments

Hu Tao - April 10, 2013, 2:59 a.m.
This is a regression introduced by c0907c9e6417c.  -M q35
to reproduce the problem.

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
---
 default-configs/i386-softmmu.mak   | 2 +-
 default-configs/x86_64-softmmu.mak | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Markus Armbruster - April 10, 2013, 8:10 a.m.
Hu Tao <hutao@cn.fujitsu.com> writes:

> This is a regression introduced by c0907c9e6417c.  -M q35
> to reproduce the problem.

Including a complete reproducer in the commit message would be a bit
nicer.  Here's one:

    $ qemu-system-x86_64 -nodefaults -vnc :0 -M q35
    WARNING: failed to find q35-acpi-dsdt.aml
    upstream-qemu: Unknown device 'q35-pcihost' for default sysbus
    Aborted (core dumped)

Tested-by: Markus Armbruster <armbru@redhat.com>
Hu Tao - April 10, 2013, 8:39 a.m.
On Wed, Apr 10, 2013 at 10:10:06AM +0200, Markus Armbruster wrote:
> Hu Tao <hutao@cn.fujitsu.com> writes:
> 
> > This is a regression introduced by c0907c9e6417c.  -M q35
> > to reproduce the problem.
> 
> Including a complete reproducer in the commit message would be a bit
> nicer.  Here's one:
> 
>     $ qemu-system-x86_64 -nodefaults -vnc :0 -M q35
>     WARNING: failed to find q35-acpi-dsdt.aml

This line is somehow unrelated. 

>     upstream-qemu: Unknown device 'q35-pcihost' for default sysbus
>     Aborted (core dumped)
> 
> Tested-by: Markus Armbruster <armbru@redhat.com>

Thanks for testing! I'll send v2.

Patch

diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 4ac0694..6d9d364 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 bf4091c..3b06310 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