[libvirt PATCH 3/9] conf: introduce virDomainDefParseBootKernelOptions

Pavel Hrdina phrdina at redhat.com
Thu Mar 18 12:26:40 UTC 2021


Extract the code to it's own function.

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 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 31b908d8fe..4876fe61bb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -19583,6 +19583,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)
@@ -19612,11 +19624,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))) {
-- 
2.30.2




More information about the libvir-list mailing list