[Qemu-devel] [PATCH 0/3] s390: Fix compile, add 0.12 machine type, backward compat

[Qemu-devel] [PATCH 0/3] s390: Fix compile, add 0.12 machine type, backward compat

[Amit Shah]

Hello,

This series fixes a compile error and adds 0.12 and 0.13 machine
types, disabling newer virtio-serial features for 0.12.

Note: The name for the machine type changes from s390-virtio to
s390-virtio-vXX, this may not be compatible for 0.12.

Amit Shah (3):
  s390-virtio: Fix compile error for virtio-block init
  s390: Add a 0.12 machine type for compatibility
  s390-virtio: Disable new virtio-serial features for 0.12 machine type

 hw/s390-virtio-bus.c |    2 +-
 hw/s390-virtio.c     |   26 +++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

[Qemu-devel] [PATCH 1/3] s390-virtio: Fix compile error for virtio-block init

[Amit Shah]

Commit 428c149b0be790b440e1cbee185b152cdb22feec modified the argument
that virtio_blk_init takes. Update the s390 bus code that calls this
function.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
CC: Christoph Hellwig <hch@lst.de>
---
 hw/s390-virtio-bus.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index fa0a74f..9fc01e9 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -123,7 +123,7 @@ static int s390_virtio_blk_init(VirtIOS390Device *dev)
 {
     VirtIODevice *vdev;
 
-    vdev = virtio_blk_init((DeviceState *)dev, dev->block.dinfo);
+    vdev = virtio_blk_init((DeviceState *)dev, &dev->block);
     if (!vdev) {
         return -1;
     }
-- 
1.6.2.5

[Qemu-devel] [PATCH 2/3] s390: Add a 0.12 machine type for compatibility

[Amit Shah]

Add a 0.12 s390-virtio machine type for compatibility with older
versions.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 hw/s390-virtio.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 3582728..a3cbfb6 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -242,7 +242,7 @@ static void s390_init(ram_addr_t ram_size,
 }
 
 static QEMUMachine s390_machine = {
-    .name = "s390-virtio",
+    .name = "s390-virtio-0.13",
     .alias = "s390",
     .desc = "VirtIO based S390 machine",
     .init = s390_init,
@@ -254,9 +254,21 @@ static QEMUMachine s390_machine = {
     .is_default = 1,
 };
 
+static QEMUMachine s390_machine_v0_12 = {
+    .name = "s390-virtio-0.12",
+    .desc = "VirtIO based S390 machine for v0.12 compatibility",
+    .init = s390_init,
+    .no_serial = 1,
+    .no_parallel = 1,
+    .use_virtcon = 1,
+    .no_vga = 1,
+    .max_cpus = 255,
+};
+
 static void s390_machine_init(void)
 {
     qemu_register_machine(&s390_machine);
+    qemu_register_machine(&s390_machine_v0_12);
 }
 
 machine_init(s390_machine_init);
-- 
1.6.2.5

[Qemu-devel] [PATCH 3/3] s390-virtio: Disable new virtio-serial features for 0.12 machine type

[Amit Shah]

Disable the MULTIPORT feature and MSI vectors for the 0.12 machine
types; those features are added only for 0.13 onwards.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 hw/s390-virtio.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index a3cbfb6..f027521 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -263,6 +263,18 @@ static QEMUMachine s390_machine_v0_12 = {
     .use_virtcon = 1,
     .no_vga = 1,
     .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        {
+            .driver   = "virtio-serial-s390",
+            .property = "max_nr_ports",
+            .value    = stringify(1),
+        },{
+            .driver   = "virtio-serial-s390",
+            .property = "vectors",
+            .value    = stringify(0),
+        },
+        { /* end of list */ }
+  },
 };
 
 static void s390_machine_init(void)
-- 
1.6.2.5

Re: [Qemu-devel] [PATCH 1/3] s390-virtio: Fix compile error for virtio-block init

[Aurelien Jarno]

On Thu, Feb 25, 2010 at 07:15:18PM +0530, Amit Shah wrote:
> Commit 428c149b0be790b440e1cbee185b152cdb22feec modified the argument
> that virtio_blk_init takes. Update the s390 bus code that calls this
> function.
> 
> Signed-off-by: Amit Shah <amit.shah@redhat.com>
> CC: Christoph Hellwig <hch@lst.de>

Thanks, applied.

> ---
>  hw/s390-virtio-bus.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
> index fa0a74f..9fc01e9 100644
> --- a/hw/s390-virtio-bus.c
> +++ b/hw/s390-virtio-bus.c
> @@ -123,7 +123,7 @@ static int s390_virtio_blk_init(VirtIOS390Device *dev)
>  {
>      VirtIODevice *vdev;
>  
> -    vdev = virtio_blk_init((DeviceState *)dev, dev->block.dinfo);
> +    vdev = virtio_blk_init((DeviceState *)dev, &dev->block);
>      if (!vdev) {
>          return -1;
>      }
> -- 
> 1.6.2.5
> 
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net

[Qemu-devel] Re: [PATCH 0/3] s390: Fix compile, add 0.12 machine type, backward compat

[Alexander Graf]

Hi Amit,

On 25.02.2010, at 14:45, Amit Shah wrote:

> Hello,
> 
> This series fixes a compile error and adds 0.12 and 0.13 machine
> types, disabling newer virtio-serial features for 0.12.
> 
> Note: The name for the machine type changes from s390-virtio to
> s390-virtio-vXX, this may not be compatible for 0.12.

Cool, thanks for doing this!

I'm fairly sure that we don't need a 0.12 compatibility machine though. There's no save/restore on S390 yet and your extensions work just fine with older kernels. So for the sake of simplicity I'd say leave it as is :-).

The compile fix would be good to apply nevertheless.


Alex