- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: capabilities detection for 0.15 through 1.1
by Doug Goldstein 02 Nov '12

02 Nov '12

With the introduction of the new capabilities storage relying on QMP we lost some insight into features available between 0.15 and 1.1. We use QMP on these versions but only when we go to start the actual guest rather than for querying up front. The issue is help scraping isn't an exact science while QMP is an exact science. The issue with the existing approach of checking QMP on startup is that if the command is really not there, then we never clear the bit. An example of this being a problem in on Ubuntu 12.04 LTS where the default qemu-kvm package does not include SPICE support but -help claims that it does (because -help always advertises SPICE support). So the user does not get to see our helpful message when they attempt to start up a SPICE based domain without having SPICE support. --- Really hoping a Ubuntu 12.04 user or Ubuntu developer can test this out and see if this remedies the issue. There's a long list of issues opened on Launchpad with this bug. I believe where this fix really remedies things for people is when they're using -vga std instead of -vga qxl. Due to the fact that qxl will have a spicevmc device that just won't work so they'll at least get notification that way. -vga std will result in no message and the domain not working. --- src/qemu/qemu_capabilities.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 271273c..37b50c1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1871,6 +1871,21 @@ qemuCapsProbeQMPCommands(qemuCapsPtr caps, if ((ncommands = qemuMonitorGetCommands(mon, &commands)) < 0) return -1; + /* We want to clear these capabilities out so we can properly + * detect them. Otherwise if they're already set and we don't + * detect them, the bit won't clear. + */ + qemuCapsClear(caps, QEMU_CAPS_WAKEUP); + qemuCapsClear(caps, QEMU_CAPS_TRANSACTION); + qemuCapsClear(caps, QEMU_CAPS_BLOCKJOB_SYNC); + qemuCapsClear(caps, QEMU_CAPS_BLOCKJOB_ASYNC); + qemuCapsClear(caps, QEMU_CAPS_DUMP_GUEST_MEMORY); + qemuCapsClear(caps, QEMU_CAPS_SPICE); + qemuCapsClear(caps, QEMU_CAPS_KVM); + qemuCapsClear(caps, QEMU_CAPS_VNC); + qemuCapsClear(caps, QEMU_CAPS_BLOCK_COMMIT); + qemuCapsClear(caps, QEMU_CAPS_DRIVE_MIRROR); + for (i = 0 ; i < ncommands ; i++) { char *name = commands[i]; if (STREQ(name, "system_wakeup")) @@ -1909,6 +1924,13 @@ qemuCapsProbeQMPEvents(qemuCapsPtr caps, int nevents; size_t i; + /* We want to clear these capabilities out so we can properly + * detect them. Otherwise if they're already set and we don't + * detect them, the bit won't clear. + */ + qemuCapsClear(caps, QEMU_CAPS_BALLOON_EVENT); + qemuCapsClear(caps, QEMU_CAPS_SEAMLESS_MIGRATION); + if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) return -1; -- 1.7.8.6

1 0

[libvirt] [PATCH] qemu: QMP capabilities support starts with 1.2
by Doug Goldstein 02 Nov '12

02 Nov '12

Per the code comment in qemuCapsInitQMPBasic() and Eric, we should only use QMP for capabilities probing starting with 1.2 and newer. --- src/qemu/qemu_capabilities.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 271273c..64c0bea 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2314,7 +2314,7 @@ qemuCapsInitQMP(qemuCapsPtr caps, VIR_DEBUG("Got version %d.%d.%d (%s)", major, minor, micro, NULLSTR(package)); - if (!(major >= 1 || (major == 1 && minor >= 1))) { + if (!(major >= 1 || (major == 1 && minor >= 2))) { VIR_DEBUG("Not new enough for QMP capabilities detection"); ret = 0; goto cleanup; -- 1.7.8.6

2 3

[libvirt] [RFC: PATCH] nodeinfo: support kernels that lack socket information
by Eric Blake 02 Nov '12

02 Nov '12

On RHEL 5, I was getting a segfault trying to start libvirtd, because we were failing virNodeParseSocket but not checking for errors, and then calling CPU_SET(-1, &sock_map) as a result. But if you don't have a topology/physical_package_id file, then you can just assume that the cpu belongs to socket 0. * src/nodeinfo.c (virNodeGetCpuValue): Change bool into default_value. (virNodeParseSocket, virNodeParseNode): Update callers. --- I'm still testing this, but wanted to get eyes on it now as I think it belongs in 1.0.0 if it passes my testing. Having libvirtd dump core on RHEL 5 is not nice. I'm not quite sure when the regression was introduced, but it was caused by our refactoring of code to parse different sysfs files. src/nodeinfo.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 35c5f96..ccf0682 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -79,13 +79,14 @@ static int linuxNodeGetMemoryStats(FILE *meminfo, int *nparams); /* Return the positive decimal contents of the given - * DIR/cpu%u/FILE, or -1 on error. If MISSING_OK and the - * file could not be found, return 1 instead of an error; this is - * because some machines cannot hot-unplug cpu0, or because - * hot-unplugging is disabled. */ + * DIR/cpu%u/FILE, or -1 on error. If DEFAULT_VALUE is non-negative + * and the file could not be found, return that instead of an error; + * this is useful for machines that cannot hot-unplug cpu0, or where + * hot-unplugging is disabled, or where the kernel is too old + * to support NUMA cells, etc. */ static int virNodeGetCpuValue(const char *dir, unsigned int cpu, const char *file, - bool missing_ok) + int default_value) { char *path; FILE *pathfp; @@ -100,8 +101,8 @@ virNodeGetCpuValue(const char *dir, unsigned int cpu, const char *file, pathfp = fopen(path, "r"); if (pathfp == NULL) { - if (missing_ok && errno == ENOENT) - value = 1; + if (default_value >= 0 && errno == ENOENT) + value = default_value; else virReportSystemError(errno, _("cannot open %s"), path); goto cleanup; @@ -174,7 +175,7 @@ static int virNodeParseSocket(const char *dir, unsigned int cpu) { int ret = virNodeGetCpuValue(dir, cpu, "topology/physical_package_id", - false); + 0); # if defined(__powerpc__) || \ defined(__powerpc64__) || \ defined(__s390__) || \ @@ -236,7 +237,7 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; - if ((online = virNodeGetCpuValue(node, cpu, "online", true)) < 0) + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; if (!online) @@ -275,7 +276,7 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; - if ((online = virNodeGetCpuValue(node, cpu, "online", true)) < 0) + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; if (!online) @@ -297,7 +298,7 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) /* logical cpu is equivalent to a core on s390 */ core = cpu; # else - core = virNodeGetCpuValue(node, cpu, "topology/core_id", false); + core = virNodeGetCpuValue(node, cpu, "topology/core_id", -1); # endif CPU_SET(core, &core_maps[sock]); -- 1.7.11.7

1 0

Re: [libvirt] [virt-devel] This patch removes the mknod capability from Linux Containers.
by Eric Blake 02 Nov '12

02 Nov '12

[originally posted to the wrong list] On 11/01/2012 12:57 PM, Daniel J Walsh wrote: > > 0001-Linux-Containers-are-not-allowed-to-create-device-no.patch > > >>From 3913ef4148728430cc9df79b84d5ec44130f4ac8 Mon Sep 17 00:00:00 2001 > From: rhatdan <dwalsh(a)redhat.com> I'll adjust the author attribution to match other patches of yours (we generally prefer 'git shortlog' to list full names). > Date: Thu, 1 Nov 2012 14:54:39 -0400 > Subject: [PATCH] Linux Containers are not allowed to create device nodes. > This needs to be done before the container starts. Turning > off the mknod capabilty is noticed by systemd, which will s/capabilty/capability/ > no longer attempt to create device nodes. Missing a blank line, so 'git log' tries to treat this as a really long subject line. > > This eliminates SELinux AVC messages and ugly failure messages in the journal. > --- > src/lxc/lxc_container.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c > index 2789c17..8faa664 100644 > --- a/src/lxc/lxc_container.c > +++ b/src/lxc/lxc_container.c > @@ -1717,6 +1717,7 @@ static int lxcContainerDropCapabilities(bool keepReboot ATTRIBUTE_UNUSED) > CAPNG_INHERITABLE | CAPNG_BOUNDING_SET, > CAP_SYS_MODULE, /* No kernel module loading */ > CAP_SYS_TIME, /* No changing the clock */ > + CAP_MKNOD, /* No creating device nodes */ > CAP_AUDIT_CONTROL, /* No messing with auditing status */ > CAP_MAC_ADMIN, /* No messing with LSM config */ > keepReboot ? -1 : CAP_SYS_BOOT, /* No use of reboot */ Makes sense to me. ACK; I'll clean it up and push in time for 1.0.0. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH 0/2] qemu: Fix incorrect qemuDomainGetBlockIoTune() results
by Stefan Hajnoczi 02 Nov '12

02 Nov '12

The qemuDomainGetBlockIoTune() function was returning incorrect results as I discovered on Fedora Virt Test Day: https://fedoraproject.org/wiki/QA:Testcase_Virtualization_IO_Throttling The problem is that I/O limits can be set but I only see zeroes when displaying them with "virsh blkdeviotune <domain> <device>" on a domain with two disks. First, we're comparing guest device names ("virtio-blk-0") instead of host device names ("drive-virtio-blk-0"). Second, the JSON monitor code has inverted string compare logic so we were skipping the device we were looking for. These patches make "virsh blkdeviotune" report correct results. Stefan Hajnoczi (2): qemu: Keep QEMU host drive prefix in BlkIoTune qemu: Fix device name comparison in qemuMonitorJSONBlockIoThrottleInfo() src/qemu/qemu_monitor_json.c | 5 +---- src/qemu/qemu_monitor_text.c | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) -- 1.7.12.1

2 3

[libvirt] [PATCH 00/20] Support for external checkpoints
by Peter Krempa 02 Nov '12

02 Nov '12

This set consists of multiple parts: The first 4 patches are a rebase of Eric's series to add external checkpoint support to the XML. I posted them as I had some conflicts to solve when rebasing them lately. Patches 5-10 are a re-send of my previously posted series to add ability to create external checkpoints. These are only rebased and I did _not_ apply review feedback to them. Patches 11-20 are new and consist of a few cleanups and refactors to implement needed functionality to revert an external snapshot. There are three new features: 1) creation of offline external snapshots 2) deletion of external snapshots (with a few limitations) 3) reverting of external snapshots When this series will be closer to being "pushable" I'll post another cleanup that will split out all snapshot related code in qemu into a separate file as it's a mess right now. Eric Blake (4): snapshot: new XML for external system checkpoint snapshot: improve disk align checking snapshot: populate new XML info for qemu snapshots snapshot: merge pre-snapshot checks Peter Krempa (16): qemu: Split out code to save domain memory to allow reuse snapshot: Add flag to enable creating checkpoints in paused state snapshot: qemu: Add async job type for snapshots snapshot: qemu: Rename qemuDomainSnapshotCreateActive snapshot: qemu: Add support for external checkpoints snapshot: qemu: Remove restrictions preventing external snapshots qemu: snapshot: Clean up snapshot retrieval to use the new helper qemu: Split out guts of qemuDomainSaveImageStartVM() to allow reuse snapshot: qemu: Add flag VIR_DOMAIN_SNAPSHOT_REVERT_STOPPED snapshot: qemu: Add support for external inactive snapshots conf: Fix private symbols exported by files in conf conf: Add helper to determine if snapshot is external snapshot: qemu: Add detail option for PMSUSPENDED event. snapshot: qemu: Fix detection of external snapshots when deleting snapshot: qemu: Add support for external snapshot deletion. snapshot: qemu: Implement reverting of external snapshots docs/formatsnapshot.html.in | 11 + docs/schemas/domainsnapshot.rng | 23 + examples/domain-events/events-c/event-test.c | 3 + include/libvirt/libvirt.h.in | 7 + src/conf/snapshot_conf.c | 102 +- src/conf/snapshot_conf.h | 6 + src/libvirt.c | 9 +- src/libvirt_private.syms | 48 +- src/qemu/qemu_domain.c | 125 ++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 1111 ++++++++++++++------ src/qemu/qemu_process.c | 19 + tests/domainsnapshotxml2xmlin/external_vm.xml | 10 + tests/domainsnapshotxml2xmlin/noparent.xml | 9 + tests/domainsnapshotxml2xmlout/all_parameters.xml | 1 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 1 + tests/domainsnapshotxml2xmlout/external_vm.xml | 43 + tests/domainsnapshotxml2xmlout/full_domain.xml | 1 + tests/domainsnapshotxml2xmlout/metadata.xml | 1 + tests/domainsnapshotxml2xmlout/noparent.xml | 1 + .../noparent_nodescription.xml | 1 + .../noparent_nodescription_noactive.xml | 1 + tests/domainsnapshotxml2xmltest.c | 1 + tools/virsh-domain-monitor.c | 2 + tools/virsh-snapshot.c | 9 + tools/virsh.pod | 21 +- 26 files changed, 1207 insertions(+), 360 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlin/external_vm.xml create mode 100644 tests/domainsnapshotxml2xmlin/noparent.xml create mode 100644 tests/domainsnapshotxml2xmlout/external_vm.xml -- 1.7.12.4

3 41

[libvirt] [PATCH] nodeinfo: enable nodeGetCPUCount for older kernels
by Viktor Mihajlovski 02 Nov '12

02 Nov '12

Since /sys/devices/system/cpu/present is not available on older kernels like on RHEL 5.x nodeGetCPUCount will fail there. The fallback implemented is to scan for /sys/devices/system/cpu/cpuNN entries. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 35c5f96..181630f 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -953,11 +953,34 @@ int nodeGetCPUCount(void) { #ifdef __linux__ - /* XXX should we also work on older kernels, like RHEL5, that lack - * cpu/present and cpu/online files? Those kernels also lack cpu - * hotplugging, so it would be a matter of finding the largest - * cpu/cpuNN directory, and returning NN + 1 */ - return linuxParseCPUmax(SYSFS_SYSTEM_PATH "/cpu/present"); + /* to support older kernels, like RHEL5, that lack + * cpu/present we fall back to count cpu/cpuNN + * entries. + */ + char *cpupath = NULL; + int i = 0; + + if (virFileExists(SYSFS_SYSTEM_PATH "/cpu/present")) { + i = linuxParseCPUmax(SYSFS_SYSTEM_PATH "/cpu/present"); + } else if (virFileExists(SYSFS_SYSTEM_PATH "/cpu/cpu0")) { + do { + i++; + VIR_FREE(cpupath); + if (virAsprintf(&cpupath, "%s/cpu/cpu%d", + SYSFS_SYSTEM_PATH, i) < 0) { + virReportOOMError(); + return -1; + } + } while (virFileExists(cpupath)); + } else { + /* no cpu/cpu0: we give up */ + virReportError(VIR_ERR_NO_SUPPORT, "%s", + _("host cpu counting not supported on this node")); + return -1; + } + + VIR_FREE(cpupath); + return i; #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("host cpu counting not implemented on this platform")); -- 1.7.0.4

2 1

[libvirt] [PATCH] net-update docs: s/domain/network/
by Michal Privoznik 01 Nov '12

01 Nov '12

A leftover from copy paste. --- tools/virsh-network.c | 6 +++--- tools/virsh.pod | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 6005e5b..fd9d563 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -755,9 +755,9 @@ static const vshCmdOptDef opts_network_update[] = { N_("name of file containing xml (or, if it starts with '<', the complete " "xml element itself) to add/modify, or to be matched for search")}, {"parent-index", VSH_OT_INT, 0, N_("which parent object to search through")}, - {"config", VSH_OT_BOOL, 0, N_("affect next boot")}, - {"live", VSH_OT_BOOL, 0, N_("affect running domain")}, - {"current", VSH_OT_BOOL, 0, N_("affect current domain")}, + {"config", VSH_OT_BOOL, 0, N_("affect next network startup")}, + {"live", VSH_OT_BOOL, 0, N_("affect running network")}, + {"current", VSH_OT_BOOL, 0, N_("affect current state of network")}, {NULL, 0, 0, NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 07d6a67..38e787a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2062,9 +2062,9 @@ the network; if a parent-index isn't provided, the "most appropriate" <dhcp> element), but if I<--parent-index> is given, that particular instance of <ip> will get the modification. -If I<--live> is specified, affect a running guest. -If I<--config> is specified, affect the next boot of a persistent guest. -If I<--current> is specified, affect the current guest state. +If I<--live> is specified, affect a running network. +If I<--config> is specified, affect the next startup of a persistent network. +If I<--current> is specified, affect the current network state. Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. Not specifying any flag is the same as specifying I<--current>. -- 1.7.8.6

2 2

[libvirt] [PATCH v3] iohelper: fsync() at the end
by Michal Privoznik 01 Nov '12

01 Nov '12

Currently, when we are doing (managed) save, we insert the iohelper between the qemu and OS. The pipe is created, the writing end is passed to qemu and the reading end to the iohelper. It reads data and write them into given file. However, with write() being asynchronous data may still be in OS caches and hence in some (corner) cases, all migration data may have been read and written (not physically though). So qemu will report success, as well as iohelper. However, with some non local filesystems, where ENOSPACE is polled every X time units, we may get into situation where all operations succeeded but data hasn't reached the disk. And in fact will never do. Therefore we ought sync caches to make sure data has reached the block device on remote host. --- src/util/iohelper.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index c6542ed..860e14a 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -179,6 +179,12 @@ runIO(const char *path, int fd, int oflags, unsigned long long length) } } + /* Ensure all data is written */ + if (fdatasync(fdout) < 0) { + virReportSystemError(errno, _("unable to fsync %s"), fdoutname); + goto cleanup; + } + ret = 0; cleanup: -- 1.7.8.6

2 3

[libvirt] [PATCHv2 0/3] Use virNodeGetCPUMap where appropriate
by Viktor Mihajlovski 01 Nov '12

01 Nov '12

This series concludes the introduction of the virNodeGetCPUMap API by replacing calls to virNodeGetInfo used only for the purpose of computing the maximum number of node CPUs (which has the potential to yield the incorrect number). Most prominently, with patch 3/3 the output of virsh vcpuinfo will now be correct for domains on hosts with offline CPUs V2 Changes: Rework based on Eric's feedback: - Use nodeGetCPUCount instead of nodeGetCPUMap - Avoid code bloat by computing node CPU count in a helper function Viktor Mihajlovski (3): qemu, lxc: Change host CPU detection logic. python: Use virNodeGetCPUMap where possible virsh: Use virNodeGetCPUMap if possible python/libvirt-override.c | 87 ++++++++++++++++++++++++++++------------------- src/lxc/lxc_controller.c | 8 ++--- src/qemu/qemu_driver.c | 14 +++----- src/qemu/qemu_process.c | 8 ++--- tools/virsh-domain.c | 32 ++++++++++++----- 5 files changed, 86 insertions(+), 63 deletions(-) -- 1.7.12.4

3 10

[libvirt] dhcp6, radvd, ip6tables, etc.
by Gene Czarcinski 01 Nov '12

01 Nov '12

OK, I have the basic implementation for libvirt support of dhcp6. Let me say again that 98% of the work was already done. There is still a bunch of work today which includes writing some tests, understanding how things such as bootp, dhcp-host, etc. should be supported with dhcp6, as well as the items I discuss below. 1. Right now, the only way that dhcp6 is in effect is if there is no dhcp4 range definition. This will be fixed/expanded so that, at a minimum, you can have both a dhcp4 and dhcp6 on the same interface. However, it appears to be easier to just pass to dnsmasq ANY/EVERY dhcp4 range or dhcp6 range defined in the xml. Comments? Any input on which approach to use or avoid? 2. I have modified radvd so both stateful (dhcp6) and stateless (SLAAC) addressing is supported with radvd for the default route. This is done on an interface basis (that is the way it works). So if any dhcp6 range is specified, then stateful is used. The way this is implemented will make it easy to add some tests verifying that the configuration parameters are working. I intend this to be an expansion to networkxml2argvtest since it has the xml specification files which determine both dnsmasq and radvd configuration parameters. 3. After completing what I thought was code that should result in a guest getting dhcp6 addresses, it was not working. Once more it took me a little time to realize that ip6tables rules were blocking it. [I have been down this path before, you would think I would realize the problem sooner.] 3a. In looking over the ip6tables rules, I saw a whole bunch of additions at the top of the INPUT chain which were accepts for udp/tcp port 53. In looking at the code in bridge_driver.c, I found that, every time a network device was started, 3 FORWARD rules and 2 INPUT rules were added, but, when the network device was destroyed, only the 3 FORWARD rules were removed. I believe this is a bug (but not high priority) and I will be submitting a separate patch to fix this. 3b. There are two different approaches for the rule which allows the dhcp6 server to work. I could add (actually insert) one rule to the INPUT chain which accepted the packet if it is "-d ff02::1:2 "--dport 547". Or, I could add (insert) a rule specifying "-i virbr__" for every IPv6 device which would be removed when the device was destroyed. 4. After getting all of this working to my satisfaction, my next mountain to climb is VM ... it really does not like network xml definitions which include a dhcp-range for an ipv6 definition. Comments? NOTE: I am implementing all of this assuming that my previous patches have been accepted ... the ones for creating a dnsmasq conf-file for parameters rather than using the dnsmasq command-line. I am sure that someone could spend the time refitting the dhcp6 patches to the old code but why get aggravated? If you folks do not want to do things that way, fine, please say so. But if it is going to be accepted, then I would like some indication of this. Gene

5 18

[libvirt] [PATCH repost] daemon: Make the default PolicyKit policy auth_admin_keep.
by Richard W.M. Jones 01 Nov '12

01 Nov '12

Reposted at Cole's request. Previous discussion here: https://www.redhat.com/archives/libvir-list/2012-October/thread.html#00682 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

3 3

[libvirt] [PATCH v2] iohelper: fsync() at the end
by Michal Privoznik 01 Nov '12

01 Nov '12

Currently, when we are doing (managed) save, we insert the iohelper between the qemu and OS. The pipe is created, the writing end is passed to qemu and the reading end to the iohelper. It reads data and write them into given file. However, with write() being asynchronous data may still be in OS caches and hence in some (corner) cases, all migration data may have been read and written (not physically though). So qemu will report success, as well as iohelper. However, with some non local filesystems, where ENOSPACE is polled every X time units, we may get into situation where all operations succeeded but data hasn't reached the disk. And in fact will never do. Therefore we ought sync caches to make sure data has reached the block device on remote host. --- For more information follow: https://bugzilla.redhat.com/show_bug.cgi?id=866369 src/util/iohelper.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index c6542ed..0d356c2 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -40,6 +40,7 @@ #include "virterror_internal.h" #include "configmake.h" #include "virrandom.h" +#include "storage_file.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -179,6 +180,14 @@ runIO(const char *path, int fd, int oflags, unsigned long long length) } } + /* If we are on shared FS ensure all data is written as some + * FSs may do writeback caching or polling for ENOSPC or any + * other magic that local FS does not.*/ + if (virStorageFileIsSharedFS(fdoutname) && (fdatasync(fdout) < 0)) { + virReportSystemError(errno, _("unable to fsync %s"), fdoutname); + goto cleanup; + } + ret = 0; cleanup: -- 1.7.8.6

3 2

[libvirt] [00/11] Automatically shutdown VMs on session quit
by Daniel P. Berrange 01 Nov '12

01 Nov '12

This is a followup to Alex's original proposal: https://www.redhat.com/archives/libvir-list/2012-October/msg00365.html The core idea & concepts are the same as in Alex's patch, but I realized I could take the opportunity to refactor part of libvirtd to improve life in general. The state drivers currently have an 'active' method which is polled on every iteration of the event loop to determine if any resources (such as VMs) are active. This is the kind of information we need to inhibit host shutdown/suspend, but it is not being made available in an easily consumable way. The key idea I had was to remove the 'active' method from the state drivers and instead pass in a callback to the 'startup' method in the state driver. This so called 'inhibit' callback is used by drivers to signal when they have resources active. This callback is used both to inhibit shutdown of libvirtd (when the --timeout arg is used), and to inhibit shutdown of the host OS itself. The state driver also gains a 'stop' method which is intended to stop any resources which are causing the shutdown inhibition. In other words, to save any VMs to disk. One of the side effects of this change is that the --timeout param to libvirtd actually now works much better. Only running VMs cause libvirtd shutdown to be inhibited. Networks / storage pools no longer inhibit it. This is obviously targetted at post-1.0.0

4 18

[libvirt] [PATCH] qemu: Add controllers in specified order
by Michal Privoznik 01 Nov '12

01 Nov '12

qemu is sensitive to the order of arguments passed. Hence, if a device requires a controller, the controller cmd string must precede device cmd string. The same apply for controllers, when for instance ccid controller requires usb controller. So controllers create partial ordering in which they should be added to qemu cmd line. --- The order is basically random for now, with one constraint: CCID must be preceded with USB. src/qemu/qemu_command.c | 102 +++++++++++++++++++++++++--------------------- 1 files changed, 55 insertions(+), 47 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fe99f5d..ffeb965 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4429,7 +4429,7 @@ qemuBuildCommandLine(virConnectPtr conn, virDomainSnapshotObjPtr snapshot, enum virNetDevVPortProfileOp vmop) { - int i; + int i, j; struct utsname ut; int disableKQEMU = 0; int enableKQEMU = 0; @@ -4446,6 +4446,17 @@ qemuBuildCommandLine(virConnectPtr conn, int usbcontroller = 0; bool usblegacy = false; uname_normalize(&ut); + int contOrder[] = { + /* We don't add an explicit IDE or FD controller because the + * provided PIIX4 device already includes one. It isn't possible to + * remove the PIIX4. */ + VIR_DOMAIN_CONTROLLER_TYPE_USB, + VIR_DOMAIN_CONTROLLER_TYPE_SCSI, + VIR_DOMAIN_CONTROLLER_TYPE_SATA, + VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL, + VIR_DOMAIN_CONTROLLER_TYPE_CCID, + }; + VIR_DEBUG("conn=%p driver=%p def=%p mon=%p json=%d " "caps=%p migrateFrom=%s migrateFD=%d " @@ -5024,61 +5035,59 @@ qemuBuildCommandLine(virConnectPtr conn, } if (qemuCapsGet(caps, QEMU_CAPS_DEVICE)) { - for (i = 0 ; i < def->ncontrollers ; i++) { - virDomainControllerDefPtr cont = def->controllers[i]; + for (j = 0; j < ARRAY_CARDINALITY(contOrder); j++) { + for (i = 0; i < def->ncontrollers; i++) { + virDomainControllerDefPtr cont = def->controllers[i]; - /* We don't add an explicit IDE or FD controller because the - * provided PIIX4 device already includes one. It isn't possible to - * remove the PIIX4. */ - if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE || - cont->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC) - continue; + if (cont->type != contOrder[j]) + continue; - /* Also, skip USB controllers with type none.*/ - if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && - cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) { - usbcontroller = -1; /* mark we don't want a controller */ - continue; - } + /* Also, skip USB controllers with type none.*/ + if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) { + usbcontroller = -1; /* mark we don't want a controller */ + continue; + } - /* Only recent QEMU implements a SATA (AHCI) controller */ - if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) { - if (!qemuCapsGet(caps, QEMU_CAPS_ICH9_AHCI)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("SATA is not supported with this " - "QEMU binary")); - goto error; + /* Only recent QEMU implements a SATA (AHCI) controller */ + if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) { + if (!qemuCapsGet(caps, QEMU_CAPS_ICH9_AHCI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("SATA is not supported with this " + "QEMU binary")); + goto error; + } else { + char *devstr; + + virCommandAddArg(cmd, "-device"); + if (!(devstr = qemuBuildControllerDevStr(def, cont, + caps, NULL))) + goto error; + + virCommandAddArg(cmd, devstr); + VIR_FREE(devstr); + } + } else if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + cont->model == -1 && + !qemuCapsGet(caps, QEMU_CAPS_PIIX3_USB_UHCI)) { + if (usblegacy) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Multiple legacy USB controllers are " + "not supported")); + goto error; + } + usblegacy = true; } else { - char *devstr; - virCommandAddArg(cmd, "-device"); - if (!(devstr = qemuBuildControllerDevStr(def, cont, - caps, NULL))) + + char *devstr; + if (!(devstr = qemuBuildControllerDevStr(def, cont, caps, + &usbcontroller))) goto error; virCommandAddArg(cmd, devstr); VIR_FREE(devstr); } - } else if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && - cont->model == -1 && - !qemuCapsGet(caps, QEMU_CAPS_PIIX3_USB_UHCI)) { - if (usblegacy) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Multiple legacy USB controllers are " - "not supported")); - goto error; - } - usblegacy = true; - } else { - virCommandAddArg(cmd, "-device"); - - char *devstr; - if (!(devstr = qemuBuildControllerDevStr(def, cont, caps, - &usbcontroller))) - goto error; - - virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); } } } @@ -5553,7 +5562,6 @@ qemuBuildCommandLine(virConnectPtr conn, virDomainSmartcardDefPtr smartcard = def->smartcards[0]; char *devstr; virBuffer opt = VIR_BUFFER_INITIALIZER; - int j; const char *database; if (def->nsmartcards > 1 || -- 1.7.8.6

2 1

[libvirt] [PATCH] iohelper: fsync() at the end
by Michal Privoznik 01 Nov '12

01 Nov '12

Currently, when we are doing (managed) save, we insert the iohelper between the qemu and OS. The pipe is created, the writing end is passed to qemu and the reading end to the iohelper. It reads data and write them into given file. However, with write() being asynchronous data may still be in OS caches and hence in some (corner) cases, all migration data may have been read and written (not physically though). So qemu will report success, as well as iohelper. However, with some non local filesystems, where ENOSPACE is polled every X time units, we may get into situation where all operations succeeded but data hasn't reached the disk. And in fact will never do. Therefore we ought sync caches to make sure data has reached the block device on remote host. --- For more information follow: https://bugzilla.redhat.com/show_bug.cgi?id=866369 src/util/iohelper.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index c6542ed..aad5cb8 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -179,6 +179,12 @@ runIO(const char *path, int fd, int oflags, unsigned long long length) } } + /* Ensure all data is written */ + if (fsync(fdout) < 0) { + virReportSystemError(errno, _("unable to fsync %s"), fdoutname); + goto cleanup; + } + ret = 0; cleanup: -- 1.7.8.6

2 2

[libvirt] [PATCH] gitignore: ignore more files
by liguang 01 Nov '12

01 Nov '12

ignore *.patch, cscope.po.out, cscope.in.out, tags Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- .gitignore | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 1cd2d45..018b5d9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ *.pyc *.rej *.s +*.patch *~ .deps .gdb_history @@ -181,10 +182,13 @@ /update.log Makefile Makefile.in +tags TAGS coverage cscope.files cscope.out +cscope.in.out +cscope.po.out results.log stamp-h stamp-h.in -- 1.7.1

3 2

[libvirt] libvirt can not get right stats of a rbd pool
by yue 01 Nov '12

01 Nov '12

Allocation exceed Capacity ,but Available is not 0. #virsh pool-info 2361a6d4-0edc-3534-87ae-e7ee09199921 Name: 2361a6d4-0edc-3534-87ae-e7ee09199921 UUID: 2361a6d4-0edc-3534-87ae-e7ee09199921 State: running Persistent: yes Autostart: no Capacity: 285.57 GiB Allocation: 489.89 GiB Available: 230.59 GiB

4 3

[libvirt] [PATCH] build: Fix RPM build for non-x86 platforms
by Viktor Mihajlovski 01 Nov '12

01 Nov '12

Make the post install script for the lock-sanlock package optional to prevent break on non-x86 platforms. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- libvirt.spec.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 41d2628..f8ede3f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1568,12 +1568,13 @@ fi /bin/systemctl try-restart libvirt-guests.service >/dev/null 2>&1 || : %endif +%if %{with_sanlock} %post lock-sanlock if getent group sanlock > /dev/null ; then chmod 0770 %{_localstatedir}/lib/libvirt/sanlock chown root:sanlock %{_localstatedir}/lib/libvirt/sanlock fi - +%endif %files %defattr(-, root, root) -- 1.7.0.4

2 1

[libvirt] [PATCH] Don't assume pid_t is the same size as an int
by Daniel P. Berrange 01 Nov '12

01 Nov '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> virPidFileReadPathIfAlive passed in an 'int *' where a 'pid_t *' was expected, which breaks on Mingw64 targets. Also a few places were using '%d' for formatting pid_t, change them to '%lld' and force a cast to the longer type as done elsewhere in the same file. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virpidfile.c | 4 ++-- src/util/virprocess.c | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index cb8a992..90a79c5 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -206,7 +206,7 @@ int virPidFileReadPathIfAlive(const char *path, pid_t *pid, const char *binPath) { - int ret, retPid; + int ret; bool isLink; char *procPath = NULL; char *procLink = NULL; @@ -215,7 +215,7 @@ int virPidFileReadPathIfAlive(const char *path, char *resolvedProcLink = NULL; const char deletedText[] = " (deleted)"; size_t deletedTextLen = strlen(deletedText); - + pid_t retPid; /* only set this at the very end on success */ *pid = -1; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 4bb7ebc..f8a8a49 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -250,7 +250,7 @@ virProcessKillPainfully(pid_t pid, bool force) int i, ret = -1; const char *signame = "TERM"; - VIR_DEBUG("vpid=%d force=%d", pid, force); + VIR_DEBUG("vpid=%lld force=%d", (long long)pid, force); /* This loop sends SIGTERM, then waits a few iterations (10 seconds) * to see if it dies. If the process still hasn't exited, and @@ -265,8 +265,8 @@ virProcessKillPainfully(pid_t pid, bool force) if (i == 0) { signum = SIGTERM; /* kindly suggest it should exit */ } else if ((i == 50) & force) { - VIR_DEBUG("Timed out waiting after SIGTERM to process %d, " - "sending SIGKILL", pid); + VIR_DEBUG("Timed out waiting after SIGTERM to process %lld, " + "sending SIGKILL", (long long)pid); /* No SIGKILL kill on Win32 ! Use SIGABRT instead which our * virProcessKill proc will handle more or less like SIGKILL */ #ifdef WIN32 @@ -283,8 +283,8 @@ virProcessKillPainfully(pid_t pid, bool force) if (virProcessKill(pid, signum) < 0) { if (errno != ESRCH) { virReportSystemError(errno, - _("Failed to terminate process %d with SIG%s"), - pid, signame); + _("Failed to terminate process %lld with SIG%s"), + (long long)pid, signame); goto cleanup; } ret = signum == SIGTERM ? 0 : 1; @@ -294,7 +294,8 @@ virProcessKillPainfully(pid_t pid, bool force) usleep(200 * 1000); } - VIR_DEBUG("Timed out waiting after SIGKILL to process %d", pid); + VIR_DEBUG("Timed out waiting after SIGKILL to process %lld", + (long long)pid); cleanup: return ret; -- 1.7.11.7

2 1

[libvirt] [PATCH] Fix arch detection for qemu-system-i386 with QMP
by Daniel P. Berrange 01 Nov '12

01 Nov '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> QEMU uses 'i386' for its 32-bit x86 architecture, but libvirt wants that to be 'i686', so we must fix it up Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9f15162..271273c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2327,6 +2327,14 @@ qemuCapsInitQMP(qemuCapsPtr caps, if (!(caps->arch = qemuMonitorGetTargetArch(mon))) goto cleanup; + /* Map i386, i486, i586 to i686. */ + if (caps->arch[0] == 'i' && + caps->arch[1] != '\0' && + caps->arch[2] == '8' && + caps->arch[3] == '6' && + caps->arch[4] == '\0') + caps->arch[1] = '6'; + /* Currently only x86_64 and i686 support PCI-multibus. */ if (STREQLEN(caps->arch, "x86_64", 6) || STREQLEN(caps->arch, "i686", 4)) { -- 1.7.12.1

2 1

[libvirt] [PATCH 0/3] Use virNodeGetCPUMap where appropriate
by Viktor Mihajlovski 01 Nov '12

01 Nov '12

This series concludes the introduction of the virNodeGetCPUMap API by replacing calls to virNodeGetInfo used only for the purpose of computing the maximum number of node CPUs (which has the potential to yield the incorrect number). Most prominently, with patch 3/3 the output of virsh vcpuinfo will now be correct for domains on hosts with offline CPUs Viktor Mihajlovski (3): qemu, lxc: Change host CPU detection logic. python: Use virNodeGetCPUMap where possible virsh: Use virNodeGetCPUMap if possible python/libvirt-override.c | 100 ++++++++++++++++++++++++++++++++++------------ src/lxc/lxc_controller.c | 8 ++-- src/qemu/qemu_driver.c | 12 ++---- src/qemu/qemu_process.c | 10 ++--- tools/virsh-domain.c | 36 +++++++++++------ 5 files changed, 108 insertions(+), 58 deletions(-) -- 1.7.12.4

2 7

[libvirt] Entering freeze for libvirt-1.0.0 release
by Daniel Veillard 01 Nov '12

01 Nov '12

As scheduled, we are entering freeze for 1.0.0, yay ! I have tagged the git tree and pushed libvirt-1.0.0-rc1.tar.gz release candidate 1 to the ftp (along with rpms): ftp://libvirt.org/libvirt/ Due to the slightly higher visibility of this release, we are giving a bit more time for testing of the candidates, and the plan is to push the final version at the end of next week, so expect an rc2 at the end of the week and probably an rc3 by mid next week. Give it a try and report, thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

7 13

[libvirt] [PATCH] docs: libvirtd no longer uses abstract namespace
by Eric Blake 01 Nov '12

01 Nov '12

Commit 905be03d2 quit using the abstract namespace, but didn't update the --help text to match. * daemon/libvirtd.c (daemonUsage): Correct socket listing. --- See also: https://www.redhat.com/archives/libvirt-users/2012-October/msg00152.html daemon/libvirtd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index d5f3e4c..624831a 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -936,7 +936,7 @@ libvirt management daemon:\n"), argv0); $XDG_CONFIG_HOME/libvirt/libvirtd.conf\n\ \n\ Sockets:\n\ - $XDG_RUNTIME_DIR/libvirt/libvirt-sock (in UNIX abstract namespace)\n\ + $XDG_RUNTIME_DIR/libvirt/libvirt-sock\n\ \n\ TLS:\n\ CA certificate: $HOME/.pki/libvirt/cacert.pem\n\ -- 1.7.11.7

2 2

[libvirt] [PATCH] gitignore: Ignore 'tags'
by Michal Privoznik 01 Nov '12

01 Nov '12

--- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 98ce398..79a055b 100644 --- a/.gitignore +++ b/.gitignore @@ -193,6 +193,7 @@ results.log stamp-h stamp-h.in stamp-h1 +tags !/gnulib/lib/Makefile.am !/gnulib/tests/Makefile.am !/m4/virt-*.m4 -- 1.7.8.6

3 3