* [Qemu-devel] [PATCH 1/3] virtio-ccw: Add missing blk chs properties.
2013-03-20 7:43 [Qemu-devel] [PATCH 0/3] virtio-ccw queue as of 2013/03/20 Cornelia Huck
@ 2013-03-20 7:43 ` Cornelia Huck
2013-03-20 7:43 ` [Qemu-devel] [PATCH 2/3] s390-virtio, virtio-ccw: Add config_wce for virtio-blk Cornelia Huck
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Cornelia Huck @ 2013-03-20 7:43 UTC (permalink / raw)
To: qemu-devel; +Cc: Alexander Graf
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 9688835..fc95116 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -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),
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Qemu-devel] [PATCH 2/3] s390-virtio, virtio-ccw: Add config_wce for virtio-blk.
2013-03-20 7:43 [Qemu-devel] [PATCH 0/3] virtio-ccw queue as of 2013/03/20 Cornelia Huck
2013-03-20 7:43 ` [Qemu-devel] [PATCH 1/3] virtio-ccw: Add missing blk chs properties Cornelia Huck
@ 2013-03-20 7:43 ` Cornelia Huck
2013-03-20 7:43 ` [Qemu-devel] [PATCH 3/3] virtio-ccw, s390-virtio: Use generic virtio-blk macro Cornelia Huck
2013-03-20 8:03 ` [Qemu-devel] [PATCH 0/3] virtio-ccw queue as of 2013/03/20 KONRAD Frédéric
3 siblings, 0 replies; 6+ messages in thread
From: Cornelia Huck @ 2013-03-20 7:43 UTC (permalink / raw)
To: qemu-devel; +Cc: Alexander Graf
There's no reason why we wouldn't want to make the cache mode
configurable.
Acked-by: 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 76bc99a..5d55a9d 100644
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -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(),
};
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index fc95116..afaf348 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -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(),
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Qemu-devel] [PATCH 3/3] virtio-ccw, s390-virtio: Use generic virtio-blk macro.
2013-03-20 7:43 [Qemu-devel] [PATCH 0/3] virtio-ccw queue as of 2013/03/20 Cornelia Huck
2013-03-20 7:43 ` [Qemu-devel] [PATCH 1/3] virtio-ccw: Add missing blk chs properties Cornelia Huck
2013-03-20 7:43 ` [Qemu-devel] [PATCH 2/3] s390-virtio, virtio-ccw: Add config_wce for virtio-blk Cornelia Huck
@ 2013-03-20 7:43 ` Cornelia Huck
2013-03-20 8:03 ` [Qemu-devel] [PATCH 0/3] virtio-ccw queue as of 2013/03/20 KONRAD Frédéric
3 siblings, 0 replies; 6+ messages in thread
From: Cornelia Huck @ 2013-03-20 7:43 UTC (permalink / raw)
To: qemu-devel; +Cc: Alexander Graf
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.
CC: Alexander Graf <agraf@suse.de>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
hw/s390x/s390-virtio-bus.c | 8 +-------
hw/s390x/virtio-ccw.c | 8 +-------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index 5d55a9d..c5d5456 100644
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -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(),
};
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index afaf348..4c44b7e 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -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(),
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH 0/3] virtio-ccw queue as of 2013/03/20
2013-03-20 7:43 [Qemu-devel] [PATCH 0/3] virtio-ccw queue as of 2013/03/20 Cornelia Huck
` (2 preceding siblings ...)
2013-03-20 7:43 ` [Qemu-devel] [PATCH 3/3] virtio-ccw, s390-virtio: Use generic virtio-blk macro Cornelia Huck
@ 2013-03-20 8:03 ` KONRAD Frédéric
2013-03-20 8:09 ` Cornelia Huck
3 siblings, 1 reply; 6+ messages in thread
From: KONRAD Frédéric @ 2013-03-20 8:03 UTC (permalink / raw)
To: Cornelia Huck; +Cc: qemu-devel, Alexander Graf
On 20/03/2013 08:43, Cornelia Huck wrote:
> 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(-)
>
Can I be CC'ed when this goes in?
Thanks,
Fred
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH 0/3] virtio-ccw queue as of 2013/03/20
2013-03-20 8:03 ` [Qemu-devel] [PATCH 0/3] virtio-ccw queue as of 2013/03/20 KONRAD Frédéric
@ 2013-03-20 8:09 ` Cornelia Huck
0 siblings, 0 replies; 6+ messages in thread
From: Cornelia Huck @ 2013-03-20 8:09 UTC (permalink / raw)
To: KONRAD Frédéric; +Cc: qemu-devel, Alexander Graf
On Wed, 20 Mar 2013 09:03:13 +0100
KONRAD Frédéric <fred.konrad@greensocs.com> wrote:
> On 20/03/2013 08:43, Cornelia Huck wrote:
> > 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(-)
> >
> Can I be CC'ed when this goes in?
Sure.
>
> Thanks,
> Fred
>
^ permalink raw reply [flat|nested] 6+ messages in thread