diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-05-14 15:53:08 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-05-31 16:26:41 +0200 |
| commit | d765519bef48bd95f2139314a5354144387523eb (patch) | |
| tree | f878a1918d981fca412680ceb7402d2f71bcd306 /hw | |
| parent | d5303df71073da70e0ad29a6dfb304ec7b747f5c (diff) | |
piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc_piix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index eb0c11f201..9d12c9364a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -838,6 +838,10 @@ static QEMUMachine pc_machine_v0_14 = { .driver = "AC97",\ .property = "use_broken_id",\ .value = stringify(1),\ + },{\ + .driver = "virtio-9p-pci",\ + .property = "vectors",\ + .value = stringify(0),\ }, #define PC_I440FX_0_13_MACHINE_OPTIONS \ @@ -850,10 +854,6 @@ static QEMUMachine pc_machine_v0_13 = { .compat_props = (GlobalProperty[]) { PC_COMPAT_0_13 { - .driver = "virtio-9p-pci", - .property = "vectors", - .value = stringify(0), - },{ .driver = "VGA", .property = "rombar", .value = stringify(0), |