|
 |
cd9d161 |
From 3cc7ef743b3f04ff986c820f67444d2dec946167 Mon Sep 17 00:00:00 2001
|
|
|
cd9d161 |
From: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
cd9d161 |
Date: Sun, 18 Dec 2011 13:07:03 -0600
|
|
|
cd9d161 |
Subject: [PATCH] pc: fix event_idx compatibility for virtio devices
|
|
|
cd9d161 |
MIME-Version: 1.0
|
|
|
cd9d161 |
Content-Type: text/plain; charset=UTF-8
|
|
|
cd9d161 |
Content-Transfer-Encoding: 8bit
|
|
|
cd9d161 |
|
|
|
cd9d161 |
event_idx was introduced in 0.15 and must be disabled for all virtio-pci devices
|
|
|
cd9d161 |
(including virtio-balloon-pci).
|
|
|
cd9d161 |
|
|
|
cd9d161 |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
cd9d161 |
(cherry picked from commit ea830ebb74461c5ad6d199857fb000d2e0284c69)
|
|
|
cd9d161 |
|
|
|
cd9d161 |
[BR: bnc#741460]
|
|
|
cd9d161 |
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
|
cd9d161 |
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
|
cd9d161 |
---
|
|
|
cd9d161 |
hw/pc_piix.c | 32 ++++++++++++++++++++++++++++++++
|
|
|
cd9d161 |
1 file changed, 32 insertions(+)
|
|
|
cd9d161 |
|
|
|
cd9d161 |
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
|
|
|
cd9d161 |
index 20bac9d..b179465 100644
|
|
|
cd9d161 |
--- a/hw/pc_piix.c
|
|
|
cd9d161 |
+++ b/hw/pc_piix.c
|
|
|
cd9d161 |
@@ -281,6 +281,22 @@ static QEMUMachine pc_machine_v0_14 = {
|
|
|
cd9d161 |
.driver = "qxl-vga",
|
|
|
cd9d161 |
.property = "revision",
|
|
|
cd9d161 |
.value = stringify(2),
|
|
|
cd9d161 |
+ },{
|
|
|
cd9d161 |
+ .driver = "virtio-blk-pci",
|
|
|
cd9d161 |
+ .property = "event_idx",
|
|
|
cd9d161 |
+ .value = "off",
|
|
|
cd9d161 |
+ },{
|
|
|
cd9d161 |
+ .driver = "virtio-serial-pci",
|
|
|
cd9d161 |
+ .property = "event_idx",
|
|
|
cd9d161 |
+ .value = "off",
|
|
|
cd9d161 |
+ },{
|
|
|
cd9d161 |
+ .driver = "virtio-net-pci",
|
|
|
cd9d161 |
+ .property = "event_idx",
|
|
|
cd9d161 |
+ .value = "off",
|
|
|
cd9d161 |
+ },{
|
|
|
cd9d161 |
+ .driver = "virtio-balloon-pci",
|
|
|
cd9d161 |
+ .property = "event_idx",
|
|
|
cd9d161 |
+ .value = "off",
|
|
|
cd9d161 |
},
|
|
|
cd9d161 |
{ /* end of list */ }
|
|
|
cd9d161 |
},
|
|
|
cd9d161 |
@@ -321,6 +337,10 @@ static QEMUMachine pc_machine_v0_13 = {
|
|
|
cd9d161 |
.property = "event_idx",
|
|
|
cd9d161 |
.value = "off",
|
|
|
cd9d161 |
},{
|
|
|
cd9d161 |
+ .driver = "virtio-balloon-pci",
|
|
|
cd9d161 |
+ .property = "event_idx",
|
|
|
cd9d161 |
+ .value = "off",
|
|
|
cd9d161 |
+ },{
|
|
|
cd9d161 |
.driver = "AC97",
|
|
|
cd9d161 |
.property = "use_broken_id",
|
|
|
cd9d161 |
.value = stringify(1),
|
|
|
cd9d161 |
@@ -368,6 +388,10 @@ static QEMUMachine pc_machine_v0_12 = {
|
|
|
cd9d161 |
.property = "event_idx",
|
|
|
cd9d161 |
.value = "off",
|
|
|
cd9d161 |
},{
|
|
|
cd9d161 |
+ .driver = "virtio-balloon-pci",
|
|
|
cd9d161 |
+ .property = "event_idx",
|
|
|
cd9d161 |
+ .value = "off",
|
|
|
cd9d161 |
+ },{
|
|
|
cd9d161 |
.driver = "AC97",
|
|
|
cd9d161 |
.property = "use_broken_id",
|
|
|
cd9d161 |
.value = stringify(1),
|
|
|
cd9d161 |
@@ -423,6 +447,10 @@ static QEMUMachine pc_machine_v0_11 = {
|
|
|
cd9d161 |
.property = "event_idx",
|
|
|
cd9d161 |
.value = "off",
|
|
|
cd9d161 |
},{
|
|
|
cd9d161 |
+ .driver = "virtio-balloon-pci",
|
|
|
cd9d161 |
+ .property = "event_idx",
|
|
|
cd9d161 |
+ .value = "off",
|
|
|
cd9d161 |
+ },{
|
|
|
cd9d161 |
.driver = "AC97",
|
|
|
cd9d161 |
.property = "use_broken_id",
|
|
|
cd9d161 |
.value = stringify(1),
|
|
|
cd9d161 |
@@ -490,6 +518,10 @@ static QEMUMachine pc_machine_v0_10 = {
|
|
|
cd9d161 |
.property = "event_idx",
|
|
|
cd9d161 |
.value = "off",
|
|
|
cd9d161 |
},{
|
|
|
cd9d161 |
+ .driver = "virtio-balloon-pci",
|
|
|
cd9d161 |
+ .property = "event_idx",
|
|
|
cd9d161 |
+ .value = "off",
|
|
|
cd9d161 |
+ },{
|
|
|
cd9d161 |
.driver = "AC97",
|
|
|
cd9d161 |
.property = "use_broken_id",
|
|
|
cd9d161 |
.value = stringify(1),
|
|
|
cd9d161 |
--
|
|
|
cd9d161 |
1.7.11.2
|
|
|
cd9d161 |
|