[Qemu-devel] [PATCH 0/2] virtio-ccw queue as of 03/18/13

[Qemu-devel] [PATCH 0/2] virtio-ccw queue as of 03/18/13

[Cornelia Huck]

The following patches can be found in my git tree at

git://github.com/cohuck/qemu virtio-ccw-upstr

Current patches in the virtio-ccw queue deal both with adding some
missing properties for virtio-blk.

Alex: Could you please ack patch 2 for s390-virtio, or would you prefer
to take it through your tree?

Cornelia Huck (2):
  virtio-ccw: Add missing blk chs properties.
  s390-virtio, virtio-ccw: Add config_wce for virtio-blk.

 hw/s390x/s390-virtio-bus.c |    1 +
 hw/s390x/virtio-ccw.c      |    2 ++
 2 files changed, 3 insertions(+)

-- 
1.7.9.5

[Qemu-devel] [PATCH 1/2] virtio-ccw: Add missing blk chs properties.

[Cornelia Huck]

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 hw/s390x/virtio-ccw.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index d4361f6..70aba41 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -755,6 +755,7 @@ static const TypeInfo virtio_ccw_net = {
 static Property virtio_ccw_blk_properties[] = {
     DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),
     DEFINE_BLOCK_PROPERTIES(VirtioCcwDevice, blk.conf),
+    DEFINE_BLOCK_CHS_PROPERTIES(VirtioCcwDevice, blk.conf),
     DEFINE_PROP_STRING("serial", VirtioCcwDevice, blk.serial),
 #ifdef __linux__
     DEFINE_PROP_BIT("scsi", VirtioCcwDevice, blk.scsi, 0, true),
-- 
1.7.9.5

[Qemu-devel] [PATCH 2/2] s390-virtio, virtio-ccw: Add config_wce for virtio-blk.

[Cornelia Huck]

There's no reason why we wouldn't want to make the cache mode
configurable.

CC: Alexander Graf <agraf@suse.de>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 hw/s390x/s390-virtio-bus.c |    1 +
 hw/s390x/virtio-ccw.c      |    1 +
 2 files changed, 2 insertions(+)

diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index d9b7f83..18f1292 100644
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -434,6 +434,7 @@ static Property s390_virtio_blk_properties[] = {
 #ifdef __linux__
     DEFINE_PROP_BIT("scsi", VirtIOS390Device, blk.scsi, 0, true),
 #endif
+    DEFINE_PROP_BIT("config-wce", VirtIOS390Device, blk.config_wce, 0, true),
     DEFINE_PROP_END_OF_LIST(),
 };
 
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 70aba41..5795bdd 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -761,6 +761,7 @@ static Property virtio_ccw_blk_properties[] = {
     DEFINE_PROP_BIT("scsi", VirtioCcwDevice, blk.scsi, 0, true),
 #endif
     DEFINE_VIRTIO_BLK_FEATURES(VirtioCcwDevice, host_features[0]),
+    DEFINE_PROP_BIT("config-wce", VirtioCcwDevice, blk.config_wce, 0, true),
     DEFINE_PROP_END_OF_LIST(),
 };
 
-- 
1.7.9.5

Re: [Qemu-devel] [PATCH 2/2] s390-virtio, virtio-ccw: Add config_wce for virtio-blk.

[Alexander Graf]

On 18.03.2013, at 12:42, Cornelia Huck wrote:

> There's no reason why we wouldn't want to make the cache mode
> configurable.
> 
> CC: Alexander Graf <agraf@suse.de>
> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Acked-by: Alexander Graf <agraf@suse.de>

Let's hope this whole bug category goes away with Fred's revamp of virtio :)


Alex

> ---
> hw/s390x/s390-virtio-bus.c |    1 +
> hw/s390x/virtio-ccw.c      |    1 +
> 2 files changed, 2 insertions(+)
> 
> diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
> index d9b7f83..18f1292 100644
> --- a/hw/s390x/s390-virtio-bus.c
> +++ b/hw/s390x/s390-virtio-bus.c
> @@ -434,6 +434,7 @@ static Property s390_virtio_blk_properties[] = {
> #ifdef __linux__
>     DEFINE_PROP_BIT("scsi", VirtIOS390Device, blk.scsi, 0, true),
> #endif
> +    DEFINE_PROP_BIT("config-wce", VirtIOS390Device, blk.config_wce, 0, true),
>     DEFINE_PROP_END_OF_LIST(),
> };
> 
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index 70aba41..5795bdd 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -761,6 +761,7 @@ static Property virtio_ccw_blk_properties[] = {
>     DEFINE_PROP_BIT("scsi", VirtioCcwDevice, blk.scsi, 0, true),
> #endif
>     DEFINE_VIRTIO_BLK_FEATURES(VirtioCcwDevice, host_features[0]),
> +    DEFINE_PROP_BIT("config-wce", VirtioCcwDevice, blk.config_wce, 0, true),
>     DEFINE_PROP_END_OF_LIST(),
> };
> 
> -- 
> 1.7.9.5
> 

[Qemu-devel] [PATCH 1/2] virtio-ccw: Add missing blk chs properties.

[Cornelia Huck]

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 hw/s390x/virtio-ccw.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index d4361f6..70aba41 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -755,6 +755,7 @@ static const TypeInfo virtio_ccw_net = {
 static Property virtio_ccw_blk_properties[] = {
     DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),
     DEFINE_BLOCK_PROPERTIES(VirtioCcwDevice, blk.conf),
+    DEFINE_BLOCK_CHS_PROPERTIES(VirtioCcwDevice, blk.conf),
     DEFINE_PROP_STRING("serial", VirtioCcwDevice, blk.serial),
 #ifdef __linux__
     DEFINE_PROP_BIT("scsi", VirtioCcwDevice, blk.scsi, 0, true),
-- 
1.7.9.5