NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: drop virCapsPtr param from domain post parse & validate APIs

Browse Source 
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-11-27 12:08:10 +00:00
parent 61bff77bf9
commit b5f591cdb4
8 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/conf/domain_conf.c
View File

@ -5810,7 +5810,6 @@ virDomainDefPostParseCheckFailure(virDomainDefPtr def,
int int
virDomainDefPostParse(virDomainDefPtr def, virDomainDefPostParse(virDomainDefPtr def,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags, unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque) void *parseOpaque)
@ -7115,7 +7114,6 @@ virDomainDefValidateInternal(const virDomainDef *def,
*/ */
int int
virDomainDefValidate(virDomainDefPtr def, virDomainDefValidate(virDomainDefPtr def,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags, unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt) virDomainXMLOptionPtr xmlopt)
{ {
@ -21566,11 +21564,11 @@ virDomainObjParseXML(xmlDocPtr xml,
parseOpaque = xmlopt->privateData.getParseOpaque(obj); parseOpaque = xmlopt->privateData.getParseOpaque(obj);
/* callback to fill driver specific domain aspects */ /* callback to fill driver specific domain aspects */
if (virDomainDefPostParse(obj->def, caps, flags, xmlopt, parseOpaque) < 0) if (virDomainDefPostParse(obj->def, flags, xmlopt, parseOpaque) < 0)
goto error; goto error;
/* validate configuration */ /* validate configuration */
if (virDomainDefValidate(obj->def, caps, flags, xmlopt) < 0) if (virDomainDefValidate(obj->def, flags, xmlopt) < 0)
goto error; goto error;
return obj; return obj;
@ -21655,11 +21653,11 @@ virDomainDefParseNode(xmlDocPtr xml,
return NULL; return NULL;
/* callback to fill driver specific domain aspects */ /* callback to fill driver specific domain aspects */
if (virDomainDefPostParse(def, caps, flags, xmlopt, parseOpaque) < 0) if (virDomainDefPostParse(def, flags, xmlopt, parseOpaque) < 0)
return NULL; return NULL;
/* validate configuration */ /* validate configuration */
if (virDomainDefValidate(def, caps, flags, xmlopt) < 0) if (virDomainDefValidate(def, flags, xmlopt) < 0)
return NULL; return NULL;
return g_steal_pointer(&def); return g_steal_pointer(&def);

2
src/conf/domain_conf.h
View File

@ -2783,7 +2783,6 @@ virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
const virDomainDeviceDriveAddress *addr); const virDomainDeviceDriveAddress *addr);
int virDomainDefPostParse(virDomainDefPtr def, int virDomainDefPostParse(virDomainDefPtr def,
virCapsPtr caps,
unsigned int parseFlags, unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque); void *parseOpaque);
@ -2796,7 +2795,6 @@ int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
bool virDomainDeviceAliasIsUserAlias(const char *aliasStr); bool virDomainDeviceAliasIsUserAlias(const char *aliasStr);
int virDomainDefValidate(virDomainDefPtr def, int virDomainDefValidate(virDomainDefPtr def,
virCapsPtr caps,
unsigned int parseFlags, unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt); virDomainXMLOptionPtr xmlopt);

2
src/libxl/xen_xl.c
View File

@ -1213,7 +1213,7 @@ xenParseXL(virConfPtr conf,
if (xenParseXLChannel(conf, def) < 0) if (xenParseXLChannel(conf, def) < 0)
goto cleanup; goto cleanup;
if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
xmlopt, NULL) < 0) xmlopt, NULL) < 0)
goto cleanup; goto cleanup;

2
src/libxl/xen_xm.c
View File

@ -467,7 +467,7 @@ xenParseXM(virConfPtr conf,
if (xenParseXMInputDevs(conf, def) < 0) if (xenParseXMInputDevs(conf, def) < 0)
goto cleanup; goto cleanup;
if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
xmlopt, NULL) < 0) xmlopt, NULL) < 0)
goto cleanup; goto cleanup;

4
src/lxc/lxc_native.c
View File

@ -1055,7 +1055,7 @@ lxcSetCapDrop(virDomainDefPtr def, virConfPtr properties)
virDomainDefPtr virDomainDefPtr
lxcParseConfigString(const char *config, lxcParseConfigString(const char *config,
virCapsPtr caps, virCapsPtr caps G_GNUC_UNUSED,
virDomainXMLOptionPtr xmlopt) virDomainXMLOptionPtr xmlopt)
{ {
virDomainDefPtr vmdef = NULL; virDomainDefPtr vmdef = NULL;
@ -1166,7 +1166,7 @@ lxcParseConfigString(const char *config,
/* lxc.cap.drop */ /* lxc.cap.drop */
lxcSetCapDrop(vmdef, properties); lxcSetCapDrop(vmdef, properties);
if (virDomainDefPostParse(vmdef, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, if (virDomainDefPostParse(vmdef, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
xmlopt, NULL) < 0) xmlopt, NULL) < 0)
goto error; goto error;

12
src/qemu/qemu_driver.c
View File

@ -8101,7 +8101,7 @@ qemuCheckDiskConfigAgainstDomain(const virDomainDef *def,
static int static int
qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
virCapsPtr caps, virCapsPtr caps G_GNUC_UNUSED,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
unsigned int parse_flags, unsigned int parse_flags,
virDomainXMLOptionPtr xmlopt) virDomainXMLOptionPtr xmlopt)
@ -8301,7 +8301,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
return -1; return -1;
} }
if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, qemuCaps) < 0) if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0)
return -1; return -1;
return 0; return 0;
@ -8311,7 +8311,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
static int static int
qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
virCapsPtr caps, virCapsPtr caps G_GNUC_UNUSED,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
unsigned int parse_flags, unsigned int parse_flags,
virDomainXMLOptionPtr xmlopt) virDomainXMLOptionPtr xmlopt)
@ -8504,7 +8504,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
return -1; return -1;
} }
if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, qemuCaps) < 0) if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0)
return -1; return -1;
return 0; return 0;
@ -8513,7 +8513,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
static int static int
qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
virCapsPtr caps, virCapsPtr caps G_GNUC_UNUSED,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
unsigned int parse_flags, unsigned int parse_flags,
virDomainXMLOptionPtr xmlopt) virDomainXMLOptionPtr xmlopt)
@ -8612,7 +8612,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
return -1; return -1;
} }
if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, qemuCaps) < 0) if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0)
return -1; return -1;
return 0; return 0;

4
src/qemu/qemu_process.c
View File

@ -5382,7 +5382,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver,
* VM that was running before (migration, snapshots, save). It's more * VM that was running before (migration, snapshots, save). It's more
* important to start such VM than keep the configuration clean */ * important to start such VM than keep the configuration clean */
if ((flags & VIR_QEMU_PROCESS_START_NEW) && if ((flags & VIR_QEMU_PROCESS_START_NEW) &&
virDomainDefValidate(vm->def, caps, 0, driver->xmlopt) < 0) virDomainDefValidate(vm->def, 0, driver->xmlopt) < 0)
return -1; return -1;
if (qemuProcessStartValidateGraphics(vm) < 0) if (qemuProcessStartValidateGraphics(vm) < 0)
@ -5581,7 +5581,7 @@ qemuProcessInit(virQEMUDriverPtr driver,
VIR_DEBUG("re-running the post parse callback"); VIR_DEBUG("re-running the post parse callback");
/* we don't have the private copy of qemuCaps at this point */ /* we don't have the private copy of qemuCaps at this point */
if (virDomainDefPostParse(vm->def, caps, 0, driver->xmlopt, NULL) < 0) if (virDomainDefPostParse(vm->def, 0, driver->xmlopt, NULL) < 0)
goto cleanup; goto cleanup;
} }

4
src/vmx/vmx.c
View File

@ -1276,7 +1276,7 @@ virVMXConfigScanResultsCollector(const char* name,
virDomainDefPtr virDomainDefPtr
virVMXParseConfig(virVMXContext *ctx, virVMXParseConfig(virVMXContext *ctx,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
virCapsPtr caps, virCapsPtr caps G_GNUC_UNUSED,
const char *vmx) const char *vmx)
{ {
bool success = false; bool success = false;
@ -1845,7 +1845,7 @@ virVMXParseConfig(virVMXContext *ctx,
} }
} }
if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
xmlopt, NULL) < 0) xmlopt, NULL) < 0)
goto cleanup; goto cleanup;