datatypes: Rename @parent to @parentName in virNodeDevice

In next patches this name will be needed for a different memeber.
Also, it makes sense to rename the variable because it does not
contain reference to parent device, just its name.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>

src/conf/virnodedeviceobj.c

@@ -870,7 +870,7 @@ virNodeDeviceObjListExportCallback(void *payload,
         virNodeDeviceMatch(obj, data->flags)) {
         if (data->devices) {
             if (!(device = virGetNodeDevice(data->conn, def->name)) ||
-                VIR_STRDUP(device->parent, def->parent) < 0) {
+                VIR_STRDUP(device->parentName, def->parent) < 0) {
                 virObjectUnref(device);
                 data->error = true;
                 goto cleanup;

src/datatypes.c

@@ -653,7 +653,7 @@ virNodeDeviceDispose(void *obj)
     VIR_DEBUG("release dev %p %s", dev, dev->name);
 
     VIR_FREE(dev->name);
-    VIR_FREE(dev->parent);
+    VIR_FREE(dev->parentName);
 
     virObjectUnref(dev->conn);
 }

src/datatypes.h

@@ -618,7 +618,7 @@ struct _virNodeDevice {
     virObject object;
     virConnectPtr conn;                 /* pointer back to the connection */
     char *name;                         /* device name (unique on node) */
-    char *parent;                       /* parent device name */
+    char *parentName;                   /* parent device name */
 };
 
 /**

src/libvirt-nodedev.c

@@ -346,16 +346,16 @@ virNodeDeviceGetParent(virNodeDevicePtr dev)
 
     virCheckNodeDeviceReturn(dev, NULL);
 
-    if (!dev->parent) {
+    if (!dev->parentName) {
         if (dev->conn->nodeDeviceDriver && dev->conn->nodeDeviceDriver->nodeDeviceGetParent) {
-            dev->parent = dev->conn->nodeDeviceDriver->nodeDeviceGetParent(dev);
+            dev->parentName = dev->conn->nodeDeviceDriver->nodeDeviceGetParent(dev);
         } else {
             virReportUnsupportedError();
             virDispatchError(dev->conn);
             return NULL;
         }
     }
-    return dev->parent;
+    return dev->parentName;
 }
 
 

src/node_device/node_device_driver.c

@@ -256,7 +256,7 @@ nodeDeviceLookupByName(virConnectPtr conn,
         goto cleanup;
 
     if ((device = virGetNodeDevice(conn, name))) {
-        if (VIR_STRDUP(device->parent, def->parent) < 0) {
+        if (VIR_STRDUP(device->parentName, def->parent) < 0) {
             virObjectUnref(device);
             device = NULL;
         }
@@ -290,7 +290,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
         goto cleanup;
 
     if ((device = virGetNodeDevice(conn, def->name))) {
-        if (VIR_STRDUP(device->parent, def->parent) < 0) {
+        if (VIR_STRDUP(device->parentName, def->parent) < 0) {
             virObjectUnref(device);
             device = NULL;
         }

src/remote/remote_daemon_dispatch.c

@@ -3805,7 +3805,7 @@ remoteDispatchNodeDeviceGetParent(virNetServerPtr server ATTRIBUTE_UNUSED,
     parent = virNodeDeviceGetParent(dev);
 
     if (parent == NULL) {
-        ret->parent = NULL;
+        ret->parentName = NULL;
     } else {
         /* remoteDispatchClientRequest will free this. */
         char **parent_p;
@@ -3815,7 +3815,7 @@ remoteDispatchNodeDeviceGetParent(virNetServerPtr server ATTRIBUTE_UNUSED,
             VIR_FREE(parent_p);
             goto cleanup;
         }
-        ret->parent = parent_p;
+        ret->parentName = parent_p;
     }
 
     rv = 0;

src/remote/remote_protocol.x

@@ -2028,7 +2028,7 @@ struct remote_node_device_get_parent_args {
 };
 
 struct remote_node_device_get_parent_ret {
-    remote_string parent;
+    remote_string parentName;
 };
 
 struct remote_node_device_num_of_caps_args {

src/remote_protocol-structs

@@ -1541,7 +1541,7 @@ struct remote_node_device_get_parent_args {
         remote_nonnull_string      name;
 };
 struct remote_node_device_get_parent_ret {
-        remote_string              parent;
+        remote_string              parentName;
 };
 struct remote_node_device_num_of_caps_args {
         remote_nonnull_string      name;

src/test/test_driver.c

@@ -5416,7 +5416,7 @@ testNodeDeviceLookupByName(virConnectPtr conn, const char *name)
     def = virNodeDeviceObjGetDef(obj);
 
     if ((ret = virGetNodeDevice(conn, name))) {
-        if (VIR_STRDUP(ret->parent, def->parent) < 0) {
+        if (VIR_STRDUP(ret->parentName, def->parent) < 0) {
             virObjectUnref(ret);
             ret = NULL;
         }
@@ -5641,8 +5641,8 @@ testNodeDeviceCreateXML(virConnectPtr conn,
     if (!(dev = virGetNodeDevice(conn, objdef->name)))
         goto cleanup;
 
-    VIR_FREE(dev->parent);
-    if (VIR_STRDUP(dev->parent, def->parent) < 0)
+    VIR_FREE(dev->parentName);
+    if (VIR_STRDUP(dev->parentName, def->parent) < 0)
         goto cleanup;
 
     ret = dev;