diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-05-14 15:53:06 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-05-31 16:26:41 +0200 |
| commit | bb08d8829b5bec6af619e4532a397ef12727516c (patch) | |
| tree | 6dad34b75458fa1530bc693ed1e8c4bd30b35492 | |
| parent | 38ff32c6e6fd966c5adb9cde4d393a8cca9ef093 (diff) | |
| download | qemu-bb08d8829b5bec6af619e4532a397ef12727516c.zip qemu-bb08d8829b5bec6af619e4532a397ef12727516c.tar.gz qemu-bb08d8829b5bec6af619e4532a397ef12727516c.tar.bz2 | |
piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14
Those properties were introduced by commit
3827cdb1c3aa17a792d1658161195b9d7173c26b. They were not duplicated into
pc-0.13 and older because 0.14 was the first QEMU version supporting
qxl. The only problem is that this breaks the PC_COMPAT_* nesting
pattern we currently use.
So, move the properties to PC_COMPAT_0_14. This makes pc-0.13 and older
inherit them, but that shouldn't be an issue as QEMU 0.13 didn't support
qxl.
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>
| -rw-r--r-- | hw/i386/pc_piix.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 8796e60..1e12eff 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -808,6 +808,14 @@ static QEMUMachine pc_machine_v0_15 = { .driver = "virtio-balloon-pci",\ .property = "event_idx",\ .value = "off",\ + },{\ + .driver = "qxl",\ + .property = "revision",\ + .value = stringify(2),\ + },{\ + .driver = "qxl-vga",\ + .property = "revision",\ + .value = stringify(2),\ }, static QEMUMachine pc_machine_v0_14 = { @@ -815,15 +823,6 @@ static QEMUMachine pc_machine_v0_14 = { .name = "pc-0.14", .compat_props = (GlobalProperty[]) { PC_COMPAT_0_14 - { - .driver = "qxl", - .property = "revision", - .value = stringify(2), - },{ - .driver = "qxl-vga", - .property = "revision", - .value = stringify(2), - }, { /* end of list */ } }, .hw_version = "0.14", |