November 2012 - Devel - libvirt List Archives

[libvirt] [PATCH] storage: fix scsi detach regression with cgroup ACLs
by Eric Blake 01 Dec '12

01 Dec '12

https://bugzilla.redhat.com/show_bug.cgi?id=876828 Commit 38c4a9cc introduced a regression in hot unplugging of disks from qemu, where cgroup device ACLs were no longer being revoked (thankfully not a security hole: cgroup ACLs only prevent open() of the disk; so reverting the ACL prevents future abuse but doesn't stop abuse from an fd that was already opened before the ACL change). Commit 1b2ebf95 overlooked that there were two spots affected. * src/qemu/qemu_hotplug.c (qemuDomainDetachDiskDevice): Transfer backing chain before deletion. * src/qemu/qemu_driver.c (qemuDomainDetachDeviceDiskLive): Fix spacing (partly to ensure a different-looking patch). --- I blame git for letting me find this - I did a 'pull --rebase' on top of libvirt.git, and noticed that my working patch was still on the tree - it turns out that the hunk for qemu_hotplug.c is _identical_ except for the context of the function name needing a fix. I still wish git would be more vocal when it finds an alternate place to apply a patch when function names don't match. src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c37bdb9..ae98dbf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6070,7 +6070,7 @@ qemuDomainDetachDeviceDiskLive(virQEMUDriverPtr driver, if (disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) ret = qemuDomainDetachPciDiskDevice(driver, vm, dev); else if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) - ret = qemuDomainDetachDiskDevice(driver, vm, dev); + ret = qemuDomainDetachDiskDevice(driver, vm, dev); else if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) ret = qemuDomainDetachDiskDevice(driver, vm, dev); else diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index cfeae68..2d4a822 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2091,6 +2091,8 @@ int qemuDomainDetachDiskDevice(virQEMUDriverPtr driver, virDomainDiskRemove(vm->def, i); + dev->data.disk->backingChain = detach->backingChain; + detach->backingChain = NULL; virDomainDiskDefFree(detach); if (virSecurityManagerRestoreImageLabel(driver->securityManager, -- 1.7.1

2 2

[libvirt] [PATCH 1/3] Add APIs for talking to init via /dev/initctl
by Daniel P. Berrange 01 Dec '12

01 Dec '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> To be able todo controlled shutdown/reboot of containers an API to talk to init via /dev/initctl is required. Fortunately this is quite straightforward to implement, and is supported by both sysvinit and systemd. Upstart support for /dev/initctl is unclear. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- include/libvirt/virterror.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt_private.syms | 4 ++ src/util/virinitctl.c | 161 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virinitctl.h | 41 +++++++++++ src/util/virterror.c | 1 + 7 files changed, 210 insertions(+) create mode 100644 src/util/virinitctl.c create mode 100644 src/util/virinitctl.h diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index a877683..4d79620 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -114,6 +114,7 @@ typedef enum { VIR_FROM_SSH = 50, /* Error from libssh2 connection transport */ VIR_FROM_LOCKSPACE = 51, /* Error from lockspace */ + VIR_FROM_INITCTL = 52, /* Error from initctl device communication */ # ifdef VIR_ENUM_SENTINELS VIR_ERR_DOMAIN_LAST diff --git a/po/POTFILES.in b/po/POTFILES.in index ec59efb..77bc04b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -153,6 +153,7 @@ src/util/virauthconfig.c src/util/virdbus.c src/util/virfile.c src/util/virhash.c +src/util/virinitctl.c src/util/virkeyfile.c src/util/virlockspace.c src/util/virnetdev.c diff --git a/src/Makefile.am b/src/Makefile.am index 627dbb5..6401dec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -94,6 +94,7 @@ UTIL_SOURCES = \ util/virdbus.c util/virdbus.h \ util/virhash.c util/virhash.h \ util/virhashcode.c util/virhashcode.h \ + util/virinitctl.c util/virinitctl.h \ util/virkeycode.c util/virkeycode.h \ util/virkeyfile.c util/virkeyfile.h \ util/virkeymaps.h \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2573b8a..f308b55 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1356,6 +1356,10 @@ virFileTouch; virFileUpdatePerm; +# virinitctl.h +virInitctlSetRunLevel; + + # virkeycode.h virKeycodeSetTypeFromString; virKeycodeSetTypeToString; diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c new file mode 100644 index 0000000..c70ea3a --- /dev/null +++ b/src/util/virinitctl.c @@ -0,0 +1,161 @@ +/* + * virinitctl.c: API for talking to init systems via initctl + * + * Copyright (C) 2012 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/>. + * + * Authors: + * Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include <sys/param.h> +#include <fcntl.h> + +#include "internal.h" +#include "virinitctl.h" +#include "virterror_internal.h" +#include "util.h" +#include "memory.h" +#include "virfile.h" + +#define VIR_FROM_THIS VIR_FROM_INITCTL + +/* These constants & struct definitions are taken from + * systemd, under terms of LGPLv2+ + * + * initreq.h Interface to talk to init through /dev/initctl. + * + * Copyright (C) 1995-2004 Miquel van Smoorenburg + */ + +#if defined(__FreeBSD_kernel__) +# define VIR_INITCTL_FIFO "/etc/.initctl" +#else +# define VIR_INITCTL_FIFO "/dev/initctl" +#endif + +#define VIR_INITCTL_MAGIC 0x03091969 +#define VIR_INITCTL_CMD_START 0 +#define VIR_INITCTL_CMD_RUNLVL 1 +#define VIR_INITCTL_CMD_POWERFAIL 2 +#define VIR_INITCTL_CMD_POWERFAILNOW 3 +#define VIR_INITCTL_CMD_POWEROK 4 +#define VIR_INITCTL_CMD_BSD 5 +#define VIR_INITCTL_CMD_SETENV 6 +#define VIR_INITCTL_CMD_UNSETENV 7 + +#define VIR_INITCTL_CMD_CHANGECONS 12345 + +#ifdef MAXHOSTNAMELEN +# define VIR_INITCTL_RQ_HLEN MAXHOSTNAMELEN +#else +# define VIR_INITCTL_RQ_HLEN 64 +#endif + +/* +* This is what BSD 4.4 uses when talking to init. +* Linux doesn't use this right now. +*/ +struct virInitctlRequestBSD { + char gen_id[8]; /* Beats me.. telnetd uses "fe" */ + char tty_id[16]; /* Tty name minus /dev/tty */ + char host[VIR_INITCTL_RQ_HLEN]; /* Hostname */ + char term_type[16]; /* Terminal type */ + int signal; /* Signal to send */ + int pid_value; /* Process to send to */ + char exec_name[128]; /* Program to execute */ + char reserved[128]; /* For future expansion. */ +}; + + +/* + * Because of legacy interfaces, "runlevel" and "sleeptime" + * aren't in a separate struct in the union. + * + * The weird sizes are because init expects the whole + * struct to be 384 bytes. + */ +struct virInitctlRequest { + int magic; /* Magic number */ + int cmd; /* What kind of request */ + int runlevel; /* Runlevel to change to */ + int sleeptime; /* Time between TERM and KILL */ + union { + struct virInitctlRequestBSD bsd; + char data[368]; + } i; +}; + + +/* + * Send a message to init to change the runlevel + * + * Returns 1 on success, 0 if initctl does not exist, -1 on error + */ +int virInitctlSetRunLevel(virInitctlRunLevel level, + const char *vroot) +{ + struct virInitctlRequest req; + int fd = -1; + char *path = NULL; + int ret = -1; + + memset(&req, 0, sizeof(req)); + + req.magic = VIR_INITCTL_MAGIC; + req.sleeptime = 0; + req.cmd = VIR_INITCTL_CMD_RUNLVL; + req.runlevel = level; + + if (vroot) { + if (virAsprintf(&path, "%s/%s", vroot, VIR_INITCTL_FIFO) < 0) { + virReportOOMError(); + return -1; + } + } else { + if (!(path = strdup(VIR_INITCTL_FIFO))) { + virReportOOMError(); + return -1; + } + } + + if ((fd = open(path, O_WRONLY|O_NDELAY|O_CLOEXEC|O_NOCTTY)) < 0) { + if (errno == ENOENT) { + ret = 0; + goto cleanup; + } + virReportSystemError(errno, + _("Cannot open init control %s"), + path); + goto cleanup; + } + + if (safewrite(fd, &req, sizeof(req)) != sizeof(req)) { + virReportSystemError(errno, + _("Failed to send request to init control %s"), + path); + goto cleanup; + } + + ret = 1; + +cleanup: + VIR_FREE(path); + VIR_FORCE_CLOSE(fd); + return ret; +} diff --git a/src/util/virinitctl.h b/src/util/virinitctl.h new file mode 100644 index 0000000..09c078f --- /dev/null +++ b/src/util/virinitctl.h @@ -0,0 +1,41 @@ +/* + * virinitctl.h: API for talking to init systems via initctl + * + * Copyright (C) 2012 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/>. + * + * Authors: + * Daniel P. Berrange <berrange(a)redhat.com> + */ + +#ifndef __VIR_INITCTL_H__ +# define __VIR_INITCTL_H__ + +typedef enum virInitctlRunLevel virInitctlRunLevel; +enum virInitctlRunLevel { + VIR_INITCTL_RUNLEVEL_POWEROFF = 0, + VIR_INITCTL_RUNLEVEL_1 = 1, + VIR_INITCTL_RUNLEVEL_2 = 2, + VIR_INITCTL_RUNLEVEL_3 = 3, + VIR_INITCTL_RUNLEVEL_4 = 4, + VIR_INITCTL_RUNLEVEL_5 = 5, + VIR_INITCTL_RUNLEVEL_REBOOT = 6, +}; + +int virInitctlSetRunLevel(virInitctlRunLevel level, + const char *vroot); + +#endif diff --git a/src/util/virterror.c b/src/util/virterror.c index 213188e..1142c40 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -117,6 +117,7 @@ VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST, "SSH transport layer", /* 50 */ "Lock Space", + "Init control", ) -- 1.7.11.7

3 11

[libvirt] problems with current libvirt and qemu-kvm
by Gene Czarcinski 01 Dec '12

01 Dec '12

When I rebased my DHCPv6, etc. patches, I did that not only on to of Laine Stump's dnsmasq-capabiliotes/bind-dynamic updates but I also rebased to "current" git master. Well, the problem with the large number/frequent RTR-ADVERT syslog messages from dnsmasq that I had previously seen were fixed ... they stopped and dnsmasq produced expected results. But, starting virt-manager hung and there were new error messages in syslog about "internal error cannot find suitable emulator for X86_64. So I downgraded to a previous version that I knew worked and it did but my RTR-ADVERT messages are back. The "good" version uses a tarball created from git on November 19th and the "bad" version has a tarball created from git on November 29th. OK, before I start shuffling through the patches applied between those two date, does anyone have an idea what patches might be "guilty" ... for both issues ... fixing the RTR-ADVERT problem and giving libvirtd/qemu-kvm indigestion? I am not griping. When you run on the "leading edge", you expect a few arrows in your back. Any suggesting on testing will also be appreciated. Gene

4 5

[libvirt] Next release planning
by Daniel Veillard 01 Dec '12

01 Dec '12

Reminder, we are shooting for 1.0.1 release by mid December. I will be away next week and probably out of reach, and it looks unlikely i will have the bandwidth to start the freeze before Monday 10 possibly Tuesday 11. So there is a bit more than a week to push API and features for 1.0.1. Then 1.0.2 will occur at the end of January. 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/

1 0

[libvirt] [PATCH 0/2] Last two coverity patches
by Ján Tomko 01 Dec '12

01 Dec '12

tools/virsh-pool.c: CHECKED_RETURN src/nwfilter/nwfilter_driver.c: UNREACHABLE Ján Tomko (2): virsh: check the return value of virStoragePoolGetAutostart nwfilter: fix error handling src/nwfilter/nwfilter_driver.c | 11 +++++------ tools/virsh-pool.c | 5 +---- 2 files changed, 6 insertions(+), 10 deletions(-) -- 1.7.8.6

2 8

[libvirt] [PATCH] Move reboot/shutdown flags combination check into QEMU driver
by Daniel P. Berrange 01 Dec '12

01 Dec '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The fact that only the guest agent, or ACPI flag can be used when requesting reboot/shutdown is merely a limitation of the QEMU driver impl at this time. Thus it should not be in libvirt.c code Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt.c | 16 ---------------- src/qemu/qemu_driver.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 757bfa8..d5310ed 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3260,14 +3260,6 @@ virDomainShutdownFlags(virDomainPtr domain, unsigned int flags) goto error; } - /* At most one of these two flags should be set. */ - if ((flags & VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN) && - (flags & VIR_DOMAIN_SHUTDOWN_GUEST_AGENT)) { - virReportInvalidArg(flags, "%s", - _("flags for acpi power button and guest agent are mutually exclusive")); - goto error; - } - conn = domain->conn; if (conn->driver->domainShutdownFlags) { @@ -3322,14 +3314,6 @@ virDomainReboot(virDomainPtr domain, unsigned int flags) goto error; } - /* At most one of these two flags should be set. */ - if ((flags & VIR_DOMAIN_REBOOT_ACPI_POWER_BTN) && - (flags & VIR_DOMAIN_REBOOT_GUEST_AGENT)) { - virReportInvalidArg(flags, "%s", - _("flags for acpi power button and guest agent are mutually exclusive")); - goto error; - } - conn = domain->conn; if (conn->driver->domainReboot) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c37bdb9..6a8a333 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1814,6 +1814,14 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { virCheckFlags(VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN | VIR_DOMAIN_SHUTDOWN_GUEST_AGENT, -1); + /* At most one of these two flags should be set. */ + if ((flags & VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN) && + (flags & VIR_DOMAIN_SHUTDOWN_GUEST_AGENT)) { + virReportInvalidArg(flags, "%s", + _("flags for acpi power button and guest agent are mutually exclusive")); + return -1; + } + qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); qemuDriverUnlock(driver); @@ -1896,6 +1904,14 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) virCheckFlags(VIR_DOMAIN_REBOOT_ACPI_POWER_BTN | VIR_DOMAIN_REBOOT_GUEST_AGENT , -1); + /* At most one of these two flags should be set. */ + if ((flags & VIR_DOMAIN_REBOOT_ACPI_POWER_BTN) && + (flags & VIR_DOMAIN_REBOOT_GUEST_AGENT)) { + virReportInvalidArg(flags, "%s", + _("flags for acpi power button and guest agent are mutually exclusive")); + return -1; + } + qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); qemuDriverUnlock(driver); -- 1.7.11.7

2 3

[libvirt] [test-API][PATCH v4] Add test case of set vcpus with flags
by Wayne Sun 30 Nov '12

30 Nov '12

v2: break down the case to small cases with separate flags * Use setVcpusFlags API to set domain vcpus with flags * 3 cases added, each only deal with one set flag value as in config, live or maximum * cases are independent on domain states, API will report error if not suitable for certain states * the sample conf is only one scenario of hotplug domain vcpus v3: merge config and maximum case to config * maximum flag can only work when domain is shutoff, merge it to config case to simplify code v4: make both vcpu and maxvcpu as optional param in config case * depend on the given params to select flags and setting Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/set_vcpus_flags.conf | 67 ++++++++++++++++++++++++ repos/setVcpus/set_vcpus_config.py | 99 ++++++++++++++++++++++++++++++++++++ repos/setVcpus/set_vcpus_live.py | 96 ++++++++++++++++++++++++++++++++++ 3 files changed, 262 insertions(+), 0 deletions(-) create mode 100644 cases/set_vcpus_flags.conf create mode 100644 repos/setVcpus/__init__.py create mode 100644 repos/setVcpus/set_vcpus_config.py create mode 100644 repos/setVcpus/set_vcpus_live.py diff --git a/cases/set_vcpus_flags.conf b/cases/set_vcpus_flags.conf new file mode 100644 index 0000000..6cf595f --- /dev/null +++ b/cases/set_vcpus_flags.conf @@ -0,0 +1,67 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + $defaultvcpu + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + imageformat + qcow2 + +domain:destroy + guestname + $defaultname + +setVcpus:set_vcpus_config + guestname + $defaultname + vcpu + 1 + maxvcpu + 8 + +domain:start + guestname + $defaultname + +setVcpus:set_vcpus_live + guestname + $defaultname + vcpu + 3 + username + $username + password + $password + +setVcpus:set_vcpus_config + guestname + $defaultname + vcpu + 5 + +domain:destroy + guestname + $defaultname + +domain:start + guestname + $defaultname + +domain:destroy + guestname + $defaultname + +domain:undefine + guestname + $defaultname + +options cleanup=enable diff --git a/repos/setVcpus/__init__.py b/repos/setVcpus/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/repos/setVcpus/set_vcpus_config.py b/repos/setVcpus/set_vcpus_config.py new file mode 100644 index 0000000..289dad1 --- /dev/null +++ b/repos/setVcpus/set_vcpus_config.py @@ -0,0 +1,99 @@ +#!/usr/bin/env python +# Test set domain vcpu with flag VIR_DOMAIN_AFFECT_CONFIG or +# VIR_DOMAIN_VCPU_MAXIMUM, depend on which optional param is +# given. + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', ) +optional_params = {'vcpu': 1, + 'maxvcpu': 8, + } + +def get_vcpu_number(domobj): + """dump domain config xml description to get vcpu number, return + current vcpu and maximum vcpu number + """ + try: + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml is :\n%s" %(domobj.name(), guestxml)) + xml = minidom.parseString(guestxml) + vcpu = xml.getElementsByTagName('vcpu')[0] + maxvcpu = int(vcpu.childNodes[0].data) + logger.info("domain max vcpu number is: %s" % maxvcpu) + + if vcpu.hasAttribute('current'): + attr = vcpu.getAttributeNode('current') + current = int(attr.nodeValue) + else: + logger.info("no 'current' atrribute for element vcpu") + current = int(vcpu.childNodes[0].data) + + logger.info("domain current vcpu number is: %s" % current) + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return False + + return current, maxvcpu + +def set_vcpus_config(params): + """set domain vcpu with config flag and check, also set and check + max vcpu with maximum flag if optional param maxvcpu is given + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + vcpu = params.get('vcpu', None) + maxvcpu = params.get('maxvcpu', None) + + logger.info("the name of virtual machine is %s" % guestname) + if vcpu == None and maxvcpu == None: + logger.error("at least one of vcpu or maxvcpu should be provided") + return 1 + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + if vcpu: + logger.info("the given vcpu number is %s" % vcpu) + logger.info("set domain vcpu as %s with flag: %s" % + (vcpu, libvirt.VIR_DOMAIN_AFFECT_CONFIG)) + domobj.setVcpusFlags(int(vcpu), libvirt.VIR_DOMAIN_AFFECT_CONFIG) + logger.info("set domain vcpu succeed") + + if maxvcpu: + logger.info("the given max vcpu number is %s" % maxvcpu) + logger.info("set domain maximum vcpu as %s with flag: %s" % + (maxvcpu, libvirt.VIR_DOMAIN_VCPU_MAXIMUM)) + domobj.setVcpusFlags(int(maxvcpu), libvirt.VIR_DOMAIN_VCPU_MAXIMUM) + logger.info("set domain vcpu succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + logger.info("check domain config xml to get vcpu number") + ret = get_vcpu_number(domobj) + if vcpu: + if ret[0] == int(vcpu): + logger.info("domain current vcpu is equal as set") + else: + logger.error("domain current vcpu is not equal as set") + return 1 + + if maxvcpu: + if ret[1] == int(maxvcpu): + logger.info("domain max vcpu is equal as set") + else: + logger.error("domain max vcpu is not equal as set") + return 1 + + return 0 diff --git a/repos/setVcpus/set_vcpus_live.py b/repos/setVcpus/set_vcpus_live.py new file mode 100644 index 0000000..35a2976 --- /dev/null +++ b/repos/setVcpus/set_vcpus_live.py @@ -0,0 +1,96 @@ +#!/usr/bin/env python +# Test set domain vcpu with flag VIR_DOMAIN_VCPU_LIVE. Check +# domain xml and inside domain to get current vcpu number. The +# live flag only work on running domain, so test on shutoff +# domain will fail. + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'vcpu', 'username', 'password', ) +optional_params = {} + +def get_current_vcpu(domobj, username, password): + """dump domain live xml description to get current vcpu number + and check in domain to confirm + """ + try: + guestxml = domobj.XMLDesc(1) + guestname = domobj.name() + logger.debug("domain %s xml is :\n%s" %(guestname, guestxml)) + xml = minidom.parseString(guestxml) + vcpu = xml.getElementsByTagName('vcpu')[0] + + if vcpu.hasAttribute('current'): + attr = vcpu.getAttributeNode('current') + current = int(attr.nodeValue) + else: + logger.info("no 'current' atrribute for element vcpu") + current = int(vcpu.childNodes[0].data) + + logger.info("domain current vcpu number in live xml is: %s" % current) + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return False + + logger.debug("get the mac address of vm %s" % guestname) + mac = utils.get_dom_mac_addr(guestname) + logger.debug("the mac address of vm %s is %s" % (guestname, mac)) + + logger.info("check cpu number in domain") + ip = utils.mac_to_ip(mac, 180) + + cmd = "cat /proc/cpuinfo | grep processor | wc -l" + ret, output = utils.remote_exec_pexpect(ip, username, password, cmd) + if not ret: + logger.info("cpu number in domain is %s" % output) + if int(output) == current: + logger.info("cpu in domain is equal to current vcpu value") + else: + logger.error("current vcpu is not equal as check in domain") + return False + else: + logger.error("check in domain fail") + return False + + return current + +def set_vcpus_live(params): + """set domain vcpu with live flag and check + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + vcpu = int(params['vcpu']) + username = params['username'] + password = params['password'] + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given vcpu number is %s" % vcpu) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + logger.info("set domain vcpu as %s with flag: %s" % + (vcpu, libvirt.VIR_DOMAIN_VCPU_LIVE)) + domobj.setVcpusFlags(vcpu, libvirt.VIR_DOMAIN_VCPU_LIVE) + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + logger.info("check domain vcpu") + ret = get_current_vcpu(domobj, username, password) + if ret == vcpu: + logger.info("domain vcpu is equal as set") + return 0 + else: + logger.error("domain vcpu is not equal as set") + return 1 -- 1.7.1

2 1

[libvirt] [PATCH 00/10 v2] Automatically shutdown VMs on session quit
by Daniel P. Berrange 30 Nov '12

30 Nov '12

A re-post of https://www.redhat.com/archives/libvir-list/2012-October/msg01768.html Changed in this version - Fixed only review bug mentioned last time - Rebased to current GIT

2 31

[libvirt] [PATCH 0/2] Clean up qemu driver configuration parser.
by Peter Krempa 30 Nov '12

30 Nov '12

Done while hacking on other series (that is not yet ready). Peter Krempa (2): qemu: Refactor config parameter retrieval qemu: Refactor error reporting in qemu driver configuration parser src/qemu/qemu_conf.c | 479 +++++++++++++++------------------------------------ 1 file changed, 142 insertions(+), 337 deletions(-) -- 1.8.0

2 6

[libvirt] [PATCHv3 0/3] network: resolve CVE 2012-3411
by Laine Stump 30 Nov '12

30 Nov '12

(This obsoletes the V2 patches I sent yesterday: https://www.redhat.com/archives/libvir-list/2012-November/msg01216.html ) This patch series resolves the libvirt part of CVE 2012-3411: https://bugzilla.redhat.com/show_bug.cgi?id=833033 Further details are in PATCH 3/3. The changes from V1 to V3: (resulting from Doug Goldstein's review, and a comment in the BZ record from the CVE reporter, David Woodhouse) 1) rework dnsmasqCapsRefresh() to create a new caps object if it's given a NULL object (function now gets dnsmasqCapsPtr* instead of dnsmasCapsPtr). This makes it possible to recover properly if dnsmasq is installed after libvirtd has already been started. 2) Add the following before each run of dnsmasq: virCommandAddEnvPassCommon(cmd); virCommandClearCaps(cmd); 3) Fixed a missing space after comma :-) 4) remove empty if () { } around initial call to dnsmasqCapsNewFromBinary() in bridge_driver.c 5) include FEC0::/10 as a "local" range when checking for private addresses to allow in the absence of an updated dnsmasq.

2 9