diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-05-14 15:53:09 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-05-31 16:26:41 +0200 |
| commit | faf7e4254fa33a13805a34a1ffeeb9dcc0a36a5e (patch) | |
| tree | 061ed505dba09f0a016a1a3f0144bee52e7f1ccf /hw/i386/pc_piix.c | |
| parent | d765519bef48bd95f2139314a5354144387523eb (diff) | |
piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13
The VGA and vmware-svga rombar compat properties were added by commit
281a26b15b4adcecb8604216738975abd754bea8, 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>
Diffstat (limited to 'hw/i386/pc_piix.c')
| -rw-r--r-- | hw/i386/pc_piix.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 9d12c9364a..ac98af12d7 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -842,6 +842,14 @@ static QEMUMachine pc_machine_v0_14 = { .driver = "virtio-9p-pci",\ .property = "vectors",\ .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 \ @@ -853,15 +861,6 @@ static QEMUMachine pc_machine_v0_13 = { .name = "pc-0.13", .compat_props = (GlobalProperty[]) { PC_COMPAT_0_13 - { - .driver = "VGA", - .property = "rombar", - .value = stringify(0), - },{ - .driver = "vmware-svga", - .property = "rombar", - .value = stringify(0), - }, { /* end of list */ } }, .hw_version = "0.13", @@ -896,15 +895,6 @@ static QEMUMachine pc_machine_v0_12 = { .name = "pc-0.12", .compat_props = (GlobalProperty[]) { PC_COMPAT_0_12 - { - .driver = "VGA", - .property = "rombar", - .value = stringify(0), - },{ - .driver = "vmware-svga", - .property = "rombar", - .value = stringify(0), - }, { /* end of list */ } }, .hw_version = "0.12", |