- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/4] use the 'vram' attribute for QEMU video devices
by Pavel Hrdina 18 Nov '14

18 Nov '14

There are some changes from the first version. We will not have a new 'vgamem' attribute for video devices because we can use the 'vram' attribute. So far for QEMU the 'vram' is used only to set the secondary ram for QXL which seems to be correct as the secondary ram is used for pixmaps and surfaces. The 'vgamem_mb' parameter for QXL sets the VGA framebuffer size, but the VGA mode in QXL is used only as fallback if the OS doesn't have any QXL drivers or before the drivers are loaded. The VGA framebuffer is part of the first ram for QXL and for that we have 'ram' attribute. The rest of the first ram is memory for rendering commands and it's data. Default VGA framebuffer size is 8MB which is sufficient. Other QEMU video devices have only 'vgamem_mb' parameter and we will use the 'vram' attribute to set the size of video memory as it's used also for other hypervisors. The first two patches clean the usage of vram attribute and improve the documentation and the rest two patches implements usage of 'vram' attribute for remaining QEMU video devices. Pavel Hrdina (4): video: cleanup usage of vram attribute and update documentation qxl: fix setting ram and vram values for qemu qxl device caps: introduce new qemu capability for vgamem_mb device property qemu-command: introduce new vgamem attribute for video devices docs/formatdomain.html.in | 62 +++++++----- src/conf/domain_conf.c | 19 +++- src/conf/domain_conf.h | 3 +- src/qemu/qemu_capabilities.c | 25 +++++ src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 44 ++++++++- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 2 + tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 100 +++++++++++++++++-- tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 108 +++++++++++++++++++-- tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 108 +++++++++++++++++++-- tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 108 +++++++++++++++++++-- tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 108 +++++++++++++++++++-- tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 108 +++++++++++++++++++-- tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 3 + tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 108 +++++++++++++++++++-- .../qemuxml2argv-graphics-spice-compression.args | 2 +- .../qemuxml2argv-graphics-spice-sasl.args | 4 +- .../qemuxml2argv-graphics-spice.args | 4 +- .../qemuxml2argv-pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- .../qemuxml2argv-video-qxl-device-vgamem.args | 6 ++ .../qemuxml2argv-video-qxl-device-vgamem.xml | 29 ++++++ .../qemuxml2argv-video-qxl-device.args | 6 ++ .../qemuxml2argv-video-qxl-device.xml | 29 ++++++ .../qemuxml2argv-video-qxl-nodevice.args | 5 + .../qemuxml2argv-video-qxl-nodevice.xml | 29 ++++++ .../qemuxml2argv-video-qxl-sec-device-vgamem.args | 8 ++ .../qemuxml2argv-video-qxl-sec-device-vgamem.xml | 32 ++++++ .../qemuxml2argv-video-qxl-sec-device.args | 7 ++ .../qemuxml2argv-video-qxl-sec-device.xml | 32 ++++++ .../qemuxml2argv-video-qxl-sec-nodevice.xml | 32 ++++++ .../qemuxml2argv-video-vga-device-vgamem.args | 6 ++ .../qemuxml2argv-video-vga-device-vgamem.xml | 29 ++++++ .../qemuxml2argv-video-vga-device.args | 6 ++ .../qemuxml2argv-video-vga-device.xml | 29 ++++++ .../qemuxml2argv-video-vga-nodevice.args | 5 + .../qemuxml2argv-video-vga-nodevice.xml | 29 ++++++ tests/qemuxml2argvtest.c | 16 +++ tools/virsh-domain.c | 4 +- 44 files changed, 1188 insertions(+), 89 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-nodevice.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.xml -- 2.0.4

2 16

[libvirt] How can I get drive_mirror migration progress with non-shared storage on KVM ?
by Wang Rui 18 Nov '14

18 Nov '14

Hi, I want to get a total progress(memory + storage). In none drive mirror migration, I can use virDomainGetJobInfo API to get the total progress. But in drive mirror migration, it seems that I must get file progress by virDomainGetBlockJobInfo and momery progress by virDomainGetJobInfo separately. So does the job status. Is there a way to get the total progress and job status? Thanks.

1 0

[libvirt] [PATCH v3] leaseshelper: improvements to support all events
by Nehal J Wani 17 Nov '14

17 Nov '14

This patch enables the helper program to detect event(s) triggered when there is a change in lease length or expiry and client-id. This transfers complete control of leases database to libvirt and obsoletes use of the lease database file (<network-name>.leases). That file will not be created, read, or written. This is achieved by adding the option --leasefile-ro to dnsmasq and passing a custom env var to leaseshelper, which helps us map events related to leases with their corresponding network bridges, no matter what the event be. Also, this requires the addition of a new non-lease entry in our custom lease database: "server-duid". It is required to identify a DHCPv6 server. Now that dnsmasq doesn't maintain its own leases database, it relies on our helper program to tell it about previous leases and server duid. Thus, this patch makes our leases program honor an extra action: "init", in which it sends the known info in a particular format to dnsmasq by printing it to stdout. --- This is compatible with libvirt 1.2.6 as only additions have been introduced, and the old leases file (*.status) will still be supported. v3: * Add server-duid as an entry in the lease object for every ipv6 lease. * Remove unnecessary variables and double copies. * Take value from DNSMASQ_OLD_HOSTNAME if hostname is not known. v2: http://www.redhat.com/archives/libvir-list/2014-July/msg01109.html v1: https://www.redhat.com/archives/libvir-list/2014-July/msg00568.html src/network/bridge_driver.c | 3 + src/network/leaseshelper.c | 132 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 109 insertions(+), 26 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 965fdec..b578b3a 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1288,7 +1288,10 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, cmd = virCommandNew(dnsmasqCapsGetBinaryPath(caps)); virCommandAddArgFormat(cmd, "--conf-file=%s", configfile); + /* Libvirt gains full control of leases database */ + virCommandAddArgFormat(cmd, "--leasefile-ro"); virCommandAddArgFormat(cmd, "--dhcp-script=%s", leaseshelper_path); + virCommandAddEnvPair(cmd, "VIR_BRIDGE_NAME", network->def->bridge); *cmdout = cmd; ret = 0; diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index c8543a2..e984cbb 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -50,6 +50,12 @@ */ #define VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX (32 * 1024 * 1024) +/* + * Use this when passing possibly-NULL strings to printf-a-likes. + * Required for unknown parameters during init call. + */ +#define EMPTY_STR(s) ((s) ? (s) : "*") + static const char *program_name; /* Display version information. */ @@ -65,7 +71,7 @@ usage(int status) if (status) { fprintf(stderr, _("%s: try --help for more details\n"), program_name); } else { - printf(_("Usage: %s add|old|del mac|clientid ip [hostname]\n" + printf(_("Usage: %s add|old|del|init mac|clientid ip [hostname]\n" "Designed for use with 'dnsmasq --dhcp-script'\n" "Refer to man page of dnsmasq for more details'\n"), program_name); @@ -89,6 +95,7 @@ enum virLeaseActionFlags { VIR_LEASE_ACTION_ADD, /* Create new lease */ VIR_LEASE_ACTION_OLD, /* Lease already exists, renew it */ VIR_LEASE_ACTION_DEL, /* Delete the lease */ + VIR_LEASE_ACTION_INIT, /* Tell dnsmasq of existing leases on restart */ VIR_LEASE_ACTION_LAST }; @@ -96,7 +103,7 @@ enum virLeaseActionFlags { VIR_ENUM_DECL(virLeaseAction); VIR_ENUM_IMPL(virLeaseAction, VIR_LEASE_ACTION_LAST, - "add", "old", "del"); + "add", "old", "del", "init"); int main(int argc, char **argv) @@ -112,20 +119,24 @@ main(int argc, char **argv) const char *interface = virGetEnvAllowSUID("DNSMASQ_INTERFACE"); const char *exptime_tmp = virGetEnvAllowSUID("DNSMASQ_LEASE_EXPIRES"); const char *hostname = virGetEnvAllowSUID("DNSMASQ_SUPPLIED_HOSTNAME"); + const char *server_duid = virGetEnvAllowSUID("DNSMASQ_SERVER_DUID"); const char *leases_str = NULL; long long currtime = 0; long long expirytime = 0; size_t i = 0; + size_t count_ipv6 = 0; + size_t count_ipv4 = 0; int action = -1; int pid_file_fd = -1; int rv = EXIT_FAILURE; int custom_lease_file_len = 0; - bool add = false; bool delete = false; virJSONValuePtr lease_new = NULL; virJSONValuePtr lease_tmp = NULL; virJSONValuePtr leases_array = NULL; virJSONValuePtr leases_array_new = NULL; + virJSONValuePtr *leases_ipv4 = NULL; + virJSONValuePtr *leases_ipv6 = NULL; virSetErrorFunc(NULL, NULL); virSetErrorLogPriorityFunc(NULL); @@ -156,16 +167,17 @@ main(int argc, char **argv) } } - if (argc != 4 && argc != 5) { + if (argc != 4 && argc != 5 && argc != 2) { /* Refer man page of dnsmasq --dhcp-script for more details */ usage(EXIT_FAILURE); } /* Make sure dnsmasq knows the interface. The interface name is not known - * when dnsmasq (re)starts and throws 'del' events for expired leases. - * So, if any old lease has expired, it will be automatically removed the - * next time this program is invoked */ - if (!interface) + * via env variable set by dnsmasq when dnsmasq (re)starts and throws 'del' + * events for expired leases. So, libvirtd sets another env var for this + * purpose */ + if (!interface && + !(interface = virGetEnvAllowSUID("VIR_BRIDGE_NAME"))) goto cleanup; ip = argv[3]; @@ -176,6 +188,10 @@ main(int argc, char **argv) if (argc == 5) hostname = argv[4]; + /* In case hostname is still unkown, use the last known one */ + if (!hostname) + hostname = virGetEnvAllowSUID("DNSMASQ_OLD_HOSTNAME"); + if (VIR_STRDUP(exptime, exptime_tmp) < 0) goto cleanup; @@ -185,7 +201,7 @@ main(int argc, char **argv) exptime[strlen(exptime) - 1] = '\0'; /* Check if it is an IPv6 lease */ - if (virGetEnvAllowSUID("DNSMASQ_IAID")) { + if (iaid) { mac = virGetEnvAllowSUID("DNSMASQ_MAC"); clientid = argv[2]; } @@ -235,7 +251,6 @@ main(int argc, char **argv) delete = true; if (action == VIR_LEASE_ACTION_ADD || action == VIR_LEASE_ACTION_OLD) { - add = true; /* Create new lease */ if (!(lease_new = virJSONValueNewObject())) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -260,11 +275,13 @@ main(int argc, char **argv) goto cleanup; if (clientid && virJSONValueObjectAppendString(lease_new, "client-id", clientid) < 0) goto cleanup; + if (server_duid && virJSONValueObjectAppendString(lease_new, "server-duid", server_duid) < 0) + goto cleanup; if (expirytime && virJSONValueObjectAppendNumberLong(lease_new, "expiry-time", expirytime) < 0) goto cleanup; } } - } else { + } else if (action != VIR_LEASE_ACTION_INIT) { fprintf(stderr, _("Unsupported action: %s\n"), virLeaseActionTypeToString(action)); exit(EXIT_FAILURE); @@ -294,7 +311,7 @@ main(int argc, char **argv) i = 0; while (i < virJSONValueArraySize(leases_array)) { const char *ip_tmp = NULL; - long long expirytime_tmp = -1; + const char *server_duid_tmp = NULL; if (!(lease_tmp = virJSONValueArrayGet(leases_array, i))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -303,14 +320,13 @@ main(int argc, char **argv) } if (!(ip_tmp = virJSONValueObjectGetString(lease_tmp, "ip-address")) || - (virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime_tmp) < 0)) { + (virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime) < 0)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse json")); goto cleanup; } - /* Check whether lease has expired or not */ - if (expirytime_tmp < currtime) { + if (expirytime < currtime) { i++; continue; } @@ -321,6 +337,30 @@ main(int argc, char **argv) continue; } + /* Store pointers to ipv4 and ipv6 leases */ + if (strchr(ip_tmp, ':')) { + /* This is an ipv6 lease */ + ignore_value(VIR_APPEND_ELEMENT_COPY(leases_ipv6, count_ipv6, lease_tmp)); + if ((server_duid_tmp + = virJSONValueObjectGetString(lease_tmp, "server-duid"))) { + if (!server_duid) { + /* Control reaches here when the 'action' is not for an + * ipv6 lease or, for some weird reason the env var + * DNSMASQ_SERVER_DUID wasn't set*/ + server_duid = server_duid_tmp; + } + } else { + /* Inject server-duid into those ipv6 leases which + * didn't have it previously, for example, those + * created by leaseshelper from libvirt 1.2.6 */ + if (virJSONValueObjectAppendString(lease_tmp, "server-duid", server_duid) < 0) + goto cleanup; + } + } else { + /* This is an ipv4 lease */ + ignore_value(VIR_APPEND_ELEMENT_COPY(leases_ipv4, count_ipv4, lease_tmp)); + } + /* Move old lease to new array */ if (virJSONValueArrayAppend(leases_array_new, lease_tmp) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -333,31 +373,71 @@ main(int argc, char **argv) } } - if (add) { + switch ((enum virLeaseActionFlags) action) { + case VIR_LEASE_ACTION_INIT: + /* Man page of dnsmasq says: the script (helper program, in our case) + * should write the saved state of the lease database, in dnsmasq + * leasefile format, to stdout and exit with zero exit code, when + * called with argument init. Format: + * $expirytime $mac $ip $hostname $clientid # For all ipv4 leases + * duid $server-duid # If DHCPv6 is present + * $expirytime $iaid $ip $hostname $clientduid # For all ipv6 leases */ + for (i = 0; i < count_ipv4; i++) { + lease_tmp = leases_ipv4[i]; + virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime); + printf("%lld %s %s %s %s\n", + expirytime, + virJSONValueObjectGetString(lease_tmp, "mac-address"), + virJSONValueObjectGetString(lease_tmp, "ip-address"), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "hostname")), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "client-id"))); + } + if (server_duid) { + printf("duid %s\n", server_duid); + for (i = 0; i < count_ipv6; i++) { + lease_tmp = leases_ipv6[i]; + virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime); + printf("%lld %s %s %s %s\n", + expirytime, + virJSONValueObjectGetString(lease_tmp, "iaid"), + virJSONValueObjectGetString(lease_tmp, "ip-address"), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "hostname")), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "client-id"))); + } + } + break; + + case VIR_LEASE_ACTION_OLD: + case VIR_LEASE_ACTION_ADD: if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create json")); goto cleanup; } lease_new = NULL; - } - if (!(leases_str = virJSONValueToString(leases_array_new, true))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("empty json array")); - goto cleanup; - } + default: + if (!(leases_str = virJSONValueToString(leases_array_new, true))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("empty json array")); + goto cleanup; + } - /* Write to file */ - if (virFileRewrite(custom_lease_file, 0644, - customLeaseRewriteFile, &leases_str) < 0) - goto cleanup; + /* Write to file */ + if (virFileRewrite(custom_lease_file, 0644, + customLeaseRewriteFile, &leases_str) < 0) + goto cleanup; + } rv = EXIT_SUCCESS; cleanup: if (pid_file_fd != -1) virPidFileReleasePath(pid_file, pid_file_fd); + for (i = 0; i < count_ipv4; i++) + VIR_FREE(leases_ipv4); + for (i = 0; i < count_ipv6; i++) + VIR_FREE(leases_ipv6); VIR_FREE(pid_file); VIR_FREE(exptime); -- 1.9.3

4 8

[libvirt] [PATCH] qemu: Resolve Coverity UNINIT
by John Ferlan 17 Nov '14

17 Nov '14

For some reason, commit id '72b4151f' triggered a Coverity uninitialized 'reply' variable check when referenced within the for loop. It seems Coverity doesn't know that flags will have to be either AFFECT_LIVE or AFFECT_CONFIG after the virDomainLiveConfigHelperMethod call. By adding a "sa_assert()" to confirm that fact, Coverity is happy again. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- NOTE: Using "sa_assert(flags & (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG)); did not clear the error - only the two separate checks using the ||. Yes, the parentheses are overkill... src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9b19629..a84fd47 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17000,6 +17000,8 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags, &persistentDef) < 0) goto endjob; + sa_assert((flags & VIR_DOMAIN_AFFECT_LIVE) || + (flags & VIR_DOMAIN_AFFECT_CONFIG)); if (flags & VIR_DOMAIN_AFFECT_LIVE) { /* If the VM is running, we can check if the current VM can use -- 1.9.3

2 2

[libvirt] ANNOUNCE: libvirt 1.1.3.8 maintenance release
by Cole Robinson 16 Nov '14

16 Nov '14

libvirt 1.1.3.8 maintenance release is now available. This is libvirt 1.1.3 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.1.3.8.tar.gz I originally release 1.1.3.7, but then when I attempted to rebuild it I hit a compile error. Really not sure why it didn't hit me during before. So 1.1.3.8 is a brown paper bag release. Changes in version 1.1.3.7: * CVE-2014-7823: dumpxml: security hole with migratable flag * node_device_udev: Try harder to get human readable vendor:product * tests: don't fail with newer gnutls * Fix crash in virsystemdtest with dbus 1.7.6 * domain_conf: fix domain deadlock * CVE-2014-3633: qemu: blkiotune: Use correct definition when looking up disk Changes in version 1.1.3.8: * tests: Fix compilation For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 1.2.9.1 maintenance release
by Cole Robinson 16 Nov '14

16 Nov '14

libvirt 1.2.9.1 maintenance release is now available. This is libvirt 1.2.9 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.2.9.1.tar.gz Changes in this version: * qemu: Don't try to parse -help for new QEMU * qemu: Always set migration capabilities * nwfilter: fix deadlock caused updating network device and nwfilter * qemuPrepareNVRAM: Save domain conf only if domain's persistent * Do not crash on gluster snapshots with no host name * Display nicer error message for unsupported chardev hotplug * Fix virDomainChrEquals for spicevmc * qemu: Update fsfreeze status on domain state transitions * network: fix call virNetworkEventLifecycleNew when networkStartNetwork fail * Require at least one console for LXC domain * Do not probe for power mgmt capabilities in lxc emulator * util: fix releasing pidfile in cleanup * qemu: stop NBD server after successful migration * qemu: make sure capability probing process can start * util: Introduce virPidFileForceCleanupPath * qemu: make advice from numad available when building commandline * qemu: Release nbd port from migrationPorts instead of remotePorts * qemu: better error message when block job can't succeed * test: Add test to verify helpers used for backing file name parsing * storage: Fix crash when parsing backing store URI with schema * remote: fix jump depends on uninitialised value * qemu_agent: Produce more readable error messages * qemu: forbid snapshot-delete --children-only on external snapshot * tests: Add SELINUX_LIBS to fix viridentitytest linker bug * qemu: migration: Make check for empty hook XML robust * qemu: restore: Fix restoring of VM when the restore hook returns empty XML * util: string: Add helper to check whether string is empty * virsh: domain: Use global constant for XML file size limit * qemu: Fix hot unplug of SCSI_HOST device * qemu: unref cfg after TerminateMachine has been called * Add virCgroupTerminateMachine stub * qemu: use systemd's TerminateMachine to kill all processes * util: Prepare URI formatting for libxml2 >= 2.9.2 * security_selinux: Don't relabel /dev/net/tun * util: eliminate "use after free" in callers of virNetDevLinkDump * CVE-2014-7823: dumpxml: security hole with migratable flag * qemu: x86_64 is good enough for i686 * qemu: Don't compare CPU against host for TCG * qemu_command: Split qemuBuildCpuArgStr For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH] qemu: fix cannot get a hot-unplug disk blockdevio settings
by Luyao Huang 15 Nov '14

15 Nov '14

When we try to get a hot-unplug disk blkdevio settings via qemuDomainGetBlockIoTune, libvirt will output a cannot find device error.Move the check after confirm vm is running. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 411179d..c717c76 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17031,12 +17031,11 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, goto endjob; } - device = qemuDiskPathToAlias(vm, disk, NULL); - if (!device) { - goto endjob; - } - if (flags & VIR_DOMAIN_AFFECT_LIVE) { + device = qemuDiskPathToAlias(vm, disk, NULL); + if (!device) { + goto endjob; + } qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorGetBlockIoThrottle(priv->mon, device, &reply, supportMaxOptions); qemuDomainObjExitMonitor(driver, vm); -- 1.8.3.1

2 2

[libvirt] [PATCH 0/2] Add missing check and test for new blkdeviotune parameters
by John Ferlan 14 Nov '14

14 Nov '14

Found missing 'size_iops_sec' check in qemu_command.c. Add a test for the new blkdeviotune parameters. John Ferlan (2): qemu: Add checks for blkdeviotune 'size_iops_sec' and adjust error qemu: Add tests for new blkdeviotune arguments src/qemu/qemu_command.c | 10 +++-- .../qemuxml2argv-blkdeviotune-max.args | 12 +++++ .../qemuxml2argv-blkdeviotune-max.xml | 51 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 4 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml -- 1.9.3

2 5

[libvirt] [PATCH v2 00/22] Remove unnecessary curly brackets around one-line bodies
by Martin Kletzander 14 Nov '14

14 Nov '14

Brackets were removed by the following script in the root directory of libvirt's repository: for i in $(git ls-files | grep '\.[ch]$'); do echo -n "$i ... "; emacs $i --batch --eval \ '(replace-regexp "^\$[[:space:]]*\\(if\\|for\\|while\$.*)\\)[[:space:]]*{\$\n[^\n;]*;[^\n;]*\$\n[[:space:]]*}$" "\\1\\3" nil (point-min) (point-max))' \ -f save-buffer &>/dev/null; echo done; done v2: - Smaller patches, so there has to be none allowed through by moderators - Only curly brackets around one-line bodies with one-line preceding conditions removed - syntax-check! (with some other bracket-spacing.pl cleanups Martin Kletzander (22): virt-aa-helper: Trick invalid syntax-check Remove unnecessary curly brackets in daemon/ and examples/ Remove unnecessary curly brackets in src/esx/esx_driver.c Remove unnecessary curly brackets in rest of src/esx/ Remove unnecessary curly brackets in src/vmx/vmx.c Remove unnecessary curly brackets in src/conf/ Remove unnecessary curly brackets in src/hyperv/ Remove unnecessary curly brackets in src/node_device/ Remove unnecessary curly brackets in src/qemu/ Remove unnecessary curly brackets in src/storage/ Remove unnecessary curly brackets in src/test/test_driver.c Remove unnecessary curly brackets in src/util/ Remove unnecessary curly brackets in src/vbox/ Remove unnecessary curly brackets in rest of src/[a-n]*/ Remove unnecessary curly brackets in rest of src/[o-u]*/ Remove unnecessary curly brackets in rest of src/ Remove unnecessary curly brackets in tools/ Remove unnecessary curly brackets in tests/ docs: Adjust contributor guidelines about curly brackets bracket-spacing: Don't modify current line bracket-spacing: Remove pointless cycles bracket-spacing: Add syntax-check for unnecessary curly brackets HACKING | 8 +- build-aux/bracket-spacing.pl | 74 ++++-- daemon/libvirtd.c | 15 +- daemon/remote.c | 12 +- docs/hacking.html.in | 4 +- examples/object-events/event-test.c | 3 +- examples/openauth/openauth.c | 9 +- src/access/viraccessdriverstack.c | 3 +- src/bhyve/bhyve_driver.c | 3 +- src/conf/capabilities.c | 3 +- src/conf/domain_conf.c | 135 ++++------- src/conf/interface_conf.c | 9 +- src/conf/network_conf.c | 51 ++-- src/conf/node_device_conf.c | 15 +- src/conf/nwfilter_conf.c | 12 +- src/conf/object_event.c | 6 +- src/conf/storage_conf.c | 24 +- src/datatypes.c | 6 +- src/driver.c | 3 +- src/esx/esx_device_monitor.c | 3 +- src/esx/esx_driver.c | 390 ++++++++++-------------------- src/esx/esx_interface_driver.c | 12 +- src/esx/esx_network_driver.c | 57 ++--- src/esx/esx_nwfilter_driver.c | 3 +- src/esx/esx_secret_driver.c | 3 +- src/esx/esx_storage_backend_iscsi.c | 45 ++-- src/esx/esx_storage_backend_vmfs.c | 51 ++-- src/esx/esx_storage_driver.c | 81 +++---- src/esx/esx_util.c | 45 ++-- src/esx/esx_vi.c | 249 +++++++------------ src/esx/esx_vi_types.c | 45 ++-- src/hyperv/hyperv_device_monitor.c | 3 +- src/hyperv/hyperv_driver.c | 87 +++---- src/hyperv/hyperv_interface_driver.c | 3 +- src/hyperv/hyperv_network_driver.c | 3 +- src/hyperv/hyperv_nwfilter_driver.c | 3 +- src/hyperv/hyperv_secret_driver.c | 3 +- src/hyperv/hyperv_storage_driver.c | 3 +- src/hyperv/hyperv_util.c | 6 +- src/hyperv/hyperv_wmi.c | 39 +-- src/interface/interface_backend_udev.c | 12 +- src/libvirt-lxc.c | 3 +- src/libvirt-nodedev.c | 3 +- src/libvirt-storage.c | 6 +- src/libxl/libxl_driver.c | 12 +- src/locking/lock_daemon.c | 3 +- src/locking/lock_driver_sanlock.c | 6 +- src/lxc/lxc_container.c | 9 +- src/lxc/lxc_driver.c | 9 +- src/lxc/lxc_process.c | 6 +- src/network/bridge_driver.c | 6 +- src/network/bridge_driver_linux.c | 3 +- src/node_device/node_device_driver.c | 21 +- src/node_device/node_device_hal.c | 6 +- src/node_device/node_device_udev.c | 87 +++---- src/nwfilter/nwfilter_dhcpsnoop.c | 3 +- src/nwfilter/nwfilter_ebiptables_driver.c | 12 +- src/nwfilter/nwfilter_gentech_driver.c | 9 +- src/nwfilter/nwfilter_learnipaddr.c | 3 +- src/openvz/openvz_conf.c | 3 +- src/openvz/openvz_driver.c | 27 +-- src/phyp/phyp_driver.c | 21 +- src/qemu/qemu_agent.c | 3 +- src/qemu/qemu_capabilities.c | 9 +- src/qemu/qemu_cgroup.c | 6 +- src/qemu/qemu_command.c | 6 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_driver.c | 45 ++-- src/qemu/qemu_hotplug.c | 6 +- src/qemu/qemu_migration.c | 3 +- src/qemu/qemu_monitor_json.c | 12 +- src/qemu/qemu_monitor_text.c | 6 +- src/qemu/qemu_process.c | 18 +- src/remote/remote_driver.c | 3 +- src/rpc/virnetclient.c | 9 +- src/rpc/virnetserver.c | 3 +- src/rpc/virnetserverclient.c | 3 +- src/rpc/virnetserverservice.c | 3 +- src/security/security_manager.c | 3 +- src/security/virt-aa-helper.c | 9 +- src/storage/parthelper.c | 3 +- src/storage/storage_backend.c | 9 +- src/storage/storage_backend_disk.c | 15 +- src/storage/storage_backend_fs.c | 6 +- src/storage/storage_backend_mpath.c | 27 +-- src/storage/storage_backend_rbd.c | 30 +-- src/storage/storage_backend_scsi.c | 6 +- src/storage/storage_driver.c | 9 +- src/test/test_driver.c | 57 ++--- src/uml/uml_conf.c | 6 +- src/uml/uml_driver.c | 9 +- src/util/virauth.c | 12 +- src/util/virbitmap.c | 6 +- src/util/virbuffer.c | 3 +- src/util/vircommand.c | 9 +- src/util/virconf.c | 15 +- src/util/virdbus.c | 3 +- src/util/virdnsmasq.c | 3 +- src/util/vireventpoll.c | 9 +- src/util/virfile.c | 6 +- src/util/virfirewall.c | 6 +- src/util/viriscsi.c | 9 +- src/util/virlockspace.c | 6 +- src/util/virlog.c | 3 +- src/util/virnetdev.c | 6 +- src/util/virnetdevbridge.c | 3 +- src/util/virnetdevmacvlan.c | 9 +- src/util/virnetdevtap.c | 6 +- src/util/virpci.c | 15 +- src/util/virsexpr.c | 24 +- src/util/virstorageencryption.c | 3 +- src/util/virstoragefile.c | 6 +- src/util/virsysinfo.c | 3 +- src/util/virthreadpool.c | 3 +- src/util/virutil.c | 9 +- src/util/virxml.c | 18 +- src/vbox/vbox_MSCOMGlue.c | 30 +-- src/vbox/vbox_XPCOMCGlue.c | 33 +-- src/vbox/vbox_common.c | 51 ++-- src/vbox/vbox_network.c | 15 +- src/vbox/vbox_snapshot_conf.c | 21 +- src/vbox/vbox_storage.c | 30 +-- src/vbox/vbox_tmpl.c | 30 +-- src/vmware/vmware_conf.c | 3 +- src/vmware/vmware_driver.c | 6 +- src/vmx/vmx.c | 243 +++++++------------ src/xen/block_stats.c | 3 +- src/xen/xen_driver.c | 6 +- src/xen/xen_hypervisor.c | 6 +- src/xen/xend_internal.c | 18 +- src/xen/xm_internal.c | 6 +- src/xenapi/xenapi_driver.c | 12 +- src/xenapi/xenapi_utils.c | 9 +- src/xenconfig/xen_common.c | 6 +- src/xenconfig/xen_sxpr.c | 6 +- tests/commandhelper.c | 3 +- tests/esxutilstest.c | 12 +- tests/eventtest.c | 3 +- tests/openvzutilstest.c | 6 +- tests/securityselinuxlabeltest.c | 6 +- tests/shunloadtest.c | 6 +- tests/utiltest.c | 3 +- tests/virbuftest.c | 3 +- tests/virhashtest.c | 30 +-- tests/virtimetest.c | 3 +- tests/vmx2xmltest.c | 12 +- tests/xml2vmxtest.c | 27 +-- tools/virsh-console.c | 6 +- tools/virsh-domain.c | 27 +-- tools/virsh-edit.c | 6 +- tools/virsh-host.c | 3 +- tools/virsh-pool.c | 6 +- tools/virsh-volume.c | 12 +- tools/virsh.c | 18 +- tools/wireshark/src/packet-libvirt.c | 6 +- 156 files changed, 1050 insertions(+), 2006 deletions(-) -- 2.1.3

3 34

[libvirt] [PATCH] drvbhyve: Use boot-order for grub-bhyve boot device
by Conrad Meyer 14 Nov '14

14 Nov '14

Rather than just picking the first CD (or failing that, HDD) we come across, if the user has picked a boot device ordering with <boot order=''>, respect that (and just try to boot the lowest-index device). Adds two sets of tests to bhyve2xmlargv; 'grub-bootorder' shows that we pick a user-specified device over the first device in the domain; 'grub-bootorder2' shows that we pick the first (lowest index) device. --- This is a follow-up to the 'Add non-FreeBSD guest support to Bhyve driver' patch series to fix the grub-bhyve automagic configuration to respect <boot order=''> in the domain. (Requested by both Roman and Michal, I believe.) --- docs/drvbhyve.html.in | 9 +-- src/bhyve/bhyve_command.c | 64 ++++++++++++++++------ .../bhyvexml2argv-grub-bootorder.args | 6 ++ .../bhyvexml2argv-grub-bootorder.devmap | 1 + .../bhyvexml2argv-grub-bootorder.ldargs | 2 + .../bhyvexml2argv-grub-bootorder.xml | 36 ++++++++++++ .../bhyvexml2argv-grub-bootorder2.args | 6 ++ .../bhyvexml2argv-grub-bootorder2.devmap | 1 + .../bhyvexml2argv-grub-bootorder2.ldargs | 2 + .../bhyvexml2argv-grub-bootorder2.xml | 38 +++++++++++++ tests/bhyvexml2argvtest.c | 2 + 11 files changed, 146 insertions(+), 21 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index bd4b35e..5479511 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -234,10 +234,11 @@ management.</p> <p>It's possible to boot non-FreeBSD guests by specifying an explicit bootloader, e.g. <code>grub-bhyve(1)</code>. Arguments to the bootloader may be specified as well. If the bootloader is <code>grub-bhyve</code> and arguments -are omitted, libvirt will try and boot the first disk in the domain (either -<code>cdrom</code>- or <code>disk</code>-type devices). If the disk type is -<code>disk</code>, it will attempt to boot from the first partition in the disk -image.</p> +are omitted, libvirt will try and infer boot ordering from user-supplied +<boot order='N'> configuration in the domain. Failing that, it will boot +the first disk in the domain (either <code>cdrom</code>- or +<code>disk</code>-type devices). If the disk type is <code>disk</code>, it will +attempt to boot from the first partition in the disk image.</p> <pre> ... diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 26d4797..6e3bf03 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -381,38 +381,62 @@ virBhyveUsableDisk(virConnectPtr conn, virDomainDiskDefPtr disk) return true; } +static void +virBhyveFormatGrubDevice(virBufferPtr devicemap, virDomainDiskDefPtr def) +{ + + if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAsprintf(devicemap, "(cd) %s\n", + virDomainDiskGetSource(def)); + else + virBufferAsprintf(devicemap, "(hd0) %s\n", + virDomainDiskGetSource(def)); +} + static virCommandPtr virBhyveProcessBuildGrubbhyveCmd(virDomainDefPtr def, virConnectPtr conn, const char *devmap_file, char **devicesmap_out) { - virDomainDiskDefPtr disk, cd; + virDomainDiskDefPtr hdd, cd, userdef, diskdef; virBuffer devicemap; virCommandPtr cmd; + int best_idx; size_t i; if (def->os.bootloaderArgs != NULL) return virBhyveProcessBuildCustomLoaderCmd(def); + best_idx = INT_MAX; devicemap = (virBuffer)VIR_BUFFER_INITIALIZER; - /* Search disk list for CD or HDD device. */ - cd = disk = NULL; + /* Search disk list for CD or HDD device. We'll respect <boot order=''> if + * present and otherwise pick the first CD or failing that HDD we come + * across. */ + cd = hdd = userdef = NULL; for (i = 0; i < def->ndisks; i++) { if (!virBhyveUsableDisk(conn, def->disks[i])) continue; + diskdef = def->disks[i]; + + if (diskdef->info.bootIndex && diskdef->info.bootIndex < best_idx) { + userdef = diskdef; + best_idx = userdef->info.bootIndex; + continue; + } + if (cd == NULL && def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { - cd = def->disks[i]; - VIR_INFO("Picking %s as boot CD", virDomainDiskGetSource(cd)); + cd = diskdef; + VIR_INFO("Picking %s as CD", virDomainDiskGetSource(cd)); } - if (disk == NULL && + if (hdd == NULL && def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) { - disk = def->disks[i]; - VIR_INFO("Picking %s as HDD", virDomainDiskGetSource(disk)); + hdd = diskdef; + VIR_INFO("Picking %s as HDD", virDomainDiskGetSource(hdd)); } } @@ -422,22 +446,28 @@ virBhyveProcessBuildGrubbhyveCmd(virDomainDefPtr def, if (devicesmap_out != NULL) { /* Grub device.map (just for boot) */ - if (disk != NULL) - virBufferAsprintf(&devicemap, "(hd0) %s\n", - virDomainDiskGetSource(disk)); + if (userdef != NULL) { + virBhyveFormatGrubDevice(&devicemap, userdef); + } else { + if (hdd != NULL) + virBhyveFormatGrubDevice(&devicemap, hdd); - if (cd != NULL) - virBufferAsprintf(&devicemap, "(cd) %s\n", - virDomainDiskGetSource(cd)); + if (cd != NULL) + virBhyveFormatGrubDevice(&devicemap, cd); + } *devicesmap_out = virBufferContentAndReset(&devicemap); } - if (cd != NULL) { - virCommandAddArg(cmd, "--root"); + virCommandAddArg(cmd, "--root"); + if (userdef != NULL) { + if (userdef->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virCommandAddArg(cmd, "cd"); + else + virCommandAddArg(cmd, "hd0,msdos1"); + } else if (cd != NULL) { virCommandAddArg(cmd, "cd"); } else { - virCommandAddArg(cmd, "--root"); virCommandAddArg(cmd, "hd0,msdos1"); } diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args new file mode 100644 index 0000000..eaba370 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args @@ -0,0 +1,6 @@ +/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 2:0,ahci-hd,/tmp/freebsd1.img \ +-s 2:0,ahci-hd,/tmp/freebsd2.img \ +-s 2:0,ahci-hd,/tmp/freebsd3.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.devmap b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.devmap new file mode 100644 index 0000000..1be3b50 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.devmap @@ -0,0 +1 @@ +(hd0) /tmp/freebsd3.img diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs new file mode 100644 index 0000000..91c15ce --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs @@ -0,0 +1,2 @@ +/usr/local/sbin/grub-bhyve --root hd0,msdos1 --device-map '<device.map>' \ +--memory 214 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml new file mode 100644 index 0000000..e372024 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml @@ -0,0 +1,36 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <bootloader>/usr/local/sbin/grub-bhyve</bootloader> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd1.img'/> + <target dev='hda' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd2.img'/> + <target dev='hda' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd3.img'/> + <target dev='hda' bus='sata'/> + <boot order='1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args new file mode 100644 index 0000000..eaba370 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args @@ -0,0 +1,6 @@ +/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 2:0,ahci-hd,/tmp/freebsd1.img \ +-s 2:0,ahci-hd,/tmp/freebsd2.img \ +-s 2:0,ahci-hd,/tmp/freebsd3.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.devmap b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.devmap new file mode 100644 index 0000000..1be3b50 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.devmap @@ -0,0 +1 @@ +(hd0) /tmp/freebsd3.img diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs new file mode 100644 index 0000000..91c15ce --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs @@ -0,0 +1,2 @@ +/usr/local/sbin/grub-bhyve --root hd0,msdos1 --device-map '<device.map>' \ +--memory 214 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml new file mode 100644 index 0000000..8742a30 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml @@ -0,0 +1,38 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <bootloader>/usr/local/sbin/grub-bhyve</bootloader> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd1.img'/> + <target dev='hda' bus='sata'/> + <boot order='111'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd2.img'/> + <target dev='hda' bus='sata'/> + <boot order='22'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd3.img'/> + <target dev='hda' bus='sata'/> + <boot order='3'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index ec57160..cd3aea0 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -163,6 +163,8 @@ mymain(void) DO_TEST("serial"); DO_TEST("console"); DO_TEST("grub-defaults"); + DO_TEST("grub-bootorder"); + DO_TEST("grub-bootorder2"); DO_TEST("bhyveload-explicitargs"); DO_TEST("custom-loader"); DO_TEST("disk-cdrom-grub"); -- 1.9.3

2 4