Skip to contentSkip to conversation

virtio-ccw queue as of 2013/03/20

PATCH In review Cornelia Huck 2 participants 6 messages Mar 20, 2013

lore
Share & tools
lore
#0 lore raw

cover virtio-ccw queue as of 2013/03/20

Hi,

here are again my patches adding missing virtio-blk properties for the s390 transports, this time rebased on top of the virtio-blk refactoring.

The third patch is new, bringing s390-virtio and virtio-ccw in line with virtio-pci.

Alex, again I'd like an ack from you (for the new patch) so I can take this through my tree.

Cornelia Huck (3):
virtio-ccw: Add missing blk chs properties. s390-virtio, virtio-ccw: Add config_wce for virtio-blk. virtio-ccw, s390-virtio: Use generic virtio-blk macro.

 hw/s390x/s390-virtio-bus.c |    7 +------
 hw/s390x/virtio-ccw.c      |    6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/3 virtio-ccw: Add missing blk chs properties.

---
 hw/s390x/virtio-ccw.c |    1 +
 1 file changed, 1 insertion(+)
hw/s390x/virtio-ccw.c +1 -0
index 9688835..fc95116 100644
@@ -757,6 +757,7 @@ static const TypeInfo virtio_ccw_net = {
 static Property virtio_ccw_blk_properties[] = {
     DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),
     DEFINE_BLOCK_PROPERTIES(VirtIOBlkCcw, blk.conf),
+    DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlkCcw, blk.conf),
     DEFINE_PROP_STRING("serial", VirtIOBlkCcw, blk.serial),
 #ifdef __linux__
     DEFINE_PROP_BIT("scsi", VirtIOBlkCcw, blk.scsi, 0, true),
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/3 s390-virtio, virtio-ccw: Add config_wce for virtio-blk.

In reply to Cornelia Huck

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

---
 hw/s390x/s390-virtio-bus.c |    1 +
 hw/s390x/virtio-ccw.c      |    1 +
 2 files changed, 2 insertions(+)
hw/s390x/s390-virtio-bus.c +1 -0
index 76bc99a..5d55a9d 100644
@@ -441,6 +441,7 @@ static Property s390_virtio_blk_properties[] = {
 #ifdef __linux__
     DEFINE_PROP_BIT("scsi", VirtIOBlkS390, blk.scsi, 0, true),
 #endif
+    DEFINE_PROP_BIT("config-wce", VirtIOBlkS390, blk.config_wce, 0, true),
     DEFINE_PROP_END_OF_LIST(),
 };
 
hw/s390x/virtio-ccw.c +1 -0
index fc95116..afaf348 100644
@@ -762,6 +762,7 @@ static Property virtio_ccw_blk_properties[] = {
 #ifdef __linux__
     DEFINE_PROP_BIT("scsi", VirtIOBlkCcw, blk.scsi, 0, true),
 #endif
+    DEFINE_PROP_BIT("config-wce", VirtIOBlkCcw, blk.config_wce, 0, true),
     DEFINE_VIRTIO_BLK_FEATURES(VirtioCcwDevice, host_features[0]),
     DEFINE_PROP_END_OF_LIST(),
 };
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 3/3 virtio-ccw, s390-virtio: Use generic virtio-blk macro.

In reply to Cornelia Huck

Now that virtio-ccw and s390-virtio define all common properties for virtio-blk, we can switch to using the generic DEFINE_VIRTIO_BLK_PROPERTIES macro.

---
 hw/s390x/s390-virtio-bus.c |    8 +-------
 hw/s390x/virtio-ccw.c      |    8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)
hw/s390x/s390-virtio-bus.c +1 -7
index 5d55a9d..c5d5456 100644
@@ -435,13 +435,7 @@ static const TypeInfo s390_virtio_net = {
 };
 
 static Property s390_virtio_blk_properties[] = {
-    DEFINE_BLOCK_PROPERTIES(VirtIOBlkS390, blk.conf),
-    DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlkS390, blk.conf),
-    DEFINE_PROP_STRING("serial", VirtIOBlkS390, blk.serial),
-#ifdef __linux__
-    DEFINE_PROP_BIT("scsi", VirtIOBlkS390, blk.scsi, 0, true),
-#endif
-    DEFINE_PROP_BIT("config-wce", VirtIOBlkS390, blk.config_wce, 0, true),
+    DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkS390, blk),
     DEFINE_PROP_END_OF_LIST(),
 };
 
hw/s390x/virtio-ccw.c +1 -7
index afaf348..4c44b7e 100644
@@ -756,14 +756,8 @@ static const TypeInfo virtio_ccw_net = {
 
 static Property virtio_ccw_blk_properties[] = {
     DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),
-    DEFINE_BLOCK_PROPERTIES(VirtIOBlkCcw, blk.conf),
-    DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlkCcw, blk.conf),
-    DEFINE_PROP_STRING("serial", VirtIOBlkCcw, blk.serial),
-#ifdef __linux__
-    DEFINE_PROP_BIT("scsi", VirtIOBlkCcw, blk.scsi, 0, true),
-#endif
-    DEFINE_PROP_BIT("config-wce", VirtIOBlkCcw, blk.config_wce, 0, true),
     DEFINE_VIRTIO_BLK_FEATURES(VirtioCcwDevice, host_features[0]),
+    DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkCcw, blk),
     DEFINE_PROP_END_OF_LIST(),
 };
 
Signature · 1 line
1.7.9.5
#4 lore raw
In reply to Cornelia Huck
Quoted 12 lines · Cornelia Huck

Hi,

here are again my patches adding missing virtio-blk properties for the s390 transports, this time rebased on top of the virtio-blk refactoring.

The third patch is new, bringing s390-virtio and virtio-ccw in line with virtio-pci.

Alex, again I'd like an ack from you (for the new patch) so I can take this through my tree.

Quoted 9 lines

Cornelia Huck (3):
virtio-ccw: Add missing blk chs properties. s390-virtio, virtio-ccw: Add config_wce for virtio-blk. virtio-ccw, s390-virtio: Use generic virtio-blk macro.

  hw/s390x/s390-virtio-bus.c |    7 +------
  hw/s390x/virtio-ccw.c      |    6 +-----
  2 files changed, 2 insertions(+), 11 deletions(-)

Can I be CC'ed when this goes in?

Thanks,
Fred

#5 lore raw
Quoted 18 lines · On Wed, 20 Mar 2013 09:03:13 +0100 KONRAD Frédéric <[email protected]>…
Quoted 17 lines · Cornelia Huck

Hi,

here are again my patches adding missing virtio-blk properties for the s390 transports, this time rebased on top of the virtio-blk refactoring.

The third patch is new, bringing s390-virtio and virtio-ccw in line with virtio-pci.

Alex, again I'd like an ack from you (for the new patch) so I can take this through my tree.

Cornelia Huck (3):
virtio-ccw: Add missing blk chs properties. s390-virtio, virtio-ccw: Add config_wce for virtio-blk. virtio-ccw, s390-virtio: Use generic virtio-blk macro.

Quoted 5 lines
Quoted 4 lines
  hw/s390x/s390-virtio-bus.c |    7 +------
  hw/s390x/virtio-ccw.c      |    6 +-----
  2 files changed, 2 insertions(+), 11 deletions(-)

Can I be CC'ed when this goes in?

Sure.

Quoted 4 lines

Thanks,
Fred