motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11

Browse source 
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>
This commit is contained in:
Eduardo Habkost 2015-05-14 15:53:07 -03:00 • committed by Michael S. Tsirkin
parent bb08d8829b
commit d5303df710
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
hw/i386/pc_piix.c
View file

@ -920,6 +920,14 @@ static QEMUMachine pc_machine_v0_12 = {
.driver = TYPE_PCI_DEVICE,\ .driver = TYPE_PCI_DEVICE,\
.property = "rombar",\ .property = "rombar",\
.value = stringify(0),\ .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 = { static QEMUMachine pc_machine_v0_11 = {
@ -927,15 +935,6 @@ static QEMUMachine pc_machine_v0_11 = {
.name = "pc-0.11", .name = "pc-0.11",
.compat_props = (GlobalProperty[]) { .compat_props = (GlobalProperty[]) {
PC_COMPAT_0_11 PC_COMPAT_0_11
{
.driver = "ide-drive",
.property = "ver",
.value = "0.11",
},{
.driver = "scsi-disk",
.property = "ver",
.value = "0.11",
},
{ /* end of list */ } { /* end of list */ }
}, },
.hw_version = "0.11", .hw_version = "0.11",