External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: parse: Use virControllerDefNew

Browse Source 
Rather than reimplement it. This will be needed in upcoming patches
This commit is contained in:
Cole Robinson 2016-04-24 11:05:31 -04:00
parent e2ac519cd2
commit 345d2ab488
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/domain_conf.c
View File

@ -1638,7 +1638,7 @@ virDomainDiskSetFormat(virDomainDiskDefPtr def, int format)
}
static virDomainControllerDefPtr
virDomainControllerDefPtr
virDomainControllerDefNew(virDomainControllerType type)
{
virDomainControllerDefPtr def;

2
src/conf/domain_conf.h
View File

@ -2563,6 +2563,8 @@ virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def,
int bus,
char *dst);
void virDomainControllerDefFree(virDomainControllerDefPtr def);
virDomainControllerDefPtr
virDomainControllerDefNew(virDomainControllerType type);
void virDomainFSDefFree(virDomainFSDefPtr def);
void virDomainActualNetDefFree(virDomainActualNetDefPtr def);
void virDomainNetDefFree(virDomainNetDefPtr def);

1
src/libvirt_private.syms
View File

@ -186,6 +186,7 @@ virDomainClockOffsetTypeToString;
virDomainConfigFile;
virDomainControllerAliasFind;
virDomainControllerDefFree;
virDomainControllerDefNew;
virDomainControllerFind;
virDomainControllerFindByType;
virDomainControllerInsert;

8
src/qemu/qemu_parse_command.c
View File

@ -2351,13 +2351,11 @@ qemuParseCommandLine(virCapsPtr caps,
/* ignore, generted on the fly */
} else if (STREQ(arg, "-usb")) {
virDomainControllerDefPtr ctldef;
if (VIR_ALLOC(ctldef) < 0)
ctldef = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB);
if (!ctldef)
goto error;
ctldef->type = VIR_DOMAIN_CONTROLLER_TYPE_USB;
ctldef->idx = 0;
ctldef->model = -1;
if (virDomainControllerInsert(def, ctldef) < 0) {
VIR_FREE(ctldef);
virDomainControllerDefFree(ctldef);
goto error;
}
} else if (STREQ(arg, "-pidfile")) {