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: Michal Privoznik <mprivozn@redhat.com>
---
src/conf/virnodedeviceobj.c | 2 +-
src/datatypes.c | 2 +-
src/datatypes.h | 2 +-
src/libvirt-nodedev.c | 6 +++---
src/node_device/node_device_driver.c | 4 ++--
src/test/test_driver.c | 6 +++---
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index ad0f27ee47..9d2996046f 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/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;
diff --git a/src/datatypes.c b/src/datatypes.c
index f7eef24ba8..0c3c66a9ce 100644
--- a/src/datatypes.c
+++ b/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);
}
diff --git a/src/datatypes.h b/src/datatypes.h
index 1a8ea01ba3..66733b075c 100644
--- a/src/datatypes.h
+++ b/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 */
};
/**
diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c
index 563ce889b9..8ced3cea0e 100644
--- a/src/libvirt-nodedev.c
+++ b/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;
}
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 61afa1f8eb..d04a31747a 100644
--- a/src/node_device/node_device_driver.c
+++ b/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;
}
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index eec7a82924..f5b5e3ee8d 100644
--- a/src/test/test_driver.c
+++ b/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;
--
2.16.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Fri, Apr 13, 2018 at 04:47:10PM +0200, Michal Privoznik wrote:
> 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: Michal Privoznik <mprivozn@redhat.com>
> ---
> src/conf/virnodedeviceobj.c | 2 +-
> src/datatypes.c | 2 +-
> src/datatypes.h | 2 +-
> src/libvirt-nodedev.c | 6 +++---
> src/node_device/node_device_driver.c | 4 ++--
> src/test/test_driver.c | 6 +++---
> 6 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
> index ad0f27ee47..9d2996046f 100644
> --- a/src/conf/virnodedeviceobj.c
> +++ b/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;
> diff --git a/src/datatypes.c b/src/datatypes.c
> index f7eef24ba8..0c3c66a9ce 100644
> --- a/src/datatypes.c
> +++ b/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);
> }
> diff --git a/src/datatypes.h b/src/datatypes.h
> index 1a8ea01ba3..66733b075c 100644
> --- a/src/datatypes.h
> +++ b/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 */
> };
>
> /**
> diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c
> index 563ce889b9..8ced3cea0e 100644
> --- a/src/libvirt-nodedev.c
> +++ b/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);
Since you're adjusting the struct member name, you could go as far as fixing
the *GetParent accessor's name too.
With that:
Reviewed-by: Erik Skultety <eskultet@redhat.com>
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 04/16/2018 09:26 AM, Erik Skultety wrote:
> On Fri, Apr 13, 2018 at 04:47:10PM +0200, Michal Privoznik wrote:
>> 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: Michal Privoznik <mprivozn@redhat.com>
>> ---
>> src/conf/virnodedeviceobj.c | 2 +-
>> src/datatypes.c | 2 +-
>> src/datatypes.h | 2 +-
>> src/libvirt-nodedev.c | 6 +++---
>> src/node_device/node_device_driver.c | 4 ++--
>> src/test/test_driver.c | 6 +++---
>> 6 files changed, 11 insertions(+), 11 deletions(-)
>>
>> diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
>> index ad0f27ee47..9d2996046f 100644
>> --- a/src/conf/virnodedeviceobj.c
>> +++ b/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;
>> diff --git a/src/datatypes.c b/src/datatypes.c
>> index f7eef24ba8..0c3c66a9ce 100644
>> --- a/src/datatypes.c
>> +++ b/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);
>> }
>> diff --git a/src/datatypes.h b/src/datatypes.h
>> index 1a8ea01ba3..66733b075c 100644
>> --- a/src/datatypes.h
>> +++ b/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 */
>> };
>>
>> /**
>> diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c
>> index 563ce889b9..8ced3cea0e 100644
>> --- a/src/libvirt-nodedev.c
>> +++ b/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);
>
> Since you're adjusting the struct member name, you could go as far as fixing
> the *GetParent accessor's name too.
I can't. That is a public API and as such it cannot change.
Michal
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 04/13/2018 10:47 AM, Michal Privoznik wrote: > In next patches this name will be needed for a different memeber. s/memeber/member > Also, it makes sense to rename the variable because it does not > contain reference to parent device, just its name. > > Signed-off-by: Michal Privoznik <mprivozn@redhat.com> > --- > src/conf/virnodedeviceobj.c | 2 +- > src/datatypes.c | 2 +- > src/datatypes.h | 2 +- > src/libvirt-nodedev.c | 6 +++--- > src/node_device/node_device_driver.c | 4 ++-- > src/test/test_driver.c | 6 +++--- > 6 files changed, 11 insertions(+), 11 deletions(-) > [...] FWIW: Not sure about changing the accessor's name too - that would mean the API name doesn't match (virNodeDeviceGetParent which could lead to other problems with automatic code generation). John -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, Apr 16, 2018 at 07:53:42AM -0400, John Ferlan wrote: > > > On 04/13/2018 10:47 AM, Michal Privoznik wrote: > > In next patches this name will be needed for a different memeber. > > s/memeber/member > > > Also, it makes sense to rename the variable because it does not > > contain reference to parent device, just its name. > > > > Signed-off-by: Michal Privoznik <mprivozn@redhat.com> > > --- > > src/conf/virnodedeviceobj.c | 2 +- > > src/datatypes.c | 2 +- > > src/datatypes.h | 2 +- > > src/libvirt-nodedev.c | 6 +++--- > > src/node_device/node_device_driver.c | 4 ++-- > > src/test/test_driver.c | 6 +++--- > > 6 files changed, 11 insertions(+), 11 deletions(-) > > > > [...] > > FWIW: Not sure about changing the accessor's name too - that would mean > the API name doesn't match (virNodeDeviceGetParent which could lead to > other problems with automatic code generation). Oh, is that so?! I missed this fact, sorry for the noise then. Nevertheless, it's sad we've such a mistake. Erik -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On 04/16/2018 01:53 PM, John Ferlan wrote: > > > On 04/13/2018 10:47 AM, Michal Privoznik wrote: >> In next patches this name will be needed for a different memeber. > > s/memeber/member > >> Also, it makes sense to rename the variable because it does not >> contain reference to parent device, just its name. >> >> Signed-off-by: Michal Privoznik <mprivozn@redhat.com> >> --- >> src/conf/virnodedeviceobj.c | 2 +- >> src/datatypes.c | 2 +- >> src/datatypes.h | 2 +- >> src/libvirt-nodedev.c | 6 +++--- >> src/node_device/node_device_driver.c | 4 ++-- >> src/test/test_driver.c | 6 +++--- >> 6 files changed, 11 insertions(+), 11 deletions(-) >> > > [...] > > FWIW: Not sure about changing the accessor's name too - that would mean > the API name doesn't match (virNodeDeviceGetParent which could lead to > other problems with automatic code generation). Not sure what do you mean by code generation. But that reminds me I forgot to rename variable on RPC protocol level :-) Michal -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
© 2016 - 2025 Red Hat, Inc.