- Devel - libvirt List Archives

[libvirt] [PATCH 00/13] Support hypervisor-threads-pin in vcpupin.
by tangchen 24 Jul '12

24 Jul '12

Hi~ Users can use vcpupin command to bind a vcpu thread to a specific physical cpu. But besides vcpu threads, there are alse some other threads created by qemu (known as hypervisor threads) that could not be explicitly bound to physical cpus. The first 3 patches are from Wen Congyang, which implement Cgroup for differrent hypervisors. The other 10 patches implemented hypervisor threads binding, in two ways: 1) Use sched_setaffinity() function; 2) Use cpuset cgroup. A new xml element is introduced, and vcpupin command is improved, see below. 1. Introduce new xml elements: <cputune> ...... <hypervisorpin cpuset='1'/> </cputune> 2. Improve vcpupin command to support hypervisor threads binding. For example, vm1 has the following configuration: <cputune> <vcpupin vcpu='1' cpuset='1'/> <vcpupin vcpu='0' cpuset='0'/> <hypervisorpin cpuset='1'/> </cputune> 1) query all threads pining # vcpupin vm1 VCPU: CPU Affinity ---------------------------------- 0: 0 1: 1 Hypervisor: CPU Affinity ---------------------------------- *: 1 2) query hypervisor threads pining only # vcpupin vm1 --hypervisor Hypervisor: CPU Affinity ---------------------------------- *: 1 3) change hypervisor threads pining # vcpupin vm1 --hypervisor 0-1 # vcpupin vm1 --hypervisor Hypervisor: CPU Affinity ---------------------------------- *: 0-1 # taskset -p 397 pid 397's current affinity mask: 3 Note: If users want to pin a vcpu thread to pcpu, --vcpu option could no longer be omitted. Tang Chen (10): Enable cpuset cgroup and synchronous vcpupin info to cgroup. Support hypervisorpin xml parse. Introduce qemuSetupCgroupHypervisorPin and synchronize hypervisorpin info to cgroup. Add qemuProcessSetHypervisorAffinites and set hypervisor threads affinities Introduce virDomainHypervisorPinAdd and virDomainHypervisorPinDel functions Introduce qemudDomainPinHypervisorFlags and qemudDomainGetHypervisorPinInfo in qemu driver. Introduce remoteDomainPinHypervisorFlags and remoteDomainGetHypervisorPinInfo functions in remote driver. Introduce remoteDispatchDomainPinHypervisorFlags and remoteDispatchDomainGetHypervisorPinInfo functions. Introduce virDomainPinHypervisorFlags and virDomainGetHypervisorPinInfo functions. Improve vcpupin to support hypervisorpin dynically. Wen Congyang (3): Introduce the function virCgroupForHypervisor Introduce the function virCgroupMoveTask create a new cgroup and move all hypervisor threads to the new cgroup .gnulib | 2 +- daemon/remote.c | 103 +++++++++ docs/schemas/domaincommon.rng | 7 + include/libvirt/libvirt.h.in | 10 + src/conf/domain_conf.c | 173 ++++++++++++++- src/conf/domain_conf.h | 7 + src/driver.h | 13 ++ src/libvirt.c | 147 +++++++++++++ src/libvirt_private.syms | 7 + src/libvirt_public.syms | 2 + src/qemu/qemu_cgroup.c | 147 ++++++++++++- src/qemu/qemu_cgroup.h | 5 + src/qemu/qemu_driver.c | 261 ++++++++++++++++++++++- src/qemu/qemu_process.c | 60 +++++- src/remote/remote_driver.c | 102 +++++++++ src/remote/remote_protocol.x | 23 +- src/remote_protocol-structs | 24 +++ src/util/cgroup.c | 204 +++++++++++++++++- src/util/cgroup.h | 15 ++ tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 1 + tests/vcpupin | 6 +- tools/virsh.c | 147 ++++++++----- tools/virsh.pod | 16 +- 23 files changed, 1405 insertions(+), 77 deletions(-) -- 1.7.10.2 -- Best Regards, Tang chen

3 22

[libvirt] [PATCH] virsh: fixed domdisplay command
by Martin Kletzander 24 Jul '12

24 Jul '12

The 'domdisplay' command didn't properly evaluate '--include-password' option. --- tools/virsh.c | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 5888d6c..e0765ba 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -66,6 +66,7 @@ #include "virtypedparam.h" #include "intprops.h" #include "conf/virdomainlist.h" +#include "datatypes.h" static char *progname; @@ -13882,7 +13883,16 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - doc = virDomainGetXMLDesc(dom, 0); + if (!vshCommandOptBool(cmd, "include-password")) + doc = virDomainGetXMLDesc(dom, 0); + else { + if (ctl->conn->flags & VIR_DOMAIN_XML_SECURE) { + vshError(ctl, _("Cannot get password with read-only connection")); + goto cleanup; + } + doc = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_SECURE); + } + if (!doc) goto cleanup; @@ -13944,19 +13954,20 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (tmp) tls_port = 0; - if (vshCommandOptBool(cmd, "daemon")) { - /* Create our XPATH lookup for the SPICE password */ - virAsprintf(&xpath, "string(/domain/devices/graphics" + /* Create our XPATH lookup for the SPICE password */ + virAsprintf(&xpath, "string(/domain/devices/graphics" "[@type='%s']/@passwd)", scheme[iter]); - if (!xpath) { - virReportOOMError(); - goto cleanup; - } - - /* Attempt to get the SPICE password */ - passwd = virXPathString(xpath, ctxt); - VIR_FREE(xpath); + if (!xpath) { + virReportOOMError(); + goto cleanup; } + + /* Attempt to get the SPICE password + * + * This will return NULL automatically if the + * virDomainGetXMLDesc wasn't secure */ + passwd = virXPathString(xpath, ctxt); + VIR_FREE(xpath); } /* Build up the full URI, starting with the scheme */ -- 1.7.8.6

4 7

[libvirt] [PATCH 00/11] Split virsh
by Osier Yang 24 Jul '12

24 Jul '12

This splits virsh.c by the command groups, except 'virsh itself' group, each group will have a separate .c, filled with the its commands, a few helpers, and command group definition moved from virsh.c. and virsh.c simply include those new .c files. It still could be optimized, but this set could set up the skelton, and further optimization could be later patches. Osier Yang (11): virsh: Move definition of cmds and cmd groups right at the top of main virsh: Split cmds for domain and domain monitoring from virsh.c virsh: Split cmds for storage pool and storage volume from virsh.c virsh: Split cmds to manage network from virsh.c virsh: Split cmds to manage host interface from virsh.c virsh: Split cmds to manage network filter from virsh.c virsh: Split cmds to manage secret from virsh.c virsh: Split cmds to manage domain snapshot from virsh.c virsh: Split cmds in host group from virsh.c virsh: Split cmds in node device group from virsh.c virsh: Move command group definition into its own file tools/virsh-domain-monitor.c | 1701 ++++ tools/virsh-domain.c | 8139 +++++++++++++++++++ tools/virsh-host.c | 839 ++ tools/virsh-interface.c | 1032 +++ tools/virsh-network.c | 710 ++ tools/virsh-nodedev.c | 402 + tools/virsh-nwfilter.c | 324 + tools/virsh-pool.c | 1442 ++++ tools/virsh-secret.c | 373 + tools/virsh-snapshot.c | 1628 ++++ tools/virsh-volume.c | 1462 ++++ tools/virsh.c |18474 +----------------------------------------- 12 files changed, 18361 insertions(+), 18165 deletions(-) create mode 100644 tools/virsh-domain-monitor.c create mode 100644 tools/virsh-domain.c create mode 100644 tools/virsh-host.c create mode 100644 tools/virsh-interface.c create mode 100644 tools/virsh-network.c create mode 100644 tools/virsh-nodedev.c create mode 100644 tools/virsh-nwfilter.c create mode 100644 tools/virsh-pool.c create mode 100644 tools/virsh-secret.c create mode 100644 tools/virsh-snapshot.c create mode 100644 tools/virsh-volume.c Regards, Osier

2 11

[libvirt] [PATCH] adding handling EINTR to poll to make it more robust
by Royce Lv 24 Jul '12

24 Jul '12

some system call and signal will interrupt poll, making event loop stops and fails to react events and keepalive message from libvirt. adding handling EINTR to poll to make it more robust Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- examples/domain-events/events-python/event-test.py | 87 +++++++++++--------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 96dc268..6b655cd 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -178,48 +178,53 @@ class virEventLoopPure: def run_once(self): sleep = -1 self.runningPoll = True - next = self.next_timeout() - debug("Next timeout due at %d" % next) - if next > 0: - now = int(time.time() * 1000) - if now >= next: - sleep = 0 - else: - sleep = (next - now) / 1000.0 - - debug("Poll with a sleep of %d" % sleep) - events = self.poll.poll(sleep) - - # Dispatch any file handle events that occurred - for (fd, revents) in events: - # See if the events was from the self-pipe - # telling us to wakup. if so, then discard - # the data just continue - if fd == self.pipetrick[0]: - self.pendingWakeup = False - data = os.read(fd, 1) - continue - - h = self.get_handle_by_fd(fd) - if h: - debug("Dispatch fd %d handle %d events %d" % (fd, h.get_id(), revents)) - h.dispatch(self.events_from_poll(revents)) - - now = int(time.time() * 1000) - for t in self.timers: - interval = t.get_interval() - if interval < 0: - continue + try: + next = self.next_timeout() + debug("Next timeout due at %d" % next) + if next > 0: + now = int(time.time() * 1000) + if now >= next: + sleep = 0 + else: + sleep = (next - now) / 1000.0 + + debug("Poll with a sleep of %d" % sleep) + events = self.poll.poll(sleep) + + # Dispatch any file handle events that occurred + for (fd, revents) in events: + # See if the events was from the self-pipe + # telling us to wakup. if so, then discard + # the data just continue + if fd == self.pipetrick[0]: + self.pendingWakeup = False + data = os.read(fd, 1) + continue + + h = self.get_handle_by_fd(fd) + if h: + debug("Dispatch fd %d handle %d events %d" % (fd, h.get_id(), revents)) + h.dispatch(self.events_from_poll(revents)) - want = t.get_last_fired() + interval - # Deduct 20ms, since schedular timeslice - # means we could be ever so slightly early - if now >= (want-20): - debug("Dispatch timer %d now %s want %s" % (t.get_id(), str(now), str(want))) - t.set_last_fired(now) - t.dispatch() - - self.runningPoll = False + now = int(time.time() * 1000) + for t in self.timers: + interval = t.get_interval() + if interval < 0: + continue + + want = t.get_last_fired() + interval + # Deduct 20ms, since scheduler timeslice + # means we could be ever so slightly early + if now >= (want-20): + debug("Dispatch timer %d now %s want %s" % (t.get_id(), str(now), str(want))) + t.set_last_fired(now) + t.dispatch() + + except (os.error, select.error), e: + if e.args[0] != errno.EINTR: + raise + finally: + self.runningPoll = False # Actually the event loop forever -- 1.7.10.4

3 2

[libvirt] [PATCH] build: regenerate .png files
by Eric Blake 24 Jul '12

24 Jul '12

We don't expect people to have tools installed to regenerate .png from .fig by default. However, since commit 5eb3df8, several .fig files were updated without regenerating the .png file, and as a result, 'make dist' ends up regenerating those five files, or worse, failing because of missing tools. Additionally, the generation of .png files is nondeterministic (the resulting files contain a timestamp), which means prior to this patch, running 'make dist' from two checkouts will end up producing different tarball contents (two 'make dist' runs will always produce different tar files, since tarballs also contain timestamps; but unpacking the tarballs and doing a recursive diff will show if the contents are unchanged). Running 'make *.png' in the docs directory and committing the result means the timestamps are now up-to-date, and 'make dist' no longer has anything to do. This gets us closer to the goal of two checkouts being able to produce the same tarball. * docs/libvirt-*.png: Regenerate. --- Found when testing 'make dist' on a machine without ImageMagick installed (for the 'convert' program). docs/libvirt-daemon-arch.png | Bin 16479 -> 11624 bytes docs/libvirt-driver-arch.png | Bin 16835 -> 12555 bytes docs/libvirt-net-logical.png | Bin 7387 -> 11243 bytes docs/libvirt-net-physical.png | Bin 10666 -> 11336 bytes docs/libvirt-object-model.png | Bin 14327 -> 9559 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/libvirt-daemon-arch.png b/docs/libvirt-daemon-arch.png index b7ed2f689112e45ffd5b108ed7a03f9808618d96..621a55cdbfebf968ed079e3940b5bd3da22321a1 100644 GIT binary patch literal 11624 [actual patch stripped for mailing list length limits - it's just a regeneration of binary files] -- 1.7.10.4

3 3

[libvirt] qemu and <transient/> disks
by Richard W.M. Jones 24 Jul '12

24 Jul '12

Partly following up this message: https://www.redhat.com/archives/libvirt-users/2011-October/msg00142.html > > And what about qemu's option "snapshot=on" ? > > Unreliable. It won't work with SELinux (since qemu tries to create the > snapshot on /tmp), and it makes your guest unmigratable. I think that > it is easier to have libvirt use qemu-img to create a qcow2 wrapper > prior to booting the guest, at which point the solution is easier to > control from an sVirt perspective, and is more likely to allow us to > figure out a way to make things work with migration (at least, I'm > hoping I can figure out how to migrate a guest with a transient disk). Lack of this feature is pretty annoying, particularly since (a) libguestfs needs it and (b) it's a trivial patch to add snapshot=on to the qemu driver. So to concentrate on the two objections above: - Why is SELinux concerned about qemu creating and using a file in /tmp? Obviously it should stop qemu opening and reading random files from /tmp but that would be a different rule surely? - The documentation actually states that using <transient/> may make your guest unable to migrate, and in any case we don't care. > But if you want to use qemu's snapshot=on in the meantime, you can > use the <qemu:commandline> namespace XML to add it. Is there an example how to do this? It seems like it might be possible using a global qemu '-set device.<id>.snapshot=on' parameter, but how can I know what <id> libvirt will give to a '-drive' parameter? (I found from experimentation that it's something like "drive-virtio-disk0", but I can't track down the bit of code that produces this string yet ...) 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 4

[libvirt] [PATCH] [libvirt-java] Fix javadoc warnings.
by Claudio Bley 23 Jul '12

23 Jul '12

Hi. I sent a few mails on friday, 6th July, via gmane.org but they haven't made it to the list yet. As I'm a subscriber now, I'm resending them directly. Sorry for any duplicates in advance. Here's a patch fixing these javadoc warnings: --- [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Connect.java:387: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Connect.java:644: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Connect.java:658: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Domain.java:681: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Domain.java:795: warning - Tag @see: reference not found: http [javadoc] ://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateToURI [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\DomainSnapshot.java:40: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\StoragePool.java:349: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "58" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "47" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "47" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "47" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "47" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "45" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see: reference not found: http://www.libvirt.org/html/libvirt-lib virt.html#virStreamRecvAll --- --- diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index 77336f0..de75f20 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -381,7 +381,7 @@ public class Connect { * Documentation</a> * @param callbackID * the callback to deregister - * @return + * @return 0 on success, -1 on failure * @throws LibvirtException */ public int domainEventDeregister(int callbackID) throws LibvirtException { @@ -400,7 +400,7 @@ public class Connect { int action); } - private interface GenericCallback { + protected interface GenericCallback { void eventCallback(Connect connect, Domain domain); } public interface RebootCallback extends GenericCallback { @@ -638,7 +638,7 @@ public class Connect { * domain configuration file describing the domain. The format of the native * data is hypervisor dependant. * - * @return + * @return domain XML as String, or {@code null} on error * @throws LibvirtException */ public String domainXMLFromNative(String nativeFormat, String nativeConfig, int flags) throws LibvirtException { @@ -652,7 +652,7 @@ public class Connect { * native configuration file describing the domain. The format of the native * data is hypervisor dependant. * - * @return + * @return domain XML as String, or {@code null} on error * @throws LibvirtException */ public String domainXMLToNative(String nativeFormat, String domainXML, int flags) throws LibvirtException { diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index fd7a03a..fe9f3b0 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -675,7 +675,7 @@ public class Domain { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainManagedSaveRemove">Libvirt * Documentation</a> - * @return + * @return 0 in case of success, and -1 in case of error * @throws LibvirtException */ public int managedSaveRemote() throws LibvirtException { @@ -778,8 +778,9 @@ public class Domain { * Migrate the domain object from its current host to the destination host * given by duri. * - * @see http - * ://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateToURI + * @see <a + * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateToURI"> + * virDomainMigrateToURI</a> * * @param uri * The destination URI diff --git a/src/main/java/org/libvirt/DomainSnapshot.java b/src/main/java/org/libvirt/DomainSnapshot.java index e9a23d6..add6830 100644 --- a/src/main/java/org/libvirt/DomainSnapshot.java +++ b/src/main/java/org/libvirt/DomainSnapshot.java @@ -34,7 +34,7 @@ public class DomainSnapshot { * Documentation</a> * @param flags * controls teh deletion - * @return + * @return 0 if the selected snapshot(s) were successfully deleted, -1 on error. * @throws LibvirtException */ public int delete(int flags) throws LibvirtException { diff --git a/src/main/java/org/libvirt/StoragePool.java b/src/main/java/org/libvirt/StoragePool.java index a3d59a9..0328d8c 100644 --- a/src/main/java/org/libvirt/StoragePool.java +++ b/src/main/java/org/libvirt/StoragePool.java @@ -343,7 +343,7 @@ public class StoragePool { * as input. Information for the new volume (name, perms) are passed via a * typical volume XML description. * - * @return + * @return The storage volume, or {@code null} on error. * @throws LibvirtException */ public StorageVol storageVolCreateXMLFrom(String xmlDesc, StorageVol cloneVolume, int flags) diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index fdef3a4..6374567 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -121,7 +121,7 @@ public class Stream { /** * Batch receive method * - * @see http://www.libvirt.org/html/libvirt-libvirt.html#virStreamRecvAll + * @see <a href="http://www.libvirt.org/html/libvirt-libvirt.html#virStreamRecvAll">virStreamRecvAll</a> * @param handler * the callback handler * @return 0 if successfule, -1 otherwise --- Best regards, Claudio -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

2 4

[libvirt] [PATCH] fixed segfault in virauth
by Martin Kletzander 23 Jul '12

23 Jul '12

No check for conn->uri being NULL in virAuthGetConfigFilePath (valid state) made the client segfault. This happens with fresh defalt VDSM configuration for example. The check ought to be enough as conn->uri being NULL is valid in later code. --- src/util/virauth.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/util/virauth.c b/src/util/virauth.c index e6b1db0..2c1a4ae 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -1,7 +1,7 @@ /* * virauth.c: authentication related utility functions * - * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2010, 2012 Matthias Bolte <matthias.bolte(a)googlemail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,14 +54,16 @@ int virAuthGetConfigFilePath(virConnectPtr conn, return 0; } - for (i = 0 ; i < conn->uri->paramsCount ; i++) { - if (STREQ_NULLABLE(conn->uri->params[i].name, "authfile") && - conn->uri->params[i].value) { - VIR_DEBUG("Using path from URI '%s'", - conn->uri->params[i].value); - if (!(*path = strdup(conn->uri->params[i].value))) - goto no_memory; - return 0; + if (conn && conn->uri) { + for (i = 0 ; i < conn->uri->paramsCount ; i++) { + if (STREQ_NULLABLE(conn->uri->params[i].name, "authfile") && + conn->uri->params[i].value) { + VIR_DEBUG("Using path from URI '%s'", + conn->uri->params[i].value); + if (!(*path = strdup(conn->uri->params[i].value))) + goto no_memory; + return 0; + } } } -- 1.7.8.6

3 2

[libvirt] [PATCH] qemu: Set swap_hard_limit before hard_limit
by Osier Yang 23 Jul '12

23 Jul '12

Setting hard_limit larger than previous swap_hard_limit must fail, it's not that good if one wants to change the swap_hard_limit and hard_limit together. E.g. % virsh memtune rhel6 hard_limit : 1000000 soft_limit : 1000000 swap_hard_limit: 1000000 % virsh memtune rhel6 --hard-limit 1000020 --soft-limit 1000020 \ --swap-hard-limit 1000020 --live This patch reoder the limits setting to set the swap_hard_limit first. --- src/qemu/qemu_driver.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dc04d13..1abdd27 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6625,43 +6625,43 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; - if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { + if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemoryHardLimit(group, params[i].value.ul); + rc = virCgroupSetMemSwapHardLimit(group, params[i].value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", - _("unable to set memory hard_limit tunable")); + _("unable to set swap_hard_limit tunable")); ret = -1; } } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.hard_limit = params[i].value.ul; + persistentDef->mem.swap_hard_limit = params[i].value.ul; } - } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { + } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemorySoftLimit(group, params[i].value.ul); + rc = virCgroupSetMemoryHardLimit(group, params[i].value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", - _("unable to set memory soft_limit tunable")); + _("unable to set memory hard_limit tunable")); ret = -1; } } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.soft_limit = params[i].value.ul; + persistentDef->mem.hard_limit = params[i].value.ul; } - } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { + } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemSwapHardLimit(group, params[i].value.ul); + rc = virCgroupSetMemorySoftLimit(group, params[i].value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", - _("unable to set swap_hard_limit tunable")); + _("unable to set memory soft_limit tunable")); ret = -1; } } + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.swap_hard_limit = params[i].value.ul; + persistentDef->mem.soft_limit = params[i].value.ul; } } } -- 1.7.7.3

3 3

[libvirt] [PATCH] More advanced auto-detection of driver module directory
by Daniel P. Berrange 23 Jul '12

23 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> When running directly from GIT, libvirtd attempts to locate the directory containing loadable modules. This currently only works if executing libvirtd with a CWD inside the libvirt source tree. Switch to locate based on the path to the current binary instead --- daemon/libvirtd.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index b5c0102..a7bb9dd 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -972,9 +972,27 @@ int main(int argc, char **argv) { virLogSetFromEnv(); #ifdef WITH_DRIVER_MODULES - if (strstr(argv[0], "lt-libvirtd") && - (access("./.git", R_OK) >= 0 || access("../.git", R_OK) >= 0)) - virDriverModuleInitialize("./src/.libs"); + if (strstr(argv[0], "lt-libvirtd")) { + char *tmp = strrchr(argv[0], '/'); + if (!tmp) { + fprintf(stderr, _("%s: cannot identify driver directory\n"), argv[0]); + exit(EXIT_FAILURE); + } + *tmp = '\0'; + char *driverdir; + if (virAsprintf(&driverdir, "%s/../../src/.libs", argv[0]) < 0) { + fprintf(stderr, _("%s: initialization failed\n"), argv[0]); + exit(EXIT_FAILURE); + } + if (access(driverdir, R_OK) < 0) { + fprintf(stderr, _("%s: expected driver directory '%s' is missing\n"), + argv[0], driverdir); + exit(EXIT_FAILURE); + } + virDriverModuleInitialize(driverdir); + *tmp = '/'; + /* Must not free 'driverdir' - it is still used */ + } #endif while (1) { -- 1.7.10.4

2 1