|
 |
45e84a0 |
From 7e2191ae9898cc957a3d1991aff0e40f2e0f44a4 Mon Sep 17 00:00:00 2001
|
|
|
45e84a0 |
From: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
45e84a0 |
Date: Sun, 18 Dec 2011 13:07:03 -0600
|
|
|
45e84a0 |
Subject: [PATCH 14/25] pc: fix event_idx compatibility for virtio devices
|
|
|
45e84a0 |
|
|
|
45e84a0 |
event_idx was introduced in 0.15 and must be disabled for all virtio-pci devices
|
|
|
45e84a0 |
(including virtio-balloon-pci).
|
|
|
45e84a0 |
|
|
|
45e84a0 |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
45e84a0 |
---
|
|
|
45e84a0 |
hw/pc_piix.c | 32 ++++++++++++++++++++++++++++++++
|
|
|
45e84a0 |
1 files changed, 32 insertions(+), 0 deletions(-)
|
|
|
45e84a0 |
|
|
|
45e84a0 |
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
|
|
|
45e84a0 |
index 9093a28..05000e3 100644
|
|
|
45e84a0 |
--- a/hw/pc_piix.c
|
|
|
45e84a0 |
+++ b/hw/pc_piix.c
|
|
|
45e84a0 |
@@ -328,6 +328,22 @@ static QEMUMachine pc_machine_v0_14 = {
|
|
|
45e84a0 |
.driver = "qxl-vga",
|
|
|
45e84a0 |
.property = "revision",
|
|
|
45e84a0 |
.value = stringify(2),
|
|
|
45e84a0 |
+ },{
|
|
|
45e84a0 |
+ .driver = "virtio-blk-pci",
|
|
|
45e84a0 |
+ .property = "event_idx",
|
|
|
45e84a0 |
+ .value = "off",
|
|
|
45e84a0 |
+ },{
|
|
|
45e84a0 |
+ .driver = "virtio-serial-pci",
|
|
|
45e84a0 |
+ .property = "event_idx",
|
|
|
45e84a0 |
+ .value = "off",
|
|
|
45e84a0 |
+ },{
|
|
|
45e84a0 |
+ .driver = "virtio-net-pci",
|
|
|
45e84a0 |
+ .property = "event_idx",
|
|
|
45e84a0 |
+ .value = "off",
|
|
|
45e84a0 |
+ },{
|
|
|
45e84a0 |
+ .driver = "virtio-balloon-pci",
|
|
|
45e84a0 |
+ .property = "event_idx",
|
|
|
45e84a0 |
+ .value = "off",
|
|
|
45e84a0 |
},
|
|
|
45e84a0 |
{ /* end of list */ }
|
|
|
45e84a0 |
},
|
|
|
45e84a0 |
@@ -368,6 +384,10 @@ static QEMUMachine pc_machine_v0_13 = {
|
|
|
45e84a0 |
.property = "event_idx",
|
|
|
45e84a0 |
.value = "off",
|
|
|
45e84a0 |
},{
|
|
|
45e84a0 |
+ .driver = "virtio-balloon-pci",
|
|
|
45e84a0 |
+ .property = "event_idx",
|
|
|
45e84a0 |
+ .value = "off",
|
|
|
45e84a0 |
+ },{
|
|
|
45e84a0 |
.driver = "AC97",
|
|
|
45e84a0 |
.property = "use_broken_id",
|
|
|
45e84a0 |
.value = stringify(1),
|
|
|
45e84a0 |
@@ -415,6 +435,10 @@ static QEMUMachine pc_machine_v0_12 = {
|
|
|
45e84a0 |
.property = "event_idx",
|
|
|
45e84a0 |
.value = "off",
|
|
|
45e84a0 |
},{
|
|
|
45e84a0 |
+ .driver = "virtio-balloon-pci",
|
|
|
45e84a0 |
+ .property = "event_idx",
|
|
|
45e84a0 |
+ .value = "off",
|
|
|
45e84a0 |
+ },{
|
|
|
45e84a0 |
.driver = "AC97",
|
|
|
45e84a0 |
.property = "use_broken_id",
|
|
|
45e84a0 |
.value = stringify(1),
|
|
|
45e84a0 |
@@ -470,6 +494,10 @@ static QEMUMachine pc_machine_v0_11 = {
|
|
|
45e84a0 |
.property = "event_idx",
|
|
|
45e84a0 |
.value = "off",
|
|
|
45e84a0 |
},{
|
|
|
45e84a0 |
+ .driver = "virtio-balloon-pci",
|
|
|
45e84a0 |
+ .property = "event_idx",
|
|
|
45e84a0 |
+ .value = "off",
|
|
|
45e84a0 |
+ },{
|
|
|
45e84a0 |
.driver = "AC97",
|
|
|
45e84a0 |
.property = "use_broken_id",
|
|
|
45e84a0 |
.value = stringify(1),
|
|
|
45e84a0 |
@@ -537,6 +565,10 @@ static QEMUMachine pc_machine_v0_10 = {
|
|
|
45e84a0 |
.property = "event_idx",
|
|
|
45e84a0 |
.value = "off",
|
|
|
45e84a0 |
},{
|
|
|
45e84a0 |
+ .driver = "virtio-balloon-pci",
|
|
|
45e84a0 |
+ .property = "event_idx",
|
|
|
45e84a0 |
+ .value = "off",
|
|
|
45e84a0 |
+ },{
|
|
|
45e84a0 |
.driver = "AC97",
|
|
|
45e84a0 |
.property = "use_broken_id",
|
|
|
45e84a0 |
.value = stringify(1),
|
|
|
45e84a0 |
--
|
|
|
45e84a0 |
1.7.7.5
|
|
|
45e84a0 |
|