External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-25 04:42:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: use switch in virDomainDefParseBootOptions

Browse Source 
The original code used a lot of conditions and was not that obvious
when each XML bits are parsed.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Pavel Hrdina 2021-03-10 11:47:24 +01:00
parent 108cb29c1c
commit 6330be1ba3
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/conf/domain_conf.c
View File

@ -19684,33 +19684,43 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
* - An init script (exe) * - An init script (exe)
*/ */
if (def->os.type == VIR_DOMAIN_OSTYPE_EXE) { switch ((virDomainOSType) def->os.type) {
if (virDomainDefParseBootInitOptions(def, ctxt) < 0) case VIR_DOMAIN_OSTYPE_HVM:
return -1;
}
if (def->os.type == VIR_DOMAIN_OSTYPE_XEN ||
def->os.type == VIR_DOMAIN_OSTYPE_XENPVH ||
def->os.type == VIR_DOMAIN_OSTYPE_HVM ||
def->os.type == VIR_DOMAIN_OSTYPE_UML) {
virDomainDefParseBootKernelOptions(def, ctxt); virDomainDefParseBootKernelOptions(def, ctxt);
if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
if (virDomainDefParseBootFirmwareOptions(def, ctxt) < 0) if (virDomainDefParseBootFirmwareOptions(def, ctxt) < 0)
return -1; return -1;
}
if (virDomainDefParseBootLoaderOptions(def, ctxt) < 0) if (virDomainDefParseBootLoaderOptions(def, ctxt) < 0)
return -1; return -1;
}
if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
if (virDomainDefParseBootAcpiOptions(def, ctxt) < 0) if (virDomainDefParseBootAcpiOptions(def, ctxt) < 0)
return -1; return -1;
if (virDomainDefParseBootXML(ctxt, def) < 0) if (virDomainDefParseBootXML(ctxt, def) < 0)
return -1; return -1;
break;
case VIR_DOMAIN_OSTYPE_XEN:
case VIR_DOMAIN_OSTYPE_XENPVH:
case VIR_DOMAIN_OSTYPE_UML:
virDomainDefParseBootKernelOptions(def, ctxt);
if (virDomainDefParseBootLoaderOptions(def, ctxt) < 0)
return -1;
break;
case VIR_DOMAIN_OSTYPE_EXE:
if (virDomainDefParseBootInitOptions(def, ctxt) < 0)
return -1;
break;
case VIR_DOMAIN_OSTYPE_LINUX:
case VIR_DOMAIN_OSTYPE_LAST:
break;
} }
return 0; return 0;