ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/vfio/ccw: Use intermediate S390CCWDevice variable 

'cdev' is VFIOCCWDevice's private parent object.
Access it using the S390_CCW_DEVICE() QOM macro.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Message-Id: <20230213170145.45666-4-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-02-13 18:01:42 +01:00 committed by Thomas Huth
parent 4c8a2054e7
commit 011da22c5c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/vfio/ccw.c
View File

@ -588,9 +588,10 @@ static void vfio_ccw_put_device(VFIOCCWDevice *vcdev)
static void vfio_ccw_get_device(VFIOGroup *group, VFIOCCWDevice *vcdev, static void vfio_ccw_get_device(VFIOGroup *group, VFIOCCWDevice *vcdev,
Error **errp) Error **errp)
{ {
char *name = g_strdup_printf("%x.%x.%04x", vcdev->cdev.hostid.cssid, S390CCWDevice *cdev = S390_CCW_DEVICE(vcdev);
vcdev->cdev.hostid.ssid, char *name = g_strdup_printf("%x.%x.%04x", cdev->hostid.cssid,
vcdev->cdev.hostid.devid); cdev->hostid.ssid,
cdev->hostid.devid);
VFIODevice *vbasedev; VFIODevice *vbasedev;
QLIST_FOREACH(vbasedev, &group->device_list, next) { QLIST_FOREACH(vbasedev, &group->device_list, next) {
@ -611,7 +612,7 @@ static void vfio_ccw_get_device(VFIOGroup *group, VFIOCCWDevice *vcdev,
*/ */
vcdev->vdev.ram_block_discard_allowed = true; vcdev->vdev.ram_block_discard_allowed = true;
if (vfio_get_device(group, vcdev->cdev.mdevid, &vcdev->vdev, errp)) { if (vfio_get_device(group, cdev->mdevid, &vcdev->vdev, errp)) {
goto out_err; goto out_err;
} }