[PATCH 5/8] nodedev: refactor udevCCWGetState

Refactor method to be only ccw state type depended to allow reuse in a later patch. Reviewed-by: Marc Hartmayer <mhartmay(a)linux.ibm.com&gt; Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com&gt; --- src/node_device/node_device_udev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 97fbe95ac7..6b362625f7 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1205,7 +1205,7 @@ udevGetCCWAddress(const char *sysfs_path, static int udevCCWGetState(struct udev_device *device, - virNodeDevCapData *data) + virNodeDevCCWStateType *state) { int online = 0; @@ -1215,10 +1215,10 @@ udevCCWGetState(struct udev_device *device, switch (online) { case VIR_NODE_DEV_CCW_STATE_OFFLINE: case VIR_NODE_DEV_CCW_STATE_ONLINE: - data->ccw_dev.state = online; + *state = online; break; default: - data->ccw_dev.state = VIR_NODE_DEV_CCW_STATE_LAST; + *state = VIR_NODE_DEV_CCW_STATE_LAST; break; } @@ -1231,7 +1231,7 @@ udevProcessCCW(struct udev_device *device, virNodeDeviceDef *def) { /* process only online devices to keep the list sane */ - if (udevCCWGetState(device, &def->caps->data) < 0) + if (udevCCWGetState(device, &def->caps->data.ccw_dev.state) < 0) return -1; if (udevGetCCWAddress(def->sysfs_path, &def->caps->data) < 0) -- 2.47.0