Added support for booting off kenrel+initrd with HVM guests

ChangeLog

@@ -1,3 +1,12 @@
+Tue Feb  3 11:21:45 EST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/xml.c, src/xend_internal.c: Allow use of kernel+initrd
+	in HVM guests as well as PV
+	* tests/xml2sexprdata/*, tests/sexpr2xmldata/*: Updated for
+	slight changes in SXPR element ordering
+	* tests/xml2sexprtest.c, tests/sexpr2xmltest.c: Add test
+	case for new HVM kernel+initrd ability
+
 Tue Feb  3 15:21:45 CET 2008  Jim Meyering  <meyering@redhat.com>
 
 	Eliminate all uses of virBufferAdd with string literals.

src/xend_internal.c

@@ -1280,65 +1280,84 @@ xend_log(virConnectPtr xend, char *buffer, size_t n_buffer)
 static int
 xend_parse_sexp_desc_os(virConnectPtr xend, struct sexpr *node, virBufferPtr buf, int hvm, int bootloader)
 {
-    const char *tmp;
+    const char *loader = NULL;
+    const char *kernel = NULL;
+    const char *initrd = NULL;
+    const char *cmdline = NULL;
+    const char *root = NULL;
 
     if (node == NULL || buf == NULL) {
        return(-1);
     }
     
     virBufferAddLit(buf, "  <os>\n");
+    if (hvm)
+        virBufferAddLit(buf, "    <type>hvm</type>\n");
+    else
+        virBufferAddLit(buf, "    <type>linux</type>\n");
+
     if (hvm) {
-        virBufferVSprintf(buf, "    <type>hvm</type>\n");
+        loader = sexpr_node(node, "domain/image/hvm/loader");
-        tmp = sexpr_node(node, "domain/image/hvm/kernel");
+        if (loader == NULL) {
-        if (tmp == NULL)
+            loader = sexpr_node(node, "domain/image/hvm/kernel");
-            tmp = sexpr_node(node, "domain/image/hvm/loader");
+
-        if (tmp == NULL && !bootloader) {
+            if (loader == NULL) {
-            virXendError(xend, VIR_ERR_INTERNAL_ERROR,
+                virXendError(xend, VIR_ERR_INTERNAL_ERROR,
-                         _("domain information incomplete, missing kernel & bootloader"));
+                             _("domain information incomplete, missing HVM loader"));
-            return(-1);
+                return(-1);
-        }
-        if (tmp)
-            virBufferVSprintf(buf, "    <loader>%s</loader>\n", tmp);
-        tmp = sexpr_node(node, "domain/image/hvm/boot");
-        if ((tmp != NULL) && (tmp[0] != 0)) {
-            while (*tmp) {
-                if (*tmp == 'a')
-                    /* XXX no way to deal with boot from 2nd floppy */
-                    virBufferAddLit(buf, "    <boot dev='fd'/>\n");
-                else if (*tmp == 'c')
-                    /*
-                     * Don't know what to put here.  Say the vm has been given 3
-                     * disks - hda, hdb, hdc.  How does one identify the boot disk?
-                     * We're going to assume that first disk is the boot disk since
-                     * this is most common practice
-                     */
-                    virBufferAddLit(buf, "    <boot dev='hd'/>\n");
-                else if (*tmp == 'd')
-                    virBufferAddLit(buf, "    <boot dev='cdrom'/>\n");
-                else if (*tmp == 'n')
-                    virBufferAddLit(buf, "    <boot dev='network'/>\n");
-                tmp++;
             }
+        } else {
+            kernel = sexpr_node(node, "domain/image/hvm/kernel");
+            initrd = sexpr_node(node, "domain/image/hvm/ramdisk");
+            cmdline = sexpr_node(node, "domain/image/hvm/args");
+            root = sexpr_node(node, "domain/image/hvm/root");
         }
     } else {
-        virBufferVSprintf(buf, "    <type>linux</type>\n");
+        kernel = sexpr_node(node, "domain/image/linux/kernel");
-        tmp = sexpr_node(node, "domain/image/linux/kernel");
+        initrd = sexpr_node(node, "domain/image/linux/ramdisk");
-        if (tmp == NULL && !bootloader) {
+        cmdline = sexpr_node(node, "domain/image/linux/args");
+        root = sexpr_node(node, "domain/image/linux/root");
+    }
+
+    if (hvm)
+        virBufferVSprintf(buf, "    <loader>%s</loader>\n", loader);
+
+    if (kernel) {
+        virBufferVSprintf(buf, "    <kernel>%s</kernel>\n", kernel);
+        if (initrd && initrd[0])
+            virBufferVSprintf(buf, "    <initrd>%s</initrd>\n", initrd);
+        if (root && root[0])
+            virBufferVSprintf(buf, "    <root>%s</root>\n", root);
+        if (cmdline && cmdline[0])
+            virBufferEscapeString(buf, "    <cmdline>%s</cmdline>\n", cmdline);
+    } else {
+        if (hvm) {
+            const char *boot = sexpr_node(node, "domain/image/hvm/boot");
+            if ((boot != NULL) && (boot[0] != 0)) {
+                while (*boot) {
+                    if (*boot == 'a')
+                        /* XXX no way to deal with boot from 2nd floppy */
+                        virBufferAddLit(buf, "    <boot dev='fd'/>\n");
+                    else if (*boot == 'c')
+                        /*
+                         * Don't know what to put here.  Say the vm has been given 3
+                         * disks - hda, hdb, hdc.  How does one identify the boot disk?
+                         * We're going to assume that first disk is the boot disk since
+                         * this is most common practice
+                         */
+                        virBufferAddLit(buf, "    <boot dev='hd'/>\n");
+                    else if (*boot == 'd')
+                        virBufferAddLit(buf, "    <boot dev='cdrom'/>\n");
+                    else if (*boot == 'n')
+                        virBufferAddLit(buf, "    <boot dev='network'/>\n");
+                    boot++;
+                }
+            }
+        } else if (!bootloader) {
             virXendError(xend, VIR_ERR_INTERNAL_ERROR,
                          _("domain information incomplete, missing kernel & bootloader"));
             return(-1);
         }
-        if (tmp)
-            virBufferVSprintf(buf, "    <kernel>%s</kernel>\n", tmp);
-        tmp = sexpr_node(node, "domain/image/linux/ramdisk");
-        if ((tmp != NULL) && (tmp[0] != 0))
-           virBufferVSprintf(buf, "    <initrd>%s</initrd>\n", tmp);
-        tmp = sexpr_node(node, "domain/image/linux/root");
-        if ((tmp != NULL) && (tmp[0] != 0))
-           virBufferVSprintf(buf, "    <root>%s</root>\n", tmp);
-        tmp = sexpr_node(node, "domain/image/linux/args");
-        if ((tmp != NULL) && (tmp[0] != 0))
-           virBufferEscapeString(buf, "    <cmdline>%s</cmdline>\n", tmp);
     }
 
     virBufferAddLit(buf, "  </os>\n");
@@ -1367,7 +1386,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
     const char *tmp;
     char *tty;
     virBuffer buf;
-    int hvm = 0, bootloader = 0;
+    int hvm = 0, bootloader = 0, vfb = 0;
     int domid = -1;
     int max_mem, cur_mem;
     unsigned char uuid[VIR_UUID_BUFLEN];
@@ -1487,8 +1506,10 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
 
     virBufferAddLit(&buf, "  <devices>\n");
 
-    /* in case of HVM we have devices emulation */
+    if (hvm)
-    tmp = sexpr_node(root, "domain/image/hvm/device_model");
+        tmp = sexpr_node(root, "domain/image/hvm/device_model");
+    else
+        tmp = sexpr_node(root, "domain/image/linux/device_model");
     if ((tmp != NULL) && (tmp[0] != 0))
         virBufferVSprintf(&buf, "    <emulator>%s</emulator>\n", tmp);
 
@@ -1681,6 +1702,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
             tmp = sexpr_node(node, "device/vfb/type");
 
             if (tmp && !strcmp(tmp, "sdl")) {
+                vfb = 1;
                 virBufferVSprintf(&buf, "    <input type='mouse' bus='%s'/>\n", hvm ? "ps2": "xen");
                 virBufferAddLit(&buf, "    <graphics type='sdl'/>\n");
             } else if (tmp && !strcmp(tmp, "vnc")) {
@@ -1688,6 +1710,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
                 const char *listenAddr = sexpr_node(node, "device/vfb/vnclisten");
                 const char *vncPasswd = NULL;
                 const char *keymap = sexpr_node(node, "device/vfb/keymap");
+                vfb = 1;
                 virBufferVSprintf(&buf, "    <input type='mouse' bus='%s'/>\n", hvm ? "ps2": "xen");
                 virBufferVSprintf(&buf, "    <graphics type='vnc' port='%d'", port);
                 if (listenAddr)
@@ -1751,8 +1774,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
     }
 
     /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.3) vnc config */
-    if ((hvm && xendConfigVersion < 4) ||
+    if (!vfb) {
-        (!hvm && xendConfigVersion < 3)) {
         tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux");
         if (tmp != NULL) {
             if (tmp[0] == '1') {

src/xml.c

@@ -718,7 +718,7 @@ virDomainParseXMLGraphicsDescImage(virConnectPtr conn ATTRIBUTE_UNUSED,
     graphics_type = xmlGetProp(node, BAD_CAST "type");
     if (graphics_type != NULL) {
         if (xmlStrEqual(graphics_type, BAD_CAST "sdl")) {
-            virBufferAddLit(buf, "(sdl 1)", 7);
+            virBufferAddLit(buf, "(sdl 1)");
             /* TODO:
              * Need to understand sdl options
              *
@@ -839,22 +839,21 @@ virDomainParseXMLGraphicsDescVFB(virConnectPtr conn ATTRIBUTE_UNUSED,
  * @ctxt: a path context representing the XML description
  * @vcpus: number of virtual CPUs to configure
  * @xendConfigVersion: xend configuration file format
+ * @hasKernel: whether the domain is booting from a kernel
  *
- * Parse the OS part of the XML description for an HVM domain and add it to
+ * Parse the OS part of the XML description for a HVM domain
- * the S-Expr in buf. This is a temporary interface as the S-Expr interface
+ * and add it to the S-Expr in buf.
- * will be replaced by XML-RPC in the future. However the XML format should
- * stay valid over time.
  *
  * Returns 0 in case of success, -1 in case of error.
  */
 static int
 virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node,
                            virBufferPtr buf, xmlXPathContextPtr ctxt,
-                           int vcpus, int xendConfigVersion)
+                           int vcpus, int xendConfigVersion,
+                           int hasKernel)
 {
     xmlNodePtr cur, txt;
     xmlNodePtr *nodes = NULL;
-    xmlChar *type = NULL;
     xmlChar *loader = NULL;
     char bootorder[5];
     int nbootorder = 0;
@@ -864,14 +863,8 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node,
     cur = node->children;
     while (cur != NULL) {
         if (cur->type == XML_ELEMENT_NODE) {
-            if ((type == NULL) &&
+            if ((loader == NULL) &&
-	        (xmlStrEqual(cur->name, BAD_CAST "type"))) {
+                (xmlStrEqual(cur->name, BAD_CAST "loader"))) {
-                txt = cur->children;
-                if ((txt != NULL) && (txt->type == XML_TEXT_NODE) &&
-                    (txt->next == NULL))
-                    type = txt->content;
-            } else if ((loader == NULL) &&
-                       (xmlStrEqual(cur->name, BAD_CAST "loader"))) {
                 txt = cur->children;
                 if ((txt != NULL) && (txt->type == XML_TEXT_NODE) &&
                     (txt->next == NULL))
@@ -904,29 +897,32 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node,
         }
         cur = cur->next;
     }
+    /*
+     * XenD always needs boot order defined for HVM, even if
+     * booting off a kernel + initrd, so force to 'c' if nothing
+     * else is specified
+     */
+    if (nbootorder == 0)
+        bootorder[nbootorder++] = 'c';
     bootorder[nbootorder] = '\0';
-    if ((type == NULL) || (!xmlStrEqual(type, BAD_CAST "hvm"))) {
+
-        /* VIR_ERR_OS_TYPE */
-        virXMLError(conn, VIR_ERR_OS_TYPE, (const char *) type, 0);
-        return (-1);
-    }
-    virBufferAddLit(buf, "(image (hvm ");
     if (loader == NULL) {
-        virXMLError(conn, VIR_ERR_NO_KERNEL, NULL, 0);
+        virXMLError(conn, VIR_ERR_INTERNAL_ERROR, "no HVM domain loader", 0);
-        goto error;
+        return -1;
+    }
+
+    /* 
+     * Originally XenD abused the 'kernel' parameter for the HVM
+     * firmware. New XenD allows HVM guests to boot from a kernel
+     * and if this is enabled, the HVM firmware must use the new
+     * 'loader' parameter
+     */
+    if (hasKernel) {
+        virBufferVSprintf(buf, "(loader '%s')", (const char *) loader);
     } else {
         virBufferVSprintf(buf, "(kernel '%s')", (const char *) loader);
     }
 
-    /* get the device emulation model */
-    str = virXPathString("string(/domain/devices/emulator[1])", ctxt);
-    if (str == NULL) {
-        virXMLError(conn, VIR_ERR_NO_KERNEL, NULL, 0);  /* TODO: error */
-        goto error;
-    }
-    virBufferVSprintf(buf, "(device_model '%s')", str);
-    xmlFree(str);
-
     virBufferVSprintf(buf, "(vcpus %d)", vcpus);
 
     if (nbootorder)
@@ -1049,27 +1045,12 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node,
         virBufferAddLit(buf, "(serial pty)");
     }
 
-    /* HVM graphics for xen <= 3.0.5 */
-    if (xendConfigVersion < 4) {
-        /* Is a graphics device specified? */
-        cur = virXPathNode("/domain/devices/graphics[1]", ctxt);
-        if (cur != NULL) {
-            res = virDomainParseXMLGraphicsDescImage(conn, cur, buf,
-                                                     xendConfigVersion);
-            if (res != 0) {
-                goto error;
-            }
-        }
-    }
-
     str = virXPathString("string(/domain/clock/@offset)", ctxt);
     if (str != NULL && !strcmp(str, "localtime")) {
         virBufferAddLit(buf, "(localtime 1)");
     }
     free(str);
 
-    virBufferAddLit(buf, "))");
-
     return (0);
 
   error:
@@ -1077,45 +1058,34 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node,
     return (-1);
 }
 
+
 /**
- * virDomainParseXMLOSDescPV:
+ * virDomainParseXMLOSDescKernel:
  * @conn: pointer to the hypervisor connection
  * @node: node containing PV OS description
  * @buf: a buffer for the result S-Expr
- * @ctxt: a path context representing the XML description
- * @xendConfigVersion: xend configuration file format
  *
- * Parse the OS part of the XML description for a paravirtualized domain
+ * Parse the OS part of the XML description for a domain using a direct
- * and add it to the S-Expr in buf.  This is a temporary interface as the
+ * kernel and initrd to boot.
- * S-Expr interface will be replaced by XML-RPC in the future. However
- * the XML format should stay valid over time.
  *
  * Returns 0 in case of success, -1 in case of error.
  */
 static int
-virDomainParseXMLOSDescPV(virConnectPtr conn, xmlNodePtr node,
+virDomainParseXMLOSDescKernel(virConnectPtr conn ATTRIBUTE_UNUSED,
-                          virBufferPtr buf, xmlXPathContextPtr ctxt,
+                              xmlNodePtr node,
-                          int xendConfigVersion)
+                              virBufferPtr buf)
 {
     xmlNodePtr cur, txt;
-    const xmlChar *type = NULL;
     const xmlChar *root = NULL;
     const xmlChar *kernel = NULL;
     const xmlChar *initrd = NULL;
     const xmlChar *cmdline = NULL;
-    int res;
 
     cur = node->children;
     while (cur != NULL) {
         if (cur->type == XML_ELEMENT_NODE) {
-            if ((type == NULL)
+            if ((kernel == NULL) &&
-                && (xmlStrEqual(cur->name, BAD_CAST "type"))) {
+                (xmlStrEqual(cur->name, BAD_CAST "kernel"))) {
-                txt = cur->children;
-                if ((txt != NULL) && (txt->type == XML_TEXT_NODE) &&
-                    (txt->next == NULL))
-                    type = txt->content;
-            } else if ((kernel == NULL) &&
-                       (xmlStrEqual(cur->name, BAD_CAST "kernel"))) {
                 txt = cur->children;
                 if ((txt != NULL) && (txt->type == XML_TEXT_NODE) &&
                     (txt->next == NULL))
@@ -1142,18 +1112,9 @@ virDomainParseXMLOSDescPV(virConnectPtr conn, xmlNodePtr node,
         }
         cur = cur->next;
     }
-    if ((type != NULL) && (!xmlStrEqual(type, BAD_CAST "linux"))) {
+    
-        /* VIR_ERR_OS_TYPE */
+    virBufferVSprintf(buf, "(kernel '%s')", (const char *) kernel);
-        virXMLError(conn, VIR_ERR_OS_TYPE, (const char *) type, 0);
+
-        return (-1);
-    }
-    virBufferAddLit(buf, "(image (linux ");
-    if (kernel == NULL) {
-        virXMLError(conn, VIR_ERR_NO_KERNEL, NULL, 0);
-        return (-1);
-    } else {
-        virBufferVSprintf(buf, "(kernel '%s')", (const char *) kernel);
-    }
     if (initrd != NULL)
         virBufferVSprintf(buf, "(ramdisk '%s')", (const char *) initrd);
     if (root != NULL)
@@ -1161,20 +1122,6 @@ virDomainParseXMLOSDescPV(virConnectPtr conn, xmlNodePtr node,
     if (cmdline != NULL)
         virBufferVSprintf(buf, "(args '%s')", (const char *) cmdline);
 
-    /* PV graphics for xen <= 3.0.4 */
-    if (xendConfigVersion < 3) {
-        cur = virXPathNode("/domain/devices/graphics[1]", ctxt);
-        if (cur != NULL) {
-            res = virDomainParseXMLGraphicsDescImage(conn, cur, buf,
-                                                     xendConfigVersion);
-            if (res != 0) {
-                goto error;
-            }
-        }
-    }
-
-  error:
-    virBufferAddLit(buf, "))");
     return (0);
 }
 
@@ -1708,23 +1655,54 @@ virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name,
 
     if (!bootloader) {
         if ((node = virXPathNode("/domain/os[1]", ctxt)) != NULL) {
+            int has_kernel = 0;
+
             /* Analyze of the os description, based on HVM or PV. */
             str = virXPathString("string(/domain/os/type[1])", ctxt);
-
+            if ((str != NULL) && STREQ(str, "hvm"))
-            if ((str == NULL) || (strcmp(str, "hvm"))) {
-                res = virDomainParseXMLOSDescPV(conn, node,
-                                                &buf, ctxt,
-                                                xendConfigVersion);
-            } else {
                 hvm = 1;
-                res = virDomainParseXMLOSDescHVM(conn, node, &buf, ctxt,
+            xmlFree(str);
-                                                 vcpus, xendConfigVersion);
+            str = NULL;
+
+            if (hvm)
+                virBufferAddLit(&buf, "(image (hvm ");
+            else
+                virBufferAddLit(&buf, "(image (linux ");
+
+            if (virXPathBoolean("count(/domain/os/kernel) > 0", ctxt)) {
+                if (virDomainParseXMLOSDescKernel(conn, node,
+                                                  &buf) != 0)
+                    goto error;
+                has_kernel = 1;
             }
 
-            free(str);
+            if (hvm &&
-
+                virDomainParseXMLOSDescHVM(conn, node,
-            if (res != 0)
+                                           &buf, ctxt, vcpus,
+                                           xendConfigVersion,
+                                           has_kernel) != 0)
                 goto error;
+
+            /* get the device emulation model */
+            str = virXPathString("string(/domain/devices/emulator[1])", ctxt);
+            if (str != NULL) {
+                virBufferVSprintf(&buf, "(device_model '%s')", str);
+                xmlFree(str);
+                str = NULL;
+            }
+
+            /* PV graphics for xen <= 3.0.4, or HVM graphics for xen <= 3.1.0 */
+            if ((!hvm && xendConfigVersion < 3) ||
+                (hvm && xendConfigVersion < 4)) {
+                xmlNodePtr cur;
+                cur = virXPathNode("/domain/devices/graphics[1]", ctxt);
+                if (cur != NULL &&
+                    virDomainParseXMLGraphicsDescImage(conn, cur, &buf,
+                                                       xendConfigVersion) != 0)
+                    goto error;
+            }
+
+            virBufferAddLit(&buf, "))");
         } else {
             virXMLError(conn, VIR_ERR_NO_OS, nam, 0);
             goto error;

tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr

@@ -0,0 +1 @@
+(domain (domid 15)(name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(usb 1)(serial pty)))(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w'))))

tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml

@@ -0,0 +1,26 @@
+<domain type='xen' id='15'>
+  <name>fvtest</name>
+  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <os>
+    <type>hvm</type>
+    <loader>/usr/lib/xen/boot/hvmloader</loader>
+    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
+    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
+    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
+  </os>
+  <memory>430080</memory>
+  <vcpu>2</vcpu>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <features>
+  </features>
+  <clock offset='utc'/>
+  <devices>
+    <disk type='file' device='disk'>
+      <driver name='file'/>
+      <source file='/root/some.img'/>
+      <target dev='xvda'/>
+    </disk>
+  </devices>
+</domain>

tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr

@@ -0,0 +1,70 @@
+(domain
+    (domid 1)
+    (on_crash restart)
+    (uuid fde0533d-d043-88c6-dfba-4822fa32f309)
+    (bootloader_args )
+    (vcpus 1)
+    (name s10u4)
+    (on_poweroff destroy)
+    (on_reboot restart)
+    (bootloader )
+    (maxmem 1024)
+    (memory 1024)
+    (shadow_memory 9)
+    (cpu_weight 256)
+    (cpu_cap 0)
+    (features )
+    (on_xend_start ignore)
+    (on_xend_stop shutdown)
+    (start_time 1201894394.0)
+    (cpu_time 17.253230349)
+    (online_vcpus 1)
+    (image
+        (hvm
+            (kernel /usr/lib/xen/boot/hvmloader)
+            (boot c)
+            (device_model /usr/lib/xen/bin/qemu-dm)
+            (keymap en-us)
+            (localtime 0)
+            (pae 1)
+            (vnc 1)
+            (vncunused 1)
+            (notes (SUSPEND_CANCEL 1))
+        )
+    )
+    (status 2)
+    (state -b----)
+    (store_mfn 262142)
+    (device
+        (vif
+            (mac 00:16:3e:3b:b9:d7)
+            (script vif-vnic)
+            (uuid 33b87cce-c187-4bdd-8301-6411a48be129)
+            (backend 0)
+        )
+    )
+    (device
+        (vbd
+            (uname phy:/dev/zvol/dsk/export/s10u4-root)
+            (uuid b1d5196f-aae7-74bb-43dc-b4aae943b9bd)
+            (mode w)
+            (dev hda:disk)
+            (backend 0)
+            (bootable 1)
+        )
+    )
+    (device
+        (vfb
+            (vncunused 1)
+            (uuid d45dfd90-c0e0-8851-8f14-f16ba9512d2d)
+            (location localhost:5900)
+        )
+    )
+    (device
+        (console
+            (protocol vt100)
+            (location 3)
+            (uuid 0248d3f7-f3ae-78e8-4829-ad51a6f94efd)
+        )
+    )
+)

tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml

@@ -0,0 +1,33 @@
+<domain type='xen' id='1'>
+  <name>s10u4</name>
+  <uuid>fde0533d-d043-88c6-dfba-4822fa32f309</uuid>
+  <os>
+    <type>hvm</type>
+    <loader>/usr/lib/xen/boot/hvmloader</loader>
+    <boot dev='hd'/>
+  </os>
+  <memory>1048576</memory>
+  <vcpu>1</vcpu>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <features>
+    <pae/>
+  </features>
+  <clock offset='utc'/>
+  <devices>
+    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <interface type='ethernet'>
+      <target dev='vif1.0'/>
+      <mac address='00:16:3e:3b:b9:d7'/>
+      <script path='vif-vnic'/>
+    </interface>
+    <disk type='block' device='disk'>
+      <driver name='phy'/>
+      <source dev='/dev/zvol/dsk/export/s10u4-root'/>
+      <target dev='hda'/>
+    </disk>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='-1' keymap='en-us'/>
+  </devices>
+</domain>

tests/sexpr2xmltest.c

@@ -178,6 +178,18 @@ static int testCompareFVclockLocaltime(const void *data ATTRIBUTE_UNUSED) {
 			  1);
 }
 
+static int testCompareFVKernel(const void *data ATTRIBUTE_UNUSED) {
+  return testCompareFiles("sexpr2xmldata/sexpr2xml-fv-kernel.xml",
+			  "sexpr2xmldata/sexpr2xml-fv-kernel.sexpr",
+			  1);
+}
+
+static int testCompareFVLegacyVFB(const void *data ATTRIBUTE_UNUSED) {
+  return testCompareFiles("sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml",
+			  "sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr",
+			  4);
+}
+
 
 int
 main(int argc, char **argv)
@@ -276,6 +288,14 @@ main(int argc, char **argv)
 		    1, testCompareFVclockLocaltime, NULL) != 0)
 	ret = -1;
 
+    if (virtTestRun("SEXPR-2-XML FV kernel",
+		    1, testCompareFVKernel, NULL) != 0)
+	ret = -1;
+
+    if (virtTestRun("SEXPR-2-XML FV legacy VFB",
+		    1, testCompareFVLegacyVFB, NULL) != 0)
+	ret = -1;
+
     exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 #else /* WITHOUT_XEN */

tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr

@@ -0,0 +1 @@
+(vm (name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(serial pty)))(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w'))))

tests/xml2sexprdata/xml2sexpr-fv-kernel.xml

@@ -0,0 +1,24 @@
+<domain type='xen' id='15'>
+  <name>fvtest</name>
+  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
+  <os>
+    <type>hvm</type>
+    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
+    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
+    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
+    <loader>/usr/lib/xen/boot/hvmloader</loader>
+  </os>
+  <memory>430080</memory>
+  <vcpu>2</vcpu>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <disk type='file' device='disk'>
+      <source file='/root/some.img'/>
+      <target dev='xvda'/>
+    </disk>
+    <console tty='/dev/pts/4'/>
+  </devices>
+</domain>
+

tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr

@@ -1 +1 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(vnc 1)(localtime 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
+(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(localtime 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))

tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr

@@ -1 +1 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
+(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))

tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr

@@ -1 +1 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
+(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))

tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr

@@ -1 +1 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
+(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))

tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr

@@ -1 +1 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(acpi 1)(usb 1)(vnc 1)(vncdisplay 17)(keymap ja)))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
+(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(usb 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)(vncdisplay 17)(keymap ja)))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))

tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr

@@ -1 +1 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(acpi 1)(usb 1)(vnc 1)(vncunused 1)(keymap ja)))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
+(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(usb 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)(vncunused 1)(keymap ja)))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))

tests/xml2sexprdata/xml2sexpr-fv.sexpr

@@ -1 +1 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))
+(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))

tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr

@@ -1 +1 @@
-(vm (name 'test')(memory 350)(maxmem 382)(vcpus 1)(uuid 'cc2315e7d26a307a438c6d188ec4c09c')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib/xen/bin/qemu-dm')(vcpus 1)(boot c)(acpi 1)(apic 1)(pae 1)(usb 1)(vnc 1)(vncdisplay 6)))(device (vbd (dev 'hda:disk:disk')(uname 'phy:/dev/sda8')(mode 'w')))(device (vbd (dev 'hdc:cdrom')(mode 'r')))(device (vif (mac '00:16:3e:0a:7b:39')(type ioemu))))
+(vm (name 'test')(memory 350)(maxmem 382)(vcpus 1)(uuid 'cc2315e7d26a307a438c6d188ec4c09c')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(apic 1)(pae 1)(usb 1)(device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncdisplay 6)))(device (vbd (dev 'hda:disk:disk')(uname 'phy:/dev/sda8')(mode 'w')))(device (vbd (dev 'hdc:cdrom')(mode 'r')))(device (vif (mac '00:16:3e:0a:7b:39')(type ioemu))))

tests/xml2sexprtest.c

@@ -235,6 +235,13 @@ static int testCompareFVInputUSBTablet(const void *data ATTRIBUTE_UNUSED) {
 			  1);
 }
 
+static int testCompareFVKernel(const void *data ATTRIBUTE_UNUSED) {
+  return testCompareFiles("xml2sexprdata/xml2sexpr-fv-kernel.xml",
+			  "xml2sexprdata/xml2sexpr-fv-kernel.sexpr",
+			  "fvtest",
+			  1);
+}
+
 
 
 int
@@ -351,6 +358,10 @@ main(int argc, char **argv)
 		    1, testCompareFVclockLocaltime, NULL) != 0)
 	ret = -1;
 
+    if (virtTestRun("XML-2-SEXPR FV kernel",
+		    1, testCompareFVKernel, NULL) != 0)
+	ret = -1;
+
     exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }