diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-05-14 15:53:07 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-05-31 16:26:41 +0200 |
| commit | d5303df71073da70e0ad29a6dfb304ec7b747f5c (patch) | |
| tree | 36a5bf447dd51fe763a57b16752957c6dda50e60 | |
| parent | bb08d8829b5bec6af619e4532a397ef12727516c (diff) | |
piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11
The current code setting ide-drive.ver and scsi-disk.ver on pc-0.11
breaks the PC_COMPAT_* nesting pattern we currently use.
As those variables are overwritten in pc-0.10 too, they can be inherited
by pc-0.10 with no side-effects at all.
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 1e12eff59e..eb0c11f201 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -920,6 +920,14 @@ static QEMUMachine pc_machine_v0_12 = { .driver = TYPE_PCI_DEVICE,\ .property = "rombar",\ .value = stringify(0),\ + },{\ + .driver = "ide-drive",\ + .property = "ver",\ + .value = "0.11",\ + },{\ + .driver = "scsi-disk",\ + .property = "ver",\ + .value = "0.11",\ }, static QEMUMachine pc_machine_v0_11 = { @@ -927,15 +935,6 @@ static QEMUMachine pc_machine_v0_11 = { .name = "pc-0.11", .compat_props = (GlobalProperty[]) { PC_COMPAT_0_11 - { - .driver = "ide-drive", - .property = "ver", - .value = "0.11", - },{ - .driver = "scsi-disk", - .property = "ver", - .value = "0.11", - }, { /* end of list */ } }, .hw_version = "0.11", |