| Message ID | 1431397521-2316-2-git-send-email-shannon.zhao@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 12 May 2015 at 03:25, <shannon.zhao@linaro.org> wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > --- > hw/s390x/s390-virtio-bus.c | 15 --------------- > 1 file changed, 15 deletions(-) > > diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c > index 1a72b56..273bd9c 100644 > --- a/hw/s390x/s390-virtio-bus.c > +++ b/hw/s390x/s390-virtio-bus.c > @@ -536,17 +536,12 @@ static unsigned virtio_s390_get_features(DeviceState *d) > Net and scsi are already fixed in master (I had to do that as part of the conflict resolution between your virtio patches and Cornelia's). -- PMM
On 2015/5/12 15:52, Peter Maydell wrote: > On 12 May 2015 at 03:25, <shannon.zhao@linaro.org> wrote: >> > From: Shannon Zhao <shannon.zhao@linaro.org> >> > >> > Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> >> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> >> > --- >> > hw/s390x/s390-virtio-bus.c | 15 --------------- >> > 1 file changed, 15 deletions(-) >> > >> > diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c >> > index 1a72b56..273bd9c 100644 >> > --- a/hw/s390x/s390-virtio-bus.c >> > +++ b/hw/s390x/s390-virtio-bus.c >> > @@ -536,17 +536,12 @@ static unsigned virtio_s390_get_features(DeviceState *d) >> > > Net and scsi are already fixed in master (I had to do that > as part of the conflict resolution between your virtio > patches and Cornelia's). Ok, so need to respin?
Applied (finally!) to -trivial, without already fixed -net and -scsi bits. Thanks! /mjt
Michael, Am 11.09.2015 um 10:00 schrieb Michael Tokarev: > Applied (finally!) to -trivial, without already fixed -net and -scsi bits. > Thanks! Can you please tweak the subjects? I found "blank Property" a very troubling thing to read. In fact it's an empty Property[] array. Thanks, Andreas
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 1a72b56..273bd9c 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -536,17 +536,12 @@ static unsigned virtio_s390_get_features(DeviceState *d) /**************** S390 Virtio Bus Device Descriptions *******************/ -static Property s390_virtio_net_properties[] = { - DEFINE_PROP_END_OF_LIST(), -}; - static void s390_virtio_net_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass); k->realize = s390_virtio_net_realize; - dc->props = s390_virtio_net_properties; set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); } @@ -575,17 +570,12 @@ static const TypeInfo s390_virtio_blk = { .class_init = s390_virtio_blk_class_init, }; -static Property s390_virtio_serial_properties[] = { - DEFINE_PROP_END_OF_LIST(), -}; - static void s390_virtio_serial_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass); k->realize = s390_virtio_serial_realize; - dc->props = s390_virtio_serial_properties; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } @@ -655,17 +645,12 @@ static const TypeInfo virtio_s390_device_info = { .abstract = true, }; -static Property s390_virtio_scsi_properties[] = { - DEFINE_PROP_END_OF_LIST(), -}; - static void s390_virtio_scsi_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass); k->realize = s390_virtio_scsi_realize; - dc->props = s390_virtio_scsi_properties; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); }