[libvirt] [PATCH V2 5/6] xenconfig: support bios=ovmf xl.cfg

8 Jun 2016

Add support to xenconfig for conversion of xl.cfg(5) bios config
to/from libvirt domXml <loader> config. SeaBIOS is the default
for HVM guests using upstream QEMU. ROMBIOS is the default when
using the old qemu-dm. This patch allows specifying OVMF as an
alternate firmware.

Example xl.cfg:
  bios = "ovmf"

Example domXML:
  <os>
    ...
    <loader readonly='yes' type='pflash'>/usr/lib/xen/boot/ovmf.bin</loader>
  </os>

An alternate OVMF firmware (from the one advertised in
domaincapabilities) can be specified with

bios = "ovmf"
bios_override = "/path/to/my/ovmf.bin"

Note that currently, Xen does not support a separate nvram for
non-volatile variables.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
---
 src/Makefile.am                                    |  2 +-
 src/xenconfig/xen_xl.c                             | 50 ++++++++++++++++---
 tests/xlconfigdata/test-fullvirt-ovmf-override.cfg | 27 ++++++++++
 tests/xlconfigdata/test-fullvirt-ovmf-override.xml | 58 ++++++++++++++++++++++
 tests/xlconfigdata/test-fullvirt-ovmf.cfg          | 26 ++++++++++
 tests/xlconfigdata/test-fullvirt-ovmf.xml          | 58 ++++++++++++++++++++++
 tests/xlconfigtest.c                               |  2 +
 7 files changed, 216 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 9e7fe75..8fd4382 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1149,7 +1149,7 @@ noinst_LTLIBRARIES += libvirt_xenconfig.la
 libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la
 libvirt_xenconfig_la_LIBADD = $(LIBXL_LIBS)
 libvirt_xenconfig_la_CFLAGS = \
-		-I$(srcdir)/conf $(AM_CFLAGS)
+		-I$(srcdir)/conf -I$(srcdir)/libxl $(AM_CFLAGS)
 libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES)
 endif WITH_XENCONFIG
 
diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c
index 9b8306f..bbe53ee 100644
--- a/src/xenconfig/xen_xl.c
+++ b/src/xenconfig/xen_xl.c
@@ -33,6 +33,7 @@
 #include "virstring.h"
 #include "virstoragefile.h"
 #include "xen_xl.h"
+#include "libxl_capabilities.h"
 
 #define VIR_FROM_THIS VIR_FROM_XENXL
 
@@ -103,15 +104,40 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps)
     size_t i;
 
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
+        const char *bios;
+        const char *alt_bios;
         const char *boot;
 
-        for (i = 0; i < caps->nguests; i++) {
-            if (caps->guests[i]->ostype == VIR_DOMAIN_OSTYPE_HVM &&
-                caps->guests[i]->arch.id == def->os.arch) {
-                if (VIR_ALLOC(def->os.loader) < 0 ||
-                    VIR_STRDUP(def->os.loader->path,
-                               caps->guests[i]->arch.defaultInfo.loader) < 0)
+        if (xenConfigGetString(conf, "bios", &bios, NULL) < 0)
+            return -1;
+
+        if (xenConfigGetString(conf, "bios_override", &alt_bios, NULL) < 0)
+            return -1;
+
+        if (bios && STREQ(bios, "ovmf")) {
+            if (VIR_ALLOC(def->os.loader) < 0)
+                return -1;
+
+            def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_PFLASH;
+            def->os.loader->readonly = VIR_TRISTATE_BOOL_YES;
+
+            if (alt_bios) {
+                if (VIR_STRDUP(def->os.loader->path, alt_bios) < 0)
                     return -1;
+            } else {
+                if (VIR_STRDUP(def->os.loader->path,
+                               LIBXL_FIRMWARE_DIR "/ovmf.bin") < 0)
+                    return -1;
+            }
+        } else {
+            for (i = 0; i < caps->nguests; i++) {
+                if (caps->guests[i]->ostype == VIR_DOMAIN_OSTYPE_HVM &&
+                    caps->guests[i]->arch.id == def->os.arch) {
+                    if (VIR_ALLOC(def->os.loader) < 0 ||
+                        VIR_STRDUP(def->os.loader->path,
+                                   caps->guests[i]->arch.defaultInfo.loader) < 0)
+                        return -1;
+                }
             }
         }
 
@@ -535,6 +561,18 @@ xenFormatXLOS(virConfPtr conf, virDomainDefPtr def)
         if (xenConfigSetString(conf, "builder", "hvm") < 0)
             return -1;
 
+        if (def->os.loader &&
+            def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH) {
+            if (xenConfigSetString(conf, "bios", "ovmf") < 0)
+                return -1;
+
+            if (STRNEQ(def->os.loader->path, LIBXL_FIRMWARE_DIR "/ovmf.bin")) {
+                if (xenConfigSetString(conf, "bios_override",
+                                       def->os.loader->path) < 0)
+                    return -1;
+            }
+        }
+
 #ifdef LIBXL_HAVE_BUILDINFO_KERNEL
         if (def->os.kernel &&
             xenConfigSetString(conf, "kernel", def->os.kernel) < 0)
diff --git a/tests/xlconfigdata/test-fullvirt-ovmf-override.cfg b/tests/xlconfigdata/test-fullvirt-ovmf-override.cfg
new file mode 100644
index 0000000..46bd684
--- /dev/null
+++ b/tests/xlconfigdata/test-fullvirt-ovmf-override.cfg
@@ -0,0 +1,27 @@
+name = "XenGuest2"
+uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
+maxmem = 579
+memory = 394
+vcpus = 1
+pae = 1
+acpi = 1
+apic = 1
+viridian = 0
+rtc_timeoffset = 0
+localtime = 0
+on_poweroff = "destroy"
+on_reboot = "restart"
+on_crash = "restart"
+device_model = "/usr/lib/xen/bin/qemu-dm"
+sdl = 0
+vnc = 1
+vncunused = 1
+vnclisten = "127.0.0.1"
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
+parallel = "none"
+serial = "none"
+builder = "hvm"
+bios = "ovmf"
+bios_override = "/usr/share/qemu/ovmf-x86_64.bin"
+boot = "d"
+disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2", "format=qcow2,vdev=hdb,access=rw,backendtype=qdisk,target=/var/lib/libvirt/images/XenGuest2-home", "format=raw,vdev=hdc,access=ro,backendtype=qdisk,devtype=cdrom,target=/root/boot.iso" ]
diff --git a/tests/xlconfigdata/test-fullvirt-ovmf-override.xml b/tests/xlconfigdata/test-fullvirt-ovmf-override.xml
new file mode 100644
index 0000000..435a791
--- /dev/null
+++ b/tests/xlconfigdata/test-fullvirt-ovmf-override.xml
@@ -0,0 +1,58 @@
+<domain type='xen'>
+  <name>XenGuest2</name>
+  <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>592896</memory>
+  <currentMemory unit='KiB'>403456</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='xenfv'>hvm</type>
+    <loader readonly='yes' type='pflash'>/usr/share/qemu/ovmf-x86_64.bin</loader>
+    <boot dev='cdrom'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='variable' adjustment='0' basis='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <disk type='block' device='disk'>
+      <driver name='phy' type='raw'/>
+      <source dev='/dev/HostVG/XenGuest2'/>
+      <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/var/lib/libvirt/images/XenGuest2-home'/>
+      <target dev='hdb' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/root/boot.iso'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
+    </disk>
+    <controller type='ide' index='0'/>
+    <interface type='bridge'>
+      <mac address='00:16:3e:66:92:9c'/>
+      <source bridge='xenbr1'/>
+      <script path='vif-bridge'/>
+      <model type='e1000'/>
+    </interface>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
+      <listen type='address' address='127.0.0.1'/>
+    </graphics>
+    <video>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
+    </video>
+  </devices>
+</domain>
diff --git a/tests/xlconfigdata/test-fullvirt-ovmf.cfg b/tests/xlconfigdata/test-fullvirt-ovmf.cfg
new file mode 100644
index 0000000..af0735e
--- /dev/null
+++ b/tests/xlconfigdata/test-fullvirt-ovmf.cfg
@@ -0,0 +1,26 @@
+name = "XenGuest2"
+uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
+maxmem = 579
+memory = 394
+vcpus = 1
+pae = 1
+acpi = 1
+apic = 1
+viridian = 0
+rtc_timeoffset = 0
+localtime = 0
+on_poweroff = "destroy"
+on_reboot = "restart"
+on_crash = "restart"
+device_model = "/usr/lib/xen/bin/qemu-dm"
+sdl = 0
+vnc = 1
+vncunused = 1
+vnclisten = "127.0.0.1"
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
+parallel = "none"
+serial = "none"
+builder = "hvm"
+bios = "ovmf"
+boot = "d"
+disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2", "format=qcow2,vdev=hdb,access=rw,backendtype=qdisk,target=/var/lib/libvirt/images/XenGuest2-home", "format=raw,vdev=hdc,access=ro,backendtype=qdisk,devtype=cdrom,target=/root/boot.iso" ]
diff --git a/tests/xlconfigdata/test-fullvirt-ovmf.xml b/tests/xlconfigdata/test-fullvirt-ovmf.xml
new file mode 100644
index 0000000..b6980e6
--- /dev/null
+++ b/tests/xlconfigdata/test-fullvirt-ovmf.xml
@@ -0,0 +1,58 @@
+<domain type='xen'>
+  <name>XenGuest2</name>
+  <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>592896</memory>
+  <currentMemory unit='KiB'>403456</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='xenfv'>hvm</type>
+    <loader readonly='yes' type='pflash'>/usr/lib/xen/boot/ovmf.bin</loader>
+    <boot dev='cdrom'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='variable' adjustment='0' basis='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <disk type='block' device='disk'>
+      <driver name='phy' type='raw'/>
+      <source dev='/dev/HostVG/XenGuest2'/>
+      <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/var/lib/libvirt/images/XenGuest2-home'/>
+      <target dev='hdb' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/root/boot.iso'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
+    </disk>
+    <controller type='ide' index='0'/>
+    <interface type='bridge'>
+      <mac address='00:16:3e:66:92:9c'/>
+      <source bridge='xenbr1'/>
+      <script path='vif-bridge'/>
+      <model type='e1000'/>
+    </interface>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
+      <listen type='address' address='127.0.0.1'/>
+    </graphics>
+    <video>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
+    </video>
+  </devices>
+</domain>
diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index 62bb144..474697b 100644
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -219,6 +219,8 @@ mymain(void)
     DO_TEST_FORMAT("paravirt-cmdline-extra-root");
     DO_TEST_FORMAT("paravirt-cmdline-bogus-extra-root");
     DO_TEST("rbd-multihost-noauth");
+    DO_TEST("fullvirt-ovmf");
+    DO_TEST("fullvirt-ovmf-override");
 
 #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST
     DO_TEST("fullvirt-multiusb");
-- 
2.1.4

    

Jim Fehlig

tags

participants (1)