]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: introduce virDomainDefParseBootKernelOptions
authorPavel Hrdina <phrdina@redhat.com>
Wed, 10 Mar 2021 10:23:42 +0000 (11:23 +0100)
committerPavel Hrdina <phrdina@redhat.com>
Thu, 18 Mar 2021 17:42:16 +0000 (18:42 +0100)
Extract the code to it's own function.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/conf/domain_conf.c

index 9c1e10aa11f1e5d564a17f59606acf1732a41d0d..dd617fca465b04c3659974d8b9a2b2fa9b0f45c1 100644 (file)
@@ -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))) {