7:03 a.m.
From: "Daniel P. Berrange" <berrange(a)redhat.com>
In renaming driver API implementations to match the
public API naming scheme, a few cases in the node
device driver were missed.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/node_device/node_device_driver.c | 6 +++---
src/node_device/node_device_driver.h | 6 +++---
src/node_device/node_device_hal.c | 18 +++++++++---------
src/node_device/node_device_udev.c | 20 ++++++++++----------
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index c9bd68b..bfc606c 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -183,9 +183,9 @@ nodeListDevices(virConnectPtr conn,
}
int
-nodeListAllNodeDevices(virConnectPtr conn,
- virNodeDevicePtr **devices,
- unsigned int flags)
+nodeConnectListAllNodeDevices(virConnectPtr conn,
+ virNodeDevicePtr **devices,
+ unsigned int flags)
{
virNodeDeviceDriverStatePtr driver = conn->nodeDevicePrivateData;
int ret = -1;
diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h
index b6c6f18..acf50cb 100644
--- a/src/node_device/node_device_driver.h
+++ b/src/node_device/node_device_driver.h
@@ -65,9 +65,9 @@ int detect_scsi_host_caps_linux(union _virNodeDevCapData *d);
int nodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags);
int nodeListDevices(virConnectPtr conn, const char *cap, char **const names,
int maxnames, unsigned int flags);
-int nodeListAllNodeDevices(virConnectPtr conn,
- virNodeDevicePtr **devices,
- unsigned int flags);
+int nodeConnectListAllNodeDevices(virConnectPtr conn,
+ virNodeDevicePtr **devices,
+ unsigned int flags);
virNodeDevicePtr nodeDeviceLookupByName(virConnectPtr conn, const char *name);
virNodeDevicePtr nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
const char *wwnn,
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 63245a9..b64ac6b 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -590,9 +590,9 @@ static void device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED,
}
-static int nodeDeviceStateInitialize(bool privileged ATTRIBUTE_UNUSED,
- virStateInhibitCallback callback ATTRIBUTE_UNUSED,
- void *opaque ATTRIBUTE_UNUSED)
+static int nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
+ virStateInhibitCallback callback ATTRIBUTE_UNUSED,
+ void *opaque ATTRIBUTE_UNUSED)
{
LibHalContext *hal_ctx = NULL;
char **udi = NULL;
@@ -691,7 +691,7 @@ static int nodeDeviceStateInitialize(bool privileged
ATTRIBUTE_UNUSED,
}
-static int nodeDeviceStateCleanup(void)
+static int nodeStateCleanup(void)
{
if (driverState) {
nodeDeviceLock(driverState);
@@ -708,7 +708,7 @@ static int nodeDeviceStateCleanup(void)
}
-static int nodeDeviceStateReload(void)
+static int nodeStateReload(void)
{
DBusError err;
char **udi = NULL;
@@ -767,7 +767,7 @@ static virNodeDeviceDriver halNodeDeviceDriver = {
.nodeDeviceClose = nodeDeviceClose, /* 0.5.0 */
.nodeNumOfDevices = nodeNumOfDevices, /* 0.5.0 */
.nodeListDevices = nodeListDevices, /* 0.5.0 */
- .connectListAllNodeDevices = nodeListAllNodeDevices, /* 0.10.2 */
+ .connectListAllNodeDevices = nodeConnectListAllNodeDevices, /* 0.10.2 */
.nodeDeviceLookupByName = nodeDeviceLookupByName, /* 0.5.0 */
.nodeDeviceLookupSCSIHostByWWN = nodeDeviceLookupSCSIHostByWWN, /* 1.0.2 */
.nodeDeviceGetXMLDesc = nodeDeviceGetXMLDesc, /* 0.5.0 */
@@ -781,9 +781,9 @@ static virNodeDeviceDriver halNodeDeviceDriver = {
static virStateDriver halStateDriver = {
.name = "HAL",
- .stateInitialize = nodeDeviceStateInitialize, /* 0.5.0 */
- .stateCleanup = nodeDeviceStateCleanup, /* 0.5.0 */
- .stateReload = nodeDeviceStateReload, /* 0.5.0 */
+ .stateInitialize = nodeStateInitialize, /* 0.5.0 */
+ .stateCleanup = nodeStateCleanup, /* 0.5.0 */
+ .stateReload = nodeStateReload, /* 0.5.0 */
};
int halNodeRegister(void)
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index f98841e..97c9b06 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1438,7 +1438,7 @@ out:
}
-static int nodeDeviceStateCleanup(void)
+static int nodeStateCleanup(void)
{
int ret = 0;
@@ -1650,9 +1650,9 @@ out:
return ret;
}
-static int nodeDeviceStateInitialize(bool privileged ATTRIBUTE_UNUSED,
- virStateInhibitCallback callback ATTRIBUTE_UNUSED,
- void *opaque ATTRIBUTE_UNUSED)
+static int nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
+ virStateInhibitCallback callback ATTRIBUTE_UNUSED,
+ void *opaque ATTRIBUTE_UNUSED)
{
udevPrivate *priv = NULL;
struct udev *udev = NULL;
@@ -1759,13 +1759,13 @@ out_unlock:
out:
if (ret == -1) {
- nodeDeviceStateCleanup();
+ nodeStateCleanup();
}
return ret;
}
-static int nodeDeviceStateReload(void)
+static int nodeStateReload(void)
{
return 0;
}
@@ -1798,7 +1798,7 @@ static virNodeDeviceDriver udevNodeDeviceDriver = {
.nodeDeviceClose = nodeDeviceClose, /* 0.7.3 */
.nodeNumOfDevices = nodeNumOfDevices, /* 0.7.3 */
.nodeListDevices = nodeListDevices, /* 0.7.3 */
- .connectListAllNodeDevices = nodeListAllNodeDevices, /* 0.10.2 */
+ .connectListAllNodeDevices = nodeConnectListAllNodeDevices, /* 0.10.2 */
.nodeDeviceLookupByName = nodeDeviceLookupByName, /* 0.7.3 */
.nodeDeviceLookupSCSIHostByWWN = nodeDeviceLookupSCSIHostByWWN, /* 1.0.2 */
.nodeDeviceGetXMLDesc = nodeDeviceGetXMLDesc, /* 0.7.3 */
@@ -1811,9 +1811,9 @@ static virNodeDeviceDriver udevNodeDeviceDriver = {
static virStateDriver udevStateDriver = {
.name = "udev",
- .stateInitialize = nodeDeviceStateInitialize, /* 0.7.3 */
- .stateCleanup = nodeDeviceStateCleanup, /* 0.7.3 */
- .stateReload = nodeDeviceStateReload, /* 0.7.3 */
+ .stateInitialize = nodeStateInitialize, /* 0.7.3 */
+ .stateCleanup = nodeStateCleanup, /* 0.7.3 */
+ .stateReload = nodeStateReload, /* 0.7.3 */
};
int udevNodeRegister(void)
--
1.8.1.4