Re: [Qemu-devel] [PATCH] s390x/virtio: Convert virtio-ccw from *_exit to *_unrealize

2018-03-09 Thread Pierre Morel 

On 09/03/2018 11:27, Cornelia Huck wrote:

On Fri, 9 Mar 2018 10:23:31 +0100
Pierre Morel  wrote:


On 07/03/2018 17:29, Nia Alarie wrote:

Signed-off-by: Nia Alarie 

What you do seems right to me, naming seems more logical, but  can you
please
add a little commit message explaining why you change the interface?

I had asked Nia to do this; see the comments in qdev-core.h regarding
usage of exit vs. unrealize.


OK thanks.



(I have already queued this for a pull request, since I'll be out
starting tomorrow.)


have fun where you go. :)

See you.
bye




Thanks,

Pierre


---
   hw/s390x/virtio-ccw.c | 34 +-
   hw/s390x/virtio-ccw.h |  2 +-
   2 files changed, 18 insertions(+), 18 deletions(-)



--
Pierre Morel
Linux/KVM/QEMU in Böblingen - Germany

Re: [Qemu-devel] [PATCH] s390x/virtio: Convert virtio-ccw from *_exit to *_unrealize

2018-03-09 Thread Cornelia Huck 
On Fri, 9 Mar 2018 10:23:31 +0100
Pierre Morel  wrote:

> On 07/03/2018 17:29, Nia Alarie wrote:
> > Signed-off-by: Nia Alarie   
> 
> What you do seems right to me, naming seems more logical, but  can you 
> please
> add a little commit message explaining why you change the interface?

I had asked Nia to do this; see the comments in qdev-core.h regarding
usage of exit vs. unrealize.

(I have already queued this for a pull request, since I'll be out
starting tomorrow.)

> 
> Thanks,
> 
> Pierre
> 
> > ---
> >   hw/s390x/virtio-ccw.c | 34 +-
> >   hw/s390x/virtio-ccw.h |  2 +-
> >   2 files changed, 18 insertions(+), 18 deletions(-)

Re: [Qemu-devel] [PATCH] s390x/virtio: Convert virtio-ccw from *_exit to *_unrealize

2018-03-09 Thread Pierre Morel 

On 07/03/2018 17:29, Nia Alarie wrote:

Signed-off-by: Nia Alarie 


What you do seems right to me, naming seems more logical, but  can you 
please

add a little commit message explaining why you change the interface?

Thanks,

Pierre


---
  hw/s390x/virtio-ccw.c | 34 +-
  hw/s390x/virtio-ccw.h |  2 +-
  2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 8f7fbc2ab7..e51fbefd23 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -752,7 +752,7 @@ out_err:
  g_free(sch);
  }

-static int virtio_ccw_exit(VirtioCcwDevice *dev)
+static void virtio_ccw_unrealize(VirtioCcwDevice *dev, Error **errp)
  {
  CcwDevice *ccw_dev = CCW_DEVICE(dev);
  SubchDev *sch = ccw_dev->sch;
@@ -760,12 +760,12 @@ static int virtio_ccw_exit(VirtioCcwDevice *dev)
  if (sch) {
  css_subch_assign(sch->cssid, sch->ssid, sch->schid, sch->devno, NULL);
  g_free(sch);
+ccw_dev->sch = NULL;
  }
  if (dev->indicators) {
  release_indicator(&dev->routes.adapter, dev->indicators);
  dev->indicators = NULL;
  }
-return 0;
  }

  static void virtio_ccw_net_realize(VirtioCcwDevice *ccw_dev, Error **errp)
@@ -1344,7 +1344,7 @@ static void virtio_ccw_net_class_init(ObjectClass *klass, 
void *data)
  VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);

  k->realize = virtio_ccw_net_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
  dc->reset = virtio_ccw_reset;
  dc->props = virtio_ccw_net_properties;
  set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
@@ -1372,7 +1372,7 @@ static void virtio_ccw_blk_class_init(ObjectClass *klass, 
void *data)
  VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);

  k->realize = virtio_ccw_blk_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
  dc->reset = virtio_ccw_reset;
  dc->props = virtio_ccw_blk_properties;
  set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
@@ -1400,7 +1400,7 @@ static void virtio_ccw_serial_class_init(ObjectClass 
*klass, void *data)
  VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);

  k->realize = virtio_ccw_serial_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
  dc->reset = virtio_ccw_reset;
  dc->props = virtio_ccw_serial_properties;
  set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
@@ -1428,7 +1428,7 @@ static void virtio_ccw_balloon_class_init(ObjectClass 
*klass, void *data)
  VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);

  k->realize = virtio_ccw_balloon_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
  dc->reset = virtio_ccw_reset;
  dc->props = virtio_ccw_balloon_properties;
  set_bit(DEVICE_CATEGORY_MISC, dc->categories);
@@ -1456,7 +1456,7 @@ static void virtio_ccw_scsi_class_init(ObjectClass 
*klass, void *data)
  VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);

  k->realize = virtio_ccw_scsi_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
  dc->reset = virtio_ccw_reset;
  dc->props = virtio_ccw_scsi_properties;
  set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
@@ -1483,7 +1483,7 @@ static void vhost_ccw_scsi_class_init(ObjectClass *klass, 
void *data)
  VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);

  k->realize = vhost_ccw_scsi_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
  dc->reset = virtio_ccw_reset;
  dc->props = vhost_ccw_scsi_properties;
  set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
@@ -1520,7 +1520,7 @@ static void virtio_ccw_rng_class_init(ObjectClass *klass, 
void *data)
  VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);

  k->realize = virtio_ccw_rng_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
  dc->reset = virtio_ccw_reset;
  dc->props = virtio_ccw_rng_properties;
  set_bit(DEVICE_CATEGORY_MISC, dc->categories);
@@ -1558,7 +1558,7 @@ static void virtio_ccw_crypto_class_init(ObjectClass 
*klass, void *data)
  VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);

  k->realize = virtio_ccw_crypto_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
  dc->reset = virtio_ccw_reset;
  dc->props = virtio_ccw_crypto_properties;
  set_bit(DEVICE_CATEGORY_MISC, dc->categories);
@@ -1596,7 +1596,7 @@ static void virtio_ccw_gpu_class_init(ObjectClass *klass, 
void *data)
  VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);

  k->realize = virtio_ccw_gpu_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
  dc->reset = virtio_ccw_reset;
  dc->props = virtio_ccw_gpu_properties;
  dc->hotpluggable = false;
@@ -1625,7 +1625,7 @@ stati

Re: [Qemu-devel] [PATCH] s390x/virtio: Convert virtio-ccw from *_exit to *_unrealize

2018-03-08 Thread nee 
On Thu, Mar 8, 2018 at 4:13 PM, Stefan Hajnoczi  wrote:
> On Wed, Mar 07, 2018 at 04:29:58PM +, Nia Alarie wrote:
>> @@ -760,12 +760,12 @@ static int virtio_ccw_exit(VirtioCcwDevice *dev)
>>  if (sch) {
>>  css_subch_assign(sch->cssid, sch->ssid, sch->schid, sch->devno, 
>> NULL);
>>  g_free(sch);
>> +ccw_dev->sch = NULL;
>
> This change is unrelated to the topic of the patch and not mentioned in
> the commit description.  I think it was probably made for consistency,
> rather than a bug fix or functional change.  That's a valid reason too
> but please mention secondary changes like this in future patches so
> reviewers know why you made them.
>
> Reviewed-by: Stefan Hajnoczi 

Indeed, this was done for consistency (but also, it feels like a good
practice to follow). Thanks for the review.

Re: [Qemu-devel] [PATCH] s390x/virtio: Convert virtio-ccw from *_exit to *_unrealize

2018-03-08 Thread Stefan Hajnoczi 
On Wed, Mar 07, 2018 at 04:29:58PM +, Nia Alarie wrote:
> @@ -760,12 +760,12 @@ static int virtio_ccw_exit(VirtioCcwDevice *dev)
>  if (sch) {
>  css_subch_assign(sch->cssid, sch->ssid, sch->schid, sch->devno, 
> NULL);
>  g_free(sch);
> +ccw_dev->sch = NULL;

This change is unrelated to the topic of the patch and not mentioned in
the commit description.  I think it was probably made for consistency,
rather than a bug fix or functional change.  That's a valid reason too
but please mention secondary changes like this in future patches so
reviewers know why you made them.

Reviewed-by: Stefan Hajnoczi 


signature.asc
Description: PGP signature

Re: [Qemu-devel] [PATCH] s390x/virtio: Convert virtio-ccw from *_exit to *_unrealize

2018-03-08 Thread Cornelia Huck 
On Wed,  7 Mar 2018 16:29:58 +
Nia Alarie  wrote:

> Signed-off-by: Nia Alarie 
> ---
>  hw/s390x/virtio-ccw.c | 34 +-
>  hw/s390x/virtio-ccw.h |  2 +-
>  2 files changed, 18 insertions(+), 18 deletions(-)

Thanks, applied.

[Qemu-devel] [PATCH] s390x/virtio: Convert virtio-ccw from *_exit to *_unrealize

2018-03-07 Thread Nia Alarie 
Signed-off-by: Nia Alarie 
---
 hw/s390x/virtio-ccw.c | 34 +-
 hw/s390x/virtio-ccw.h |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 8f7fbc2ab7..e51fbefd23 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -752,7 +752,7 @@ out_err:
 g_free(sch);
 }
 
-static int virtio_ccw_exit(VirtioCcwDevice *dev)
+static void virtio_ccw_unrealize(VirtioCcwDevice *dev, Error **errp)
 {
 CcwDevice *ccw_dev = CCW_DEVICE(dev);
 SubchDev *sch = ccw_dev->sch;
@@ -760,12 +760,12 @@ static int virtio_ccw_exit(VirtioCcwDevice *dev)
 if (sch) {
 css_subch_assign(sch->cssid, sch->ssid, sch->schid, sch->devno, NULL);
 g_free(sch);
+ccw_dev->sch = NULL;
 }
 if (dev->indicators) {
 release_indicator(&dev->routes.adapter, dev->indicators);
 dev->indicators = NULL;
 }
-return 0;
 }
 
 static void virtio_ccw_net_realize(VirtioCcwDevice *ccw_dev, Error **errp)
@@ -1344,7 +1344,7 @@ static void virtio_ccw_net_class_init(ObjectClass *klass, 
void *data)
 VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
 
 k->realize = virtio_ccw_net_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
 dc->reset = virtio_ccw_reset;
 dc->props = virtio_ccw_net_properties;
 set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
@@ -1372,7 +1372,7 @@ static void virtio_ccw_blk_class_init(ObjectClass *klass, 
void *data)
 VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
 
 k->realize = virtio_ccw_blk_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
 dc->reset = virtio_ccw_reset;
 dc->props = virtio_ccw_blk_properties;
 set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
@@ -1400,7 +1400,7 @@ static void virtio_ccw_serial_class_init(ObjectClass 
*klass, void *data)
 VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
 
 k->realize = virtio_ccw_serial_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
 dc->reset = virtio_ccw_reset;
 dc->props = virtio_ccw_serial_properties;
 set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
@@ -1428,7 +1428,7 @@ static void virtio_ccw_balloon_class_init(ObjectClass 
*klass, void *data)
 VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
 
 k->realize = virtio_ccw_balloon_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
 dc->reset = virtio_ccw_reset;
 dc->props = virtio_ccw_balloon_properties;
 set_bit(DEVICE_CATEGORY_MISC, dc->categories);
@@ -1456,7 +1456,7 @@ static void virtio_ccw_scsi_class_init(ObjectClass 
*klass, void *data)
 VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
 
 k->realize = virtio_ccw_scsi_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
 dc->reset = virtio_ccw_reset;
 dc->props = virtio_ccw_scsi_properties;
 set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
@@ -1483,7 +1483,7 @@ static void vhost_ccw_scsi_class_init(ObjectClass *klass, 
void *data)
 VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
 
 k->realize = vhost_ccw_scsi_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
 dc->reset = virtio_ccw_reset;
 dc->props = vhost_ccw_scsi_properties;
 set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
@@ -1520,7 +1520,7 @@ static void virtio_ccw_rng_class_init(ObjectClass *klass, 
void *data)
 VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
 
 k->realize = virtio_ccw_rng_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
 dc->reset = virtio_ccw_reset;
 dc->props = virtio_ccw_rng_properties;
 set_bit(DEVICE_CATEGORY_MISC, dc->categories);
@@ -1558,7 +1558,7 @@ static void virtio_ccw_crypto_class_init(ObjectClass 
*klass, void *data)
 VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
 
 k->realize = virtio_ccw_crypto_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
 dc->reset = virtio_ccw_reset;
 dc->props = virtio_ccw_crypto_properties;
 set_bit(DEVICE_CATEGORY_MISC, dc->categories);
@@ -1596,7 +1596,7 @@ static void virtio_ccw_gpu_class_init(ObjectClass *klass, 
void *data)
 VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
 
 k->realize = virtio_ccw_gpu_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
 dc->reset = virtio_ccw_reset;
 dc->props = virtio_ccw_gpu_properties;
 dc->hotpluggable = false;
@@ -1625,7 +1625,7 @@ static void virtio_ccw_input_class_init(ObjectClass 
*klass, void *data)
 VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
 
 k->realize = virtio_ccw_input_realize;
-k->exit = virtio_ccw_exit;
+k->unrealize = virtio_ccw_unrealize;
 dc->res