- Devel - libvirt List Archives

[libvirt] ipv6 slirp network
by Vasiliy Tolstov 22 Jul '14

22 Jul '14

Hello. I have now slirp qemu network with ipv4 address, but for tests i need also ipv6 addresses in slirp network. How can i provide this args for qemu via libvirt or (best) via qemu args? I found some commits about ipv6 slirp network but can't find args needed to enable it. -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

2 22

[libvirt] [PATCH] tests: Remove stale scsihostdata dir
by Michal Privoznik 22 Jul '14

22 Jul '14

In the fbd91d49 commit, new scsihostdata dir is added to EXTRA_DIST in the tests/Makefile.am. However, the directory itself is not created anywhere, nor in the commit. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Notes: Pushed under build-breaker rule. tests/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ecb2f34..3e71069 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -83,7 +83,6 @@ EXTRA_DIST = \ domainsnapshotxml2xmlin \ domainsnapshotxml2xmlout \ fchostdata \ - scsihostdata \ interfaceschemadata \ lxcconf2xmldata \ lxcxml2xmldata \ -- 1.8.5.5

1 0

[libvirt] [PATCHv2 0/2] Deal with snapshots in PMSUSPENDED state
by Peter Krempa 22 Jul '14

22 Jul '14

Peter Krempa (2): qemu: snapshot: Forbid taking snapshot in invalid state qemu: snapshot: Forbid taking/reverting snapshots in PMSUSPENDED state src/qemu/qemu_driver.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) -- 2.0.0

2 5

[libvirt] Syslog "nested job is dangerous" message
by Sam Bobroff 22 Jul '14

22 Jul '14

Hello everyone, After performing a migration, the syslog often contains several messages like this: "This thread seems to be the async job owner; entering monitor without asking for a nested job is dangerous" The message makes it sound as if the user has done something dangerous but, after looking at the code that produces the message, it appears to be more to do with how the libvirt job code is used. The commit that added the warning (6eede368bc8e3df2c94c2ec1a913885ce08e99db) doesn't explain why it might be dangerous... qemu: Warn on possibly incorrect usage of EnterMonitor* qemuDomainObjEnterMonitor{,WithDriver} should not be called from async jobs, only EnterMonitorAsync variant is allowed. ... so I would appreciate some advice from people who understand that area. Would it be appropriate to re-word the message, or perhaps change it to a debug message so that it's not normally seen by users? Is it important to track down the cases that are generating the warning and fix them? (Could it cause some kind of significant problem?) Cheers, Sam.

4 5

[libvirt] [PATCH V2 0/3] refactor virMutexInit virRWLockInit and virCondInit
by Jincheng Miao 22 Jul '14

22 Jul '14

This patchset refactors vir{Mutex,RWLock,Cond}Init by calling a Initernal function, which has the error reporting. So that the caller no longer to write a redundant error message after them. V2: removed quiet argument of vir{Mutex,RWLock,Cond}Internal. separated argument renaming patch. Jincheng Miao (3): rename arguments of virthread functions add error report for virMutexInit virRWLockInit and virCondInit remove error message after virMutexInit virRWLockInit virCondInit daemon/remote.c | 1 - src/conf/interface_conf.c | 2 - src/conf/network_conf.c | 2 - src/conf/node_device_conf.c | 2 - src/conf/nwfilter_conf.c | 2 - src/conf/object_event.c | 2 - src/conf/storage_conf.c | 2 - src/conf/virchrdev.c | 2 - src/esx/esx_vi.c | 15 +---- src/fdstream.c | 2 - src/libvirt_private.syms | 7 +-- src/libxl/libxl_driver.c | 2 - src/locking/lock_daemon.c | 5 -- src/node_device/node_device_udev.c | 1 - src/nwfilter/nwfilter_learnipaddr.c | 2 - src/parallels/parallels_driver.c | 5 +- src/qemu/qemu_agent.c | 2 - src/qemu/qemu_capabilities.c | 2 - src/qemu/qemu_driver.c | 1 - src/qemu/qemu_monitor.c | 6 +- src/remote/remote_driver.c | 2 - src/rpc/virnetclient.c | 5 +- src/test/test_driver.c | 4 -- src/util/vireventpoll.c | 5 +- src/util/virlockspace.c | 4 -- src/util/virobject.c | 2 - src/util/virthread.c | 109 +++++++++++++++++------------------- src/util/virthread.h | 50 +++++++++++------ src/xen/xen_driver.c | 2 - tests/qemumonitortestutils.c | 2 - 30 files changed, 97 insertions(+), 153 deletions(-) -- 1.8.3.1

2 6

[libvirt] [PATCH] leaseshelper: add enhancements to support all events
by Nehal J Wani 21 Jul '14

21 Jul '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 suppresses 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 applying the symlink technique, which helps us map events related to leases with their corresponding network bridges. Example: /var/lib/libvirt/dnsmasq/virbr0.helper -> /home/wani/libvirt/src/libvirt_leaseshelper /var/lib/libvirt/dnsmasq/virbr3.helper -> /home/wani/libvirt/src/libvirt_leaseshelper 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. --- src/network/bridge_driver.c | 43 +++++++++++- src/network/leaseshelper.c | 156 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 175 insertions(+), 24 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6a2e760..1e1e53f 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -229,6 +229,16 @@ networkDnsmasqLeaseFileNameCustom(const char *bridge) } static char * +networkDnsmasqPseudoLeaseHelperName(const char *bridge) +{ + char *pseudo_leasehelper; + + ignore_value(virAsprintf(&pseudo_leasehelper, "%s/%s.helper", + driverState->dnsmasqStateDir, bridge)); + return pseudo_leasehelper; +} + +static char * networkDnsmasqConfigFileName(const char *netname) { char *conffile; @@ -1261,6 +1271,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, char *configfile = NULL; char *configstr = NULL; char *leaseshelper_path = NULL; + char *pseudo_leaseshelper_path = NULL; network->dnsmasqPid = -1; @@ -1273,6 +1284,11 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, if (!(configfile = networkDnsmasqConfigFileName(network->def->name))) goto cleanup; + /* construct symlink name */ + if (!(pseudo_leaseshelper_path + = networkDnsmasqPseudoLeaseHelperName(network->def->bridge))) + goto cleanup; + /* Write the file */ if (virFileWriteStr(configfile, configstr, 0600) < 0) { virReportSystemError(errno, @@ -1287,9 +1303,30 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, LIBEXECDIR))) goto cleanup; + /* Symlink technique for dnsmasq lease file is needed so that libvirt + * can have complete control over the handling of leases database */ + + /* Remove unwanted, old symlink */ + if (unlink(pseudo_leaseshelper_path) < 0 && + errno != ENOENT && errno != ENOTDIR) { + virReportSystemError(errno, + _("Failed to delete symlink '%s'"), + pseudo_leaseshelper_path); + goto cleanup; + } + + /* Create a new symlink */ + if (symlink(leaseshelper_path, pseudo_leaseshelper_path) < 0) { + virReportSystemError(errno, + _("Failed to create symlink '%s' to '%s'"), + leaseshelper_path, pseudo_leaseshelper_path); + goto cleanup; + } + cmd = virCommandNew(dnsmasqCapsGetBinaryPath(caps)); virCommandAddArgFormat(cmd, "--conf-file=%s", configfile); - virCommandAddArgFormat(cmd, "--dhcp-script=%s", leaseshelper_path); + virCommandAddArgFormat(cmd, "--dhcp-script=%s", pseudo_leaseshelper_path); + virCommandAddArgFormat(cmd, "--leasefile-ro"); *cmdout = cmd; ret = 0; @@ -3432,6 +3469,10 @@ networkGetDHCPLeases(virNetworkPtr network, goto error; } + /* Ignore server-duid. It's not part of a lease */ + if (virJSONValueObjectHasKey(lease_tmp, "server-duid")) + continue; + if (!(mac_tmp = virJSONValueObjectGetString(lease_tmp, "mac-address"))) { /* leaseshelper program guarantees that lease will be stored only if * mac-address is known otherwise not */ diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index e4b5283..3d6c773 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -50,6 +50,13 @@ */ #define VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX (32 * 1024 * 1024) +/* + * Use this when passing possibly-NULL strings to printf-a-likes. + * Required for unkown parameters during init call. + */ +# define EMPTY_STR(s) ((s) ? (s) : "*") + + static const char *program_name; /* Display version information. */ @@ -65,7 +72,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 +96,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 +104,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) @@ -105,6 +113,7 @@ main(int argc, char **argv) char *pid_file = NULL; char *lease_entries = NULL; char *custom_lease_file = NULL; + char *server_duid = NULL; const char *ip = NULL; const char *mac = NULL; const char *iaid = virGetEnvAllowSUID("DNSMASQ_IAID"); @@ -112,20 +121,26 @@ 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_env = 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 init = 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,17 +171,19 @@ 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) - goto cleanup; + * via env variable when dnsmasq (re)starts and throws 'del' events for + * expired leases. Our symlink hack provides us an alternative method to + * find it */ + if (!interface) { + interface = basename(argv[0]); + *(strchr(interface, '.')) = '\0'; + } ip = argv[3]; mac = argv[2]; @@ -185,9 +202,14 @@ 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]; + + if (server_duid_env) { + if (VIR_STRDUP(server_duid, server_duid_env) < 0) + goto cleanup; + } } if (virAsprintf(&custom_lease_file, @@ -264,6 +286,8 @@ main(int argc, char **argv) goto cleanup; } } + } else if (action == VIR_LEASE_ACTION_INIT) { + init = true; } else { fprintf(stderr, _("Unsupported action: %s\n"), virLeaseActionTypeToString(action)); @@ -294,6 +318,7 @@ main(int argc, char **argv) i = 0; while (i < virJSONValueArraySize(leases_array)) { const char *ip_tmp = NULL; + const char *server_duid_tmp = NULL; long long expirytime_tmp = -1; if (!(lease_tmp = virJSONValueArrayGet(leases_array, i))) { @@ -302,6 +327,20 @@ main(int argc, char **argv) goto cleanup; } + if ((server_duid_tmp + = virJSONValueObjectGetString(lease_tmp, "server-duid"))) { + /* Control reaches here atmost once */ + if (!server_duid) { + /* Control reaches here when the action is not for an + * ipv6 lease or for some weird reason the env variable + * DNSMASQ_SERVER_DUID wasn't set*/ + if (VIR_STRDUP(server_duid, server_duid_tmp) < 0) + goto cleanup; + } + i++; + continue; + } + if (!(ip_tmp = virJSONValueObjectGetString(lease_tmp, "ip-address")) || (virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime_tmp) < 0)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -328,39 +367,110 @@ main(int argc, char **argv) goto cleanup; } + /* Store pointers to ipv4 and ipv6 leases */ + if (strchr(ip_tmp, ':')) + ignore_value(VIR_APPEND_ELEMENT(leases_ipv6, count_ipv6, lease_tmp)); + else + ignore_value(VIR_APPEND_ELEMENT(leases_ipv4, count_ipv4, lease_tmp)); + ignore_value(virJSONValueArraySteal(leases_array, i)); } } } - if (add) { - if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { + if (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: + * #For all ipv4 leases: + * Expiry_time MAC_address IP_address Hostname Client-id + * #If DHCPv6 is present: + * duid Server_DUID + * #For all ipv6 leases: + * Expiry_time IAID IP_address Hostname Client-DUID */ + long long expirytime_tmp = -1; + for (i = 0; i < count_ipv4; i++) { + lease_tmp = leases_ipv4[i]; + virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime_tmp); + printf("%lld %s %s %s %s\n", + expirytime_tmp, + 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_tmp); + printf("%lld %s %s %s %s\n", + expirytime_tmp, + virJSONValueObjectGetString(lease_tmp, "iaid"), + virJSONValueObjectGetString(lease_tmp, "ip-address"), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "hostname")), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "client-id"))); + } + } + } + else { + if (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 (server_duid) { + if (!(lease_new = virJSONValueNewObject())) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + + if (virJSONValueObjectAppendString(lease_new, + "server-duid", server_duid) < 0) + goto cleanup; + + 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", - _("failed to create json")); + _("empty json array")); goto cleanup; } - lease_new = NULL; - } - 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); + VIR_FREE(server_duid); + VIR_FREE(lease_entries); VIR_FREE(custom_lease_file); virJSONValueFree(lease_new); virJSONValueFree(leases_array); -- 1.9.3

3 8

[libvirt] [PATCH 0/8] Add iSCSI hostdev pass-through device
by John Ferlan 21 Jul '14

21 Jul '14

https://bugzilla.redhat.com/show_bug.cgi?id=957293 Allow iSCSI <hostdev/> devices to be added similarly to the existing <disk/> devices. Initially do a little bit of refactoring of the hostdev subsys structures to make it easier to model an iSCSI hostdev after the SCSI scsi_host. Although the bulk of the non-structure changes are "technically unnecessary", it just looked nicer to see {usb|pci|scsi}src rather than the longer "->source.subsys.u.{usb|pci|scsi}" in many places in the code. The end result is the guest will have /dev/sdX devices created. I have run this code through my Coverity environment and will be running the virttest suite over the weekend. Patches 1-3 are repetitive moves of the various hostdev subsys types (USB, PCI, and SCSI) into separate typedefs and then modifying code use the Ptr instead of the long union path to each field. I think I got most, but I'm sure there's still a few that could be cleaned up or that were added since I started this. Patch 4 more or less redoes patch 3 and I suppose could be combined. I left it separate because it's showing the progression to patch 6. This patch uses 'scsihost' to reference the specific portions while still using 'scsisrc' to reference the shared portion (which is only sgio). Patch 5 adds a virConnectPtr since patch 6 will need a way to get the secret value for the iSCSI secret/auth in qemuBuildSCSIHostdevDrvStr. Patch 6 adds the qemu code to handle a new hostdev protocol type VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI. The code will mimic the network disk (VIR_STORAGE_NET_PROTOCOL_ISCSI) code when making decisions. The new 'scsisrc' field 'protocol' will be the decision point. The default of VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE was chosen over TYPE_SCSI_HOST. The changes were made in this order to reduce the size of the patch when the XML is added (patch 8). Most of the code was done inline using the iscsisrc->protocol (when the iSCSI code had nothing to do). The remaining changes refactored code into "SCSIHost" and "SCSIiSCSI" to process the differences. Patch 7 just refactors domain_conf to add what will be a common routine to handle the "<host/>" element network disks. The iSCSI code will reuse the code to have it's own element. Patch 8 adds the XML, schema, and updates the docs to describe the <hostdev/> entry as well as of course adding new tests. The tests are a copy/merge of the scsi_host and network iscsi tests to define and describe the expected model. John Ferlan (8): hostdev: Introduce virDomainHostdevSubsysUSB hostdev: Introduce virDomainHostdevSubsysPCI hostdev: Introduce virDomainHostdevSubsysSCSI hostdev: Introduce virDomainHostdevSubsysSCSIHost Add virConnectPtr for qemuBuildSCSIHostdevDrvStr hostdev: Introduce virDomainHostdevSubsysSCSIiSCSI domain_conf: Common routine to handle network storage host xml def hostdev: Add iSCSI hostdev XML docs/formatdomain.html.in | 142 +++++-- docs/schemas/domaincommon.rng | 46 +- src/conf/domain_audit.c | 38 +- src/conf/domain_conf.c | 463 +++++++++++++++------ src/conf/domain_conf.h | 80 +++- src/libxl/libxl_conf.c | 9 +- src/libxl/libxl_domain.c | 5 +- src/libxl/libxl_driver.c | 34 +- src/lxc/lxc_cgroup.c | 4 +- src/lxc/lxc_controller.c | 10 +- src/lxc/lxc_driver.c | 16 +- src/qemu/qemu_cgroup.c | 69 +-- src/qemu/qemu_command.c | 158 ++++--- src/qemu/qemu_command.h | 5 +- src/qemu/qemu_conf.c | 20 +- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_hotplug.c | 93 +++-- src/qemu/qemu_hotplug.h | 9 +- src/security/security_apparmor.c | 33 +- src/security/security_dac.c | 66 +-- src/security/security_selinux.c | 64 +-- src/security/virt-aa-helper.c | 5 +- src/util/virhostdev.c | 295 +++++++------ .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 14 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml | 46 ++ .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 14 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi.xml | 40 ++ ...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 16 + ...qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml | 46 ++ .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 16 + .../qemuxml2argv-hostdev-scsi-virtio-iscsi.xml | 40 ++ tests/qemuxml2argvtest.c | 16 + tests/qemuxml2xmltest.c | 5 + 33 files changed, 1317 insertions(+), 606 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.xml -- 1.9.3

2 16

[libvirt] [PATCH] storage: logical: drop useless if
by Roman Bogorodskiy 21 Jul '14

21 Jul '14

virStorageBackendLogicalCreateVol contains a piece like: if (vol->target.path != NULL) { /* A target path passed to CreateVol has no meaning */ VIR_FREE(vol->target.path); } The 'if' is useless here, but 'syntax-check' doesn't catch that because of the comment, so drop the 'if'. --- src/storage/storage_backend_logical.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ed62c2f..4959985 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -742,10 +742,8 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, vol->type = VIR_STORAGE_VOL_BLOCK; - if (vol->target.path != NULL) { - /* A target path passed to CreateVol has no meaning */ - VIR_FREE(vol->target.path); - } + /* A target path passed to CreateVol has no meaning */ + VIR_FREE(vol->target.path); if (virAsprintf(&vol->target.path, "%s/%s", pool->def->target.path, -- 1.9.0

2 2

[libvirt] [PATCH] Fix build on non-Linux platforms
by Roman Bogorodskiy 21 Jul '14

21 Jul '14

Commit ef48a1b introduced virFindSCSIHostByPCI for Linux and a stub for other platforms that returns -1 while the function should return 'char *', so use 'return NULL' instead. Commit fbd91d4 introduced virReadSCSIUniqueId with the third argument 'int *result', however the stub for non-Linux patform uses 'unsigned int *result', so change it to 'int *result'. Pushed under the build breaker rule. --- src/util/virutil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 1c6d261..20e9f0e 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2176,7 +2176,7 @@ virFindFCHostCapableVport(const char *sysfs_prefix) int virReadSCSIUniqueId(const char *sysfs_prefix ATTRIBUTE_UNUSED, int host ATTRIBUTE_UNUSED, - unsigned int *result ATTRIBUTE_UNUSED) + int *result ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); return -1; @@ -2188,7 +2188,7 @@ virFindSCSIHostByPCI(const char *sysfs_prefix ATTRIBUTE_UNUSED, unsigned int unique_id ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); - return -1; + return NULL; } int -- 1.9.0

2 2

[libvirt] [PATCH] build: fix build without numactl
by Eric Blake 21 Jul '14

21 Jul '14

Under ./configure --without-numactl but with numactl-devel installed, the build fails with: ../../src/util/virnuma.c: In function 'virNumaNodeIsAvailable': ../../src/util/virnuma.c:407:5: error: implicit declaration of function 'numa_bitmask_isbitset' [-Werror=implicit-function-declaration] return numa_bitmask_isbitset(numa_nodes_ptr, node); ^ and other failures, all because the configure results for particular functions were used without regard to whether libnuma was even being linked in. * src/util/virnuma.c (virNumaGetPages): Fix message typo. (virNumaNodeIsAvailable): Correct build when not using numactl. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virnuma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 46f48d2..7a11a3b 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -390,7 +390,7 @@ virNumaGetMaxCPUs(void) } -#ifdef HAVE_NUMA_BITMASK_ISBITSET +#if WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET /** * virNumaNodeIsAvailable: * @node: node to check @@ -485,7 +485,7 @@ virNumaGetDistances(int node ATTRIBUTE_UNUSED, { *distances = NULL; *ndistances = 0; - VIR_DEBUG("NUMA distance information isn't availble on this host"); + VIR_DEBUG("NUMA distance information isn't available on this host"); return 0; } #endif -- 1.9.3

1 0

[libvirt] [REPOST 0/8] storage_scsi: Stable SCSI host addressing
by John Ferlan 21 Jul '14

21 Jul '14

Reposting of a series from last month changing only the span version in the docs from 1.2.6 to 1.2.7. Previous posting here: http://www.redhat.com/archives/libvir-list/2014-June/msg00448.html The concept still remains the same - rather than rely on the hostNN numbers for the scsi_host to remain stable and unique across host reboots and/or kernel rebuilds, allow use a combination of the scsi_host's PCI address and the value from the hostNN's 'unique_id' file. John Ferlan (6): getAdapterName: check for SCSI_HOST scsi_backend: Use existing LINUX_SYSFS_SCSI_HOST_PREFIX definition virutil: Introduce virReadSCSIUniqueId Add unique_id to nodedev output scsi_host: Introduce virFindSCSIHostByPCI getAdapterName: Lookup stable scsi_host Osier Yang (2): virStoragePoolSourceAdapter: Refine the SCSI_HOST adapter name storage: Introduce parentaddr into virStoragePoolSourceAdapter docs/formatnode.html.in | 11 + docs/formatstorage.html.in | 143 ++++++++-- docs/schemas/basictypes.rng | 24 +- docs/schemas/nodedev.rng | 6 + src/conf/node_device_conf.c | 23 +- src/conf/node_device_conf.h | 1 + src/conf/storage_conf.c | 111 +++++++- src/conf/storage_conf.h | 8 +- src/libvirt_private.syms | 2 + src/node_device/node_device_linux_sysfs.c | 6 + src/phyp/phyp_driver.c | 8 +- src/storage/storage_backend_scsi.c | 53 +++- src/test/test_driver.c | 5 +- src/util/virutil.c | 154 +++++++++++ src/util/virutil.h | 8 + tests/Makefile.am | 7 + .../pci_8086_27c5_scsi_host_0_unique_id.xml | 8 + tests/nodedevxml2xmltest.c | 1 + tests/scsihosttest.c | 308 +++++++++++++++++++++ .../pool-scsi-type-scsi-host-stable.xml | 19 ++ .../pool-scsi-type-scsi-host-stable.xml | 22 ++ tests/storagepoolxml2xmltest.c | 1 + 22 files changed, 868 insertions(+), 61 deletions(-) create mode 100644 tests/nodedevschemadata/pci_8086_27c5_scsi_host_0_unique_id.xml create mode 100644 tests/scsihosttest.c create mode 100644 tests/storagepoolxml2xmlin/pool-scsi-type-scsi-host-stable.xml create mode 100644 tests/storagepoolxml2xmlout/pool-scsi-type-scsi-host-stable.xml -- 1.9.3

2 13

[libvirt] [PATCH] schema: pool: netfs: Don't enforce slash in glusterfs pool source
by Peter Krempa 21 Jul '14

21 Jul '14

Gluster volumes don't start with a leading slash. Our schema for netfs gluster pools enforces it though. Luckily mount.glusterfs skips it. Allow a slashless volume name for glusterfs netfs mounts in the schema. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1101999 --- docs/schemas/basictypes.rng | 6 +++ docs/schemas/storagepool.rng | 44 +++++++++++++++++----- .../pool-netfs-gluster-without-slash.xml | 12 ++++++ 3 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-gluster-without-slash.xml diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 5fe3a97..9c9419f 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -231,6 +231,12 @@ </data> </define> + <define name="dirPath"> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_\.\+\-\\&"'<>/%]*</param> + </data> + </define> + <define name="absFilePath"> <data type="string"> <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%,]+</param> diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 8d7a94d..b2d1473 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -327,6 +327,15 @@ </element> </define> + <define name='sourceinfonetfsgluster'> + <element name='dir'> + <attribute name='path'> + <ref name='dirPath'/> + </attribute> + <empty/> + </element> + </define> + <define name='sourceinfoname'> <element name='name'> <text/> @@ -394,7 +403,6 @@ <value>auto</value> <value>nfs</value> <value>cifs</value> - <value>glusterfs</value> </choice> </attribute> </element> @@ -468,14 +476,32 @@ <define name='sourcenetfs'> <element name='source'> - <interleave> - <ref name='sourceinfohost'/> - <ref name='sourceinfodir'/> - <ref name='sourcefmtnetfs'/> - <optional> - <ref name='sourceinfovendor'/> - </optional> - </interleave> + <choice> + <group> + <interleave> + <ref name='sourceinfohost'/> + <ref name='sourceinfodir'/> + <ref name='sourcefmtnetfs'/> + <optional> + <ref name='sourceinfovendor'/> + </optional> + </interleave> + </group> + <group> + <interleave> + <ref name='sourceinfohost'/> + <ref name='sourceinfonetfsgluster'/> + <element name='format'> + <attribute name='type'> + <value>glusterfs</value> + </attribute> + </element> + <optional> + <ref name='sourceinfovendor'/> + </optional> + </interleave> + </group> + </choice> </element> </define> diff --git a/tests/storagepoolxml2xmlin/pool-netfs-gluster-without-slash.xml b/tests/storagepoolxml2xmlin/pool-netfs-gluster-without-slash.xml new file mode 100644 index 0000000..69a2c6d --- /dev/null +++ b/tests/storagepoolxml2xmlin/pool-netfs-gluster-without-slash.xml @@ -0,0 +1,12 @@ +<pool type='netfs'> + <source> + <host name='example.com'/> + <format type='glusterfs'/> + <dir path='volume'/> + </source> + <name>netfs-gluster</name> + <uuid>d5609ced-94b1-489e-b218-eff35c30336a</uuid> + <target> + <path>/mnt/gluster</path> + </target> +</pool> -- 2.0.0

2 3

[libvirt] [PATCH] doc: Explicitly specify how to override spice channel mode
by Peter Krempa 21 Jul '14

21 Jul '14

Be more clear that the "<channel mode=" attribute overrides the default set by "defaultMode". Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1033704 --- docs/formatdomain.html.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index bb6f710..8950959 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4191,7 +4191,13 @@ qemu-kvm -net nic,model=? /dev/null configured, it can be desirable to restrict what channels can be run on each port. This is achieved by adding one or more <channel> elements inside the - main <graphics> element. Valid channel names + main <graphics> element and setting the <code>mode</code> + attribute to either <code>secure</code> or <code>insecure</code>. + Setting the mode attribute overrides the default value as set + by the <code>defaultMode</code> attribute. (Note that specifying + <code>any</code> as mode discards the entry as the channel would + inherit the default mode anyways) + Valid channel names include <code>main</code>, <code>display</code>, <code>inputs</code>, <code>cursor</code>, <code>playback</code>, <code>record</code> -- 2.0.0

2 2

[libvirt] [PATCH] domtop: Fix build on mingw
by Michal Privoznik 21 Jul '14

21 Jul '14

Firstly, there's no sigaction() nor struct sigaction on mingw. We have to use the one implemented by gnulib (and hence link with gnulib). Then, for some reason one header file from windows defines ERROR symbol. Yes it does. Sigh. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/domtop/Makefile.am | 6 ++++-- examples/domtop/domtop.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/examples/domtop/Makefile.am b/examples/domtop/Makefile.am index c5cb6c7..dbebb46 100644 --- a/examples/domtop/Makefile.am +++ b/examples/domtop/Makefile.am @@ -16,9 +16,11 @@ ## License along with this library. If not, see ## <http://www.gnu.org/licenses/>. -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \ + -I$(top_srcdir) LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ - $(COVERAGE_LDFLAGS) + $(top_builddir)/gnulib/lib/libgnu.la $(COVERAGE_LDFLAGS) noinst_PROGRAMS=domtop diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c index 4ac7889..af5da46 100644 --- a/examples/domtop/domtop.c +++ b/examples/domtop/domtop.c @@ -20,6 +20,8 @@ * Author: Michal Privoznik <mprivozn(a)redhat.com> */ +#include <config.h> + #include <errno.h> #include <getopt.h> #include <libvirt/libvirt.h> @@ -35,6 +37,21 @@ static bool debug; static bool run_top; +/* On mingw, there's a header file that poisons the well: + * + * + * CC domtop.o + *domtop.c:40:0: warning: "ERROR" redefined [enabled by default] + * #define ERROR(...) \ + * ^ + *In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:71:0, + * from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23, + * from ../../gnulib/lib/unistd.h:48, + * from domtop.c:35: + * /usr/i686-w64-mingw32/sys-root/mingw/include/wingdi.h:75:0: note: this is the location of the previous definition + * #define ERROR 0 + */ +#undef ERROR #define ERROR(...) \ do { \ fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__); \ -- 1.8.5.5

2 1

[libvirt] [PATCH] node_device: HAL: Ignore return value of virStrToLong_ui
by Peter Krempa 21 Jul '14

21 Jul '14

Commit 5df813177c3b609a8cf5db26ae94b26d4a40063d forgot to adjust a few callers of virStrToLong_ui to ignore the returned value in some ancient parts of the code. --- Notes: Pushed under build-braker rule as HAL enabled hosts fail to compile. src/node_device/node_device_hal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 8656b5d..cd7d399 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -151,10 +151,10 @@ gather_pci_cap(LibHalContext *ctx, const char *udi, if (get_str_prop(ctx, udi, "pci.linux.sysfs_path", &sysfs_path) == 0) { char *p = strrchr(sysfs_path, '/'); if (p) { - (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.domain); - (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.bus); - (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.slot); - (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.function); + ignore_value(virStrToLong_ui(p+1, &p, 16, &d->pci_dev.domain)); + ignore_value(virStrToLong_ui(p+1, &p, 16, &d->pci_dev.bus)); + ignore_value(virStrToLong_ui(p+1, &p, 16, &d->pci_dev.slot)); + ignore_value(virStrToLong_ui(p+1, &p, 16, &d->pci_dev.function)); } if (!virPCIGetPhysicalFunction(sysfs_path, -- 2.0.0

1 0

[libvirt] [PATCH 0/7] Fix domain state handling when reverting snapshots in PMSUSPENDED state
by Peter Krempa 21 Jul '14

21 Jul '14

Unfortunately qemu behaves strangely so it probably can't be fully verified :/ Peter Krempa (7): event: Add transition reason for PMSUSPENDED state from snapshot ops lib: Add reason for a domain reaching the PMSUSPENDED state qemu: snapshot: Convert if-else switch to switch statement qemu: snapshot: Reject revertion from clearly bad states qemu: snapshot: Add helper to generate lifecycle events qemu: snapshot: Refactor event creation when reverting snapshots qemu: snapshot: Correctly revert snapshots in PMSUSPENDED state examples/object-events/event-test.c | 3 + include/libvirt/libvirt.h.in | 6 + src/conf/domain_conf.c | 3 +- src/qemu/qemu_driver.c | 301 +++++++++++++++++++++++++----------- tools/virsh-domain-monitor.c | 3 +- tools/virsh-domain.c | 3 +- 6 files changed, 228 insertions(+), 91 deletions(-) -- 2.0.0

2 15

[libvirt] [PATCH 0/3] Resolve a few coverity issues
by Peter Krempa 21 Jul '14

21 Jul '14

Mostly introduced by the "domtop" program. Peter Krempa (3): examples: domtop: Fix uninitialized variable use examples: domtop: Avoid leaking memory util: Check return value from virStrToLong* functions examples/domtop/domtop.c | 10 +++------- src/util/virsexpr.c | 6 +++--- src/util/virstring.h | 30 ++++++++++++++++++++---------- src/vbox/vbox_tmpl.c | 4 ++-- src/xen/xs_internal.c | 2 +- src/xenxs/xen_xm.c | 9 +++++++-- 6 files changed, 36 insertions(+), 25 deletions(-) -- 2.0.0

2 5

[libvirt] KVM Reset Password
by Farzad Zarasvand 21 Jul '14

21 Jul '14

Hi, I am using KVM with libvirt and openstack. I try to reset an instance password. but I received error 501 not implemented. how do I change instance password? thnx

1 0

Re: [libvirt] Enable kvm on aarch64, Cleanup F-16/18 conditionals
by Eric Blake 18 Jul '14

18 Jul '14

On 07/15/2014 04:29 PM, Peter Robinson wrote: >> Doing an out-of-the-box build on RHEL 5 is the oldest configuration >> still actively (if marginally) supported, ideally for as long as RHEL 5 >> remains a live platform (several more years to go). We have build-bots >> that ensure that we can build on RHEL 5, although I'm not sure if those >> buildbots are exercising 'make rpm' to test the older parts of the spec >> file. Historically, RHEL 5.10 is based off of libvirt-0.8.2, and that >> was the release in use during Fedora 13. So it's _definitely_ worth >> culling any conditionals older than F13; but stuff between F13 and F18 >> might be shared with RHEL 5, and therefore more effort to cull the >> Fedora side while still leaving the RHEL side intact. > > Yes, and you'll note in my change that I didn't change anything that > affected EL based releases. In terms of F-13 style tags you should be > capturing that in appropriate and equivalent EL tags to ensure you get > right and consistent conditionals for the appropriate release as > opposed to relying on a translation as you have EL conditionals there > already.... why mix the two. Not sure I follow you here; a patch may be worth more than words (and I'm planning on posting a tentative patch soon). >> Anyone else on the libvirt list have an opinion on how far back we can >> clean without annoying people that are slow on the upgrade to modern Fedora? > > You have known users that are actively upgrading to the latest libvirt > and no other components on old versions of Fedora? I don't honestly know - which is why I'm asking the list if anyone reading here would care if we pruned F18 code. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH libvirt-tck] bhyve: reconnect to domains after libvirtd restart
by Roman Bogorodskiy 18 Jul '14

18 Jul '14

Try to reconnect to the running domains after libvirtd restart. To achieve that, do: * Save domain state - Modify virBhyveProcessStart() to save domain state to the state dir - Modify virBhyveProcessStop() to cleanup the pidfile and the state * Detect if the state information loaded from the driver's state dir matches the actual state. Consider domain active if: - PID it points to exist - Process title of this PID matches the expected one with the domain name Otherwise, mark the domain as shut off. Note: earlier development bhyve versions before FreeBSD 10.0-RELEASE didn't set proctitle we expect, so the current code will not detect it. I don't plan adding support for this unless somebody requests this. --- src/bhyve/bhyve_driver.c | 18 ++++++++++ src/bhyve/bhyve_process.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_process.h | 2 ++ 3 files changed, 111 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index eb5fc95..4c7596e 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1151,6 +1151,8 @@ bhyveStateInitialize(bool priveleged ATTRIBUTE_UNUSED, virStateInhibitCallback callback ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { + virConnectPtr conn = NULL; + if (!priveleged) { VIR_INFO("Not running priveleged, disabling driver"); return 0; @@ -1199,6 +1201,15 @@ bhyveStateInitialize(bool priveleged ATTRIBUTE_UNUSED, } if (virDomainObjListLoadAllConfigs(bhyve_driver->domains, + BHYVE_STATE_DIR, + NULL, 1, + bhyve_driver->caps, + bhyve_driver->xmlopt, + 1 << VIR_DOMAIN_VIRT_BHYVE, + NULL, NULL) < 0) + goto cleanup; + + if (virDomainObjListLoadAllConfigs(bhyve_driver->domains, BHYVE_CONFIG_DIR, BHYVE_AUTOSTART_DIR, 0, bhyve_driver->caps, @@ -1207,9 +1218,16 @@ bhyveStateInitialize(bool priveleged ATTRIBUTE_UNUSED, NULL, NULL) < 0) goto cleanup; + conn = virConnectOpen("bhyve:///system"); + + virBhyveProcessReconnectAll(conn, bhyve_driver); + + virObjectUnref(conn); + return 0; cleanup: + virObjectUnref(conn); bhyveStateCleanup(); return -1; } diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index f3898f5..ea5ac9b 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -185,6 +185,11 @@ virBhyveProcessStart(virConnectPtr conn, vm->def->id = vm->pid; virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, reason); + if (virDomainSaveStatus(driver->xmlopt, + BHYVE_STATE_DIR, + vm) < 0) + goto cleanup; + ret = 0; cleanup: @@ -257,6 +262,10 @@ virBhyveProcessStop(bhyveConnPtr driver, cleanup: virCommandFree(cmd); + + virPidFileDelete(BHYVE_STATE_DIR, vm->def->name); + virDomainDeleteConfig(BHYVE_STATE_DIR, NULL, vm); + return ret; } @@ -295,3 +304,85 @@ virBhyveGetDomainTotalCpuStats(virDomainObjPtr vm, return ret; } + +struct bhyveProcessReconnectData { + virConnectPtr conn; + bhyveConnPtr driver; + kvm_t *kd; +}; + +static int +virBhyveProcessReconnect(virDomainObjPtr vm, + void *opaque) +{ + struct bhyveProcessReconnectData *data = opaque; + struct kinfo_proc *kp; + int nprocs; + char **proc_argv; + char *expected_proctitle = NULL; + int ret = -1; + + if (!virDomainObjIsActive(vm)) + return 0; + + if (!vm->pid) + return 0; + + virObjectLock(vm); + + kp = kvm_getprocs(data->kd, KERN_PROC_PID, vm->pid, &nprocs); + if (kp == NULL || nprocs != 1) + goto cleanup; + + if (virAsprintf(&expected_proctitle, "bhyve: %s", vm->def->name) < 0) + goto cleanup; + + proc_argv = kvm_getargv(data->kd, kp, 0); + if (proc_argv && proc_argv[0]) + if (STREQ(expected_proctitle, proc_argv[0])) + ret = 0; + + cleanup: + if (ret < 0) { + /* If VM is reported to be in active state, but we cannot find + * its PID, then we clear information about the PID and + * set state to 'shutdown' */ + vm->pid = 0; + vm->def->id = -1; + virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_UNKNOWN); + ignore_value(virDomainSaveStatus(data->driver->xmlopt, + BHYVE_STATE_DIR, + vm)); + } + + virObjectUnlock(vm); + VIR_FREE(expected_proctitle); + + return ret; +} + +void +virBhyveProcessReconnectAll(virConnectPtr conn, + bhyveConnPtr driver) +{ + kvm_t *kd; + struct bhyveProcessReconnectData data; + char errbuf[_POSIX2_LINE_MAX]; + + if ((kd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, errbuf)) == NULL) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Unable to get kvm descriptor: %s"), + errbuf); + return; + + } + + data.conn = conn; + data.driver = driver; + data.kd = kd; + + virDomainObjListForEach(driver->domains, virBhyveProcessReconnect, &data); + + kvm_close(kd); +} diff --git a/src/bhyve/bhyve_process.h b/src/bhyve/bhyve_process.h index 3049ad0..006a5ae 100644 --- a/src/bhyve/bhyve_process.h +++ b/src/bhyve/bhyve_process.h @@ -37,6 +37,8 @@ int virBhyveProcessStop(bhyveConnPtr driver, int virBhyveGetDomainTotalCpuStats(virDomainObjPtr vm, unsigned long long *cpustats); +void virBhyveProcessReconnectAll(virConnectPtr conn, bhyveConnPtr driver); + typedef enum { VIR_BHYVE_PROCESS_START_AUTODESTROY = 1 << 0, } bhyveProcessStartFlags; -- 1.9.0

2 5

[libvirt] [PATCH 0/2] Fix docs and handling of snapshots on SCSI passthrough devices
by Peter Krempa 18 Jul '14

18 Jul '14

Libvirt didn't catch an attempt to do a snapshot of a SCSI passthrough disk when backed by iSCSI and the docs didn't state that disk type 'lun' works also with iSCSI. Peter Krempa (2): doc: domain: Clarify that disk type 'lun' works with iSCSI too qemu: snapshot: Forbid snapshots of iSCSI passthrough devices docs/formatdomain.html.in | 3 ++- src/qemu/qemu_driver.c | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) -- 2.0.0

2 5

[libvirt] [PATCH v2] examples: Introduce domtop
by Michal Privoznik 18 Jul '14

18 Jul '14

There's this question on the list that is asked over and over again. How do I get {cpu, memory, ...} usage in percentage? Or its modified version: How do I plot nice graphs like virt-manager does? It would be nice if we have an example to inspire people. And that's what domtop should do. Yes, it could be written in different ways, but I've chosen this one as I think it show explicitly what users need to implement in order to imitate virt-manager's graphing. Note: The usage is displayed from host perspective. That is, how much host CPUs the domain is using. But it should be fairly simple to switch do just guest CPU usage if needed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- .gitignore | 1 + Makefile.am | 2 +- cfg.mk | 2 +- configure.ac | 1 + examples/domtop/Makefile.am | 27 +++ examples/domtop/domtop.c | 400 ++++++++++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 2 +- 7 files changed, 432 insertions(+), 3 deletions(-) create mode 100644 examples/domtop/Makefile.am create mode 100644 examples/domtop/domtop.c diff --git a/.gitignore b/.gitignore index 2d4d401..90fee91 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,7 @@ /examples/dominfo/info1 /examples/domsuspend/suspend /examples/dommigrate/dommigrate +/examples/domtop/domtop /examples/hellolibvirt/hellolibvirt /examples/openauth/openauth /gnulib/lib/* diff --git a/Makefile.am b/Makefile.am index a374e1a..4aafe94 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ examples/dominfo examples/domsuspend examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap \ tools/wireshark examples/dommigrate \ - examples/lxcconvert + examples/lxcconvert examples/domtop ACLOCAL_AMFLAGS = -I m4 diff --git a/cfg.mk b/cfg.mk index c3d89a0..0559edd 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1078,7 +1078,7 @@ exclude_file_name_regexp--sc_prohibit_sprintf = \ exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/virstring\.c$$ exclude_file_name_regexp--sc_prohibit_strtol = \ - ^(src/util/.*|examples/domsuspend/suspend)\.c$$ + ^(src/util/.*|examples/dom.*/.*)\.c$$ exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/virxml\.c$$ diff --git a/configure.ac b/configure.ac index 8001e24..f37c716 100644 --- a/configure.ac +++ b/configure.ac @@ -2755,6 +2755,7 @@ AC_CONFIG_FILES([\ examples/domsuspend/Makefile \ examples/dominfo/Makefile \ examples/dommigrate/Makefile \ + examples/domtop/Makefile \ examples/openauth/Makefile \ examples/hellolibvirt/Makefile \ examples/systemtap/Makefile \ diff --git a/examples/domtop/Makefile.am b/examples/domtop/Makefile.am new file mode 100644 index 0000000..c5cb6c7 --- /dev/null +++ b/examples/domtop/Makefile.am @@ -0,0 +1,27 @@ +## Process this file with automake to produce Makefile.in + +## Copyright (C) 2014 Red Hat, Inc. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see +## <http://www.gnu.org/licenses/>. + +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include +LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ + $(COVERAGE_LDFLAGS) + +noinst_PROGRAMS=domtop + +domtop_SOURCES=domtop.c +domtop_LDFLAGS= +domtop_LDADD= $(LDADDS) diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c new file mode 100644 index 0000000..6fb6cbe --- /dev/null +++ b/examples/domtop/domtop.c @@ -0,0 +1,400 @@ +/* + * domtop.c: Demo program showing how to calculate CPU usage + * + * Copyright (C) 2014 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> + */ + +#include <errno.h> +#include <getopt.h> +#include <libvirt/libvirt.h> +#include <libvirt/virterror.h> +#include <signal.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/time.h> +#include <unistd.h> + +static bool debug; +static bool run_top; + +#define ERROR(...) \ +do { \ + fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ +} while (0) + +#define DEBUG(...) \ +do { \ + if (!debug) \ + break; \ + fprintf(stderr, "DEBUG %s:%d : ", __FUNCTION__, __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ +} while (0) + +#define STREQ(a,b) (strcmp(a,b) == 0) + +static void +print_usage(const char *progname) +{ + const char *unified_progname; + + if (!(unified_progname = strrchr(progname, '/'))) + unified_progname = progname; + else + unified_progname++; + + printf("\n%s [options] [domain name]\n\n" + " options:\n" + " -d | --debug enable debug messages\n" + " -h | --help print this help\n" + " -c | --connect=URI hypervisor connection URI\n" + " -D | --delay=X delay between updates in milliseconds\n" + "\n" + "Print the cumulative usage of each host CPU. \n" + "Without any domain name specified the list of \n" + "all running domains is printed out.\n", + unified_progname); +} + +static int +parse_argv(int argc, char *argv[], + const char **uri, + const char **dom_name, + unsigned int *milliseconds) +{ + int ret = -1; + int arg; + unsigned long val; + char *p; + struct option opt[] = { + {"debug", no_argument, NULL, 'd'}, + {"help", no_argument, NULL, 'h'}, + {"connect", required_argument, NULL, 'c'}, + {"delay", required_argument, NULL, 'D'}, + {NULL, 0, NULL, 0} + }; + + while ((arg = getopt_long(argc, argv, "+:dhc:D:", opt, NULL)) != -1) { + switch (arg) { + case 'd': + debug = true; + break; + case 'h': + print_usage(argv[0]); + exit(EXIT_SUCCESS); + break; + case 'c': + *uri = optarg; + break; + case 'D': + /* strtoul man page suggest clearing errno prior to call */ + errno = 0; + val = strtoul(optarg, &p, 10); + if (errno || *p || p == optarg) { + ERROR("Invalid number: '%s'", optarg); + goto cleanup; + } + *milliseconds = val; + if (*milliseconds != val) { + ERROR("Integer overflow: %ld", val); + goto cleanup; + } + break; + case ':': + ERROR("option '-%c' requires an argument", optopt); + exit(EXIT_FAILURE); + case '?': + if (optopt) + ERROR("unsupported option '-%c'. See --help.", optopt); + else + ERROR("unsupported option '%s'. See --help.", argv[optind - 1]); + exit(EXIT_FAILURE); + default: + ERROR("unknown option"); + exit(EXIT_FAILURE); + } + } + + if (argc > optind) + *dom_name = argv[optind]; + + ret = 0; + cleanup: + return ret; +} + +static int +fetch_domains(virConnectPtr conn) +{ + int num_domains, ret = -1; + virDomainPtr *domains = NULL; + size_t i; + const int list_flags = VIR_CONNECT_LIST_DOMAINS_ACTIVE; + + DEBUG("Fetching list of running domains"); + num_domains = virConnectListAllDomains(conn, &domains, list_flags); + + DEBUG("num_domains=%d", num_domains); + if (num_domains < 0) { + ERROR("Unable to fetch list of running domains"); + goto cleanup; + } + + printf("Running domains:\n"); + printf("----------------\n"); + for (i = 0; i < num_domains; i++) { + virDomainPtr dom = domains[i]; + const char *dom_name = virDomainGetName(dom); + printf("%s\n", dom_name); + virDomainFree(dom); + } + + ret = 0; + cleanup: + free(domains); + return ret; +} + +static void +print_cpu_usage(const char *dom_name, + size_t cpu, + size_t ncpus, + unsigned long long then, + virTypedParameterPtr then_params, + size_t then_nparams, + unsigned long long now, + virTypedParameterPtr now_params, + size_t now_nparams) +{ + size_t i, j, k; + size_t nparams = now_nparams; + bool delim = false; + + if (then_nparams != now_nparams) { + /* this should not happen (TM) */ + ERROR("parameters counts don't match"); + return; + } + + for (i = 0; i < ncpus; i++) { + size_t pos; + double usage; + + /* check if the vCPU is in the maps */ + if (now_params[i * nparams].type == 0 || + then_params[i * then_nparams].type == 0) + continue; + + for (j = 0; j < nparams; j++) { + pos = i * nparams + j; + if (STREQ(then_params[pos].field, VIR_DOMAIN_CPU_STATS_CPUTIME) || + STREQ(then_params[pos].field, VIR_DOMAIN_CPU_STATS_VCPUTIME)) + break; + } + + if (j == nparams) { + ERROR("unable to find %s", VIR_DOMAIN_CPU_STATS_CPUTIME); + return; + } + + DEBUG("now_params=%llu then_params=%llu now=%llu then=%llu", + now_params[pos].value.ul, then_params[pos].value.ul, now, then); + + /* @now_params and @then_params are in nanoseconds, @now and @then are + * in microseconds. In ideal world, we would translate them both into + * the same scale, divide one by another and multiply by factor of 100 + * to get percentage. However, the count of floating point operations + * performed has a bad effect on the precision, so instead of dividing + * @now_params and @then_params by 1000 and then multiplying again by + * 100, we divide only once by 10 and get the same result. */ + usage = (now_params[pos].value.ul - then_params[pos].value.ul) / + (now - then) / 10; + + if (delim) + printf("\t"); + printf("CPU%zu: %.2lf", cpu + i, usage); + delim = true; + } + + if (delim) + printf("\n"); + +} + +static void +stop(int sig) +{ + DEBUG("Exiting on signal %d\n", sig); + run_top = false; +} + +static int +do_top(virConnectPtr conn, + const char *dom_name, + unsigned int milliseconds) +{ + int ret = -1; + virDomainPtr dom; + int max_id; + int nparams = 0, then_nparams = 0, now_nparams = 0; + virTypedParameterPtr then_params = NULL, now_params = NULL; + struct sigaction action_stop; + + memset(&action_stop, 0, sizeof(action_stop)); + action_stop.sa_handler = stop; + + /* Lookup the domain */ + if (!(dom = virDomainLookupByName(conn, dom_name))) { + ERROR("Unable to find domain '%s'", dom_name); + goto cleanup; + } + + /* and see how many vCPUs can we fetch stats for */ + if ((max_id = virDomainGetCPUStats(dom, NULL, 0, 0, 0, 0)) < 0) { + ERROR("Unable to get cpu stats"); + goto cleanup; + } + + /* how many stats can we get for a vCPU? */ + if ((nparams = virDomainGetCPUStats(dom, NULL, 0, 0, 1, 0)) < 0) { + ERROR("Unable to get cpu stats"); + goto cleanup; + } + + if (!(now_params = calloc(nparams * max_id, sizeof(*now_params))) || + !(then_params = calloc(nparams * max_id, sizeof(*then_params)))) { + ERROR("Unable to allocate memory"); + goto cleanup; + } + + sigaction(SIGTERM, &action_stop, NULL); + sigaction(SIGINT, &action_stop, NULL); + + run_top = true; + while (run_top) { + struct timeval then, now; + + /* Get current time */ + if (gettimeofday(&then, NULL) < 0) { + ERROR("unable to get time"); + goto cleanup; + } + + /* And current stats */ + if ((then_nparams = virDomainGetCPUStats(dom, then_params, + nparams, 0, max_id, 0)) < 0) { + ERROR("Unable to get cpu stats"); + goto cleanup; + } + + /* Now sleep some time */ + usleep(milliseconds * 1000); /* usleep expects microseconds */ + + /* And get current time */ + if (gettimeofday(&now, NULL) < 0) { + ERROR("unable to get time"); + goto cleanup; + } + + /* And current stats */ + if ((now_nparams = virDomainGetCPUStats(dom, now_params, + nparams, 0, max_id, 0)) < 0) { + ERROR("Unable to get cpu stats"); + goto cleanup; + } + + print_cpu_usage(dom_name, 0, max_id, + then.tv_sec * 1000000 + then.tv_usec, + then_params, then_nparams, + now.tv_sec * 1000000 + now.tv_usec, + now_params, now_nparams); + + virTypedParamsClear(now_params, now_nparams * max_id); + virTypedParamsClear(then_params, then_nparams * max_id); + } + + ret = 0; + cleanup: + if (max_id > 0) { + if (now_nparams > 0) + virTypedParamsFree(now_params, now_nparams * max_id); + if (then_nparams > 0) + virTypedParamsFree(then_params, then_nparams * max_id); + } + if (dom) + virDomainFree(dom); + return ret; +} + +int +main(int argc, char *argv[]) +{ + int ret = EXIT_FAILURE; + virConnectPtr conn = NULL; + const char *uri = NULL; + const char *dom_name = NULL; + unsigned int milliseconds = 500; /* Sleep this long between two API calls */ + const int connect_flags = 0; /* No connect flags for now */ + + if (parse_argv(argc, argv, &uri, &dom_name, &milliseconds) < 0) + goto cleanup; + + DEBUG("Proceeding with uri=%s dom_name=%s milliseconds=%u", + uri, dom_name, milliseconds); + + if (!(conn = virConnectOpenAuth(uri, + virConnectAuthPtrDefault, + connect_flags))) { + ERROR("Failed to connect to hypervisor"); + goto cleanup; + } + + DEBUG("Successfully connected"); + + if (!dom_name) { + if (fetch_domains(conn) == 0) + ret = EXIT_SUCCESS; + goto cleanup; + } + + if (do_top(conn, dom_name, milliseconds) < 0) + goto cleanup; + + ret = EXIT_SUCCESS; + cleanup: + if (conn) { + int tmp; + tmp = virConnectClose(conn); + if (tmp < 0) { + ERROR("Failed to disconnect from the hypervisor"); + ret = EXIT_FAILURE; + } else if (tmp > 0) { + ERROR("One or more references were leaked after " + "disconnect from the hypervisor"); + ret = EXIT_FAILURE; + } else { + DEBUG("Connection successfully closed"); + } + } + return ret; +} diff --git a/libvirt.spec.in b/libvirt.spec.in index 472fa4b..76e57aa 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1505,7 +1505,7 @@ rm -fr %{buildroot} # on RHEL 5, thus we need to expand it here. make install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} -for i in object-events dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap dommigrate +for i in object-events dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap dommigrate domtop do (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) done -- 1.8.5.5

2 2

[libvirt] [PATCH] doc: add domain to address of hostdev pci
by Hu Tao 18 Jul '14

18 Jul '14

libvirt supports pci domain already, so update the documentation. Otherwise users who lookup the documentation for how to use hostdev may miss the domain and encounter error when pass-through a pci device in a domain other than 0. Signed-off-by: Hu Tao <hutao(a)cn.fujitsu.com> --- docs/formatdomain.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3c85fc5..4572feb 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2777,7 +2777,7 @@ <devices> <hostdev mode='subsystem' type='pci' managed='yes'> <source> - <address bus='0x06' slot='0x02' function='0x0'/> + <address domain='0x0000' bus='0x06' slot='0x02' function='0x0'/> </source> <boot order='1'/> <rom bar='on' file='/etc/fake/boot.bin'/> @@ -2891,7 +2891,7 @@ USB bus and device number the device appears at on the host. The values of these attributes can be given in decimal, hexadecimal (starting with 0x) or octal (starting with 0) form. - For PCI devices the element carries 3 attributes allowing to designate + For PCI devices the element carries 4 attributes allowing to designate the device as can be found with the <code>lspci</code> or with <code>virsh nodedev-list</code>. <a href="#elementsAddress">See above</a> for -- 1.9.3

2 1

[libvirt] OVMF exposure in libvirt
by Michal Privoznik 18 Jul '14

18 Jul '14

Dear list, there's been a lot of development in QEMU on this part. And I think it's settled down enough long so I can start looking at it. So I'd like to hear you opinion what's the best way to expose this in libvirt. OVMF can bee looked at as a UEFI enablement in guest. Standard UEFI consists of two parts: a) the firmware binary image (RO) b) UEFI variables flash (RW) IIUC both of these are to be passed to qemu on the command line as: -drive file=img_1,if=pflash,format=raw,readonly \ -drive file=img_2,if=pflash,format=raw Subsequently, -bios parameter should be dropped. The idea of splitting the UEFI into two files allows distros to update the UEFI firmware (FW for short) without modifying guest written UEFI variables file (the variables should have unified name so they should be transferable between two versions of UEFI FW). So my question is: how to expose this in the domain XML? We have the <os/> element which handles the booting arguments. It can have <loader/> (which would be great for the FW, wouldn't it?). But then we need to invent a different element (say <vars/>) which would contain path the the UEFI vars file. Moreover, the element would exclude other elements like <boot/>, <bios/> or <smbios/>. So my proposal is: <os> <type>hvm</type> <loader>/path/to/uefi.fw</loader> <vars>/path/to/uefi.nvvarstore</vars> </os> Does this make any sense or am I just blabbing? Michal BTW OVMF stands for Open Virtual Machine Firmware.

4 8

[libvirt] [libvirt-glib] gobject: Fix GEnum generation through glib-mkenums
by Christophe Fergeau 18 Jul '14

18 Jul '14

We were only passing libvirt-gobject-domain.h and libvirt-gobject-connection.h through glib-mkenums, which causes it to only generate GEnum information for enums found in these headers. We want to do that for all enums defined in installed headers, so passing all headers listed in libvirt_gobject_1_0_la_HEADERS is more appropriate. --- libvirt-gobject/Makefile.am | 4 ++-- libvirt-gobject/libvirt-gobject.sym | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 516c10f..7163c7d 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -93,7 +93,7 @@ libvirt_gobject_1_0_la_LDFLAGS = \ -Wl,--version-script=$(srcdir)/libvirt-gobject.sym \ -version-info $(LIBVIRT_GLIB_VERSION_INFO) -libvirt-gobject-enums.c: libvirt-gobject-domain.h libvirt-gobject-connection.h +libvirt-gobject-enums.c: $(libvirt_gobject_1_0_la_HEADERS) $(AM_V_GEN)glib-mkenums \ --fhead "#include \"libvirt-gobject/libvirt-gobject.h\"\n\n" \ --vhead "static const G@Type@Value _@enum_name@_values[] = {" \ @@ -106,7 +106,7 @@ libvirt-gobject-enums.c: libvirt-gobject-domain.h libvirt-gobject-connection.h --vtail " return type;\n}\n\n" \ $^ | sed -e 's/g_vir/gvir/g' > $@ -libvirt-gobject-enums.h: libvirt-gobject-domain.h libvirt-gobject-connection.h +libvirt-gobject-enums.h: $(libvirt_gobject_1_0_la_HEADERS) $(AM_V_GEN)glib-mkenums --fhead "#ifndef __LIBVIRT_GOBJECT_ENUMS_H__\n" \ --fhead "#define __LIBVIRT_GOBJECT_ENUMS_H__\n\n" \ --fhead "G_BEGIN_DECLS\n\n" \ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index b781cc6..4e856e7 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -237,6 +237,11 @@ LIBVIRT_GOBJECT_0.1.5 { LIBVIRT_GOBJECT_0.1.9 { global: gvir_domain_snapshot_delete; + gvir_domain_snapshot_delete_flags_get_type; + gvir_storage_pool_state_get_type; + gvir_storage_vol_resize_flags_get_type; + gvir_storage_vol_type_get_type; + gvir_stream_io_condition_get_type; } LIBVIRT_GOBJECT_0.1.5; # .... define new API here using predicted next version number .... -- 1.9.3

2 2

[libvirt] [PATCH v3 00/16] Support for per-guest-node binding
by Martin Kletzander 18 Jul '14

18 Jul '14

v3 of https://www.redhat.com/archives/libvir-list/2014-July/msg00372.html v3: - Michal's suggestions worked in - rebased on current master Martin Kletzander (16): qemu: purely a code movement qemu: remove useless error check conf: purely a code movement conf, schema: add 'id' field for cells numatune: create new module for numatune numatune: unify numatune struct and enum names numatune: Encapsulate numatune configuration in order to unify results conf, schema: add support for memnode elements numatune: add support for per-node memory bindings in private APIs qemu: allow qmp probing for cmdline options without params qemu: memory-backend-ram capability probing qemu: newer -numa parameter capability probing qemu: enable disjoint numa cpu ranges qemu: pass numa node binding preferences to qemu qemu: split out cpuset.mems setting qemu: leave restricting cpuset.mems after initialization docs/formatdomain.html.in | 32 +- docs/schemas/domaincommon.rng | 22 + po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/conf/cpu_conf.c | 41 +- src/conf/cpu_conf.h | 3 +- src/conf/domain_conf.c | 203 ++----- src/conf/domain_conf.h | 10 +- src/conf/numatune_conf.c | 595 +++++++++++++++++++++ src/conf/numatune_conf.h | 108 ++++ src/libvirt_private.syms | 24 +- src/lxc/lxc_cgroup.c | 20 +- src/lxc/lxc_controller.c | 5 +- src/lxc/lxc_native.c | 15 +- src/parallels/parallels_driver.c | 7 +- src/qemu/qemu_capabilities.c | 16 +- src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_cgroup.c | 52 +- src/qemu/qemu_cgroup.h | 4 +- src/qemu/qemu_command.c | 98 +++- src/qemu/qemu_driver.c | 84 ++- src/qemu/qemu_monitor.c | 6 +- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_monitor_json.c | 8 +- src/qemu/qemu_monitor_json.h | 3 +- src/qemu/qemu_process.c | 12 +- src/util/virnuma.c | 61 +-- src/util/virnuma.h | 28 +- tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 5 + tests/qemumonitorjsontest.c | 20 +- .../qemuxml2argv-cpu-numa-disjoint.args | 6 + .../qemuxml2argv-cpu-numa-disjoint.xml | 28 + tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml | 25 + .../qemuxml2argv-numatune-auto-prefer.xml | 29 + .../qemuxml2argv-numatune-memnode-no-memory.args | 8 + .../qemuxml2argv-numatune-memnode-no-memory.xml | 30 ++ .../qemuxml2argv-numatune-memnode-nocpu.xml | 25 + .../qemuxml2argv-numatune-memnode.args | 11 + .../qemuxml2argv-numatune-memnode.xml | 33 ++ .../qemuxml2argv-numatune-memnodes-problematic.xml | 31 ++ tests/qemuxml2argvtest.c | 12 + .../qemuxml2xmlout-cpu-numa1.xml | 28 + .../qemuxml2xmlout-cpu-numa2.xml | 28 + .../qemuxml2xmlout-numatune-auto-prefer.xml | 29 + .../qemuxml2xmlout-numatune-memnode.xml | 33 ++ tests/qemuxml2xmltest.c | 8 + 49 files changed, 1479 insertions(+), 389 deletions(-) create mode 100644 src/conf/numatune_conf.c create mode 100644 src/conf/numatune_conf.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-nocpu.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memnodes-problematic.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-auto-prefer.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode.xml -- 2.0.0

5 36

[libvirt] [PATCH] qemuConnectGetDomainCapabilities: Use wiser defaults
by Michal Privoznik 18 Jul '14

18 Jul '14

Up to now, users have to pass two arguments at least: domain virt type ('qemu' vs 'kvm') and one of emulatorbin or architecture. This is not much user friendly. Nowadays users mostly use KVM and share the host architecture with the guest. So now, the API (and subsequently virsh command) can be called with all NULLs (without any arguments). Before this patch: # virsh domcapabilities error: failed to get emulator capabilities error: virttype_str in qemuConnectGetDomainCapabilities must not be NULL # virsh domcapabilities kvm error: failed to get emulator capabilities error: invalid argument: at least one of emulatorbin or architecture fields must be present After: # virsh domcapabilities <domainCapabilities> <path>/usr/bin/qemu-system-x86_64</path> <domain>kvm</domain> <machine>pc-i440fx-2.1</machine> <arch>x86_64</arch> <vcpu max='255'/> </domainCapabilities> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 33541d3..7d99435 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16849,17 +16849,17 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn, char *ret = NULL; virQEMUDriverPtr driver = conn->privateData; virQEMUCapsPtr qemuCaps = NULL; - int virttype; /* virDomainVirtType */ + int virttype = VIR_DOMAIN_VIRT_KVM; /* virDomainVirtType */ virDomainCapsPtr domCaps = NULL; - int arch = VIR_ARCH_NONE; /* virArch */ + int arch = virArchFromHost(); /* virArch */ virCheckFlags(0, ret); - virCheckNonNullArgReturn(virttype_str, ret); if (virConnectGetDomainCapabilitiesEnsureACL(conn) < 0) return ret; - if ((virttype = virDomainVirtTypeFromString(virttype_str)) < 0) { + if (virttype_str && + (virttype = virDomainVirtTypeFromString(virttype_str)) < 0) { virReportError(VIR_ERR_INVALID_ARG, _("unknown virttype: %s"), virttype_str); @@ -16882,9 +16882,6 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn, arch_from_caps = virQEMUCapsGetArch(qemuCaps); - if (arch == VIR_ARCH_NONE) - arch = arch_from_caps; - if (arch_from_caps != arch) { virReportError(VIR_ERR_INVALID_ARG, _("architecture from emulator '%s' doesn't " @@ -16893,21 +16890,12 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn, virArchToString(arch)); goto cleanup; } - } else if (arch_str) { + } else { if (!(qemuCaps = virQEMUCapsCacheLookupByArch(driver->qemuCapsCache, arch))) goto cleanup; - if (!emulatorbin) - emulatorbin = virQEMUCapsGetBinary(qemuCaps); - /* Deliberately not checking if provided @emulatorbin matches @arch, - * since if @emulatorbin was specified the match has been checked a few - * lines above. */ - } else { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("at least one of emulatorbin or " - "architecture fields must be present")); - goto cleanup; + emulatorbin = virQEMUCapsGetBinary(qemuCaps); } if (machine) { -- 1.8.5.5

2 2

[libvirt] [PATCH] spec: Consolidate with_qemu* definitions
by Jiri Denemark 18 Jul '14

18 Jul '14

Decisions whether qemu driver and libvirt-daemon-{qemu,kvm} packages should be built on various OS/arch combinations were scattered around the spec file. Let's make it easier to see where qemu driver is going to be built. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9c7b241..472fa4b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -54,15 +54,27 @@ %define with_vbox 0%{!?_without_vbox:%{server_drivers}} %define with_qemu_tcg %{with_qemu} -# Change if we ever provide qemu-kvm binaries on non-x86 hosts -%if 0%{?fedora} >= 18 + +%define qemu_kvm_arches %{ix86} x86_64 + +%if 0%{?fedora} + %if 0%{?fedora} < 16 + # Fedora doesn't have any QEMU on ppc64 until FC16 - only ppc + %ifarch ppc64 + %define with_qemu_tcg 0 + %endif + %endif + %if 0%{?fedora} >= 18 + %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x + %endif %if 0%{?fedora} >= 20 - %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x %{arm} - %else - %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x + %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x %{arm} %endif -%else - %define qemu_kvm_arches %{ix86} x86_64 +%endif + +%if 0%{?rhel} + %define with_qemu_tcg 0 + %define qemu_kvm_arches x86_64 %endif %ifarch %{qemu_kvm_arches} @@ -71,6 +83,10 @@ %define with_qemu_kvm 0 %endif +%if ! %{with_qemu_tcg} && ! %{with_qemu_kvm} + %define with_qemu 0 +%endif + # Then the hypervisor drivers that run outside libvirtd, in libvirt.so %define with_openvz 0%{!?_without_openvz:1} %define with_vmware 0%{!?_without_vmware:1} @@ -191,34 +207,16 @@ %define with_firewalld 1 %endif -# RHEL-5 has restricted QEMU to x86_64 only and is too old for LXC +# RHEL-5 is too old for LXC %if 0%{?rhel} == 5 - %define with_qemu_tcg 0 - %ifnarch x86_64 - %define with_qemu 0 - %define with_qemu_kvm 0 - %endif %define with_lxc 0 %endif -# RHEL-6 has restricted QEMU to x86_64 only, stopped including Xen -# on all archs. Other archs all have LXC available though +# RHEL-6 stopped including Xen on all archs. %if 0%{?rhel} >= 6 - %define with_qemu_tcg 0 - %ifnarch x86_64 - %define with_qemu 0 - %define with_qemu_kvm 0 - %endif %define with_xen 0 %endif -# Fedora doesn't have any QEMU on ppc64 until FC16 - only ppc -%if 0%{?fedora} && 0%{?fedora} < 16 - %ifarch ppc64 - %define with_qemu 0 - %endif -%endif - # Fedora doesn't have new enough Xen for libxl until F18 %if 0%{?fedora} && 0%{?fedora} < 18 %define with_libxl 0 -- 2.0.0

2 2

[libvirt] [PATCH 00/29] vbox: Rewrite several APIs.
by Taowei 18 Jul '14

18 Jul '14

Put exactly one API into one patch. Add a test case to test with vboxUniformedAPI. Taowei (29): vbox: Begin to rewrite, vboxConnectOpen vbox: Add test case for vboxUniformedAPI vbox: Rewrite vboxConnectClose vbox: Rewrite vboxDomainSave vbox: Rewrite vboxConnectGetVersion vbox: Rewrite vboxConnectGetHostname vbox: Rewrite vboxConnectIsSecure vbox: Rewrite vboxConnectIsEncrypted vbox: Rewrite vboxConnectIsAlive vbox: Rewrite vboxConnectGetMaxVcpus vbox: Rewrite vboxConnectGetCapabilities vbox: Rewrite vboxConnectListDomains vbox: Rewrite vboxConnectNumOfDomains vbox: Rewrite vboxDomainLookupById vbox: Rewrite vboxDomainLookupByUUId vbox: Rewrite vboxDomainUndefineFlags vbox: Rewrite vboxDomainDefineXML vbox: Rewrite vboxDomainCreateWithFlags vbox: Rewrite vboxDomainCreate vbox: Rewrite vboxDomainCreateXML vbox: Rewrite vboxDomainLookupByName vbox: Rewrite vboxDomainIsActive vbox: Rewrite vboxDomainIsPersistent vbox: Rewrite vboxDomainIsUpdated vbox: Rewrite vboxDomainSuspend vbox: Rewrite vboxDomainResume vbox: Rewrite vboxDomainShutdownFlags vbox: Rewrite vboxDomainShutdown vbox: Rewrite vboxDomainReboot po/POTFILES.in | 1 + src/Makefile.am | 4 +- src/vbox/vbox_common.c | 2547 ++++++++++++++++++++++++++ src/vbox/vbox_common.h | 261 +++ src/vbox/vbox_driver.c | 23 +- src/vbox/vbox_tmpl.c | 4041 ++++++++++++++++------------------------- src/vbox/vbox_uniformed_api.h | 461 +++++ tests/Makefile.am | 9 +- tests/vboxuniformedapitest.c | 98 + 9 files changed, 4933 insertions(+), 2512 deletions(-) create mode 100644 src/vbox/vbox_common.c create mode 100644 src/vbox/vbox_common.h create mode 100644 src/vbox/vbox_uniformed_api.h create mode 100644 tests/vboxuniformedapitest.c -- 1.7.9.5

1 29

[libvirt] [PATCH] support vhost-scsi controller
by Zhang Min 18 Jul '14

18 Jul '14

libvirt support vhost-scsi controller. The way to config the vhost-scsi controller is edit the xml file, Format is as follows: <controller type='scsi' index='0' model='vhost-scsi'> <source wwpn='naa.6001405f5e3acbba' event_idx='on'/> </controller> the tag of "wwpn" is necessary, the 'model' must be 'vhost-scsi' 'event_idx' is optional. Signed-off-by: Zhang Min <rudy.zhangmin(a)huawei.com> --- src/conf/domain_conf.c | 64 +++++++++++++++++++++++++++++++++++++++-- src/conf/domain_conf.h | 10 ++++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 21 ++++++++++++- src/vmx/vmx.c | 3 +- 6 files changed, 94 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 54925ba..e42ede7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -306,7 +306,8 @@ VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAS "vmpvscsi", "ibmvscsi", "virtio-scsi", - "lsisas1078"); + "lsisas1078", + "vhost-scsi"); VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "piix3-uhci", @@ -1290,6 +1291,10 @@ void virDomainControllerDefFree(virDomainControllerDefPtr def) if (!def) return; + if (def->vhostscsi.wwpn) + VIR_FREE(def->vhostscsi.wwpn); + memset(&def->vhostscsi, 0, sizeof(def->vhostscsi)); + virDomainDeviceInfoClear(&def->info); VIR_FREE(def); @@ -6051,6 +6056,9 @@ virDomainControllerDefParseXML(xmlNodePtr node, char *max_sectors = NULL; xmlNodePtr saved = ctxt->node; int rc; + char *wwpn = NULL; + char *event_idx = NULL; + int event_idx_num = 0; ctxt->node = node; @@ -6087,13 +6095,42 @@ virDomainControllerDefParseXML(xmlNodePtr node, def->model = -1; } + def->vhostscsi.wwpn = NULL; cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { if (xmlStrEqual(cur->name, BAD_CAST "driver")) queues = virXMLPropString(cur, "queues"); - cmd_per_lun = virXMLPropString(cur, "cmd_per_lun"); - max_sectors = virXMLPropString(cur, "max_sectors"); + else if(xmlStrEqual(cur->name, BAD_CAST "source")) { + switch (def->model) { + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VHOST_SCSI: + wwpn = virXMLPropString(cur, "wwpn"); + if (wwpn && !STREQ(wwpn,"")) { + def->vhostscsi.wwpn = wwpn; + wwpn = NULL; + } else { + virReportError(VIR_ERR_XML_ERROR, + _("vhost-scsi:wwpn can't be null")); + goto error; + } + + event_idx = virXMLPropString(cur, "event_idx"); + if (event_idx) { + if ((event_idx_num = virDomainVirtioEventIdxTypeFromString(event_idx)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown vhost-scsi event_idx mode '%s'"), + event_idx); + goto error; + } + def->vhostscsi.event_idx = event_idx_num; + } + break; + default: + break; + } + } + cmd_per_lun = virXMLPropString(cur, "cmd_per_lun"); + max_sectors = virXMLPropString(cur, "max_sectors"); } cur = cur->next; } @@ -6216,6 +6253,12 @@ virDomainControllerDefParseXML(xmlNodePtr node, goto error; } + if (def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VHOST_SCSI && + def->vhostscsi.wwpn == NULL) { + virReportError(VIR_ERR_XML_ERROR,_("vhost-scsi:wwpn can't be null")); + goto error; + } + cleanup: ctxt->node = saved; VIR_FREE(type); @@ -6224,6 +6267,8 @@ virDomainControllerDefParseXML(xmlNodePtr node, VIR_FREE(queues); VIR_FREE(cmd_per_lun); VIR_FREE(max_sectors); + VIR_FREE(wwpn); + VIR_FREE(event_idx); return def; @@ -15300,10 +15345,21 @@ virDomainControllerDefFormat(virBufferPtr buf, break; } - if (def->queues || def->cmd_per_lun || def->max_sectors || + if (def->queues || def->cmd_per_lun || def->max_sectors || def->vhostscsi.wwpn virDomainDeviceInfoIsSet(&def->info, flags) || pcihole64) { virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); + + if (def->vhostscsi.wwpn) { + virBufferAsprintf(buf, " <source wwpn='%s'", def->vhostscsi.wwpn); + + if (def->vhostscsi.event_idx) { + virBufferAsprintf(buf, " event_idx='%s'", + virDomainVirtioEventIdxTypeToString(def->vhostscsi.event_idx)); + } + virBufferAddLit(buf, "/>\n"); + } + if (def->queues) virBufferAsprintf(buf, "<driver queues='%u'/>\n", def->queues); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a00e30a..7b3cfd8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -679,6 +679,7 @@ typedef enum { VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078, + VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VHOST_SCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST } virDomainControllerModelSCSI; @@ -713,6 +714,14 @@ struct _virDomainPCIControllerOpts { unsigned long pcihole64size; }; +/* Stores the vhost-scsi controller configuration */ +typedef struct _virDomainControllerVhostDef virDomainControllerVhostDef; +typedef virDomainControllerVhostDef *virDomainControllerVhostDefPtr; +struct _virDomainControllerVhostDef { + char *wwpn; + int event_idx; +}; + /* Stores the virtual disk controller configuration */ struct _virDomainControllerDef { int type; @@ -721,6 +730,7 @@ struct _virDomainControllerDef { unsigned int queues; unsigned int cmd_per_lun; unsigned int max_sectors; + virDomainControllerVhostDef vhostscsi; union { virDomainVirtioSerialOpts vioserial; virDomainPCIControllerOpts pciopts; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 40ebf29..bf124b7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -258,6 +258,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "host-pci-multidomain", "msg-timestamp", "active-commit", + "vhost-scsi-pci", ); @@ -1445,6 +1446,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-s390", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI }, + { "vhost-scsi-pci", QEMU_CAPS_VHOST_SCSI }, { "megasas", QEMU_CAPS_SCSI_MEGASAS }, { "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC }, { "qxl-vga", QEMU_CAPS_DEVICE_QXL_VGA }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0ea8de8..9eb18f4 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -208,6 +208,7 @@ typedef enum { QEMU_CAPS_HOST_PCI_MULTIDOMAIN = 166, /* support domain > 0 in host pci address */ QEMU_CAPS_MSG_TIMESTAMP = 167, /* -msg timestamp */ QEMU_CAPS_ACTIVE_COMMIT = 168, /* block-commit works without 'top' */ + QEMU_CAPS_VHOST_SCSI = 153, /* -device vhost-scsi-pci */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fb64cda..02edad2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -701,6 +701,14 @@ qemuSetSCSIControllerModel(virDomainDefPtr def, return -1; } break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VHOST_SCSI: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VHOST_SCSI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support " + "vhost scsi controller")); + return -1; + } + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: /*TODO: need checking work here if necessary */ break; @@ -4119,8 +4127,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, virBuffer buf = VIR_BUFFER_INITIALIZER; int model; - if (!(def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && - def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI)) { + if (!((def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) && + (def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI || + def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VHOST_SCSI))) { if (def->queues) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("'queues' is only supported by virtio-scsi controller")); @@ -4157,6 +4166,14 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, else virBufferAddLit(&buf, "virtio-scsi-pci"); break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VHOST_SCSI: + virBufferAddLit(&buf, "vhost-scsi-pci"); + virBufferAsprintf(&buf, ",wwpn=%s", def->vhostscsi.wwpn); + if (def->vhostscsi.event_idx) { + virBufferAsprintf(&buf, ",event_idx=%s", + virDomainVirtioEventIdxTypeToString(def->vhostscsi.event_idx)); + } + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC: virBufferAddLit(&buf, "lsi"); break; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index cd6c51e..ace6ccd 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -517,7 +517,8 @@ VIR_ENUM_IMPL(virVMXControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST, "pvscsi", "UNUSED ibmvscsi", "UNUSED virtio-scsi", - "UNUSED lsisas1078"); + "UNUSED lsisas1078", + "UNUSED vhost-scsi"); /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -- zhang min

1 0

[libvirt] libxl: Enable video device selection for Xen
by Stefan Bader 17 Jul '14

17 Jul '14

Sorry, this fell complete off my todos for a while. So I split off the fixup of VRAM into a separate patch which may or may not be used and only accept vga, xen and cirrus as supported types in the main patch. I believe I saw some discussions about how to fix some of the VRAM values as they are passed into qemu. At least for the Cirrus type I saw that the command line looked ok but the guest was getting a much larger VRAM size than it was told. -Stefan

3 9

[libvirt] [PATCH 0/2] Disallow wiping a sparse logical volume
by John Ferlan 17 Jul '14

17 Jul '14

The first patch just changes 'building' into a bool as that's how I found it used when going to add a new bool for patch 2 Patch 2 addresses the following bz: https://bugzilla.redhat.com/show_bug.cgi?id=1091866 Essentially, wiping the lv caused it to disappear after a vol-refresh. This was because the lv that was created was a sparse (or thin or snapshot via --virtualsize of -V) logical volume. The multiple names are the ways I found the feature described. When the sparse volume was written to by the wipe algorithms it actually filled the volume beyond it's capacity rendering it INACTIVE which causes pool-refresh to ignore it. As it turns out a sparse lv created of size (for example) 4 MiB has metadata contained within the size created. While we could adjust the size of the metadata, control over it's location becomes the issue. It seems there is also some guard data at each end of the sparse lv as when the wipe was done lost I/O messages were sent to the system log. After much searching it just seems that writing a sparse lv with some sort of wipe algorithm will not work. Although if anyone has suggestions I'm willing to try. I have found writing '0x00''s, the scrub utility, and a "dd if=/dev/zero of=/dev/lv_pool/lv_test bs=4096 count=1024" doesn't work. It's also of interest to note that the 'scrub' utility doesn't seem to recognize the logical volume format properly as none of the nonzero algorithms are run - each fails to open the file - for example: $ /usr/sbin/lvcreate --name lv_test -L 4096K lv_pool $ /usr/bin/scrub -f -p bsi /dev/lv_pool/lv_test scrub: using BSI patterns scrub: warning: /dev/lv_pool/lv_test is zero length $ John Ferlan (2): storage: Convert 'building' into a bool storage: Disallow vol_wipe for sparse logical volumes src/conf/storage_conf.h | 2 +- src/storage/storage_backend_logical.c | 39 ++++++++++++++++++++++++++++++++++- src/storage/storage_driver.c | 8 +++---- src/util/virstoragefile.h | 1 + 4 files changed, 44 insertions(+), 6 deletions(-) -- 1.9.3

2 5

[libvirt] [PATCH] examples: Introduce domtop
by Michal Privoznik 17 Jul '14

17 Jul '14

There's this question on the list that is asked over and over again. How do I get {cpu, memory, ...} usage in percentage? Or its modified version: How do I plot nice graphs like virt-manager does? It would be nice if we have an example to inspire people. And that's what domtop should do. Yes, it could be written in different ways, but I've chosen this one as I think it show explicitly what users need to implement in order to imitate virt-manager's graphing. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- .gitignore | 1 + Makefile.am | 2 +- cfg.mk | 2 +- configure.ac | 1 + examples/domtop/Makefile.am | 27 +++ examples/domtop/domtop.c | 388 ++++++++++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 2 +- 7 files changed, 420 insertions(+), 3 deletions(-) create mode 100644 examples/domtop/Makefile.am create mode 100644 examples/domtop/domtop.c diff --git a/.gitignore b/.gitignore index 2d4d401..90fee91 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,7 @@ /examples/dominfo/info1 /examples/domsuspend/suspend /examples/dommigrate/dommigrate +/examples/domtop/domtop /examples/hellolibvirt/hellolibvirt /examples/openauth/openauth /gnulib/lib/* diff --git a/Makefile.am b/Makefile.am index a374e1a..4aafe94 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ examples/dominfo examples/domsuspend examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap \ tools/wireshark examples/dommigrate \ - examples/lxcconvert + examples/lxcconvert examples/domtop ACLOCAL_AMFLAGS = -I m4 diff --git a/cfg.mk b/cfg.mk index baaab71..9880704 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1078,7 +1078,7 @@ exclude_file_name_regexp--sc_prohibit_sprintf = \ exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/virstring\.c$$ exclude_file_name_regexp--sc_prohibit_strtol = \ - ^(src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c)|(examples/domsuspend/suspend.c)$$ + ^(src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c)|(examples/domsuspend/suspend.c)|(examples/domtop/domtop.c)$$ exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/virxml\.c$$ diff --git a/configure.ac b/configure.ac index 8001e24..f37c716 100644 --- a/configure.ac +++ b/configure.ac @@ -2755,6 +2755,7 @@ AC_CONFIG_FILES([\ examples/domsuspend/Makefile \ examples/dominfo/Makefile \ examples/dommigrate/Makefile \ + examples/domtop/Makefile \ examples/openauth/Makefile \ examples/hellolibvirt/Makefile \ examples/systemtap/Makefile \ diff --git a/examples/domtop/Makefile.am b/examples/domtop/Makefile.am new file mode 100644 index 0000000..c5cb6c7 --- /dev/null +++ b/examples/domtop/Makefile.am @@ -0,0 +1,27 @@ +## Process this file with automake to produce Makefile.in + +## Copyright (C) 2014 Red Hat, Inc. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see +## <http://www.gnu.org/licenses/>. + +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include +LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ + $(COVERAGE_LDFLAGS) + +noinst_PROGRAMS=domtop + +domtop_SOURCES=domtop.c +domtop_LDFLAGS= +domtop_LDADD= $(LDADDS) diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c new file mode 100644 index 0000000..fcdcc66 --- /dev/null +++ b/examples/domtop/domtop.c @@ -0,0 +1,388 @@ +/* + * domtop.c: Demo program showing how to calculate CPU usage + * + * Copyright (C) 2014 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> + */ + +#include <errno.h> +#include <getopt.h> +#include <libvirt/libvirt.h> +#include <libvirt/virterror.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/time.h> +#include <signal.h> + +static int debug; +static int run_top = 1; + +#define ERROR(...) \ +do { \ + fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ +} while (0) + +#define DEBUG(...) \ +do { \ + if (!debug) \ + break; \ + fprintf(stderr, "DEBUG %s:%d : ", __FUNCTION__, __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ +} while (0) + +#define STREQ(a,b) (strcmp(a,b) == 0) + +static void +print_usage(const char *progname) +{ + const char *unified_progname; + + if (!(unified_progname = strrchr(progname, '/'))) + unified_progname = progname; + else + unified_progname++; + + printf("\n%s [options] [domain name]\n\n" + " options:\n" + " -d | --debug enable debug printings\n" + " -h | --help print this help\n" + " -c | --connect=URI hypervisor connection URI\n" + " -D | --delay=X delay between updates in miliseconds\n", + unified_progname); +} + +static int +parse_argv(int argc, char *argv[], + const char **uri, + const char **dom_name, + unsigned int *mili_seconds) +{ + int ret = -1; + int arg; + unsigned long val; + char *p; + struct option opt[] = { + {"debug", no_argument, NULL, 'd'}, + {"help", no_argument, NULL, 'h'}, + {"connect", required_argument, NULL, 'c'}, + {"delay", required_argument, NULL, 'D'}, + {NULL, 0, NULL, 0} + }; + + while ((arg = getopt_long(argc, argv, "+:dhc:D:", opt, NULL)) != -1) { + switch (arg) { + case 'd': + debug = 1; + break; + case 'h': + print_usage(argv[0]); + exit(EXIT_SUCCESS); + break; + case 'c': + *uri = optarg; + break; + case 'D': + /* strtoul man page suggest clearing errno prior to call */ + errno = 0; + val = strtoul(optarg, &p, 10); + if (errno || *p || p == optarg) { + ERROR("Invalid number: '%s'", optarg); + goto cleanup; + } + *mili_seconds = val; + if (*mili_seconds != val) { + ERROR("Integer overflow: %ld", val); + goto cleanup; + } + break; + case ':': + ERROR("option '-%c' requires an argument", optopt); + exit(EXIT_FAILURE); + case '?': + if (optopt) + ERROR("unsupported option '-%c'. See --help.", optopt); + else + ERROR("unsupported option '%s'. See --help.", argv[optind - 1]); + exit(EXIT_FAILURE); + default: + ERROR("unknown option"); + exit(EXIT_FAILURE); + } + } + + if (argc > optind) + *dom_name = argv[optind]; + + ret = 0; + cleanup: + return ret; +} + +static int +fetch_domains(virConnectPtr conn) +{ + int num_domains, ret = -1; + virDomainPtr *domains = NULL; + size_t i; + const int list_flags = VIR_CONNECT_LIST_DOMAINS_ACTIVE; + + DEBUG("Fetching list of running domains"); + num_domains = virConnectListAllDomains(conn, &domains, list_flags); + + DEBUG("num_domains=%d", num_domains); + if (num_domains < 0) { + ERROR("Unable to fetch list of running domains"); + goto cleanup; + } + + printf("Running domains:\n"); + printf("----------------\n"); + for (i = 0; i < num_domains; i++) { + virDomainPtr dom = domains[i]; + const char *dom_name = virDomainGetName(dom); + printf("%s\n", dom_name); + virDomainFree(dom); + } + + ret = 0; + cleanup: + free(domains); + return ret; +} + +static void +print_cpu_usage(const char *dom_name, + size_t cpu, + size_t ncpus, + unsigned long long then, + virTypedParameterPtr then_params, + size_t then_nparams, + unsigned long long now, + virTypedParameterPtr now_params, + size_t now_nparams) +{ + size_t i, j, k; + size_t nparams = now_nparams; + + if (then_nparams != now_nparams) { + /* this should not happen (TM) */ + ERROR("parameters counts don't match"); + return; + } + + for (i = 0; i < ncpus; i++) { + size_t pos; + double usage; + + /* check if the vCPU is in the maps */ + if (now_params[i * nparams].type == 0 || + then_params[i * then_nparams].type == 0) + continue; + + for (j = 0; j < nparams; j++) { + pos = i * nparams + j; + if (STREQ(then_params[pos].field, VIR_DOMAIN_CPU_STATS_CPUTIME) || + STREQ(then_params[pos].field, VIR_DOMAIN_CPU_STATS_VCPUTIME)) + break; + } + + if (j == nparams) { + ERROR("unable to find %s", VIR_DOMAIN_CPU_STATS_CPUTIME); + return; + } + + DEBUG("now_params=%llu then_params=%llu now=%llu then=%llu", + now_params[pos].value.ul, then_params[pos].value.ul, now, then); + + /* @now_params and @then_params are in nanoseconds, @now and @then are + * in microseconds. In ideal world, we would translate them both into + * the same scale, divide one by another and multiply by factor of 100 + * to get percentage. However, the count of floating point operations + * performed has a bad affect on the precision, so instead of dividing + * @now_params and @then_params by 1000 and then multiplying again by + * 100, we divide only once by 10 and get the same result. */ + usage = (now_params[pos].value.ul - then_params[pos].value.ul) / + (now - then) / 10; + + printf("CPU%zu: %.2lf\n", cpu + i, usage); + + } + +} + +static void +stop(int sig) +{ + DEBUG("Exiting on signal %d\n", sig); + run_top = 0; +} + +static int +do_top(virConnectPtr conn, + const char *dom_name, + unsigned int mili_seconds) +{ + int ret = -1; + virDomainPtr dom; + int max_id; + int nparams = 0, then_nparams = 0, now_nparams = 0; + virTypedParameterPtr then_params = NULL, now_params = NULL; + struct sigaction action_stop; + + memset(&action_stop, 0, sizeof(action_stop)); + action_stop.sa_handler = stop; + + /* Lookup the domain */ + if (!(dom = virDomainLookupByName(conn, dom_name))) { + ERROR("Unable to find domain '%s'", dom_name); + goto cleanup; + } + + /* and see how many vCPUs can we fetch stats for */ + if ((max_id = virDomainGetCPUStats(dom, NULL, 0, 0, 0, 0)) < 0) { + ERROR("Unable to get cpu stats"); + goto cleanup; + } + + /* how many stats can we get for a vCPU? */ + if ((nparams = virDomainGetCPUStats(dom, NULL, 0, 0, 1, 0)) < 0) { + ERROR("Unable to get cpu stats"); + goto cleanup; + } + + if (!(now_params = calloc(nparams * max_id, sizeof(*now_params))) || + !(then_params = calloc(nparams * max_id, sizeof(*then_params)))) { + ERROR("Unable to allocate memory"); + goto cleanup; + } + + sigaction(SIGTERM, &action_stop, NULL); + sigaction(SIGINT, &action_stop, NULL); + + while (run_top) { + struct timeval then, now; + + /* Get current time */ + if (gettimeofday(&then, NULL) < 0) { + ERROR("unable to get time"); + goto cleanup; + } + + /* And current stats */ + if ((then_nparams = virDomainGetCPUStats(dom, then_params, + nparams, 0, max_id, 0)) < 0) { + ERROR("Unable to get cpu stats"); + goto cleanup; + } + + /* Now sleep some time */ + usleep(mili_seconds * 1000); /* usleep expects microseconds */ + + /* And get current time */ + if (gettimeofday(&now, NULL) < 0) { + ERROR("unable to get time"); + goto cleanup; + } + + /* And current stats */ + if ((now_nparams = virDomainGetCPUStats(dom, now_params, + nparams, 0, max_id, 0)) < 0) { + ERROR("Unable to get cpu stats"); + goto cleanup; + } + + print_cpu_usage(dom_name, 0, max_id, + then.tv_sec * 1000000 + then.tv_usec, + then_params, then_nparams, + now.tv_sec * 1000000 + now.tv_usec, + now_params, now_nparams); + + virTypedParamsClear(now_params, now_nparams * max_id); + virTypedParamsClear(then_params, then_nparams * max_id); + } + + ret = 0; + cleanup: + if (max_id > 0) { + if (now_nparams > 0) + virTypedParamsFree(now_params, now_nparams * max_id); + if (then_nparams > 0) + virTypedParamsFree(then_params, then_nparams * max_id); + } + if (dom) + virDomainFree(dom); + return ret; +} + +int +main(int argc, char *argv[]) +{ + int ret = EXIT_FAILURE; + virConnectPtr conn = NULL; + const char *uri = NULL; + const char *dom_name = NULL; + unsigned int mili_seconds = 500; /* Sleep this long between two API calls */ + const int connect_flags = 0; /* No connect flags for now */ + + if (parse_argv(argc, argv, &uri, &dom_name, &mili_seconds) < 0) + goto cleanup; + + DEBUG("Proceeding with uri=%s dom_name=%s mili_seconds=%u", + uri, dom_name, mili_seconds); + + if (!(conn = virConnectOpenAuth(uri, + virConnectAuthPtrDefault, + connect_flags))) { + ERROR("Failed to connect to hypervisor"); + goto cleanup; + } + + DEBUG("Successfully connected"); + + if (!dom_name) { + if (fetch_domains(conn) == 0) + ret = EXIT_SUCCESS; + goto cleanup; + } + + if (do_top(conn, dom_name, mili_seconds) < 0) + goto cleanup; + + ret = EXIT_SUCCESS; + cleanup: + if (conn) { + int tmp; + tmp = virConnectClose(conn); + if (tmp < 0) { + ERROR("Failed to disconnect from the hypervisor"); + ret = EXIT_FAILURE; + } else if (tmp > 0) { + ERROR("One or more references were leaked after " + "disconnect from the hypervisor"); + ret = EXIT_FAILURE; + } else { + DEBUG("Connection successfully closed"); + } + } + return ret; +} diff --git a/libvirt.spec.in b/libvirt.spec.in index 9c7b241..a456c25 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1507,7 +1507,7 @@ rm -fr %{buildroot} # on RHEL 5, thus we need to expand it here. make install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} -for i in object-events dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap dommigrate +for i in object-events dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap dommigrate domtop do (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) done -- 1.8.5.5

3 3

[libvirt] [PATCH] esx: Fix a comment about VSphere versions
by Geoff Hickey 17 Jul '14

17 Jul '14

Update the VSphere version comment in esx_vi.c for ESX 5.1 and 5.5. --- src/esx/esx_vi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 3f5becb..c02a293 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -4556,12 +4556,14 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersio /* * virtualHW.version compatibility matrix: * - * 4 7 8 API - * ESX 3.5 + 2.5 - * ESX 4.0 + + 4.0 - * ESX 4.1 + + 4.1 - * ESX 5.0 + + + 5.0 - * GSX 2.0 + + 2.5 + * 4 7 8 9 10 API + * ESX 3.5 + 2.5 + * ESX 4.0 + + 4.0 + * ESX 4.1 + + 4.1 + * ESX 5.0 + + + 5.0 + * ESX 5.1 + + + + 5.1 + * ESX 5.5 + + + + + 5.5 + * GSX 2.0 + + 2.5 */ switch (productVersion) { case esxVI_ProductVersion_ESX35: -- 1.9.1

2 1

[libvirt] [PATCH 0/2] virsh: negative numbers for specific commands
by John Ferlan 17 Jul '14

17 Jul '14

Following up to the recently restarted discussion: http://www.redhat.com/archives/libvir-list/2014-July/msg00686.html regarding negative values for certain virsh commands - these patches will document the "feature" of using a negative value to indicate the largest value *and* for the vol-{upload|download} change 'offset' to not accept a negative value. John Ferlan (2): virsh vol-upload/download disallow negative offset virsh: Document bandwidth maximum more clearly tools/virsh-volume.c | 6 +++--- tools/virsh.pod | 33 +++++++++++++++++++++++++++------ 2 files changed, 30 insertions(+), 9 deletions(-) -- 1.9.3

3 6

[libvirt] [PATCH] test: metadata: Improve test coverate
by Peter Krempa 17 Jul '14

17 Jul '14

Test also the TITLE and DESCRIPTION metadata types. --- tests/metadatatest.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/tests/metadatatest.c b/tests/metadatatest.c index 91fc944..a8d8f10 100644 --- a/tests/metadatatest.c +++ b/tests/metadatatest.c @@ -167,6 +167,10 @@ verifyMetadata(virDomainPtr dom, struct metadataTest { virConnectPtr conn; virDomainPtr dom; + + const char *data; + int type; + bool fail; }; @@ -216,6 +220,52 @@ testEraseMetadata(const void *data) } static int +testTextMetadata(const void *data) +{ + const struct metadataTest *test = data; + char *actual = NULL; + int ret = -1; + + if (virDomainSetMetadata(test->dom, test->type, test->data, NULL, NULL, 0) < 0) { + if (test->fail) + return 0; + return -1; + } + + actual = virDomainGetMetadata(test->dom, test->type, NULL, 0); + + if (STRNEQ_NULLABLE(test->data, actual)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "expected metadata doesn't match actual: " + "expected:'%s'\ngot: '%s'", + NULLSTR(test->data), NULLSTR(actual)); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(actual); + + return ret; +} + +#define TEST_TEXT_METADATA(INDEX, TYPE, DATA, FAIL) \ + do { \ + test.type = VIR_DOMAIN_METADATA_ ## TYPE; \ + test.data = DATA; \ + test.fail = FAIL; \ + \ + if (virtTestRun("text metadata: " #TYPE " " INDEX " ", \ + testTextMetadata, &test) < 0) \ + ret = EXIT_FAILURE; \ + } while (0) + +#define TEST_TITLE(INDEX, DATA) TEST_TEXT_METADATA(INDEX, TITLE, DATA, false) +#define TEST_TITLE_FAIL(INDEX, DATA) TEST_TEXT_METADATA(INDEX, TITLE, DATA, true) +#define TEST_DESCR(INDEX, DATA) TEST_TEXT_METADATA(INDEX, DESCRIPTION, DATA, false) + +static int mymain(void) { struct metadataTest test; @@ -238,6 +288,20 @@ mymain(void) if (virtTestRun("Erase metadata ", testEraseMetadata, &test) < 0) ret = EXIT_FAILURE; + TEST_TITLE("1", "qwert"); + TEST_TITLE("2", NULL); + TEST_TITLE("3", "blah"); + TEST_TITLE_FAIL("4", "qwe\nrt"); + TEST_TITLE("5", ""); + TEST_TITLE_FAIL("6", "qwert\n"); + TEST_TITLE_FAIL("7", "\n"); + + TEST_DESCR("1", "qwert\nqwert"); + TEST_DESCR("2", NULL); + TEST_DESCR("3", "qwert"); + TEST_DESCR("4", "\n"); + TEST_DESCR("5", ""); + virDomainFree(test.dom); virConnectClose(test.conn); -- 2.0.0

2 2

[libvirt] virsh capabilities vs. domcapabilities
by Eric Blake 17 Jul '14

17 Jul '14

We have some inconsistencies in the node capabilities (which shows guest capabilities for some default binaries) and domcapabilities (which shows guest capabilities for a specified binary). It might be nicer for client applications if the two XML components share a common schema and output layout, so that the same client code can be used to parse either (sub-tree of) XML, modulo the name of the top-most element containing the tree. Furthermore, I'm trying to figure out how to advertise whether a given domain will support active commit (and similarly, Peter's patches for relative backing name preservation). Advertising the feature just through 'virsh capabilities' is insufficient, because that only covers the default binary; so it seems like the sort of thing that should also be in 'virsh domcapabilities'. Since virConnectGetDomainCapabilities is brand new to 1.2.7, we still have time to change its XML. But I want consensus on whether we need things to match, or whether we intentionally want people to rely only on the newer XML format of the new API call (that is, don't bloat 'virsh capabilities'/virConnectGetCapabilities any further, and learning whether active commit is supported will have to be done via 'virsh domcapabilities'/virConnectGetDomainCapabilities). That is, I'm wondering if <domainCapabilities> should use <capabilities>/<guest> as its starting point, rather than completely inventing new XML. I'm also finding 'virsh domcapabilities' a bit hard to use - even though it allows all its arguments to be optional at the RPC level, the qemu implementation isn't so happy: # tools/virsh domcapabilities error: failed to get emulator capabilities error: virttype_str in qemuConnectGetDomainCapabilities must not be NULL but how am I supposed to know what --virttype strings are valid? # tools/virsh domcapabilities --virttype kvm error: failed to get emulator capabilities error: invalid argument: at least one of emulatorbin or architecture fields must be present Would it be nicer to behave the same as 'virsh capabilities' and give the details of the default binary in this case? Now, for a comparison between the two XML per binary: 'virsh capabilities' gives me this segment: <guest> <os_type>hvm</os_type> <arch name='alpha'> <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-alpha</emulator> <machine maxCpus='4'>clipper</machine> <domain type='qemu'> </domain> </arch> <features> <deviceboot/> <disksnapshot default='on' toggle='no'/> </features> </guest> while 'virsh domcapabilities --emulatorbin /usr/bin/qemu-system-alpha --virttype kvm' gives this: <domainCapabilities> <path>/usr/bin/qemu-system-alpha</path> <domain>kvm</domain> <machine>clipper</machine> <arch>alpha</arch> <vcpu max='4'/> <devices> <disk supported='yes'> <enum name='diskDevice'> <value>disk</value> <value>cdrom</value> <value>floppy</value> <value>lun</value> </enum> <enum name='bus'> <value>ide</value> <value>fdc</value> <value>scsi</value> <value>virtio</value> <value>usb</value> </enum> </disk> <hostdev supported='yes'> <enum name='mode'> <value>subsystem</value> </enum> <enum name='startupPolicy'> <value>default</value> <value>mandatory</value> <value>requisite</value> <value>optional</value> </enum> <enum name='subsysType'> <value>usb</value> <value>pci</value> <value>scsi</value> </enum> <enum name='capsType'/> <enum name='pciBackend'/> </hostdev> </devices> </domainCapabilities> I'm okay that the domcapabilites output is longer, and don't think we need to backport any of the new stuff to the older API. But any information present in the old API should be easily retrieved using the new API, so that the information isn't lost, and so that a client can learn the same amount of detail about a non-default binary as they can about the defaults. Look at the difference in XPath to get to some of the same information: /guest/os_type vs. ? - where is os_type in domcapabilities? /guest/arch@name vs. /domainCapabilities/arch - why is one an attribute and the other an element? /guest/arch/wordsize vs. nothing - where is wordsize in domcapabilities? /guest/arch/emulator vs. /domainCapabilities/path - why 3 levels vs. 2, and different naming? /guest/arch/machine@maxCpus vs. /domainCapabilities/vcpu@max - why 3 levels vs. 2, with different naming? /guest/arch/machine vs. /domainCapabilities/machine - why 3 levels vs. 2? /guest/arch/domain@type vs. /domainCapabilities/domain - why attribute of 3 levels vs. element at 2 levels? And did I expose an error when I passed --virrtype kvm, even though qemu-system-alpha is only a qemu emulator on my machine (since kvm emulators is only for hardware-assit emulation, which is not possible when I'm doing cross architecture)? /guest/features vs. ? - where are the features in domcapabilities? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

3 5

[libvirt] [PATCH] Log an error when we fail to set the COW attribute
by Ján Tomko 17 Jul '14

17 Jul '14

Coverity complains about the return value of ioctl not being checked. Even though we carry on when this fails (just like qemu-img does), we can log an error. --- src/storage/storage_backend.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 5e7aa3c..b8b89ca 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -464,9 +464,14 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED, * The FS_IOC_SETFLAGS ioctl return value will be ignored since any * failure of this operation should not block the left work. */ - if (ioctl(fd, FS_IOC_GETFLAGS, &attr) == 0) { + if (ioctl(fd, FS_IOC_GETFLAGS, &attr) < 0) { + virReportSystemError(errno, "%s", _("Failed to get fs flags")); + } else { attr |= FS_NOCOW_FL; - ioctl(fd, FS_IOC_SETFLAGS, &attr); + if (ioctl(fd, FS_IOC_SETFLAGS, &attr) < 0) { + virReportSystemError(errno, "%s", + _("Failed to set NOCOW flag")); + } } #endif } -- 1.8.5.5

2 2

[libvirt] [PATCH V3 0/2] storagevol: add 'nocow' option to vol xml
by Chunyan Liu 17 Jul '14

17 Jul '14

Add 'nocow' option to vol xml, so that user can have a chance to create a volume with NOCOW flag set on btrfs. It improves performance when the volume is a file image on btrfs and is used in VM environment. --- Changes: * fix typo in V2 * add test case for 'nocow', in separate patch V2 is here: http://www.redhat.com/archives/libvir-list/2014-July/msg00361.html Chunyan Liu (2): storagevol: add nocow to vol xml add nocow test case docs/formatstorage.html.in | 7 +++++ docs/schemas/storagevol.rng | 5 ++++ src/conf/storage_conf.c | 3 ++ src/storage/storage_backend.c | 22 +++++++++++++++ src/util/virstoragefile.h | 1 + .../storagevolxml2argvdata/qcow2-nocow-compat.argv | 3 ++ tests/storagevolxml2argvdata/qcow2-nocow.argv | 3 ++ tests/storagevolxml2argvtest.c | 6 ++++ tests/storagevolxml2xmlin/vol-qcow2-nocow.xml | 32 ++++++++++++++++++++++ tests/storagevolxml2xmlout/vol-qcow2-nocow.xml | 31 +++++++++++++++++++++ 10 files changed, 113 insertions(+) create mode 100644 tests/storagevolxml2argvdata/qcow2-nocow-compat.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nocow.argv create mode 100644 tests/storagevolxml2xmlin/vol-qcow2-nocow.xml create mode 100644 tests/storagevolxml2xmlout/vol-qcow2-nocow.xml -- 1.8.4.5

3 4

[libvirt] Schedule for the next release 1.2.7
by Daniel Veillard 17 Jul '14

17 Jul '14

Plan is to get the new release on Friday Aug 1st, so I think this mean entering freeze at some point on the preceeding week-end, I will be travelling then, but I should be able to do that at some point saturday 26. We already have 180 commits in since 1.2.6 so deinitely makes sense to push this month too, thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCHv2 0/2] storage: Don't wipe volumes on remote filesystems with local tools
by Peter Krempa 17 Jul '14

17 Jul '14

Version 2 now splits the stuff into separate driver backend funcs. Peter Krempa (2): storage: wipe: Move helper code into storage backend storage: Split out volume wiping as separate backend function src/storage/storage_backend.c | 203 +++++++++++++++++++++++++++++++++ src/storage/storage_backend.h | 12 ++ src/storage/storage_backend_disk.c | 1 + src/storage/storage_backend_fs.c | 3 + src/storage/storage_backend_iscsi.c | 1 + src/storage/storage_backend_logical.c | 1 + src/storage/storage_backend_mpath.c | 1 + src/storage/storage_backend_scsi.c | 1 + src/storage/storage_driver.c | 205 +--------------------------------- 9 files changed, 229 insertions(+), 199 deletions(-) -- 2.0.0

2 4

[libvirt] [PATCH] esx: Fix a bug in the XML code for storage pools
by Geoff Hickey 16 Jul '14

16 Jul '14

For ESX, the code that builds XML descriptions for attached storage pools was not setting the host count to anything when it returned a host name. --- src/esx/esx_storage_backend_vmfs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index 6bed3ce..cf0da84 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -488,6 +488,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) if (VIR_ALLOC_N(def.source.hosts, 1) < 0) goto cleanup; def.type = VIR_STORAGE_POOL_NETFS; + def.source.nhost = 1; def.source.hosts[0].name = nasInfo->nas->remoteHost; def.source.dir = nasInfo->nas->remotePath; -- 1.9.1

2 1

[libvirt] [PATCH v2] support for QEMU vhost-user
by Michele Paolino 16 Jul '14

16 Jul '14

This patch adds support for the QEMU vhost-user feature to libvirt. vhost-user enables the communication between a QEMU virtual machine and other userspace process using the Virtio transport protocol. It uses a char dev (e.g. Unix socket) for the control plane, while the data plane based on shared memory. The XML looks like: <interface type='vhostuser'> <source type='unix' path='/tmp/vhost.sock' mode='server'/> <mac address='52:54:00:3b:83:1a'/> <model type='virtio'/> </interface> changes from v1: * addressed comments * removed unnecessary checks * series merged in a single patch The previous version of this patch can be found at: http://www.redhat.com/archives/libvir-list/2014-July/msg00111.html Signed-off-by: Michele Paolino <m.paolino(a)virtualopensystems.com> --- docs/formatdomain.html.in | 34 +++++++++ docs/schemas/domaincommon.rng | 25 +++++++ src/conf/domain_conf.c | 87 ++++++++++++++++++++++ src/conf/domain_conf.h | 10 ++- src/libxl/libxl_conf.c | 1 + src/lxc/lxc_process.c | 1 + src/qemu/qemu_command.c | 63 ++++++++++++++++ src/uml/uml_conf.c | 5 ++ src/xenxs/xen_sxpr.c | 1 + .../qemuxml2argv-net-vhostuser.args | 7 ++ .../qemuxml2argv-net-vhostuser.xml | 33 ++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 13 files changed, 267 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3f8bbee..606b7d4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3927,6 +3927,40 @@ qemu-kvm -net nic,model=? /dev/null <span class="since">Since 0.9.5</span> </p> + <h5><a name="elementVhostuser">vhost-user interface</a></h5> + + <p> + vhost-user enables the communication between a QEMU virtual machine + and other userspace process using the Virtio transport protocol. + A char dev (e.g. Unix socket) is used for the control plane, while + the data plane is based on shared memory. + </p> + +<pre> + ... + <devices> + <interface type='vhostuser'> + <source type='unix' path='/tmp/vhost.sock' mode='server'> + </source> + <mac address='52:54:00:3b:83:1a'> + </mac> + <model type='virtio'> + </model> + </interface> + </devices> + ...</pre> + + <p> + The <code><source></code> element has to be specified + along with the type of char device. + Currently, only type='unix' is supported, where the path (the + directory path of the socket) and mode attributes are required. + Both <code>mode='server'</code> and <code>mode='client'</code> + are supported. + vhost-user requires the virtio model type, thus the + <code><model></code> element is mandatory. + </p> + <h4><a name="elementsInput">Input devices</a></h4> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index af51eee..c9c02b6 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1968,6 +1968,31 @@ </group> <group> <attribute name="type"> + <value>vhostuser</value> + </attribute> + <interleave> + <element name="source"> + <attribute name="type"> + <choice> + <value>unix</value> + </choice> + </attribute> + <attribute name="path"> + <ref name="absFilePath"/> + </attribute> + <attribute name="mode"> + <choice> + <value>server</value> + <value>client</value> + </choice> + </attribute> + <empty/> + </element> + <ref name="interface-options"/> + </interleave> + </group> + <group> + <attribute name="type"> <value>network</value> </attribute> <interleave> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8df43b7..fb286c6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -349,6 +349,7 @@ VIR_ENUM_IMPL(virDomainFSWrpolicy, VIR_DOMAIN_FS_WRPOLICY_LAST, VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "user", "ethernet", + "vhostuser", "server", "client", "mcast", @@ -1361,6 +1362,10 @@ void virDomainNetDefFree(virDomainNetDefPtr def) VIR_FREE(def->data.ethernet.ipaddr); break; + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + virDomainChrSourceDefFree(def->data.vhostuser); + break; + case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: @@ -6665,6 +6670,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *mode = NULL; char *linkstate = NULL; char *addrtype = NULL; + char *vhostuser_mode = NULL; + char *vhostuser_path = NULL; + char *vhostuser_type = NULL; virNWFilterHashTablePtr filterparams = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; @@ -6710,6 +6718,12 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, xmlStrEqual(cur->name, BAD_CAST "source")) { dev = virXMLPropString(cur, "dev"); mode = virXMLPropString(cur, "mode"); + } else if (!vhostuser_path && !vhostuser_mode && !vhostuser_type + && def->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && + xmlStrEqual(cur->name, BAD_CAST "source")) { + vhostuser_type = virXMLPropString(cur, "type"); + vhostuser_path = virXMLPropString(cur, "path"); + vhostuser_mode = virXMLPropString(cur, "mode"); } else if (!def->virtPortProfile && xmlStrEqual(cur->name, BAD_CAST "virtualport")) { if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) { @@ -6867,6 +6881,65 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, actual = NULL; break; + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + if (STRNEQ_NULLABLE(model, "virtio")) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Wrong or no <model> 'type' attribute " + "specified with <interface type='vhostuser'/>. " + "vhostuser requires the virtio-net* frontend")); + goto error; + } + + if (STRNEQ_NULLABLE(vhostuser_type, "unix")) { + if (vhostuser_type) + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Type='%s' unsupported for" + " <interface type='vhostuser'>"), + vhostuser_type); + else + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("No <source> 'type' attribute " + "specified for <interface " + "type='vhostuser'>")); + goto error; + } + + if (vhostuser_path == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("No <source> 'path' attribute " + "specified with <interface " + "type='vhostuser'/>")); + goto error; + } + + if (vhostuser_mode == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("No <source> 'mode' attribute " + "specified with <interface " + "type='vhostuser'/>")); + goto error; + } + + if (VIR_ALLOC(def->data.vhostuser) < 0) + goto error; + + def->data.vhostuser->type = VIR_DOMAIN_CHR_TYPE_UNIX; + def->data.vhostuser->data.nix.path = vhostuser_path; + + if (STREQ(vhostuser_mode, "server")) + def->data.vhostuser->data.nix.listen = true; + else if (STREQ(vhostuser_mode, "client")) + def->data.vhostuser->data.nix.listen = false; + else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Wrong <source> 'mode' attribute " + "specified with <interface " + "type='vhostuser'/>")); + goto error; + } + vhostuser_path = NULL; + break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: if (dev != NULL) { def->data.ethernet.dev = dev; @@ -7112,6 +7185,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(portgroup); VIR_FREE(address); VIR_FREE(port); + VIR_FREE(vhostuser_type); + VIR_FREE(vhostuser_path); + VIR_FREE(vhostuser_mode); VIR_FREE(ifname); VIR_FREE(dev); virDomainActualNetDefFree(actual); @@ -15987,6 +16063,17 @@ virDomainNetDefFormat(virBufferPtr buf, def->data.ethernet.ipaddr); break; + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + if (def->data.vhostuser->type == VIR_DOMAIN_CHR_TYPE_UNIX) { + virBufferAddLit(buf, "<source type='unix'"); + virBufferEscapeString(buf, " path='%s'", + def->data.vhostuser->data.nix.path); + if (def->data.vhostuser->data.nix.listen) + virBufferAddLit(buf, " mode='server'"); + virBufferAddLit(buf, "/>\n"); + } + break; + case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferEscapeString(buf, "<source bridge='%s'/>\n", def->data.bridge.brname); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index eb5bad7..91f7524 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -133,6 +133,12 @@ typedef virDomainIdMapDef *virDomainIdMapDefPtr; typedef struct _virDomainPanicDef virDomainPanicDef; typedef virDomainPanicDef *virDomainPanicDefPtr; +/* forward declarations virDomainChrSourceDef, required by + * virDomainNetDef + */ +typedef struct _virDomainChrSourceDef virDomainChrSourceDef; +typedef virDomainChrSourceDef *virDomainChrSourceDefPtr; + /* Flags for the 'type' field in virDomainDeviceDef */ typedef enum { VIR_DOMAIN_DEVICE_NONE = 0, @@ -795,6 +801,7 @@ struct _virDomainFSDef { typedef enum { VIR_DOMAIN_NET_TYPE_USER, VIR_DOMAIN_NET_TYPE_ETHERNET, + VIR_DOMAIN_NET_TYPE_VHOSTUSER, VIR_DOMAIN_NET_TYPE_SERVER, VIR_DOMAIN_NET_TYPE_CLIENT, VIR_DOMAIN_NET_TYPE_MCAST, @@ -880,6 +887,7 @@ struct _virDomainNetDef { char *dev; char *ipaddr; } ethernet; + virDomainChrSourceDefPtr vhostuser; struct { char *address; int port; @@ -1006,8 +1014,6 @@ typedef enum { } virDomainChrSpicevmcName; /* The host side information for a character device. */ -typedef struct _virDomainChrSourceDef virDomainChrSourceDef; -typedef virDomainChrSourceDef *virDomainChrSourceDefPtr; struct _virDomainChrSourceDef { int type; /* virDomainChrType */ union { diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 4b6b5c0..c196136 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -955,6 +955,7 @@ libxlMakeNic(virDomainDefPtr def, return -1; break; } + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 0aef13a..854f65d 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -437,6 +437,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_ETHERNET: + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index af4d009..e2d4645 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6923,6 +6923,66 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg, } static int +qemuBuildVhostuserCommandLine(virCommandPtr cmd, + virDomainDefPtr def, + virDomainNetDefPtr net, + virQEMUCapsPtr qemuCaps) +{ + virBuffer chardev_buf = VIR_BUFFER_INITIALIZER; + virBuffer netdev_buf = VIR_BUFFER_INITIALIZER; + + char* nic = NULL; + char* str = NULL; + + if (!qemuDomainSupportsNetdev(def, qemuCaps, net)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Netdev support unavailable")); + goto error; + } + + if (net->data.vhostuser->type == VIR_DOMAIN_CHR_TYPE_UNIX) { + virBufferAsprintf(&chardev_buf, "socket,id=char%s,path=%s%s", + net->info.alias, net->data.vhostuser->data.nix.path, + net->data.vhostuser->data.nix.listen ? ",server" : ""); + } + + virBufferAsprintf(&netdev_buf, "type=vhost-user,id=host%s,chardev=char%s", + net->info.alias, net->info.alias); + + if (virBufferError(&chardev_buf) || virBufferError(&netdev_buf)) { + virReportOOMError(); + goto error; + } + + str = virBufferContentAndReset(&chardev_buf); + virCommandAddArgList(cmd, "-chardev", str, NULL); + VIR_FREE(str); + + str = virBufferContentAndReset(&netdev_buf); + virCommandAddArgList(cmd, "-netdev", str, NULL); + VIR_FREE(str); + + if (!(nic = qemuBuildNicDevStr(def, net, -1, 0, 0, qemuCaps))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Error generating NIC -device string")); + goto error; + } + + virCommandAddArgList(cmd, "-device", nic, NULL); + VIR_FREE(nic); + + return 0; + + error: + virBufferFreeAndReset(&chardev_buf); + virBufferFreeAndReset(&netdev_buf); + VIR_FREE(nic); + VIR_FREE(str); + + return -1; +} + +static int qemuBuildInterfaceCommandLine(virCommandPtr cmd, virQEMUDriverPtr driver, virConnectPtr conn, @@ -6945,6 +7005,9 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, int actualType = virDomainNetGetActualType(net); size_t i; + if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) + return qemuBuildVhostuserCommandLine(cmd, def, net, qemuCaps); + if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) { /* NET_TYPE_HOSTDEV devices are really hostdev devices, so * their commandlines are constructed with other hostdevs. diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 464d56d..d33d9b4 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -182,6 +182,11 @@ umlBuildCommandLineNet(virConnectPtr conn, } break; + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("vhostuser networking type not supported")); + goto error; + case VIR_DOMAIN_NET_TYPE_SERVER: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("TCP server networking type not supported")); diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index aacf74c..fe49c42 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -1933,6 +1933,7 @@ xenFormatSxprNet(virConnectPtr conn, virBufferEscapeSexpr(buf, "(ip '%s')", def->data.ethernet.ipaddr); break; + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args new file mode 100644 index 0000000..cc66ec3 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args @@ -0,0 +1,7 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ +-chardev socket,id=charnet0,path=/tmp/vhost.sock,server \ +-netdev type=vhost-user,id=hostnet0,chardev=charnet0 \ +-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml new file mode 100644 index 0000000..b49d48e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <interface type='vhostuser'> + <mac address='52:54:00:ee:96:6b'/> + <source type='unix' path='/tmp/vhost.sock' mode='server'/> + <model type='virtio'/> + </interface> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d5066d2..2099624 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -927,6 +927,7 @@ mymain(void) DO_TEST_FAILURE("misc-enable-s4", NONE); DO_TEST("misc-no-reboot", NONE); DO_TEST("misc-uuid", QEMU_CAPS_NAME, QEMU_CAPS_UUID); + DO_TEST("net-vhostuser", QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV); DO_TEST("net-user", NONE); DO_TEST("net-virtio", NONE); DO_TEST("net-virtio-device", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 200d50f..359125a 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -245,6 +245,7 @@ mymain(void) DO_TEST("misc-disable-suspends"); DO_TEST("misc-enable-s4"); DO_TEST("misc-no-reboot"); + DO_TEST("net-vhostuser"); DO_TEST("net-user"); DO_TEST("net-virtio"); DO_TEST("net-virtio-device"); -- 1.9.3

2 1

[libvirt] Changing the default qemu path in libvirt
by satheesh 16 Jul '14

16 Jul '14

Hi All, I would like to change the default qemu path in libvirt xml and the changed path has to be used while installing VMs using virt-install. There was a similar question rasied some years back, I could not find the answer to the same. http://www.redhat.com/archives/libvir-list/2011-December/msg01100.html Is that possible right now?, If we have the support already, please point to the same. Thanks in advance. Regards, -Satheesh.

2 1

[libvirt] [PATCH 0/3] LXC guest network device name changes
by Cédric Bosdonnat 16 Jul '14

16 Jul '14

This patch series allows users to configure the network device name in the LXC container. I intentionaly didn't allow this for hostdev net interfaces as the NIC would be returned with a different name to the host and we have no way to guess under what name it was returned to the host namespace. This will help filling the feature gap with LXC WRT network configuration. Cédric Bosdonnat (3): lxc network configuration allows setting target container NIC name lxc conf2xml: convert lxc.network.name for veth networks lxc network device names change documentation docs/formatdomain.html.in | 17 +++++++++++++ docs/schemas/domaincommon.rng | 17 +++++++++++++ src/conf/domain_conf.c | 27 ++++++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/lxc/lxc_container.c | 29 +++++++++++++++++++--- src/lxc/lxc_native.c | 22 +++++++++++----- src/lxc/lxc_process.c | 25 +++++++++++++++++++ .../lxcconf2xmldata/lxcconf2xml-physnetwork.config | 1 + tests/lxcconf2xmldata/lxcconf2xml-simple.xml | 1 + tests/lxcxml2xmldata/lxc-idmap.xml | 1 + 10 files changed, 132 insertions(+), 10 deletions(-) -- 1.8.4.5

5 8

[libvirt] [PATCH 0/8] Add support for setting DAC permissions on remote filesystems
by Peter Krempa 16 Jul '14

16 Jul '14

Peter Krempa (8): storage: Implement storage driver helper to chown disk images storage: Add witness for checking storage volume use in security driver security: DAC: Remove superfluous link resolution security: DAC: Introduce callback to perform image chown security: DAC: Plumb usage of chown callback qemu: Implement DAC driver chown callback to co-operate with storage drv storage: Implement virStorageFileCreate for local and gluster files qemu: snapshot: Use storage driver to pre-create snapshot file src/qemu/qemu_driver.c | 66 ++++++++++++++++---- src/security/security_dac.c | 109 +++++++++++++++++++++++----------- src/security/security_dac.h | 3 + src/security/security_manager.c | 4 +- src/security/security_manager.h | 19 +++++- src/storage/storage_backend.h | 6 ++ src/storage/storage_backend_fs.c | 29 +++++++++ src/storage/storage_backend_gluster.c | 27 +++++++++ src/storage/storage_driver.c | 58 ++++++++++++++++++ src/storage/storage_driver.h | 3 + 10 files changed, 277 insertions(+), 47 deletions(-) -- 2.0.0

1 9

[libvirt] [PATCHv3 0/2] virsh: Fix negative value parsing in vcpuinfo
by Peter Krempa 16 Jul '14

16 Jul '14

Jincheng Miao (1): virsh: forbid negative vcpu argument to vcpupin Peter Krempa (1): virsh: Reject negative numbers in vshCommandOptUInt tests/vcpupin | 29 ++++++++++++++++++++++++++++- tools/virsh-domain.c | 35 ++++++++++++++++++----------------- tools/virsh.c | 4 ++-- 3 files changed, 48 insertions(+), 20 deletions(-) -- 1.9.3

3 7

[libvirt] [PREPOST 01/17] src/xenxs:Introduce function
by David Kiarie 16 Jul '14

16 Jul '14

From: Kiarie Kahurani <davidkiarie4(a)gmail.com> Introduce function xenParseXMGeneral(virConfPtr conf, ...); This function parses the xm general options such as uuid and name signed-off-by: David Kiarie <davidkiarie4(a)gmail.com> --- src/xenxs/xen_xm.c | 65 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index 25a042d..1953a85 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -253,44 +253,25 @@ xenXMConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid) * Turn a config record into a lump of XML describing the * domain, suitable for later feeding for virDomainCreateXML */ -virDomainDefPtr -xenParseXM(virConfPtr conf, int xendConfigVersion, - virCapsPtr caps) +static int xenParseXMGeneral(virConfPtr conf, virDomainDefPtr def, + virCapsPtr caps) { + + const char *defaultMachine; const char *str; int hvm = 0; - int val; - virConfValuePtr list; - virDomainDefPtr def = NULL; - virDomainDiskDefPtr disk = NULL; - virDomainNetDefPtr net = NULL; - virDomainGraphicsDefPtr graphics = NULL; - virDomainHostdevDefPtr hostdev = NULL; - size_t i; - const char *defaultMachine; - int vmlocaltime = 0; - unsigned long count; - char *script = NULL; - char *listenAddr = NULL; - - if (VIR_ALLOC(def) < 0) - return NULL; - - def->virtType = VIR_DOMAIN_VIRT_XEN; - def->id = -1; if (xenXMConfigCopyString(conf, "name", &def->name) < 0) - goto cleanup; + return -1; if (xenXMConfigGetUUID(conf, "uuid", def->uuid) < 0) - goto cleanup; - + return -1; if ((xenXMConfigGetString(conf, "builder", &str, "linux") == 0) && STREQ(str, "hvm")) hvm = 1; if (VIR_STRDUP(def->os.type, hvm ? "hvm" : "xen") < 0) - goto cleanup; + return -1; def->os.arch = virCapabilitiesDefaultGuestArch(caps, @@ -300,7 +281,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, virReportError(VIR_ERR_INTERNAL_ERROR, _("no supported architecture for os type '%s'"), def->os.type); - goto cleanup; + return -1; } defaultMachine = virCapabilitiesDefaultGuestMachine(caps, @@ -309,9 +290,37 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, virDomainVirtTypeToString(def->virtType)); if (defaultMachine != NULL) { if (VIR_STRDUP(def->os.machine, defaultMachine) < 0) - goto cleanup; + return -1; } + return 0; +} +virDomainDefPtr +xenParseXM(virConfPtr conf, int xendConfigVersion, + virCapsPtr caps) +{ + const char *str; + int hvm = 0; + int val; + virConfValuePtr list; + virDomainDefPtr def = NULL; + virDomainDiskDefPtr disk = NULL; + virDomainNetDefPtr net = NULL; + virDomainGraphicsDefPtr graphics = NULL; + virDomainHostdevDefPtr hostdev = NULL; + size_t i; + int vmlocaltime = 0; + unsigned long count; + char *script = NULL; + char *listenAddr = NULL; + + if (VIR_ALLOC(def) < 0) + return NULL; + def->virtType = VIR_DOMAIN_VIRT_XEN; + def->id = -1; + if (xenParseXMGeneral(conf, def, caps) < 0) + goto cleanup; + hvm = (STREQ(def->os.type, "hvm")); if (hvm) { const char *boot; if (xenXMConfigCopyString(conf, "kernel", &def->os.loader) < 0) -- 1.8.4.5

4 42

[libvirt] [PATCH] blockjob: wait for pivot to complete
by Eric Blake 16 Jul '14

16 Jul '14

https://bugzilla.redhat.com/show_bug.cgi?id=1119173 documents that commit eaba79d was flawed in the implementation of the VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC flag when it comes to completing a blockcopy. Basically, the qemu pivot action is async (the QMP command returns immediately, but the user must wait for the BLOCK_JOB_COMPLETE event to know that all I/O related to the job has finally been flushed), but the libvirt command was documented as synchronous by default. As active block commit will also be using this code, it is worth fixing now. * src/qemu/qemu_driver.c (qemuDomainBlockJobImpl): Don't skip wait loop after pivot. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Shown here with extra context, to hopefully aid the review. src/qemu/qemu_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ecccf6c..300e49e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14973,45 +14973,45 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, if (!device) goto endjob; disk = vm->def->disks[idx]; if (mode == BLOCK_JOB_PULL && disk->mirror) { virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, _("disk '%s' already in active block job"), disk->dst); goto endjob; } if (mode == BLOCK_JOB_ABORT && (flags & VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT) && !(async && disk->mirror)) { virReportError(VIR_ERR_OPERATION_INVALID, _("pivot of disk '%s' requires an active copy job"), disk->dst); goto endjob; } if (disk->mirror && mode == BLOCK_JOB_ABORT && (flags & VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT)) { ret = qemuDomainBlockPivot(conn, driver, vm, device, disk); - goto endjob; + goto waitjob; } if (base && (virStorageFileParseChainIndex(disk->dst, base, &baseIndex) < 0 || !(baseSource = virStorageFileChainLookup(disk->src, disk->src, base, baseIndex, NULL)))) goto endjob; if (baseSource) { if (qemuGetDriveSourceString(baseSource, NULL, &basePath) < 0) goto endjob; if (flags & VIR_DOMAIN_BLOCK_REBASE_RELATIVE) { if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHANGE_BACKING_FILE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this QEMU binary doesn't support relative " "block pull/rebase")); goto endjob; } if (virStorageFileGetRelativeBackingPath(disk->src->backingStore, baseSource, @@ -15030,44 +15030,45 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorBlockJob(priv->mon, device, basePath, backingPath, bandwidth, info, mode, async); qemuDomainObjExitMonitor(driver, vm); if (ret < 0) goto endjob; /* Snoop block copy operations, so future cancel operations can * avoid checking if pivot is safe. */ if (mode == BLOCK_JOB_INFO && ret == 1 && disk->mirror && info->cur == info->end && info->type == VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) disk->mirroring = true; /* A successful block job cancelation stops any mirroring. */ if (mode == BLOCK_JOB_ABORT && disk->mirror) { /* XXX We should also revoke security labels and disk lease on * the mirror, and audit that fact, before dropping things. */ virStorageSourceFree(disk->mirror); disk->mirror = NULL; disk->mirroring = false; } + waitjob: /* With synchronous block cancel, we must synthesize an event, and * we silently ignore the ABORT_ASYNC flag. With asynchronous * block cancel, the event will come from qemu, but without the * ABORT_ASYNC flag, we must block to guarantee synchronous * operation. We do the waiting while still holding the VM job, * to prevent newly scheduled block jobs from confusing us. */ if (mode == BLOCK_JOB_ABORT) { if (!async) { /* Older qemu that lacked async reporting also lacked * active commit, so we can hardcode the event to pull. * We have to generate two variants of the event. */ int type = VIR_DOMAIN_BLOCK_JOB_TYPE_PULL; int status = VIR_DOMAIN_BLOCK_JOB_CANCELED; event = virDomainEventBlockJobNewFromObj(vm, disk->src->path, type, status); event2 = virDomainEventBlockJob2NewFromObj(vm, disk->dst, type, status); } else if (!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC)) { while (1) { /* Poll every 50ms */ static struct timespec ts = { .tv_sec = 0, .tv_nsec = 50 * 1000 * 1000ull }; -- 1.9.3

2 2

[libvirt] [PATCH v2] util: forbid freeing const pointers
by Eric Blake 16 Jul '14

16 Jul '14

Now that we've finally fixed all the violators, it's time to enforce that any pointer to a const object is never freed (it is aliasing some other memory, where the non-const original should be freed instead). Alas, the code still needs a normal vs. Coverity version, but at least we are still guaranteeing that the macro call evaluates its argument exactly once. I verified that we still get the following compiler warnings, which in turn halts the build thanks to -Werror on gcc (hmm, gcc 4.8.3's placement of the ^ for ?: type mismatch is a bit off, but that's not our problem): int oops1 = 0; VIR_FREE(oops1); const char *oops2 = NULL; VIR_FREE(oops2); struct blah { int dummy; } oops3; VIR_FREE(oops3); util/virauthconfig.c:159:35: error: pointer/integer type mismatch in conditional expression [-Werror] VIR_FREE(oops1); ^ util/virauthconfig.c:161:5: error: passing argument 1 of 'virFree' discards 'const' qualifier from pointer target type [-Werror] VIR_FREE(oops2); ^ In file included from util/virauthconfig.c:28:0: util/viralloc.h:79:6: note: expected 'void *' but argument is of type 'const void *' void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); ^ util/virauthconfig.c:163:35: error: type mismatch in conditional expression VIR_FREE(oops3); ^ * src/util/viralloc.h (VIR_FREE): No longer cast away const. * src/xenapi/xenapi_utils.c (xenSessionFree): Work around bogus header. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: this depends on the existing 1/4, while being a replacement to all of 2-4/4 at once. https://www.redhat.com/archives/libvir-list/2014-July/msg00716.html src/util/viralloc.h | 11 +++++------ src/xenapi/xenapi_utils.c | 4 +++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/util/viralloc.h b/src/util/viralloc.h index 7125e67..bf85c16 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -548,18 +548,17 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); * This macro is safe to use on arguments with side effects. */ # if !STATIC_ANALYSIS -/* The ternary ensures that ptr is a pointer and not an integer type, - * while evaluating ptr only once. This gives us extra compiler - * safety when compiling under gcc. For now, we intentionally cast - * away const, since a number of callers safely pass const char *. +/* The ternary ensures that ptr is a non-const pointer and not an + * integer type, all while evaluating ptr only once. This gives us + * extra compiler safety when compiling under gcc. */ -# define VIR_FREE(ptr) virFree((void *) (1 ? (const void *) &(ptr) : (ptr))) +# define VIR_FREE(ptr) virFree(1 ? (void *) &(ptr) : (ptr)) # else /* The Coverity static analyzer considers the else path of the "?:" and * flags the VIR_FREE() of the address of the address of memory as a * RESOURCE_LEAK resulting in numerous false positives (eg, VIR_FREE(&ptr)) */ -# define VIR_FREE(ptr) virFree((void *) &(ptr)) +# define VIR_FREE(ptr) virFree(&(ptr)) # endif void virAllocTestInit(void); diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index a80d136..ef89f42 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -44,13 +44,15 @@ void xenSessionFree(xen_session *session) { size_t i; + char *tmp; if (session->error_description != NULL) { for (i = 0; i < session->error_description_count; i++) VIR_FREE(session->error_description[i]); VIR_FREE(session->error_description); } /* The session_id member is type of 'const char *'. Sigh. */ - VIR_FREE(session->session_id); + tmp = (char *)session->session_id; + VIR_FREE(tmp); VIR_FREE(session); } -- 1.9.3

2 2