pc/piix: fix mismerge of b1aeb92666
The change set of b1aeb92666
in pci branch
was mismerged. The compatibility should be kept for 0.13, not for 0.14.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
f530cce315
commit
362dd48c16
12
hw/pc_piix.c
12
hw/pc_piix.c
|
@ -217,14 +217,6 @@ static QEMUMachine pc_machine = {
|
|||
.desc = "Standard PC",
|
||||
.init = pc_init_pci,
|
||||
.max_cpus = 255,
|
||||
.compat_props = (GlobalProperty[]) {
|
||||
{
|
||||
.driver = "PCI",
|
||||
.property = "command_serr_enable",
|
||||
.value = "off",
|
||||
},
|
||||
{ /* end of list */ }
|
||||
},
|
||||
.is_default = 1,
|
||||
};
|
||||
|
||||
|
@ -246,6 +238,10 @@ static QEMUMachine pc_machine_v0_13 = {
|
|||
.driver = "vmware-svga",
|
||||
.property = "rombar",
|
||||
.value = stringify(0),
|
||||
},{
|
||||
.driver = "PCI",
|
||||
.property = "command_serr_enable",
|
||||
.value = "off",
|
||||
},
|
||||
{ /* end of list */ }
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue