mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-30 21:47:18 +00:00
LXC: use virDomainObjEndJob()
This patch removes virLXCDomainObjEndJob() and replaces it with call to the generalized virDomainObjEndJob(). Signed-off-by: Kristina Hanicova <khanicov@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
a7ed601d34
commit
565e3caf55
@ -35,26 +35,6 @@
|
|||||||
VIR_LOG_INIT("lxc.lxc_domain");
|
VIR_LOG_INIT("lxc.lxc_domain");
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* obj must be locked and have a reference before calling
|
|
||||||
*
|
|
||||||
* To be called after completing the work associated with the
|
|
||||||
* earlier virLXCDomainBeginJob() call
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
virLXCDomainObjEndJob(virLXCDriver *driver G_GNUC_UNUSED,
|
|
||||||
virDomainObj *obj)
|
|
||||||
{
|
|
||||||
virDomainJob job = obj->job->active;
|
|
||||||
|
|
||||||
VIR_DEBUG("Stopping job: %s",
|
|
||||||
virDomainJobTypeToString(job));
|
|
||||||
|
|
||||||
virDomainObjResetJob(obj->job);
|
|
||||||
virCondSignal(&obj->job->cond);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
virLXCDomainObjPrivateAlloc(void *opaque)
|
virLXCDomainObjPrivateAlloc(void *opaque)
|
||||||
{
|
{
|
||||||
|
@ -72,10 +72,6 @@ extern virXMLNamespace virLXCDriverDomainXMLNamespace;
|
|||||||
extern virDomainXMLPrivateDataCallbacks virLXCDriverPrivateDataCallbacks;
|
extern virDomainXMLPrivateDataCallbacks virLXCDriverPrivateDataCallbacks;
|
||||||
extern virDomainDefParserConfig virLXCDriverDomainDefParserConfig;
|
extern virDomainDefParserConfig virLXCDriverDomainDefParserConfig;
|
||||||
|
|
||||||
void
|
|
||||||
virLXCDomainObjEndJob(virLXCDriver *driver,
|
|
||||||
virDomainObj *obj);
|
|
||||||
|
|
||||||
|
|
||||||
char *
|
char *
|
||||||
virLXCDomainGetMachineName(virDomainDef *def, pid_t pid);
|
virLXCDomainGetMachineName(virDomainDef *def, pid_t pid);
|
||||||
|
@ -709,7 +709,7 @@ static int lxcDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -793,7 +793,7 @@ lxcDomainSetMemoryParameters(virDomainPtr dom,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -1005,7 +1005,7 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom,
|
|||||||
}
|
}
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -1114,7 +1114,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn,
|
|||||||
if (virLXCProcessStart(driver, vm, nfiles, files, autoDestroyConn,
|
if (virLXCProcessStart(driver, vm, nfiles, files, autoDestroyConn,
|
||||||
VIR_DOMAIN_RUNNING_BOOTED) < 0) {
|
VIR_DOMAIN_RUNNING_BOOTED) < 0) {
|
||||||
virDomainAuditStart(vm, "booted", false);
|
virDomainAuditStart(vm, "booted", false);
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
if (!vm->persistent)
|
if (!vm->persistent)
|
||||||
virDomainObjListRemove(driver->domains, vm);
|
virDomainObjListRemove(driver->domains, vm);
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
@ -1127,7 +1127,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn,
|
|||||||
|
|
||||||
dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id);
|
dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id);
|
||||||
|
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -1365,7 +1365,7 @@ lxcDomainDestroyFlags(virDomainPtr dom,
|
|||||||
virDomainAuditStop(vm, "destroyed");
|
virDomainAuditStop(vm, "destroyed");
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
if (!vm->persistent)
|
if (!vm->persistent)
|
||||||
virDomainObjListRemove(driver->domains, vm);
|
virDomainObjListRemove(driver->domains, vm);
|
||||||
|
|
||||||
@ -1896,7 +1896,7 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -2021,7 +2021,6 @@ lxcDomainBlockStats(virDomainPtr dom,
|
|||||||
const char *path,
|
const char *path,
|
||||||
virDomainBlockStatsPtr stats)
|
virDomainBlockStatsPtr stats)
|
||||||
{
|
{
|
||||||
virLXCDriver *driver = dom->conn->privateData;
|
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
virDomainObj *vm;
|
virDomainObj *vm;
|
||||||
virDomainDiskDef *disk = NULL;
|
virDomainDiskDef *disk = NULL;
|
||||||
@ -2077,7 +2076,7 @@ lxcDomainBlockStats(virDomainPtr dom,
|
|||||||
&stats->wr_req);
|
&stats->wr_req);
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -2092,7 +2091,6 @@ lxcDomainBlockStatsFlags(virDomainPtr dom,
|
|||||||
int * nparams,
|
int * nparams,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
virLXCDriver *driver = dom->conn->privateData;
|
|
||||||
int tmp, ret = -1;
|
int tmp, ret = -1;
|
||||||
virDomainObj *vm;
|
virDomainObj *vm;
|
||||||
virDomainDiskDef *disk = NULL;
|
virDomainDiskDef *disk = NULL;
|
||||||
@ -2205,7 +2203,7 @@ lxcDomainBlockStatsFlags(virDomainPtr dom,
|
|||||||
*nparams = tmp;
|
*nparams = tmp;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -2285,7 +2283,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom,
|
|||||||
}
|
}
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -2387,7 +2385,6 @@ lxcDomainInterfaceStats(virDomainPtr dom,
|
|||||||
{
|
{
|
||||||
virDomainObj *vm;
|
virDomainObj *vm;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
virLXCDriver *driver = dom->conn->privateData;
|
|
||||||
virDomainNetDef *net = NULL;
|
virDomainNetDef *net = NULL;
|
||||||
|
|
||||||
if (!(vm = lxcDomObjFromDomain(dom)))
|
if (!(vm = lxcDomObjFromDomain(dom)))
|
||||||
@ -2412,7 +2409,7 @@ lxcDomainInterfaceStats(virDomainPtr dom,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -2508,7 +2505,7 @@ static int lxcDomainSetAutostart(virDomainPtr dom,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -2631,7 +2628,7 @@ static int lxcDomainSuspend(virDomainPtr dom)
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virObjectEventStateQueue(driver->domainEventState, event);
|
virObjectEventStateQueue(driver->domainEventState, event);
|
||||||
@ -2687,7 +2684,7 @@ static int lxcDomainResume(virDomainPtr dom)
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virObjectEventStateQueue(driver->domainEventState, event);
|
virObjectEventStateQueue(driver->domainEventState, event);
|
||||||
@ -2763,7 +2760,6 @@ lxcDomainSendProcessSignal(virDomainPtr dom,
|
|||||||
unsigned int signum,
|
unsigned int signum,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
virLXCDriver *driver = dom->conn->privateData;
|
|
||||||
virDomainObj *vm = NULL;
|
virDomainObj *vm = NULL;
|
||||||
virLXCDomainObjPrivate *priv;
|
virLXCDomainObjPrivate *priv;
|
||||||
pid_t victim;
|
pid_t victim;
|
||||||
@ -2825,7 +2821,7 @@ lxcDomainSendProcessSignal(virDomainPtr dom,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -2854,7 +2850,6 @@ static int
|
|||||||
lxcDomainShutdownFlags(virDomainPtr dom,
|
lxcDomainShutdownFlags(virDomainPtr dom,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
virLXCDriver *driver = dom->conn->privateData;
|
|
||||||
virLXCDomainObjPrivate *priv;
|
virLXCDomainObjPrivate *priv;
|
||||||
virDomainObj *vm;
|
virDomainObj *vm;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
@ -2912,7 +2907,7 @@ lxcDomainShutdownFlags(virDomainPtr dom,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -2930,7 +2925,6 @@ static int
|
|||||||
lxcDomainReboot(virDomainPtr dom,
|
lxcDomainReboot(virDomainPtr dom,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
virLXCDriver *driver = dom->conn->privateData;
|
|
||||||
virLXCDomainObjPrivate *priv;
|
virLXCDomainObjPrivate *priv;
|
||||||
virDomainObj *vm;
|
virDomainObj *vm;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
@ -2988,7 +2982,7 @@ lxcDomainReboot(virDomainPtr dom,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -4344,7 +4338,7 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr dom,
|
|||||||
}
|
}
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
if (dev != dev_copy)
|
if (dev != dev_copy)
|
||||||
@ -4415,7 +4409,7 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr dom,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainDeviceDefFree(dev);
|
virDomainDeviceDefFree(dev);
|
||||||
@ -4506,7 +4500,7 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom,
|
|||||||
}
|
}
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
if (dev != dev_copy)
|
if (dev != dev_copy)
|
||||||
@ -4529,7 +4523,6 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom,
|
|||||||
int **fdlist,
|
int **fdlist,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
virLXCDriver *driver = dom->conn->privateData;
|
|
||||||
virDomainObj *vm;
|
virDomainObj *vm;
|
||||||
virLXCDomainObjPrivate *priv;
|
virLXCDomainObjPrivate *priv;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
@ -4564,7 +4557,7 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom,
|
|||||||
ret = nfds;
|
ret = nfds;
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -4617,7 +4610,6 @@ lxcDomainMemoryStats(virDomainPtr dom,
|
|||||||
virLXCDomainObjPrivate *priv;
|
virLXCDomainObjPrivate *priv;
|
||||||
unsigned long long swap_usage;
|
unsigned long long swap_usage;
|
||||||
unsigned long mem_usage;
|
unsigned long mem_usage;
|
||||||
virLXCDriver *driver = dom->conn->privateData;
|
|
||||||
|
|
||||||
virCheckFlags(0, -1);
|
virCheckFlags(0, -1);
|
||||||
|
|
||||||
@ -4659,7 +4651,7 @@ lxcDomainMemoryStats(virDomainPtr dom,
|
|||||||
}
|
}
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -4812,7 +4804,7 @@ lxcDomainSetMetadata(virDomainPtr dom,
|
|||||||
virObjectEventStateQueue(driver->domainEventState, ev);
|
virObjectEventStateQueue(driver->domainEventState, ev);
|
||||||
}
|
}
|
||||||
|
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
@ -4890,7 +4882,6 @@ static char *
|
|||||||
lxcDomainGetHostname(virDomainPtr dom,
|
lxcDomainGetHostname(virDomainPtr dom,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
virLXCDriver *driver = dom->conn->privateData;
|
|
||||||
virDomainObj *vm = NULL;
|
virDomainObj *vm = NULL;
|
||||||
char macaddr[VIR_MAC_STRING_BUFLEN];
|
char macaddr[VIR_MAC_STRING_BUFLEN];
|
||||||
g_autoptr(virConnect) conn = NULL;
|
g_autoptr(virConnect) conn = NULL;
|
||||||
@ -4954,7 +4945,7 @@ lxcDomainGetHostname(virDomainPtr dom,
|
|||||||
}
|
}
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
virLXCDomainObjEndJob(driver, vm);
|
virDomainObjEndJob(vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virDomainObjEndAPI(&vm);
|
virDomainObjEndAPI(&vm);
|
||||||
|
Loading…
Reference in New Issue
Block a user