search for: uefi_vars

...+#define single_element(element,str) \ > do { \ > start_element ((element)) { \ > string ((str)); \ This fits better as squashed in patch #3. > - if (params->data->uefi_vars) { > - start_element ("nvram") { > - string (params->data->uefi_vars); > - } end_element (); > - } > + if (params->data->uefi_vars) > + single_element ("nvram", params->data->uefi_vars); Hm indented with tab? -- Pino Toscano

...ect.c b/src/launch-direct.c index b74f689..e6ed54a 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -236,6 +236,7 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) int sv[2]; char guestfsd_sock[256]; struct sockaddr_un addr; + CLEANUP_FREE char *uefi_code = NULL, *uefi_vars = NULL; CLEANUP_FREE char *kernel = NULL, *dtb = NULL, *initrd = NULL, *appliance = NULL; int has_appliance_drive; @@ -444,6 +445,19 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) ADD_CMDLINE ("kvm-pit.lost_tick_policy=discard"); } + /* UEFI (firmware)...

...cpu", "%d", g->smp); start_element ("clock") { attribute ("offset", "utc"); @@ -1158,24 +1150,13 @@ construct_libvirt_xml_boot (guestfs_h *g, string (params->data->uefi_code); } end_element (); - if (params->data->uefi_vars) { - start_element ("nvram") { - string (params->data->uefi_vars); - } end_element (); - } + if (params->data->uefi_vars) + single_element ("nvram", params->data->uefi_vars); } - start_element ("kernel") { - string (params-&...

In case you configure libguestfs with a custom QEMU, e.g.: $ ./configure [...] QEMU=/path/to/qemu then the libvirt backend did not use to override it, launching the appliance with the default QEMU for libvirt. This does not change the manual emulator overriding using set-hv. Pino Toscano (2): launch: libvirt: get default QEMU from domcapabilities launch: libvirt: fix custom hypervisor

This is only lightly tested. In particularly I only tested that the non-secure-boot path still works. I didn't test it on RHEL 7.3 yet because I haven't got enough free disk space for these giant source *.ova files :-( Will try to give that a go later. Rich.

Starting with 5.2.0, libvirt has a way to select the firmware by specifying its type, provided configuration files for the firmware are shipped. Currently we start the appliance as UEFI if any of the firmware are found, so instead we can try to just set the firmware type iff: - the libvirt autoselection works - the 'efi' firmware is available The only behaviour change is that the default

First version was posted here: https://www.redhat.com/archives/libguestfs/2016-August/thread.html#00100 This is semantically the same as the first version. However I've split the patch up into two parts. In the first part, I factor out the UEFI paths so now they are created by the generator and written in the library and v2v/ directory directly, instead of the complex business of having a C

...ot;); +#if defined(__i386__) || defined(__x86_64__) if (guestfs_int_version_ge (&data->qemu_version, 1, 3, 0)) arg ("-global", "kvm-pit.lost_tick_policy=discard"); +#endif /* UEFI (firmware) if required. */ if (guestfs_int_get_uefi (g, &uefi_code, &uefi_vars, &uefi_flags) == -1) -- 2.13.5

v1 was here: https://www.redhat.com/archives/libguestfs/2018-October/msg00047.html v2 was here: https://www.redhat.com/archives/libguestfs/2018-October/msg00051.html v3: - Back to using string/string_format and attribute/attribute_format. - Add both single_element and single_element_format. - Rebased and retested. Rich.

...let fpf fs = fprintf chan fs in + fpf "#!/bin/sh -\n"; + fpf "\n"; - (match uefi_firmware with - | None -> () - | Some { Uefi.vars = vars_template } -> - fpf "# Make a copy of the UEFI variables template\n"; - fpf "uefi_vars=\"$(mktemp)\"\n"; - fpf "cp %s \"$uefi_vars\"\n" (quote vars_template); - fpf "\n" + (match uefi_firmware with + | None -> () + | Some { Uefi.vars = vars_template } -> + fpf "# Make a copy of the...

v1 was here: https://www.redhat.com/archives/libguestfs/2018-October/msg00047.html However it was broken in a few ways. First of all the documentation was broken because "/**" enhanced comments were not permitted on macros. This is fixed in the new 1/4 patch. Secondly we didn't use single_element() everywhere possible, which is fixed in the new 4/4 patch. Lastly I've

...start_element ("loader") { attribute ("readonly", "yes"); attribute ("type", "pflash"); - string (params->data->uefi_code); + string ("%s", params->data->uefi_code); } end_element (); if (params->data->uefi_vars) { start_element ("nvram") { - string (params->data->uefi_vars); + string ("%s", params->data->uefi_vars); } end_element (); } } @@ -1192,15 +1129,15 @@ construct_libvirt_xml_boot (guestfs_h *g, #endif start_element ("kernel") {...

Consolidate and extend the use of funky start_element() etc macros. Rich.

Error out early if the path to the socket will not fit into sockaddr_un::sun_path, as we will not be able to connect to it. --- src/launch-unix.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/launch-unix.c b/src/launch-unix.c index 740c554..973e14b 100644 --- a/src/launch-unix.c +++ b/src/launch-unix.c @@ -47,6 +47,12 @@ launch_unix (guestfs_h *g, void *datav, const char

Currently we have an OCaml library for generating the qemu command line (used only by ‘virt-v2v -o qemu’). However we also generate a qemu command line in ‘lib/launch-direct.c’, and we might in future need to generate a ‘-readconfig’-compatible configuration file if we want to go beyond 10,000 drives for scalability testing. Therefore this patch series reimplements the qemu command line code as

Doing qemu feature detection in the direct backend takes ~100ms because we need to run `qemu -help' and `qemu -devices ?', and each of those interacts with glibc's very slow link loader. Fixing the link loader is really hard. Instead memoize the output of those two commands. This patch series first separates all the code dealing with qemu into a separate module (src/qemu.c) and

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.