Support Xenner bootloader

ChangeLog

@@ -1,3 +1,13 @@
+Thu May 15 12:16:08 EST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	Support xenner bootloader capability
+	* src/qemu_conf.c, src/qemu_conf.h: Add support for specifying a
+	bootloader for paravirt xen guests
+	* tests/qemuxml2argv-bootloader.{args,xml}: Test case data
+	files for xen bootloader
+	* tests/qemuxml2argvtest.c, tests/qemuxml2xmltest.c: Add
+	test case for xen bootloader
+
 Thu May 15 12:11:08 EST 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/qemu_conf.c, src/qemu_conf.h: Pass the -name flag to QEMU

src/qemu_conf.c

@@ -1702,22 +1702,37 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn,
     xmlXPathFreeObject(obj);
 
 
+    /* Extract bootloader */
+    obj = xmlXPathEval(BAD_CAST "string(/domain/bootloader)", ctxt);
+    if ((obj != NULL) && (obj->type == XPATH_STRING) &&
+        (obj->stringval != NULL) && (obj->stringval[0] != 0)) {
+        strncpy(def->os.bootloader, (const char*)obj->stringval, sizeof(def->os.bootloader));
+        NUL_TERMINATE(def->os.bootloader);
+        xmlXPathFreeObject(obj);
+
+        /* Set a default OS type, since <type> is optional with bootloader */
+        strcpy(def->os.type, "xen");
+    }
+
     /* Extract OS type info */
     obj = xmlXPathEval(BAD_CAST "string(/domain/os/type[1])", ctxt);
     if ((obj == NULL) || (obj->type != XPATH_STRING) ||
         (obj->stringval == NULL) || (obj->stringval[0] == 0)) {
+        if (!def->os.type[0]) {
             qemudReportError(conn, NULL, NULL, VIR_ERR_OS_TYPE,
                              "%s", _("no OS type"));
             goto error;
         }
-    if (!virCapabilitiesSupportsGuestOSType(driver->caps, (const char*)obj->stringval)) {
-        qemudReportError(conn, NULL, NULL, VIR_ERR_OS_TYPE,
-                         "%s", obj->stringval);
-        goto error;
-    }
+    } else {
         strcpy(def->os.type, (const char *)obj->stringval);
         xmlXPathFreeObject(obj);
+    }
 
+    if (!virCapabilitiesSupportsGuestOSType(driver->caps, def->os.type)) {
+        qemudReportError(conn, NULL, NULL, VIR_ERR_OS_TYPE,
+                         "%s", def->os.type);
+        goto error;
+    }
 
     obj = xmlXPathEval(BAD_CAST "string(/domain/os/type[1]/@arch)", ctxt);
     if ((obj == NULL) || (obj->type != XPATH_STRING) ||
@@ -1772,6 +1787,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn,
     xmlXPathFreeObject(obj);
 
 
+    if (!def->os.bootloader[0]) {
         obj = xmlXPathEval(BAD_CAST "string(/domain/os/kernel[1])", ctxt);
         if ((obj != NULL) && (obj->type == XPATH_STRING) &&
             (obj->stringval != NULL) && (obj->stringval[0] != 0)) {
@@ -1840,7 +1856,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn,
             def->os.nBootDevs = 1;
             def->os.bootDevs[0] = QEMUD_BOOT_DISK;
         }
-
+    }
 
     obj = xmlXPathEval(BAD_CAST "string(/domain/devices/emulator[1])", ctxt);
     if ((obj == NULL) || (obj->type != XPATH_STRING) ||
@@ -2371,6 +2387,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
         (vm->def->os.kernel[0] ? 2 : 0) + /* kernel */
         (vm->def->os.initrd[0] ? 2 : 0) + /* initrd */
         (vm->def->os.cmdline[0] ? 2 : 0) + /* cmdline */
+        (vm->def->os.bootloader[0] ? 2 : 0) + /* bootloader */
         (vm->def->graphicsType == QEMUD_GRAPHICS_VNC ? 2 :
          (vm->def->graphicsType == QEMUD_GRAPHICS_SDL ? 0 : 1)) + /* graphics */
         (vm->migrateFrom[0] ? 3 : 0); /* migrateFrom */
@@ -2438,6 +2455,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
             goto no_memory;
     }
 
+    if (!vm->def->os.bootloader[0]) {
         for (i = 0 ; i < vm->def->os.nBootDevs ; i++) {
             switch (vm->def->os.bootDevs[i]) {
             case QEMUD_BOOT_CDROM:
@@ -2481,6 +2499,12 @@ int qemudBuildCommandLine(virConnectPtr conn,
             if (!((*argv)[++n] = strdup(vm->def->os.cmdline)))
                 goto no_memory;
         }
+    } else {
+        if (!((*argv)[++n] = strdup("-bootloader")))
+            goto no_memory;
+        if (!((*argv)[++n] = strdup(vm->def->os.bootloader)))
+            goto no_memory;
+    }
 
     /* If QEMU supports -drive param instead of old -hda, -hdb, -cdrom .. */
     if (vm->qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) {
@@ -3809,6 +3833,8 @@ char *qemudGenerateXML(virConnectPtr conn,
     virBufferVSprintf(&buf, "  <memory>%lu</memory>\n", def->maxmem);
     virBufferVSprintf(&buf, "  <currentMemory>%lu</currentMemory>\n", def->memory);
     virBufferVSprintf(&buf, "  <vcpu>%d</vcpu>\n", def->vcpus);
+    if (def->os.bootloader[0])
+        virBufferVSprintf(&buf, "  <bootloader>%s</bootloader>\n", def->os.bootloader);
     virBufferAddLit(&buf, "  <os>\n");
 
     if (def->virtType == QEMUD_VIRT_QEMU)
@@ -3817,6 +3843,7 @@ char *qemudGenerateXML(virConnectPtr conn,
     else
         virBufferVSprintf(&buf, "    <type>%s</type>\n", def->os.type);
 
+    if (!def->os.bootloader[0]) {
         if (def->os.kernel[0])
             virBufferVSprintf(&buf, "    <kernel>%s</kernel>\n", def->os.kernel);
         if (def->os.initrd[0])
@@ -3842,6 +3869,7 @@ char *qemudGenerateXML(virConnectPtr conn,
             }
             virBufferVSprintf(&buf, "    <boot dev='%s'/>\n", boottype);
         }
+    }
 
     virBufferAddLit(&buf, "  </os>\n");
 

src/qemu_conf.h

@@ -270,6 +270,7 @@ struct qemud_vm_os_def {
     char initrd[PATH_MAX];
     char cmdline[PATH_MAX];
     char binary[PATH_MAX];
+    char bootloader[PATH_MAX];
 };
 
 /* Guest VM main configuration */

tests/qemuxml2argvdata/qemuxml2argv-bootloader.args

@@ -0,0 +1 @@
+/usr/bin/qemu-kvm -M xenner -m 214 -smp 1 -nographic -monitor pty -no-acpi -bootloader /usr/bin/pygrub -cdrom /dev/cdrom -net none -serial none -parallel none -usb

tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml

@@ -0,0 +1,23 @@
+<domain type='kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory>219200</memory>
+  <currentMemory>219200</currentMemory>
+  <vcpu>1</vcpu>
+  <bootloader>/usr/bin/pygrub</bootloader>
+  <os>
+    <type>xen</type>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-kvm</emulator>
+    <disk type='block' device='cdrom'>
+      <source dev='/dev/cdrom'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+    </disk>
+  </devices>
+</domain>

tests/qemuxml2argvtest.c

@@ -144,6 +144,7 @@ main(int argc, char **argv)
     DO_TEST("boot-cdrom", 0);
     DO_TEST("boot-network", 0);
     DO_TEST("boot-floppy", 0);
+    DO_TEST("bootloader", 0);
     DO_TEST("clock-utc", 0);
     DO_TEST("clock-localtime", 0);
     DO_TEST("disk-cdrom", 0);

tests/qemuxml2xmltest.c

@@ -97,6 +97,7 @@ main(int argc, char **argv)
     DO_TEST("boot-cdrom");
     DO_TEST("boot-network");
     DO_TEST("boot-floppy");
+    DO_TEST("bootloader");
     DO_TEST("clock-utc");
     DO_TEST("clock-localtime");
     DO_TEST("disk-cdrom");