david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13

Browse Source 
The compat property was added by commit
9dbcca5aa13cb9ab40788ac4c56bc227d94ca920, and the pc-0.12 and older
machine-types were not changed because virtio-9p-pci was introduced on QEMU
0.13 (commit 9f10751365b26b13b8a9b67e0e90536ae3d282df). The only problem is
that this breaks the PC_COMPAT_* nesting pattern we currently use.

So, move the property to PC_COMPAT_0_13. This make pc-0.12 and older inherit
it, but that shouldn't be an issue as QEMU 0.12 didn't have virtio-9p-pci.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eduardo Habkost 2015-05-14 15:53:08 -03:00 committed by Michael S. Tsirkin
parent d5303df710
commit d765519bef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/i386/pc_piix.c
View File

@ -838,6 +838,10 @@ static QEMUMachine pc_machine_v0_14 = {
.driver = "AC97",\ .driver = "AC97",\
.property = "use_broken_id",\ .property = "use_broken_id",\
.value = stringify(1),\ .value = stringify(1),\
},{\
.driver = "virtio-9p-pci",\
.property = "vectors",\
.value = stringify(0),\
}, },
#define PC_I440FX_0_13_MACHINE_OPTIONS \ #define PC_I440FX_0_13_MACHINE_OPTIONS \
@ -850,10 +854,6 @@ static QEMUMachine pc_machine_v0_13 = {
.compat_props = (GlobalProperty[]) { .compat_props = (GlobalProperty[]) {
PC_COMPAT_0_13 PC_COMPAT_0_13
{ {
.driver = "virtio-9p-pci",
.property = "vectors",
.value = stringify(0),
},{
.driver = "VGA", .driver = "VGA",
.property = "rombar", .property = "rombar",
.value = stringify(0), .value = stringify(0),