External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Allocate domain definition with the new helper

Browse Source 
Use the virDomainDefNew() helper to allocate the definition instead of
doing it via VIR_ALLOC.
This commit is contained in:
Peter Krempa 2015-02-16 16:30:11 +01:00
parent 61e43ce9df
commit c03411199e
13 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/domain_conf.c
View File

@ -12910,7 +12910,7 @@ virDomainDefParseXML(xmlDocPtr xml,
VIR_FREE(schema); VIR_FREE(schema);
} }
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
return NULL; return NULL;
if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE))

2
src/lxc/lxc_native.c
View File

@ -1002,7 +1002,7 @@ lxcParseConfigString(const char *config)
if (!(properties = virConfReadMem(config, 0, VIR_CONF_FLAG_LXC_FORMAT))) if (!(properties = virConfReadMem(config, 0, VIR_CONF_FLAG_LXC_FORMAT)))
return NULL; return NULL;
if (VIR_ALLOC(vmdef) < 0) if (!(vmdef = virDomainDefNew()))
goto error; goto error;
if (virUUIDGenerate(vmdef->uuid) < 0) { if (virUUIDGenerate(vmdef->uuid) < 0) {

2
src/openvz/openvz_conf.c
View File

@ -543,7 +543,7 @@ int openvzLoadDomains(struct openvz_driver *driver)
} }
*line++ = '\0'; *line++ = '\0';
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
goto cleanup; goto cleanup;
def->virtType = VIR_DOMAIN_VIRT_OPENVZ; def->virtType = VIR_DOMAIN_VIRT_OPENVZ;

2
src/parallels/parallels_sdk.c
View File

@ -1186,7 +1186,7 @@ prlsdkLoadDomain(parallelsConnPtr privconn,
virCheckNonNullArgGoto(privconn, error); virCheckNonNullArgGoto(privconn, error);
virCheckNonNullArgGoto(sdkdom, error); virCheckNonNullArgGoto(sdkdom, error);
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
goto error; goto error;
if (!olddom) { if (!olddom) {

2
src/phyp/phyp_driver.c
View File

@ -1708,7 +1708,7 @@ phypDomainAttachDevice(virDomainPtr domain, const char *xml)
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
char *domain_name = NULL; char *domain_name = NULL;
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
goto cleanup; goto cleanup;
domain_name = escape_specialcharacters(domain->name); domain_name = escape_specialcharacters(domain->name);

2
src/qemu/qemu_command.c
View File

@ -11870,7 +11870,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
return NULL; return NULL;
} }
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
goto error; goto error;
/* allocate the cmdlinedef up-front; if it's unused, we'll free it later */ /* allocate the cmdlinedef up-front; if it's unused, we'll free it later */

8
src/vbox/vbox_common.c
View File

@ -3860,7 +3860,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
if (openSessionForMachine(data, dom->uuid, &iid, &machine, false) < 0) if (openSessionForMachine(data, dom->uuid, &iid, &machine, false) < 0)
goto cleanup; goto cleanup;
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
goto cleanup; goto cleanup;
gVBoxAPI.UIMachine.GetAccessible(machine, &accessible); gVBoxAPI.UIMachine.GetAccessible(machine, &accessible);
@ -4114,7 +4114,7 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom,
return ret; return ret;
VBOX_IID_INITIALIZE(&iid); VBOX_IID_INITIALIZE(&iid);
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
return ret; return ret;
if (VIR_STRDUP(def->os.type, "hvm") < 0) if (VIR_STRDUP(def->os.type, "hvm") < 0)
@ -4246,7 +4246,7 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml)
return ret; return ret;
VBOX_IID_INITIALIZE(&iid); VBOX_IID_INITIALIZE(&iid);
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
return ret; return ret;
if (VIR_STRDUP(def->os.type, "hvm") < 0) if (VIR_STRDUP(def->os.type, "hvm") < 0)
@ -6032,7 +6032,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
if (!(snap = vboxDomainSnapshotGet(data, dom, machine, snapshot->name))) if (!(snap = vboxDomainSnapshotGet(data, dom, machine, snapshot->name)))
goto cleanup; goto cleanup;
if (VIR_ALLOC(def) < 0 || VIR_ALLOC(def->dom) < 0) if (VIR_ALLOC(def) < 0 || !(def->dom = virDomainDefNew()))
goto cleanup; goto cleanup;
if (VIR_STRDUP(def->name, snapshot->name) < 0) if (VIR_STRDUP(def->name, snapshot->name) < 0)
goto cleanup; goto cleanup;

2
src/vmx/vmx.c
View File

@ -1298,7 +1298,7 @@ virVMXParseConfig(virVMXContext *ctx,
} }
/* Allocate domain def */ /* Allocate domain def */
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
goto cleanup; goto cleanup;
def->virtType = VIR_DOMAIN_VIRT_VMWARE; def->virtType = VIR_DOMAIN_VIRT_VMWARE;

2
src/xenconfig/xen_sxpr.c
View File

@ -1093,7 +1093,7 @@ xenParseSxpr(const struct sexpr *root,
virDomainDefPtr def; virDomainDefPtr def;
int hvm = 0, vmlocaltime; int hvm = 0, vmlocaltime;
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
goto error; goto error;
tmp = sexpr_node(root, "domain/domid"); tmp = sexpr_node(root, "domain/domid");

2
src/xenconfig/xen_xl.c
View File

@ -295,7 +295,7 @@ xenParseXL(virConfPtr conf, virCapsPtr caps, int xendConfigVersion)
{ {
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
return NULL; return NULL;
def->virtType = VIR_DOMAIN_VIRT_XEN; def->virtType = VIR_DOMAIN_VIRT_XEN;

2
src/xenconfig/xen_xm.c
View File

@ -375,7 +375,7 @@ xenParseXM(virConfPtr conf,
{ {
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
return NULL; return NULL;
def->virtType = VIR_DOMAIN_VIRT_XEN; def->virtType = VIR_DOMAIN_VIRT_XEN;

2
tests/openvzutilstest.c
View File

@ -102,7 +102,7 @@ testReadNetworkConf(const void *data ATTRIBUTE_UNUSED)
" </devices>\n" " </devices>\n"
"</domain>\n"; "</domain>\n";
if (VIR_ALLOC(def) < 0 || if (!(def = virDomainDefNew()) ||
VIR_STRDUP(def->os.type, "exe") < 0 || VIR_STRDUP(def->os.type, "exe") < 0 ||
VIR_STRDUP(def->os.init, "/sbin/init") < 0) VIR_STRDUP(def->os.init, "/sbin/init") < 0)
goto cleanup; goto cleanup;

2
tests/securityselinuxtest.c
View File

@ -70,7 +70,7 @@ testBuildDomainDef(bool dynamic,
virDomainDefPtr def; virDomainDefPtr def;
virSecurityLabelDefPtr secdef; virSecurityLabelDefPtr secdef;
if (VIR_ALLOC(def) < 0) if (!(def = virDomainDefNew()))
goto error; goto error;
if (VIR_ALLOC_N(def->seclabels, 1) < 0) if (VIR_ALLOC_N(def->seclabels, 1) < 0)