On Tue, Jun 17, 2014 at 12:04 AM, Cornelia Huck
<cornelia.h...@de.ibm.com> wrote:
> On Mon, 16 Jun 2014 23:40:50 +0800
> Ming Lei <ming....@canonical.com> wrote:
>
>> The two common virtio features can be defined per bus, so move all
>> into virtio-s390 class device to make code more clean.
>>
>> Suggested-by: Paolo Bonzini <pbonz...@redhat.com>
>> Signed-off-by: Ming Lei <ming....@canonical.com>
>> ---
>> hw/s390x/s390-virtio-bus.c | 15 ++++++---------
>> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> This one breaks for me:
>
> qemu-system-s390x: -device
> virtio-blk-s390,scsi=off,config-wce=off,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1:
> Property '.scsi' not found
>
>>
>> diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
>> index 9c71afa..ab9758e 100644
>> --- a/hw/s390x/s390-virtio-bus.c
>> +++ b/hw/s390x/s390-virtio-bus.c
>> @@ -526,18 +526,11 @@ static const TypeInfo s390_virtio_net = {
>> .class_init = s390_virtio_net_class_init,
>> };
>>
>> -static Property s390_virtio_blk_properties[] = {
>> - DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkS390, blk),
>> - DEFINE_PROP_END_OF_LIST(),
>> -};
>> -
>> static void s390_virtio_blk_class_init(ObjectClass *klass, void *data)
>> {
>> - DeviceClass *dc = DEVICE_CLASS(klass);
>> VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
>>
>> k->init = s390_virtio_blk_init;
>> - dc->props = s390_virtio_blk_properties;
>
> ...which is probably because you removed the block properties here.
You are right, DEFINE_VIRTIO_BLK_PROPERTIES() should have been
kept.
Could you test attached patch?
Thanks,
--
Ming Lei
From 8b58db209e5703583f9d8133e32c69a03ecca6ec Mon Sep 17 00:00:00 2001
From: Ming Lei <ming....@canonical.com>
Date: Mon, 16 Jun 2014 23:23:28 +0800
Subject: [PATCH 2/4] s390-virtio-bus: move common virtio properties to virtio
s390 device class
The two common virtio features can be defined per bus, so move all
into virtio-s390 class device to make code more clean.
Suggested-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Ming Lei <ming....@canonical.com>
---
hw/s390x/s390-virtio-bus.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index 9c71afa..34f6de8 100644
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -571,7 +571,6 @@ static const TypeInfo s390_virtio_serial = {
};
static Property s390_virtio_rng_properties[] = {
- DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features),
DEFINE_VIRTIO_RNG_PROPERTIES(VirtIORNGS390, vdev.conf),
DEFINE_PROP_END_OF_LIST(),
};
@@ -610,10 +609,16 @@ static void s390_virtio_busdev_reset(DeviceState *dev)
virtio_reset(_dev->vdev);
}
+static Property virtio_s390_properties[] = {
+ DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
static void virtio_s390_device_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ dc->props = virtio_s390_properties;
dc->init = s390_virtio_busdev_init;
dc->bus_type = TYPE_S390_VIRTIO_BUS;
dc->unplug = qdev_simple_unplug_cb;
@@ -654,7 +659,6 @@ static const TypeInfo s390_virtio_scsi = {
#ifdef CONFIG_VHOST_SCSI
static Property s390_vhost_scsi_properties[] = {
- DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features),
DEFINE_VHOST_SCSI_PROPERTIES(VHostSCSIS390, vdev.parent_obj.conf),
DEFINE_PROP_END_OF_LIST(),
};
--
1.7.9.5
