* [Qemu-devel] [PATCH 2/2] pc: fix event_idx compatibility for virtio devices
2011-12-19 14:45 [Qemu-devel] [PATCH 1/2] pc: add pc-0.15 Anthony Liguori
@ 2011-12-19 14:45 ` Anthony Liguori
2011-12-19 15:35 ` [Qemu-devel] [PATCH 1/2] pc: add pc-0.15 Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Anthony Liguori @ 2011-12-19 14:45 UTC (permalink / raw)
To: qemu-devel; +Cc: Anthony Liguori
event_idx was introduced in 0.15 and must be disabled for all virtio-pci devices
(including virtio-balloon-pci).
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
hw/pc_piix.c | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 265ccb2..b9bb09d 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -343,6 +343,22 @@ static QEMUMachine pc_machine_v0_14 = {
.driver = "qxl-vga",
.property = "revision",
.value = stringify(2),
+ },{
+ .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",
+ },{
+ .driver = "virtio-balloon-pci",
+ .property = "event_idx",
+ .value = "off",
},
{ /* end of list */ }
},
@@ -383,6 +399,10 @@ static QEMUMachine pc_machine_v0_13 = {
.property = "event_idx",
.value = "off",
},{
+ .driver = "virtio-balloon-pci",
+ .property = "event_idx",
+ .value = "off",
+ },{
.driver = "AC97",
.property = "use_broken_id",
.value = stringify(1),
@@ -430,6 +450,10 @@ static QEMUMachine pc_machine_v0_12 = {
.property = "event_idx",
.value = "off",
},{
+ .driver = "virtio-balloon-pci",
+ .property = "event_idx",
+ .value = "off",
+ },{
.driver = "AC97",
.property = "use_broken_id",
.value = stringify(1),
@@ -485,6 +509,10 @@ static QEMUMachine pc_machine_v0_11 = {
.property = "event_idx",
.value = "off",
},{
+ .driver = "virtio-balloon-pci",
+ .property = "event_idx",
+ .value = "off",
+ },{
.driver = "AC97",
.property = "use_broken_id",
.value = stringify(1),
@@ -552,6 +580,10 @@ static QEMUMachine pc_machine_v0_10 = {
.property = "event_idx",
.value = "off",
},{
+ .driver = "virtio-balloon-pci",
+ .property = "event_idx",
+ .value = "off",
+ },{
.driver = "AC97",
.property = "use_broken_id",
.value = stringify(1),
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH 1/2] pc: add pc-0.15
2011-12-19 14:45 [Qemu-devel] [PATCH 1/2] pc: add pc-0.15 Anthony Liguori
2011-12-19 14:45 ` [Qemu-devel] [PATCH 2/2] pc: fix event_idx compatibility for virtio devices Anthony Liguori
@ 2011-12-19 15:35 ` Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Anthony Liguori @ 2011-12-19 15:35 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, qemu-stable
On 12/19/2011 08:45 AM, Anthony Liguori wrote:
> Signed-off-by: Anthony Liguori<aliguori@us.ibm.com>
I should add that both of these are stable candidates. The second one in
particular.
Regards,
Anthony Liguori
> ---
> hw/pc_piix.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index 166c2fc..265ccb2 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -321,6 +321,14 @@ static QEMUMachine pc_machine_v1_0 = {
> .is_default = 1,
> };
>
> +static QEMUMachine pc_machine_v0_15 = {
> + .name = "pc-0.15",
> + .desc = "Standard PC",
> + .init = pc_init_pci,
> + .max_cpus = 255,
> + .is_default = 1,
> +};
> +
> static QEMUMachine pc_machine_v0_14 = {
> .name = "pc-0.14",
> .desc = "Standard PC",
> @@ -572,6 +580,7 @@ static QEMUMachine xenfv_machine = {
> static void pc_machine_init(void)
> {
> qemu_register_machine(&pc_machine_v1_0);
> + qemu_register_machine(&pc_machine_v0_15);
> qemu_register_machine(&pc_machine_v0_14);
> qemu_register_machine(&pc_machine_v0_13);
> qemu_register_machine(&pc_machine_v0_12);
^ permalink raw reply [flat|nested] 3+ messages in thread