External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

nodedev_hal: Modernize the function's style

Browse Source 
Use style like:

void
foo (const char *name)
{
    printf("Hello, %s\n", name);
}

Later patches will clean up node_device_hal.c more.
This commit is contained in:
Osier Yang 2013-06-01 10:52:17 +08:00
parent cdb9789559
commit 620c470aff
1 changed files with 89 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/node_device/node_device_hal.c
View File

@ -57,16 +57,18 @@ static virNodeDeviceDriverStatePtr driverState;
#define NODE_DEV_UDI(obj) ((const char *)((obj)->privateData) #define NODE_DEV_UDI(obj) ((const char *)((obj)->privateData)
static const char *hal_name(const char *udi) static const char *
hal_name(const char *udi)
{ {
const char *name = strrchr(udi, '/'); const char *name = strrchr(udi, '/');
if (name) if (name)
return name+1; return name + 1;
return udi; return udi;
} }
static int get_str_prop(LibHalContext *ctxt, const char *udi, static int
get_str_prop(LibHalContext *ctxt, const char *udi,
const char *prop, char **val_p) const char *prop, char **val_p)
{ {
char *val = libhal_device_get_property_string(ctxt, udi, prop, NULL); char *val = libhal_device_get_property_string(ctxt, udi, prop, NULL);
@ -84,7 +86,8 @@ static int get_str_prop(LibHalContext *ctxt, const char *udi,
return -1; return -1;
} }
static int get_int_prop(LibHalContext *ctxt, const char *udi, static int
get_int_prop(LibHalContext *ctxt, const char *udi,
const char *prop, int *val_p) const char *prop, int *val_p)
{ {
DBusError err; DBusError err;
@ -101,7 +104,8 @@ static int get_int_prop(LibHalContext *ctxt, const char *udi,
return rv; return rv;
} }
static int get_bool_prop(LibHalContext *ctxt, const char *udi, static int
get_bool_prop(LibHalContext *ctxt, const char *udi,
const char *prop, int *val_p) const char *prop, int *val_p)
{ {
DBusError err; DBusError err;
@ -118,7 +122,8 @@ static int get_bool_prop(LibHalContext *ctxt, const char *udi,
return rv; return rv;
} }
static int get_uint64_prop(LibHalContext *ctxt, const char *udi, static int
get_uint64_prop(LibHalContext *ctxt, const char *udi,
const char *prop, unsigned long long *val_p) const char *prop, unsigned long long *val_p)
{ {
DBusError err; DBusError err;
@ -135,7 +140,8 @@ static int get_uint64_prop(LibHalContext *ctxt, const char *udi,
return rv; return rv;
} }
static int gather_pci_cap(LibHalContext *ctx, const char *udi, static int
gather_pci_cap(LibHalContext *ctx, const char *udi,
union _virNodeDevCapData *d) union _virNodeDevCapData *d)
{ {
char *sysfs_path; char *sysfs_path;
@ -177,7 +183,8 @@ static int gather_pci_cap(LibHalContext *ctx, const char *udi,
} }
static int gather_usb_cap(LibHalContext *ctx, const char *udi, static int
gather_usb_cap(LibHalContext *ctx, const char *udi,
union _virNodeDevCapData *d) union _virNodeDevCapData *d)
{ {
(void)get_int_prop(ctx, udi, "usb.interface.number", (void)get_int_prop(ctx, udi, "usb.interface.number",
@ -194,7 +201,8 @@ static int gather_usb_cap(LibHalContext *ctx, const char *udi,
} }
static int gather_usb_device_cap(LibHalContext *ctx, const char *udi, static int
gather_usb_device_cap(LibHalContext *ctx, const char *udi,
union _virNodeDevCapData *d) union _virNodeDevCapData *d)
{ {
(void)get_int_prop(ctx, udi, "usb_device.bus_number", (void)get_int_prop(ctx, udi, "usb_device.bus_number",
@ -215,7 +223,8 @@ static int gather_usb_device_cap(LibHalContext *ctx, const char *udi,
} }
static int gather_net_cap(LibHalContext *ctx, const char *udi, static int
gather_net_cap(LibHalContext *ctx, const char *udi,
union _virNodeDevCapData *d) union _virNodeDevCapData *d)
{ {
unsigned long long dummy; unsigned long long dummy;
@ -234,7 +243,8 @@ static int gather_net_cap(LibHalContext *ctx, const char *udi,
} }
static int gather_scsi_host_cap(LibHalContext *ctx, const char *udi, static int
gather_scsi_host_cap(LibHalContext *ctx, const char *udi,
union _virNodeDevCapData *d) union _virNodeDevCapData *d)
{ {
int retval = 0; int retval = 0;
@ -252,7 +262,8 @@ out:
} }
static int gather_scsi_cap(LibHalContext *ctx, const char *udi, static int
gather_scsi_cap(LibHalContext *ctx, const char *udi,
union _virNodeDevCapData *d) union _virNodeDevCapData *d)
{ {
(void)get_int_prop(ctx, udi, "scsi.host", (int *)&d->scsi.host); (void)get_int_prop(ctx, udi, "scsi.host", (int *)&d->scsi.host);
@ -264,7 +275,8 @@ static int gather_scsi_cap(LibHalContext *ctx, const char *udi,
} }
static int gather_storage_cap(LibHalContext *ctx, const char *udi, static int
gather_storage_cap(LibHalContext *ctx, const char *udi,
union _virNodeDevCapData *d) union _virNodeDevCapData *d)
{ {
int val; int val;
@ -292,7 +304,8 @@ static int gather_storage_cap(LibHalContext *ctx, const char *udi,
} }
static int gather_system_cap(LibHalContext *ctx, const char *udi, static int
gather_system_cap(LibHalContext *ctx, const char *udi,
union _virNodeDevCapData *d) union _virNodeDevCapData *d)
{ {
char *uuidstr; char *uuidstr;
@ -341,14 +354,16 @@ static caps_tbl_entry caps_tbl[] = {
/* qsort/bsearch string comparator */ /* qsort/bsearch string comparator */
static int cmpstringp(const void *p1, const void *p2) static int
cmpstringp(const void *p1, const void *p2)
{ {
/* from man 3 qsort */ /* from man 3 qsort */
return strcmp(* (char * const *) p1, * (char * const *) p2); return strcmp(* (char * const *) p1, * (char * const *) p2);
} }
static int gather_capability(LibHalContext *ctx, const char *udi, static int
gather_capability(LibHalContext *ctx, const char *udi,
const char *cap_name, const char *cap_name,
virNodeDevCapsDefPtr *caps_p) virNodeDevCapsDefPtr *caps_p)
{ {
@ -377,7 +392,8 @@ static int gather_capability(LibHalContext *ctx, const char *udi,
} }
static int gather_capabilities(LibHalContext *ctx, const char *udi, static int
gather_capabilities(LibHalContext *ctx, const char *udi,
virNodeDevCapsDefPtr *caps_p) virNodeDevCapsDefPtr *caps_p)
{ {
char *bus_name = NULL; char *bus_name = NULL;
@ -433,12 +449,14 @@ static int gather_capabilities(LibHalContext *ctx, const char *udi,
return rv; return rv;
} }
static void free_udi(void *udi) static void
free_udi(void *udi)
{ {
VIR_FREE(udi); VIR_FREE(udi);
} }
static void dev_create(const char *udi) static void
dev_create(const char *udi)
{ {
LibHalContext *ctx; LibHalContext *ctx;
char *parent_key = NULL; char *parent_key = NULL;
@ -503,7 +521,8 @@ cleanup:
nodeDeviceUnlock(driverState); nodeDeviceUnlock(driverState);
} }
static void dev_refresh(const char *udi) static void
dev_refresh(const char *udi)
{ {
const char *name = hal_name(udi); const char *name = hal_name(udi);
virNodeDeviceObjPtr dev; virNodeDeviceObjPtr dev;
@ -524,7 +543,8 @@ static void dev_refresh(const char *udi)
} }
} }
static void device_added(LibHalContext *ctx ATTRIBUTE_UNUSED, static void
device_added(LibHalContext *ctx ATTRIBUTE_UNUSED,
const char *udi) const char *udi)
{ {
VIR_DEBUG("%s", hal_name(udi)); VIR_DEBUG("%s", hal_name(udi));
@ -532,7 +552,8 @@ static void device_added(LibHalContext *ctx ATTRIBUTE_UNUSED,
} }
static void device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED, static void
device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED,
const char *udi) const char *udi)
{ {
const char *name = hal_name(udi); const char *name = hal_name(udi);
@ -549,7 +570,8 @@ static void device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED,
} }
static void device_cap_added(LibHalContext *ctx, static void
device_cap_added(LibHalContext *ctx,
const char *udi, const char *cap) const char *udi, const char *cap)
{ {
const char *name = hal_name(udi); const char *name = hal_name(udi);
@ -568,7 +590,8 @@ static void device_cap_added(LibHalContext *ctx,
} }
static void device_cap_lost(LibHalContext *ctx ATTRIBUTE_UNUSED, static void
device_cap_lost(LibHalContext *ctx ATTRIBUTE_UNUSED,
const char *udi, const char *udi,
const char *cap) const char *cap)
{ {
@ -579,7 +602,8 @@ static void device_cap_lost(LibHalContext *ctx ATTRIBUTE_UNUSED,
} }
static void device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED, static void
device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED,
const char *udi, const char *udi,
const char *key, const char *key,
dbus_bool_t is_removed ATTRIBUTE_UNUSED, dbus_bool_t is_removed ATTRIBUTE_UNUSED,
@ -592,7 +616,8 @@ static void device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED,
} }
static int nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, static int
nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
virStateInhibitCallback callback ATTRIBUTE_UNUSED, virStateInhibitCallback callback ATTRIBUTE_UNUSED,
void *opaque ATTRIBUTE_UNUSED) void *opaque ATTRIBUTE_UNUSED)
{ {
@ -693,7 +718,8 @@ static int nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
} }
static int nodeStateCleanup(void) static int
nodeStateCleanup(void)
{ {
if (driverState) { if (driverState) {
nodeDeviceLock(driverState); nodeDeviceLock(driverState);
@ -710,7 +736,8 @@ static int nodeStateCleanup(void)
} }
static int nodeStateReload(void) static int
nodeStateReload(void)
{ {
DBusError err; DBusError err;
char **udi = NULL; char **udi = NULL;
@ -742,7 +769,8 @@ static int nodeStateReload(void)
} }
static virDrvOpenStatus nodeDeviceOpen(virConnectPtr conn, static virDrvOpenStatus
nodeDeviceOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED, virConnectAuthPtr auth ATTRIBUTE_UNUSED,
unsigned int flags) unsigned int flags)
{ {
@ -756,7 +784,8 @@ static virDrvOpenStatus nodeDeviceOpen(virConnectPtr conn,
return VIR_DRV_OPEN_SUCCESS; return VIR_DRV_OPEN_SUCCESS;
} }
static int nodeDeviceClose(virConnectPtr conn ATTRIBUTE_UNUSED) static int
nodeDeviceClose(virConnectPtr conn ATTRIBUTE_UNUSED)
{ {
conn->nodeDevicePrivateData = NULL; conn->nodeDevicePrivateData = NULL;
return 0; return 0;
@ -788,7 +817,8 @@ static virStateDriver halStateDriver = {
.stateReload = nodeStateReload, /* 0.5.0 */ .stateReload = nodeStateReload, /* 0.5.0 */
}; };
int halNodeRegister(void) int
halNodeRegister(void)
{ {
if (virRegisterNodeDeviceDriver(&halNodeDeviceDriver) < 0) if (virRegisterNodeDeviceDriver(&halNodeDeviceDriver) < 0)
return -1; return -1;