ret = 0;
cleanup:
- VIR_FREE(confdir);
- virCommandFree(cmd);
+ VIR_FREE(confdir);
+ virCommandFree(cmd);
- return ret;
+ return ret;
}
ret = 0;
cleanup:
- virCommandFree(cmd);
+ virCommandFree(cmd);
- return ret;
+ return ret;
}
static int openvzDomainResume(virDomainPtr dom)
{
- struct openvz_driver *driver = dom->conn->privateData;
- virDomainObjPtr vm;
- const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINEL, "--resume", NULL};
- int ret = -1;
+ struct openvz_driver *driver = dom->conn->privateData;
+ virDomainObjPtr vm;
+ const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINEL, "--resume", NULL};
+ int ret = -1;
- openvzDriverLock(driver);
- vm = virDomainObjListFindByUUID(driver->domains, dom->uuid);
- openvzDriverUnlock(driver);
+ openvzDriverLock(driver);
+ vm = virDomainObjListFindByUUID(driver->domains, dom->uuid);
+ openvzDriverUnlock(driver);
- if (!vm) {
- virReportError(VIR_ERR_NO_DOMAIN, "%s",
- _("no domain with matching uuid"));
- goto cleanup;
- }
+ if (!vm) {
+ virReportError(VIR_ERR_NO_DOMAIN, "%s",
+ _("no domain with matching uuid"));
+ goto cleanup;
+ }
- if (!virDomainObjIsActive(vm)) {
- virReportError(VIR_ERR_OPERATION_INVALID, "%s",
- _("Domain is not running"));
- goto cleanup;
- }
+ if (!virDomainObjIsActive(vm)) {
+ virReportError(VIR_ERR_OPERATION_INVALID, "%s",
+ _("Domain is not running"));
+ goto cleanup;
+ }
- if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
- openvzSetProgramSentinal(prog, vm->def->name);
- if (virRun(prog, NULL) < 0)
- goto cleanup;
- virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNPAUSED);
- }
+ if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
+ openvzSetProgramSentinal(prog, vm->def->name);
+ if (virRun(prog, NULL) < 0)
+ goto cleanup;
+ virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNPAUSED);
+ }
- ret = 0;
+ ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
- return ret;
+ if (vm)
+ virObjectUnlock(vm);
+ return ret;
}
static int
char *guest_ifname = NULL;
if (net == NULL)
- return 0;
+ return 0;
+
if (vpsid == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Container ID is not specified"));
} else {
guest_ifname = openvzGenerateContainerVethName(veid);
if (guest_ifname == NULL) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Could not generate eth name for container"));
- goto cleanup;
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Could not generate eth name for container"));
+ goto cleanup;
}
}
if (net->ifname == NULL) {
net->ifname = openvzGenerateVethName(veid, guest_ifname);
if (net->ifname == NULL) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Could not generate veth name"));
- goto cleanup;
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Could not generate veth name"));
+ goto cleanup;
}
}
virCommandAddArg(cmd, "--netif_add");
virCommandAddArgBuffer(cmd, &buf);
} else if (net->type == VIR_DOMAIN_NET_TYPE_ETHERNET &&
- net->guestIP.nips > 0) {
+ net->guestIP.nips > 0) {
size_t i;
/* --ipadd ip */
driver->xmlopt) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Could not set number of vCPUs"));
- goto cleanup;
+ goto cleanup;
}
}
if (openvzDomainSetMemoryInternal(vm, vm->def->mem.cur_balloon) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Could not set memory size"));
- goto cleanup;
+ goto cleanup;
}
}
static int
openvzDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml,
- unsigned int flags)
+ unsigned int flags)
{
int ret = -1;
int veid;