diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-22 07:11:09 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-22 07:11:09 -0500 |
| commit | fdba9594df8eb2e2ac16bba95308e4159ffbb9e4 (patch) | |
| tree | ae99a704abd1629e8f0a2de427814ad48bc85197 /hw/pc_piix.c | |
| parent | 7ee28fd303003d70bb4c142e6ad4b92b7383b5b4 (diff) | |
| parent | 0e6264db2c04dfad79be60240bfacfcaf47f9d6c (diff) | |
| download | qemu-fdba9594df8eb2e2ac16bba95308e4159ffbb9e4.tar.gz qemu-fdba9594df8eb2e2ac16bba95308e4159ffbb9e4.tar.bz2 qemu-fdba9594df8eb2e2ac16bba95308e4159ffbb9e4.zip | |
Merge remote-tracking branch 'mst/for_anthony' into staging
Conflicts:
hw/usb-uhci.c
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 8dbeb0c8ab..c5c16b4571 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -288,6 +288,18 @@ static QEMUMachine pc_machine_v0_13 = { .driver = "PCI", .property = "command_serr_enable", .value = "off", + },{ + .driver = "virtio-blk-pci", + .property = "event_idx", + .value = "off", + },{ + .driver = "virtio-serial-pci", + .property = "event_idx", + .value = "off", + },{ + .driver = "virtio-net-pci", + .property = "event_idx", + .value = "off", }, { /* end of list */ } }, @@ -319,6 +331,18 @@ static QEMUMachine pc_machine_v0_12 = { .driver = "PCI", .property = "command_serr_enable", .value = "off", + },{ + .driver = "virtio-blk-pci", + .property = "event_idx", + .value = "off", + },{ + .driver = "virtio-serial-pci", + .property = "event_idx", + .value = "off", + },{ + .driver = "virtio-net-pci", + .property = "event_idx", + .value = "off", }, { /* end of list */ } } @@ -358,6 +382,18 @@ static QEMUMachine pc_machine_v0_11 = { .driver = "PCI", .property = "command_serr_enable", .value = "off", + },{ + .driver = "virtio-blk-pci", + .property = "event_idx", + .value = "off", + },{ + .driver = "virtio-serial-pci", + .property = "event_idx", + .value = "off", + },{ + .driver = "virtio-net-pci", + .property = "event_idx", + .value = "off", }, { /* end of list */ } } @@ -409,6 +445,18 @@ static QEMUMachine pc_machine_v0_10 = { .driver = "PCI", .property = "command_serr_enable", .value = "off", + },{ + .driver = "virtio-blk-pci", + .property = "event_idx", + .value = "off", + },{ + .driver = "virtio-serial-pci", + .property = "event_idx", + .value = "off", + },{ + .driver = "virtio-net-pci", + .property = "event_idx", + .value = "off", }, { /* end of list */ } }, |