diff options
| author | Anthony Liguori | 2010-12-17 15:21:29 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2010-12-17 15:21:29 +0100 |
| commit | b254b0d15d48efc3bd43ae535158ded3c1519257 (patch) | |
| tree | 856460106817ca5ccbab285b474a52cdcac2a46e /hw/pc_piix.c | |
| parent | Watchdog: disable watchdog timer when hard-rebooting a guest. (diff) | |
| parent | pci/aer: factor out common code (diff) | |
| download | qemu-b254b0d15d48efc3bd43ae535158ded3c1519257.tar.gz qemu-b254b0d15d48efc3bd43ae535158ded3c1519257.tar.xz qemu-b254b0d15d48efc3bd43ae535158ded3c1519257.zip | |
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 7d29d43190..a2fb554aa2 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -217,6 +217,14 @@ 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, }; @@ -265,6 +273,10 @@ static QEMUMachine pc_machine_v0_12 = { .driver = "vmware-svga", .property = "rombar", .value = stringify(0), + },{ + .driver = "PCI", + .property = "command_serr_enable", + .value = "off", }, { /* end of list */ } } @@ -300,6 +312,10 @@ static QEMUMachine pc_machine_v0_11 = { .driver = "PCI", .property = "rombar", .value = stringify(0), + },{ + .driver = "PCI", + .property = "command_serr_enable", + .value = "off", }, { /* end of list */ } } @@ -347,6 +363,10 @@ static QEMUMachine pc_machine_v0_10 = { .driver = "PCI", .property = "rombar", .value = stringify(0), + },{ + .driver = "PCI", + .property = "command_serr_enable", + .value = "off", }, { /* end of list */ } }, |