From bf9b3f8e573092cc98ea647f25cf116e22bbfe3c Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Wed, 10 Mar 2021 11:23:42 +0100 Subject: [PATCH] conf: introduce virDomainDefParseBootKernelOptions Extract the code to it's own function. Signed-off-by: Pavel Hrdina Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9c1e10aa11..dd617fca46 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19565,6 +19565,18 @@ virDomainDefParseBootInitOptions(virDomainDefPtr def, } +static void +virDomainDefParseBootKernelOptions(virDomainDefPtr def, + xmlXPathContextPtr ctxt) +{ + def->os.kernel = virXPathString("string(./os/kernel[1])", ctxt); + def->os.initrd = virXPathString("string(./os/initrd[1])", ctxt); + def->os.cmdline = virXPathString("string(./os/cmdline[1])", ctxt); + def->os.dtb = virXPathString("string(./os/dtb[1])", ctxt); + def->os.root = virXPathString("string(./os/root[1])", ctxt); +} + + static int virDomainDefParseBootOptions(virDomainDefPtr def, xmlXPathContextPtr ctxt) @@ -19594,11 +19606,7 @@ virDomainDefParseBootOptions(virDomainDefPtr def, g_autofree char *firmware = NULL; xmlNodePtr loader_node; - def->os.kernel = virXPathString("string(./os/kernel[1])", ctxt); - def->os.initrd = virXPathString("string(./os/initrd[1])", ctxt); - def->os.cmdline = virXPathString("string(./os/cmdline[1])", ctxt); - def->os.dtb = virXPathString("string(./os/dtb[1])", ctxt); - def->os.root = virXPathString("string(./os/root[1])", ctxt); + virDomainDefParseBootKernelOptions(def, ctxt); if (def->os.type == VIR_DOMAIN_OSTYPE_HVM && (firmware = virXPathString("string(./os/@firmware)", ctxt))) {