提交 ced272ef 编写于 作者: D Daniel P. Berrange

Rename all APIs in lxc_domain.c to have a virLXCDomain prefix

For consistency all the APIs in the lxc_domain.c file should
have a virLXCDomain prefix in their name
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 eaf10b84
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#include "memory.h" #include "memory.h"
static void *lxcDomainObjPrivateAlloc(void) static void *virLXCDomainObjPrivateAlloc(void)
{ {
lxcDomainObjPrivatePtr priv; virLXCDomainObjPrivatePtr priv;
if (VIR_ALLOC(priv) < 0) if (VIR_ALLOC(priv) < 0)
return NULL; return NULL;
...@@ -38,16 +38,16 @@ static void *lxcDomainObjPrivateAlloc(void) ...@@ -38,16 +38,16 @@ static void *lxcDomainObjPrivateAlloc(void)
return priv; return priv;
} }
static void lxcDomainObjPrivateFree(void *data) static void virLXCDomainObjPrivateFree(void *data)
{ {
lxcDomainObjPrivatePtr priv = data; virLXCDomainObjPrivatePtr priv = data;
VIR_FREE(priv); VIR_FREE(priv);
} }
void lxcDomainSetPrivateDataHooks(virCapsPtr caps) void virLXCDomainSetPrivateDataHooks(virCapsPtr caps)
{ {
caps->privateDataAllocFunc = lxcDomainObjPrivateAlloc; caps->privateDataAllocFunc = virLXCDomainObjPrivateAlloc;
caps->privateDataFreeFunc = lxcDomainObjPrivateFree; caps->privateDataFreeFunc = virLXCDomainObjPrivateFree;
} }
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
# include "lxc_conf.h" # include "lxc_conf.h"
typedef struct _lxcDomainObjPrivate lxcDomainObjPrivate; typedef struct _virLXCDomainObjPrivate virLXCDomainObjPrivate;
typedef lxcDomainObjPrivate *lxcDomainObjPrivatePtr; typedef virLXCDomainObjPrivate *virLXCDomainObjPrivatePtr;
struct _lxcDomainObjPrivate { struct _virLXCDomainObjPrivate {
int monitor; int monitor;
int monitorWatch; int monitorWatch;
}; };
void lxcDomainSetPrivateDataHooks(virCapsPtr caps); void virLXCDomainSetPrivateDataHooks(virCapsPtr caps);
#endif /* __LXC_DOMAIN_H__ */ #endif /* __LXC_DOMAIN_H__ */
...@@ -1434,7 +1434,7 @@ static int lxcStartup(int privileged) ...@@ -1434,7 +1434,7 @@ static int lxcStartup(int privileged)
if ((lxc_driver->caps = lxcCapsInit(lxc_driver)) == NULL) if ((lxc_driver->caps = lxcCapsInit(lxc_driver)) == NULL)
goto cleanup; goto cleanup;
lxcDomainSetPrivateDataHooks(lxc_driver->caps); virLXCDomainSetPrivateDataHooks(lxc_driver->caps);
if (virLXCProcessAutoDestroyInit(lxc_driver) < 0) if (virLXCProcessAutoDestroyInit(lxc_driver) < 0)
goto cleanup; goto cleanup;
......
...@@ -161,7 +161,7 @@ static void virLXCProcessCleanup(lxc_driver_t *driver, ...@@ -161,7 +161,7 @@ static void virLXCProcessCleanup(lxc_driver_t *driver,
{ {
virCgroupPtr cgroup; virCgroupPtr cgroup;
int i; int i;
lxcDomainObjPrivatePtr priv = vm->privateData; virLXCDomainObjPrivatePtr priv = vm->privateData;
virNetDevVPortProfilePtr vport = NULL; virNetDevVPortProfilePtr vport = NULL;
/* now that we know it's stopped call the hook if present */ /* now that we know it's stopped call the hook if present */
...@@ -590,7 +590,7 @@ static void virLXCProcessMonitorEvent(int watch, ...@@ -590,7 +590,7 @@ static void virLXCProcessMonitorEvent(int watch,
lxc_driver_t *driver = lxc_driver; lxc_driver_t *driver = lxc_driver;
virDomainObjPtr vm = data; virDomainObjPtr vm = data;
virDomainEventPtr event = NULL; virDomainEventPtr event = NULL;
lxcDomainObjPrivatePtr priv; virLXCDomainObjPrivatePtr priv;
lxcDriverLock(driver); lxcDriverLock(driver);
virDomainObjLock(vm); virDomainObjLock(vm);
...@@ -807,7 +807,7 @@ int virLXCProcessStart(virConnectPtr conn, ...@@ -807,7 +807,7 @@ int virLXCProcessStart(virConnectPtr conn,
char ebuf[1024]; char ebuf[1024];
char *timestamp; char *timestamp;
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
lxcDomainObjPrivatePtr priv = vm->privateData; virLXCDomainObjPrivatePtr priv = vm->privateData;
virErrorPtr err = NULL; virErrorPtr err = NULL;
if (!lxc_driver->cgroup) { if (!lxc_driver->cgroup) {
...@@ -1178,7 +1178,7 @@ virLXCProcessReconnectDomain(void *payload, const void *name ATTRIBUTE_UNUSED, v ...@@ -1178,7 +1178,7 @@ virLXCProcessReconnectDomain(void *payload, const void *name ATTRIBUTE_UNUSED, v
{ {
virDomainObjPtr vm = payload; virDomainObjPtr vm = payload;
lxc_driver_t *driver = opaque; lxc_driver_t *driver = opaque;
lxcDomainObjPrivatePtr priv; virLXCDomainObjPrivatePtr priv;
virDomainObjLock(vm); virDomainObjLock(vm);
VIR_DEBUG("Reconnect %d %d %d\n", vm->def->id, vm->pid, vm->state.state); VIR_DEBUG("Reconnect %d %d %d\n", vm->def->id, vm->pid, vm->state.state);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册