[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-2.10 05/10] s390x/css: provide introspection
From: |
Thomas Huth |
Subject: |
Re: [Qemu-devel] [PATCH for-2.10 05/10] s390x/css: provide introspection for virtual subchannel and device busid |
Date: |
Thu, 6 Apr 2017 14:19:10 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 |
On 06.04.2017 13:16, Cornelia Huck wrote:
> From: Dong Jia Shi <address@hidden>
>
> Expose the busids of the virtual I/O subchannel and the virtual CCW
> device to ease debugging. This is needed because:
> 1. subchannel id are assigned dynamically, and cannot be set from
> outside.
> 2. device busid could possibly be auto generated.
>
> An example of using HMP to retrieve the property values of a
> virtio-balloon-ccw device looks like:
>
> address@hidden ~]# lscss -d 0.0.0004
> Device Subchan. DevType CU Type Use PIM PAM POM CHPIDs
> ----------------------------------------------------------------------
> 0.0.0004 0.0.0003 0000/00 3832/05 yes 80 80 ff 00000000 00000000
>
> (qemu) info qtree
> ... ...
> dev: virtio-balloon-ccw, id "balloon0"
> devno = "<unset>"
> ioeventfd = true
> max_revision = 2 (0x2)
> dev_id = "fe.0.0004"
> subch_id = "fe.0.0003"
> ... ...
>
> After migration, if we have the same device that shows up on a
> different subchannel, we must re-fill the subch_id of the ccw
> device with the new schid, or the subch_id will have an old wrong
> schid value. So this also re-fills the subch_id after migration.
>
> While we are at it, also neaten the related error handling a bit.
>
> Signed-off-by: Dong Jia Shi <address@hidden>
> Signed-off-by: Cornelia Huck <address@hidden>
> ---
> hw/s390x/ccw-device.c | 39 +++++++++++++++++++++++++++++++++++++++
> hw/s390x/ccw-device.h | 7 +++++++
> hw/s390x/virtio-ccw.c | 28 ++++++++++++++++++++++------
> 3 files changed, 68 insertions(+), 6 deletions(-)
[...]
> static inline CcwDevice *to_ccw_dev_fast(DeviceState *d)
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index 00b3bde4e9..4e59e34d74 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -680,6 +680,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice
> *dev, Error **errp)
> {
> VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_GET_CLASS(dev);
> CcwDevice *ccw_dev = CCW_DEVICE(dev);
> + CCWDeviceClass *ck = CCW_DEVICE_GET_CLASS(ccw_dev);
> SubchDev *sch = css_create_virtual_sch(ccw_dev->bus_id, errp);
> Error *err = NULL;
>
> @@ -689,8 +690,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice
> *dev, Error **errp)
> if (!virtio_ccw_rev_max(dev) && dev->force_revision_1) {
> error_setg(&err, "Invalid value of property max_rev "
> "(is %d expected >= 1)", virtio_ccw_rev_max(dev));
> - error_propagate(errp, err);
> - return;
> + goto out_err;
> }
>
> sch->driver_data = dev;
> @@ -713,13 +713,24 @@ static void virtio_ccw_device_realize(VirtioCcwDevice
> *dev, Error **errp)
>
> if (k->realize) {
> k->realize(dev, &err);
> + if (err) {
> + goto out_err;
> + }
> }
> +
> + ck->realize(ccw_dev, &err);
> if (err) {
> - error_propagate(errp, err);
> - css_subch_assign(sch->cssid, sch->ssid, sch->schid, sch->devno,
> NULL);
> - ccw_dev->sch = NULL;
> - g_free(sch);
> + goto out_err;
> }
> +
> + return;
> +
> +out_err:
> + error_propagate(errp, err);
> + css_subch_assign(sch->cssid, sch->ssid, sch->schid, sch->devno, NULL);
> + ccw_dev->sch = NULL;
> + g_free(sch);
> + return;
> }
Cosmetic nit: Remove the unnecessary "return;" statement right before
the closing curly bracket.
Thomas
- [Qemu-devel] [PATCH for-2.10 00/10] s390x queue for 2.10, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 01/10] s390x: introduce 2.10 compat machine, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 03/10] s390x/pci: make printf always compile in debug output, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 02/10] s390x/kvm: make printf always compile in debug output, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 04/10] s390x/css: introduce read-only property type for device ids, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 05/10] s390x/css: provide introspection for virtual subchannel and device busid, Cornelia Huck, 2017/04/06
- Re: [Qemu-devel] [PATCH for-2.10 05/10] s390x/css: provide introspection for virtual subchannel and device busid,
Thomas Huth <=
- [Qemu-devel] [PATCH for-2.10 07/10] s390x: use enum for adapter type and standardize its naming, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 08/10] s390x: initialize flic before I/O subsystems, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 06/10] s390x/css: consolidate the devno property for ccw devices, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 09/10] s390x/flic: cache flic in s390_get_flic, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 10/10] s390x: register I/O adapters per ISC during init, Cornelia Huck, 2017/04/06