diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2010-12-22 15:13:43 +0900 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2010-12-22 09:00:07 +0200 |
| commit | 362dd48c16728a656c1ef75f8160838127fd76d5 (patch) | |
| tree | c8e3e449ca97b4e6abc9e061ad7a957f8a704eb1 /hw/pc_piix.c | |
| parent | f530cce3152b55a535e9e87610110fefa4e9c853 (diff) | |
| download | focaccia-qemu-362dd48c16728a656c1ef75f8160838127fd76d5.tar.gz focaccia-qemu-362dd48c16728a656c1ef75f8160838127fd76d5.zip | |
pc/piix: fix mismerge of b1aeb92666d2fde413c34578b3b42bbfe5f2a506
The change set of b1aeb92666d2fde413c34578b3b42bbfe5f2a506 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>
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index a2fb554aa2..f82508d92f 100644 --- a/hw/pc_piix.c +++ b/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 */ } }, |