mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13

Browse Source 
The VGA and vmware-svga rombar compat properties were added by commit
281a26b15b, but only to pc-0.13 and
pc-0.12. This breaks the PC_COMPAT_* nesting pattern we currently
follow.

The new variables will now be inherited by pc-0.11 and older, but
pc-0.11 and pc-0.10 already have PCI.rombar=0 on compat_props, so they
shouldn't be affected at all.

Cc: Stefan Weil <sw@weilnetz.de>
Cc: Gerd Hoffmann <kraxel@redhat.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:09 -03:00 committed by Michael S. Tsirkin
parent d765519bef
commit faf7e4254f
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/i386/pc_piix.c
View File

@ -842,6 +842,14 @@ static QEMUMachine pc_machine_v0_14 = {
.driver = "virtio-9p-pci",\ .driver = "virtio-9p-pci",\
.property = "vectors",\ .property = "vectors",\
.value = stringify(0),\ .value = stringify(0),\
},{\
.driver = "VGA",\
.property = "rombar",\
.value = stringify(0),\
},{\
.driver = "vmware-svga",\
.property = "rombar",\
.value = stringify(0),\
}, },
#define PC_I440FX_0_13_MACHINE_OPTIONS \ #define PC_I440FX_0_13_MACHINE_OPTIONS \
@ -853,15 +861,6 @@ static QEMUMachine pc_machine_v0_13 = {
.name = "pc-0.13", .name = "pc-0.13",
.compat_props = (GlobalProperty[]) { .compat_props = (GlobalProperty[]) {
PC_COMPAT_0_13 PC_COMPAT_0_13
{
.driver = "VGA",
.property = "rombar",
.value = stringify(0),
},{
.driver = "vmware-svga",
.property = "rombar",
.value = stringify(0),
},
{ /* end of list */ } { /* end of list */ }
}, },
.hw_version = "0.13", .hw_version = "0.13",
@ -896,15 +895,6 @@ static QEMUMachine pc_machine_v0_12 = {
.name = "pc-0.12", .name = "pc-0.12",
.compat_props = (GlobalProperty[]) { .compat_props = (GlobalProperty[]) {
PC_COMPAT_0_12 PC_COMPAT_0_12
{
.driver = "VGA",
.property = "rombar",
.value = stringify(0),
},{
.driver = "vmware-svga",
.property = "rombar",
.value = stringify(0),
},
{ /* end of list */ } { /* end of list */ }
}, },
.hw_version = "0.12", .hw_version = "0.12",