- Devel - libvirt List Archives

[libvirt] ocaml: prototype bindings for event callbacks
by David Scott 28 Mar '13

28 Mar '13

Hi, I've made an prototype set of ocaml bindings for the libvirt event mechanism -- here is what I've got so far. It's possible to register for all the types supported by virConnectDomainEventRegisterAny I've not tested each type of event yet, but the basics are all working. For every distinct callback function signature it maintains: 1. OCaml: a hashtable mapping callback_id (int64) to a specific closure 2. OCaml: a function registered with Callback.register 3. C: a function registered with libvirt, which upcalls to OCaml There's still some missing polish, for example I've not implemented a means to actually deregister a callback :-) I thought it would be best to get feedback on the overall approach, style of the mapping etc first. Comments and criticism greatly appreciated! Thanks, Dave

2 4

[libvirt] [PATCH 0/3 RESENT] Fix virsh race and coredump
by Viktor Mihajlovski 27 Mar '13

27 Mar '13

Please consider for 1.0.4 as this prevents a potential data corruption or segfault. The race is caused by referencing a disposed connection object in a callback. In the first patch we make sure that the object reference count is reflecting the callback registration. This prevents a premature disposal. The second patch prevents the invocation of a NULL callback. The last one tries to ensure that we don't leak connection references in virsh. Viktor Mihajlovski (3): libvirt: Increase connection reference count for callbacks remote: Don't call NULL closeFreeCallback virsh: Unregister the connection close notifier upon termination src/libvirt.c | 5 +++++ src/remote/remote_driver.c | 3 ++- tools/virsh.c | 23 +++++++++++++++++------ 3 files changed, 24 insertions(+), 7 deletions(-) -- 1.7.9.5

3 9

[libvirt] How to get iteration time & downtime?
by Yuan, Ye A 27 Mar '13

27 Mar '13

Hi all, I'm a graduate student in Shanghai, and will do experiment about live migration using KVM as hypervisor. Due to my demand, I want to get each iteration time and downtime in migration. I found there is no API to implement it, and how can I obtain data I want? Thanks very much. Best wishes, Yale Yuan

3 5

[libvirt] [PATCHv2] virsh-domain: Simplify usage of --current, --live and --config flags
by Peter Krempa 27 Mar '13

27 Mar '13

This patch uses the new helper to avoid the more complex check for domain state modification flags. --- Notes: Version 2: - remove unecessary usage of "if (current)" - fix cmdSetmaxmem - convert cmdMemtune too tools/virsh-domain.c | 300 ++++++++++++++++++++------------------------------- 1 file changed, 118 insertions(+), 182 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 128e516..11db36b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1021,25 +1021,21 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) int nparams = 0; int maxparams = 0; virTypedParameterPtr params = NULL; - unsigned int flags = 0, i = 0; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; + unsigned int i = 0; int rv = 0; bool current = vshCommandOptBool(cmd, "current"); bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool ret = false; - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - flags = VIR_DOMAIN_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) goto cleanup; @@ -1206,23 +1202,18 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) unsigned int i = 0; virTypedParameterPtr params = NULL; bool ret = false; - unsigned int flags = 0; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; bool current = vshCommandOptBool(cmd, "current"); bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - flags = VIR_DOMAIN_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -2475,7 +2466,7 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; const char *name = NULL, *device = NULL, *inboundStr = NULL, *outboundStr = NULL; - unsigned int flags = 0; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; int nparams = 0; int maxparams = 0; virTypedParameterPtr params = NULL; @@ -2486,18 +2477,13 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) virNetDevBandwidthRate inbound, outbound; int i; - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - flags = VIR_DOMAIN_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; @@ -4027,23 +4013,18 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) int nupdates = 0; int i, ret; bool ret_val = false; - unsigned int flags = 0; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; bool current = vshCommandOptBool(cmd, "current"); bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - flags = VIR_DOMAIN_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -5478,23 +5459,18 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); bool query = false; /* Query mode if no cpulist */ - unsigned int flags = 0; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - flags = VIR_DOMAIN_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - /* neither option is specified */ - if (!live && !config) - flags = -1; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + /* none of the options were specified */ + if (!current && !live && !config) + flags = -1; if (vshCommandOptStringReq(ctl, cmd, "cpulist", &cpulist) < 0) return false; @@ -5712,23 +5688,18 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); bool query = false; /* Query mode if no cpulist */ - unsigned int flags = 0; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - flags = VIR_DOMAIN_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - /* neither option is specified */ - if (!live && !config) - flags = -1; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + /* none of the options were specified */ + if (!current && !live && !config) + flags = -1; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -5911,23 +5882,18 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); - unsigned int flags = 0; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - flags = VIR_DOMAIN_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - /* neither option is specified */ - if (!live && !config && !maximum) - flags = -1; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + /* none of the options were specified */ + if (!current && !live && !config && !maximum) + flags = -1; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -6608,18 +6574,13 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) bool ret = false; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - flags = VIR_DOMAIN_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -7025,23 +6986,18 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); - unsigned int flags = 0; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - flags = VIR_DOMAIN_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - /* neither option is specified */ - if (!live && !config) - flags = -1; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + /* none of the options were specified */ + if (!current && !live && !config) + flags = -1; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -7127,22 +7083,18 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); - unsigned int flags = VIR_DOMAIN_MEM_MAXIMUM; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT | VIR_DOMAIN_MEM_MAXIMUM; - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - /* neither option is specified */ - if (!live && !config) - flags = -1; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + /* none of the options were specified */ + if (!current && !live && !config) + flags = -1; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -7264,23 +7216,18 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) unsigned int i = 0; virTypedParameterPtr params = NULL; bool ret = false; - unsigned int flags = 0; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; bool current = vshCommandOptBool(cmd, "current"); bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - flags = VIR_DOMAIN_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -7435,24 +7382,19 @@ cmdNumatune(vshControl * ctl, const vshCmd * cmd) virTypedParameterPtr params = NULL; const char *nodeset = NULL; bool ret = false; - unsigned int flags = 0; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; bool current = vshCommandOptBool(cmd, "current"); bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); const char *mode = NULL; - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - flags = VIR_DOMAIN_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -9961,7 +9903,7 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) const char *doc = NULL; xmlNodePtr disk_node = NULL; const char *disk_xml = NULL; - int flags = 0; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; bool config, live, current, force = false; bool eject, insert, update = false; bool ret = false; @@ -9997,19 +9939,13 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) action = "update"; } - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - return false; - } - flags = VIR_DOMAIN_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - } + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; if (force) flags |= VIR_DOMAIN_DEVICE_MODIFY_FORCE; -- 1.8.1.5

2 1

[libvirt] [PATCH] log: Separate thread ID from timestemp in ring buffer
by Jiri Denemark 27 Mar '13

27 Mar '13

When we write a log message into a log, we separate thread ID from timestamp using ": ". However, when storing the message into the ring buffer, we omitted the separator, e.g.: 2013-02-27 11:49:11.852+00003745: ... --- src/util/virlog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virlog.c b/src/util/virlog.c index 957d993..721c9bd 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -850,6 +850,7 @@ virLogVMessage(virLogSource source, */ virLogLock(); virLogStr(timestamp); + virLogStr(": "); virLogStr(msg); virLogUnlock(); if (emit == 0) -- 1.8.1.5

2 2

[libvirt] [PATCH] rpc: Fix client crash when server drops connection
by Jiri Denemark 27 Mar '13

27 Mar '13

Despite of the comment stating virNetClientIncomingEvent handler should never be called with either client->haveTheBuck or client->wantClose set, there is a sequence of events that may lead to both booleans being true when virNetClientIncomingEvent is called. However, when that happens, we must not immediately close the socket as there are other threads waiting for the buck and they would cause SIGSEGV once they are woken up after the socket was closed. Another thing is we should clear all remaining calls in the queue after closing the socket. The situation that can lead to the crash involves three threads, one of them running event loop and the other two calling libvirt APIs. The event loop threads detects an event on client->sock and calls virNetClientIncomingEvent handler. But before the handler gets a chance to lock client, the other two threads (T1 and T2) start calling some APIs. T1 gets the buck and detects EOF on client->sock while processing its RPC call. Since T2 is waiting for its own call, T1 passes the buck onto it and unlocks client. But before T2 gets the signal, the event loop thread wakes up, does its job and closes client->sock. The crash happens when T2 actually wakes up and tries to do its job using a closed client->sock. --- src/rpc/virnetclient.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 1379078..010c5c3 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1825,7 +1825,6 @@ void virNetClientIncomingEvent(virNetSocketPtr sock, if (!client->sock) goto done; - /* This should be impossible, but it doesn't hurt to check */ if (client->haveTheBuck || client->wantClose) goto done; @@ -1858,8 +1857,12 @@ void virNetClientIncomingEvent(virNetSocketPtr sock, virNetClientIOUpdateCallback(client, true); done: - if (client->wantClose) + if (client->wantClose && !client->haveTheBuck) { virNetClientCloseLocked(client); + virNetClientCallRemovePredicate(&client->waitDispatch, + virNetClientIOEventLoopRemoveAll, + NULL); + } virObjectUnlock(client); } -- 1.8.1.5

2 2

[libvirt] Unable to start container on Fedora 17 with kernel 3.8.0
by Purcareata Bogdan-B43198 27 Mar '13

27 Mar '13

Hello, I've had some trouble starting a Linux Container with libvirt. Here's my setup: 1. I've downloaded libvirt-1.0.3.tar.gz from [1] and issued: - ./configure --prefix=/usr - make - make install - ldconfig 2. I've started the libvirtd service: - sudo service libvirtd start Starting libvirtd (via systemctl): Warning: Unit file of created job changed on disk, 'systemctl --system daemon-reload' recommended. [ OK ] 3. I've defined the lxc domain: <domain type='lxc'> <name>foo</name> <uuid>2d1fa65a-0dbf-46e3-3a5c-ebc53e3d0c25</uuid> <memory unit='KiB'>500000</memory> <currentMemory unit='KiB'>500000</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='x86_64'>exe</type> <init>/bin/init</init> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/libvirt_lxc</emulator> <filesystem type='mount' accessmode='passthrough'> <source dir='/usr/var/lib/lxc/foo/rootfs'/> <target dir='/'/> </filesystem> <console type='pty'> <target type='serial' port='0'/> </console> <console type='pty'> <target type='serial' port='1'/> </console> <console type='pty'> <target type='serial' port='2'/> </console> <console type='pty'> <target type='serial' port='3'/> </console> </devices> </domain> When issuing virsh -c lxc:/// start foo I get the following error: error: Failed to start domain foo error: internal error guest failed to start: PATH=/bin:/sbin TERM=linux container=lxc-libvirt container_uuid=2d1fa65a-0dbf-46e3-3a5c-ebc53e3d0c25 LIBVIRT_LXC_UUID=2d1fa65a-0dbf-46e3-3a5c-ebc53e3d0c25 LIBVIRT_LXC_NAME=foo /bin/init 2013-03-26 17:09:34.186+0000: 1: info : libvirt version: 1.0.3 2013-03-26 17:09:34.186+0000: 1: error : lxcContainerMountBasicFS:563 : Failed to mount /selinux on /selinux type selinuxfs flags=e opts=(null): No such device 2013-03-26 17:09:34.186+0000: 8087: info : libvirt version: 1.0.3 2013-03-26 17:09:34.186+0000: 8087: error : virLXCControllerRun:1468 : error receiving signal from container: Input/output error Same message is present in /var/log/libvirt/lxc/foo.log. No errors shown in /var/log/messages. Machine: Linux everest 3.8.0 #1 SMP Mon Mar 25 19:29:56 EET 2013 x86_64 x86_64 x86_64 GNU/Linux Can you please provide me some more info on the issue? Thank you very much, Bogdan P. [1] http://libvirt.org/sources/libvirt-1.0.3.tar.gz

2 2

[libvirt] [PATCH] conf: fix a failure when detaching a usb device
by Guannan Ren 27 Mar '13

27 Mar '13

#virsh detach-device $guest usb.xml error: Failed to detach device from usb2.xml error: operation failed: host usb device vendor=0x0951 \ product=0x1625 not found This regresstion is due to a typo in matching function. The first argument is always the usb device that we are checking for. If the usb xml file provided by user contains bus and device info, we try to search it by them, otherwise, we use vendor and product info. The bug occurred only when detaching a usb device with no bus and device info provided in the usb xml file. --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4cae0d3..2b2f35c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8541,7 +8541,7 @@ static int virDomainHostdevMatchSubsysUSB(virDomainHostdevDefPtr a, virDomainHostdevDefPtr b) { - if (b->source.subsys.u.usb.bus && b->source.subsys.u.usb.device) { + if (a->source.subsys.u.usb.bus && a->source.subsys.u.usb.device) { /* specified by bus location on host */ if (a->source.subsys.u.usb.bus == b->source.subsys.u.usb.bus && a->source.subsys.u.usb.device == b->source.subsys.u.usb.device) -- 1.7.11.2

2 2

[libvirt] [PATCH] qemu: Set migration FD blocking
by Michal Privoznik 27 Mar '13

27 Mar '13

Since we switched from direct host migration scheme to the one, where we connect to the destination and then just pass a FD to a qemu, we have uncovered a qemu bug. Qemu expects migration FD to block. However, we are passing a nonblocking one which results in cryptic error messages like: qemu: warning: error while loading state section id 2 load of migration failed The bug is already known to Qemu folks, but we should workaround already released Qemus. Patch has been originally proposed by Stefan Hajnoczi <stefanha(a)gmail.com> --- src/qemu/qemu_migration.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 537b834..15f3cef 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2657,6 +2657,13 @@ qemuMigrationConnect(virQEMUDriverPtr driver, spec->dest.fd.qemu == -1) goto cleanup; + /* Migration expects a blocking FD */ + if (virSetBlocking(spec->dest.fd.qemu, true) < 0) { + virReportSystemError(errno, _("Unable to set FD %d blocking"), + spec->dest.fd.qemu); + goto cleanup; + } + ret = 0; cleanup: -- 1.8.1.5

4 6

[libvirt] [PATCH] qemu: Don't set type too earla during virtio disk hotplug
by Guido Günther 27 Mar '13

27 Mar '13

f946462e14ac036357b7c11ce5c23f94a3ee4e49 changed behaviour by settings VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI upfront. If we do so before invoking qemuDomainPCIAddressEnsureAddr we merely try to set the PCI slot via qemuDomainPCIAddressReserveSlot instead reserving a new address via qemuDomainPCIAddressSetNextAddr which fails with $ ~/run-tck-test domain/200-disk-hotplug.t ./scripts/domain/200-disk-hotplug.t .. # Creating a new transient domain ./scripts/domain/200-disk-hotplug.t .. 1/5 # Attaching the new disk /var/lib/jenkins/jobs/libvirt-tck-build/workspace/scratchdir/200-disk-hotplug/extra.img # Failed test 'disk has been attached' # at ./scripts/domain/200-disk-hotplug.t line 67. # died: Sys::Virt::Error (libvirt error code: 1, message: internal error unable to reserve PCI address 0:0:0.0 # ) --- This unbreaks libvirt-tck on debian wheezy. Cheers, -- Guido src/qemu/qemu_hotplug.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 044f8cd..576738b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -226,7 +226,6 @@ int qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390; - else disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; } for (i = 0 ; i < vm->def->ndisks ; i++) { @@ -253,7 +252,8 @@ int qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (qemuDomainCCWAddressAssign(&disk->info, priv->ccwaddrs, !disk->info.addr.ccw.assigned) < 0) goto error; - } else if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { + } else if (!disk->info.type || + disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { if (qemuDomainPCIAddressEnsureAddr(priv->pciaddrs, &disk->info) < 0) goto error; } @@ -291,14 +291,17 @@ int qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, } } } - } else if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI){ + } else if (!disk->info.type || + disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virDevicePCIAddress guestAddr = disk->info.addr.pci; ret = qemuMonitorAddPCIDisk(priv->mon, disk->src, type, &guestAddr); - if (ret == 0) + if (ret == 0) { + disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; memcpy(&disk->info.addr.pci, &guestAddr, sizeof(guestAddr)); + } } qemuDomainObjExitMonitor(driver, vm); -- 1.7.10.4

2 4

[libvirt] [PATCH] Correct DESCRIPTION for virsh help blockcopy
by Yanbing Du 27 Mar '13

27 Mar '13

Signed-off-by: Yanbing Du <ydu(a)redhat.com> --- tools/virsh-domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 592a6e8..fc5cb1e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1603,7 +1603,7 @@ static const vshCmdInfo info_block_copy[] = { .data = N_("Start a block copy operation.") }, {.name = "desc", - .data = N_("Populate a disk from its backing image.") + .data = N_("Copy a disk backing image chain to dest.") }, {.name = NULL} }; -- 1.7.1

2 1

[libvirt] [PATCH] virsh: error out on non-numeric timeout values
by Ján Tomko 27 Mar '13

27 Mar '13

Some block commands and migrate ignored incorrect values. Bug: https://bugzilla.redhat.com/show_bug.cgi?id=927495 --- tools/virsh-domain.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 592a6e8..12bdd58 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1495,14 +1495,14 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) const char *path = NULL; bool quit = false; int abort_flags = 0; + int rv; if (blocking) { - if (vshCommandOptInt(cmd, "timeout", &timeout) > 0) { - if (timeout < 1) { - vshError(ctl, "%s", _("invalid timeout")); - return false; - } - + if ((rv = vshCommandOptInt(cmd, "timeout", &timeout)) < 0 || + (rv > 0 && timeout < 1)) { + vshError(ctl, "%s", _("invalid timeout")); + return false; + } else if (rv > 0) { /* Ensure that we can multiply by 1000 without overflowing. */ if (timeout > INT_MAX / 1000) { vshError(ctl, "%s", _("timeout is too big")); @@ -1685,18 +1685,18 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) const char *path = NULL; bool quit = false; int abort_flags = 0; + int rv; if (blocking) { if (pivot && finish) { vshError(ctl, "%s", _("cannot mix --pivot and --finish")); return false; } - if (vshCommandOptInt(cmd, "timeout", &timeout) > 0) { - if (timeout < 1) { - vshError(ctl, "%s", _("invalid timeout")); - return false; - } - + if ((rv = vshCommandOptInt(cmd, "timeout", &timeout)) < 0 || + (rv > 0 && timeout < 1)) { + vshError(ctl, "%s", _("invalid timeout")); + return false; + } else if (rv > 0) { /* Ensure that we can multiply by 1000 without overflowing. */ if (timeout > INT_MAX / 1000) { vshError(ctl, "%s", _("timeout is too big")); @@ -1962,14 +1962,14 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) const char *path = NULL; bool quit = false; int abort_flags = 0; + int rv; if (blocking) { - if (vshCommandOptInt(cmd, "timeout", &timeout) > 0) { - if (timeout < 1) { - vshError(ctl, "%s", _("invalid timeout")); - return false; - } - + if ((rv = vshCommandOptInt(cmd, "timeout", &timeout)) < 0 || + (rv > 0 && timeout < 1)) { + vshError(ctl, "%s", _("invalid timeout")); + return false; + } else if (rv > 0) { /* Ensure that we can multiply by 1000 without overflowing. */ if (timeout > INT_MAX / 1000) { vshError(ctl, "%s", _("timeout is too big")); @@ -8456,6 +8456,7 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) int timeout = 0; bool live_flag = false; vshCtrlData data; + int rv; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -8465,18 +8466,17 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "live")) live_flag = true; - if (vshCommandOptInt(cmd, "timeout", &timeout) > 0) { + if ((rv = vshCommandOptInt(cmd, "timeout", &timeout)) < 0 || + (rv > 0 && timeout < 1)) { + vshError(ctl, "%s", _("migrate: Invalid timeout")); + goto cleanup; + } else if (rv > 0) { if (! live_flag) { vshError(ctl, "%s", _("migrate: Unexpected timeout for offline migration")); goto cleanup; } - if (timeout < 1) { - vshError(ctl, "%s", _("migrate: Invalid timeout")); - goto cleanup; - } - /* Ensure that we can multiply by 1000 without overflowing. */ if (timeout > INT_MAX / 1000) { vshError(ctl, "%s", _("migrate: Timeout is too big")); -- 1.8.1.5

2 2

[libvirt] [PATCH] Fix virConnectOpen.*() name requirements
by Martin Kletzander 26 Mar '13

26 Mar '13

virConnectOpenAuth didn't require 'name' to be specified (VIR_DEBUG used NULLSTR() for the output) and by default, if name == NULL, the default connection uri is used. This was not indicated in the documentation and wasn't checked for in other API's VIR_DEBUG outputs. --- Thanks to Guannan's patch, this makes the following possible in python: conn = libvirt.open() which I personally find pretty nice. --- src/libvirt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 1624776..4b9ea75 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1334,7 +1334,7 @@ failed: /** * virConnectOpen: - * @name: URI of the hypervisor + * @name: (optional) URI of the hypervisor * * This function should be called first to get a connection to the * Hypervisor and xen store @@ -1362,7 +1362,7 @@ virConnectOpen(const char *name) if (virInitialize() < 0) goto error; - VIR_DEBUG("name=%s", name); + VIR_DEBUG("name=%s", NULLSTR(name)); virResetLastError(); ret = do_open(name, NULL, 0); if (!ret) @@ -1376,7 +1376,7 @@ error: /** * virConnectOpenReadOnly: - * @name: URI of the hypervisor + * @name: (optional) URI of the hypervisor * * This function should be called first to get a restricted connection to the * library functionalities. The set of APIs usable are then restricted @@ -1397,7 +1397,7 @@ virConnectOpenReadOnly(const char *name) if (virInitialize() < 0) goto error; - VIR_DEBUG("name=%s", name); + VIR_DEBUG("name=%s", NULLSTR(name)); virResetLastError(); ret = do_open(name, NULL, VIR_CONNECT_RO); if (!ret) @@ -1411,7 +1411,7 @@ error: /** * virConnectOpenAuth: - * @name: URI of the hypervisor + * @name: (optional) URI of the hypervisor * @auth: Authenticate callback parameters * @flags: bitwise-OR of virConnectFlags * -- 1.8.1.5

2 4

[libvirt] [PATCH] virsh: Let the compiler check usage of all fields in vshCmdOptType enum
by Peter Krempa 26 Mar '13

26 Mar '13

Get rid of the "default" labels to do so. --- tools/virsh.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index b574d7e..0a9ac6f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1172,8 +1172,6 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) case VSH_OT_ALIAS: /* aliases are intentionally undocumented */ continue; - default: - assert(0); } fputc(' ', stdout); fprintf(stdout, fmt, opt->name); @@ -1215,8 +1213,6 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) break; case VSH_OT_ALIAS: continue; - default: - assert(0); } fprintf(stdout, " %-15s %s\n", buf, _(opt->help)); -- 1.8.1.5

2 3

[libvirt] [PATCH] python: set default value to optional arguments
by Guannan Ren 26 Mar '13

26 Mar '13

When prefixing with string (optional) or optional in the description of arguments to libvirt C APIs, in python, these arguments will be set as optional arugments, for example: * virDomainSaveFlags: * @domain: a domain object * @to: path for the output file * @dxml: (optional) XML config for adjusting guest xml used on restore * @flags: bitwise-OR of virDomainSaveRestoreFlags the corresponding python APIs is restoreFlags(self, frm, dxml=None, flags=0) The following python APIs are changed to: blockCommit(self, disk, base, top, bandwidth=0, flags=0) blockPull(self, disk, bandwidth=0, flags=0) blockRebase(self, disk, base, bandwidth=0, flags=0) migrate(self, dconn, flags=0, dname=None, uri=None, bandwidth=0) migrate2(self, dconn, dxml=None, flags=0, dname=None, uri=None, bandwidth=0) migrateToURI(self, duri, flags=0, dname=None, bandwidth=0) migrateToURI2(self, dconnuri=None, miguri=None, dxml=None, flags=0, \ dname=None, bandwidth=0) saveFlags(self, to, dxml=None, flags=0) migrate(self, domain, flags=0, dname=None, uri=None, bandwidth=0) migrate2(self, domain, dxml=None, flags=0, dname=None, uri=None, bandwidth=0) restoreFlags(self, frm, dxml=None, flags=0) --- python/generator.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/python/generator.py b/python/generator.py index 0237374..7586ffc 100755 --- a/python/generator.py +++ b/python/generator.py @@ -1005,6 +1005,8 @@ functions_int_default_test = "%s == -1" def is_integral_type (name): return not re.search ("^(unsigned)? ?(int|long)$", name) is None +def is_optional_arg(info): + return not re.search("^$?\optional$?", info) is None # Functions returning lists which need special rules to check for errors # and raise exceptions. functions_list_exception_test = { @@ -1488,9 +1490,12 @@ def buildWrappers(module): for arg in args: if n != index: classes.write(", %s" % arg[0]) + if arg[0] == "flags" or is_optional_arg(arg[2]): + if is_integral_type(arg[1]): + classes.write("=0") + else: + classes.write("=None") n = n + 1 - if arg[0] == "flags": - classes.write("=0") classes.write("):\n") writeDoc(module, name, args, ' ', classes) n = 0 -- 1.7.11.2

2 3

[libvirt] [PATCH] Remove the redundant parentheses in migrate help
by Yanbing Du 26 Mar '13

26 Mar '13

Signed-off-by: Yanbing Du <ydu(a)redhat.com> --- tools/virsh-domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 128e516..592a6e8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8286,7 +8286,7 @@ static const vshCmdOptDef opts_migrate[] = { }, {.name = "change-protection", .type = VSH_OT_BOOL, - .help = N_("prevent any configuration changes to domain until migration ends)") + .help = N_("prevent any configuration changes to domain until migration ends") }, {.name = "unsafe", .type = VSH_OT_BOOL, -- 1.7.1

3 2

[libvirt] libvirt<->QEMU interfaces for CPU models
by Eduardo Habkost 26 Mar '13

26 Mar '13

Hi, After a long time trying to figure out the proper modelling inside QEMU, I believe the plans are now clearer in QEMU, so it's time to coordinate more closely with libvirt to try to make use of the new stuff. I tried to enumerate the libvirt requirements and current problems, and how we should be able to solve those problems using the X86CPU subclasses and properties, on the following wiki page: http://wiki.qemu.org/Features/CPUModels#Interfaces.2Frequirements_from_libv… I am pasting the section contents below, to facilitate discussion: = Ensuring predictable set of guest features = Requirement: libvirt needs to ensure all features required on the command-line are present and exposed to the guest. Current problem: libvirt doesn't use the "enforce" flag so it can't guarantee that a given feature will be actually exposed to the guest. Solution: use the "enforce" flag on the "-cpu" option. Limitation: no proper machine-friendly interface to report which features are missing. Workaround: See "querying for host capabilities" below. == Future plans == Machine-friendly reporting of missing host features/capabilities. = Listing CPU models = Requirement: libvirt needs to know which CPU models are available to be used with the "-cpu" option. Current problem: libvirt relies on help output parsing for that. Solution: use QMP qom-list-types command. Dependency: X86CPU subclasses. Limitation: needs a live QEMU process for the query. Solution: use QMP query-cpu-definitions command. Limitation: needs a live QEMU process for the query. == Future plans == It would be interesting to get rid of the requirement for a live QEMU process (with a complete machine being created) to be already running. = Getting information about CPU models = Requirement: libvirt uses the predefined CPU models from QEMU, but it needs to be able to query for CPU model details, to find out how it can create a VM that matches what was requested by the user. Current problem: libvirt has a copy of the CPU model definitions on its cpu_map.xml file, and the copy can be out of sync in case CPU models in QEMU change. libvirt also assumes that the set of features on each model is always the same on all machine-types, which is not true. Challenge: the resulting CPU features depend on lots of factors, including the machine-type. Workaround: start a paused VM and query for the CPU device information after the CPU was created. Solution: start a paused VM with no devices, but with the right machine-type and right CPU model. Use QMP QOM commands to query for CPU flags (especially the properties starting with the "f-" prefix). Dependency: X86CPU feature properties ("f-*" properties). Limitation: requires a live QEMU process with the right machine-type/ CPU-model to be started, to make the query. Requirement: libvirt needs to know if a specific CPU model can be used in the current host. See "Ensuring predictable set of guest features" above See "Querying host capabilities" below = Querying host capabilities = Requirement: libvirt needs to know which feature can really be enabled, before it tries to start a VM, and before it tries to start a live-migration process. The set of available capabilities depend on: • Host CPU (hardware) capabilities; • Kernel capabilities (reported by GET_SUPPORTED_CPUID); • QEMU capabilities; • Specific configuration options (e.g. in-kernel IRQ chip is required for some features). Current problem: libvirt uses the CPUID intruction directly and assumes that the presence of a feature in the host CPU means it can be enabled and exposed to the guest. This breaks when virtualization of a feature requires: • Additional hardware support (e.g. INVPCID); • Additional host kernel code (this applies to _all_ CPU features, that need to be reported as supported by GET_SUPPORTED_CPUID); • Additional QEMU-side code; • Specific configuration options (e.g. in-kernel IRQ chip). Challenge: QEMU doesn't have a generic capability-querying interface, and host capability querying depends on KVM to be initialized. Workaround: start a paused VM using the "host" CPU model, that has every single CPU feature supported by the host enabled by default, and query for the information about the CPU though QMP, using the QOM commands. Current solution: start a paused VM with no devices but with "host" CPU model and use QMP QOM commands to query for the enabled CPU features. Dependency: X86CPU feature properties == Future plans == It would be interesting to have a more generic capability-querying interface that doesn't require starting a whole machine with a live QEMU process. See also: -query-capabilities RFC series from Anthony Message-Id: <1332169763-30665-9-git-send-email-aliguori(a)us.ibm.com> -- Eduardo

4 11

[libvirt] [PATCH] Revert "qemu: detect multi-head qxl via more than version check"
by Eric Blake 26 Mar '13

26 Mar '13

This reverts commit 5ac846e42e5b7e0475f6aa9cc1e0b0c8dac84d44. After further discussions with Alon Levy, I learned the following: The use of '-vga qxl' vs. '-device qxl-vga' is completely orthogonal to whether ram_size can be exposed. Downstream distros are interested in backporting support for multi-head qxl, but this can be done in one of two ways: 1. Support one head per PCI device. If you do this, then it makes sense to have full control over the PCI address of each device. For full control, you need '-device qxl-vga' instead of '-vga qxl'. 2. Support multiple heads through a single PCI device. If you do this, then you need to allocate more RAM to that PCI device (enough ram to cover the multiple screens). Here, the device is hard-coded to 0:0:2.0, both in qemu and libvirt code. Apparently, backporting ram_size changes to allow multiple heads in a single device is much easier than backporting multiple device support. Furthermore, the presence or absence of qxl-vga.surfaces is no different than the presence or absence of qxl-vga.ram_size; both properties can be applied regardless of whether you have one PCI device (-vga qxl) or multiple (-device qxl-vga), so this property is NOT a good witness of whether '-device qxl-vga' support has been backported. Downstream RHEL will NOT be using this patch; and worse, leaving this patch in risks doing the wrong thing if compiling upstream libvirt on RHEL, so the best course of action is to revert it. That means that libvirt will go back to only using '-device qxl-vga' for qemu >= 1.2, but this is just fine because we know of no distros that plan on backporting multiple PCI address support to any older version of qemu. Meanwhile, downstream can still use ram_size to pack multiple heads through a single PCI device. --- src/qemu/qemu_capabilities.c | 7 ------- tests/qemuhelpdata/qemu-1.2.0-device | 16 ---------------- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device | 10 ---------- tests/qemuhelpdata/qemu-kvm-1.2.0-device | 16 ---------------- 4 files changed, 49 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 519d2c5..9a1b781 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1387,10 +1387,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUsbHost[] = { { "bootindex", QEMU_CAPS_USB_HOST_BOOTINDEX }, }; -static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxlVga[] = { - { "surfaces", QEMU_CAPS_DEVICE_VIDEO_PRIMARY }, -}; - struct virQEMUCapsObjectTypeProps { const char *type; struct virQEMUCapsStringFlags *props; @@ -1424,8 +1420,6 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbRedir) }, { "usb-host", virQEMUCapsObjectPropsUsbHost, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbHost) }, - { "qxl-vga", virQEMUCapsObjectPropsQxlVga, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxlVga) }, }; @@ -1623,7 +1617,6 @@ virQEMUCapsExtractDeviceStr(const char *qemu, "-device", "usb-redir,?", "-device", "ide-drive,?", "-device", "usb-host,?", - "-device", "qxl-vga,?", NULL); /* qemu -help goes to stdout, but qemu -device ? goes to stderr. */ virCommandSetErrorBuffer(cmd, &output); diff --git a/tests/qemuhelpdata/qemu-1.2.0-device b/tests/qemuhelpdata/qemu-1.2.0-device index 027d99a..5613e00 100644 --- a/tests/qemuhelpdata/qemu-1.2.0-device +++ b/tests/qemuhelpdata/qemu-1.2.0-device @@ -208,19 +208,3 @@ usb-host.bootindex=int32 usb-host.pipeline=on/off usb-host.port=string usb-host.full-path=on/off -qxl-vga.ram_size=uint32 -qxl-vga.vram_size=uint32 -qxl-vga.revision=uint32 -qxl-vga.debug=uint32 -qxl-vga.guestdebug=uint32 -qxl-vga.cmdlog=uint32 -qxl-vga.ram_size_mb=uint32 -qxl-vga.vram_size_mb=uint32 -qxl-vga.vram64_size_mb=uint32 -qxl-vga.vgamem_mb=uint32 -qxl-vga.surfaces=int32 -qxl-vga.addr=pci-devfn -qxl-vga.romfile=string -qxl-vga.rombar=uint32 -qxl-vga.multifunction=on/off -qxl-vga.command_serr_enable=on/off diff --git a/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device b/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device index 5eab539..ee0fd78 100644 --- a/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device +++ b/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device @@ -118,13 +118,3 @@ virtio-net-pci.addr=pci-devfn virtio-net-pci.romfile=string virtio-net-pci.rombar=uint32 virtio-net-pci.multifunction=on/off -qxl-vga.ram_size=uint32 -qxl-vga.vram_size=uint32 -qxl-vga.revision=uint32 -qxl-vga.debug=uint32 -qxl-vga.guestdebug=uint32 -qxl-vga.cmdlog=uint32 -qxl-vga.addr=pci-devfn -qxl-vga.romfile=string -qxl-vga.rombar=uint32 -qxl-vga.multifunction=on/off diff --git a/tests/qemuhelpdata/qemu-kvm-1.2.0-device b/tests/qemuhelpdata/qemu-kvm-1.2.0-device index ebc27f0..879a049 100644 --- a/tests/qemuhelpdata/qemu-kvm-1.2.0-device +++ b/tests/qemuhelpdata/qemu-kvm-1.2.0-device @@ -220,19 +220,3 @@ usb-host.bootindex=int32 usb-host.pipeline=on/off usb-host.port=string usb-host.full-path=on/off -qxl-vga.ram_size=uint32 -qxl-vga.vram_size=uint32 -qxl-vga.revision=uint32 -qxl-vga.debug=uint32 -qxl-vga.guestdebug=uint32 -qxl-vga.cmdlog=uint32 -qxl-vga.ram_size_mb=uint32 -qxl-vga.vram_size_mb=uint32 -qxl-vga.vram64_size_mb=uint32 -qxl-vga.vgamem_mb=uint32 -qxl-vga.surfaces=int32 -qxl-vga.addr=pci-devfn -qxl-vga.romfile=string -qxl-vga.rombar=uint32 -qxl-vga.multifunction=on/off -qxl-vga.command_serr_enable=on/off -- 1.8.1.4

2 3

[libvirt] [PATCH] libvirt-guests: newline between output sentences
by Eric Blake 25 Mar '13

25 Mar '13

Right now, libvirt-guests gives awkward output. It's possible to force faster failure by setting /etc/sysconfig/libvirt-guests to use: ON_SHUTDOWN=shutdown PARALLEL_SHUTDOWN=0 SHUTDOWN_TIMEOUT=1 ON_BOOT=ignore at which point, we see: $ service libvirt-guests restart Running guests on default URI: a, b, d, c Shutting down guests on default URI... Starting shutdown on guest: a Shutdown of guest a failed to complete in time.Starting shutdown on guest: b Shutdown of guest b failed to complete in time.Starting shutdown on guest: d Shutdown of guest d failed to complete in time.Starting shutdown on guest: c Shutdown of guest c failed to complete in time.libvirt-guests is configured not to start any guests on boot * tools/libvirt-guests.sh.in (shutdown_guest): Add missing newline. Reported off-list by Xuesong Zhang. --- tools/libvirt-guests.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 1c9c46b..4f2e203 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -269,6 +269,7 @@ shutdown_guest() else eval_gettext "Shutdown of guest \$name complete." fi + echo fi } -- 1.8.1.4

2 2

[libvirt] [PATCH] virsh: Fix docs for "virsh setmaxmem"
by Peter Krempa 25 Mar '13

25 Mar '13

The docs assumed the command works always for QEMU and other hypervisors. Unfortunately until qemu will add memory hotplug this can't be done. Fix the docs to mention this limitation. --- tools/virsh.pod | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index b5e632e..07e7c24 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1469,23 +1469,24 @@ paravirtualized or running the PV balloon driver. =item B<setmaxmem> I<domain> B<size> [[I<--config>] [I<--live>] | [I<--current>]] Change the maximum memory allocation limit for a guest domain. 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. Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. -This command works for at least the Xen, QEMU/KVM and vSphere/ESX hypervisors. +Some hypervisors such as QEMU/KVM don't support live changes (especially +increasing) of the maximum memory limit. I<size> is a scaled integer (see B<NOTES> above); it defaults to kibibytes (blocks of 1024 bytes) unless you provide a suffix (and the older option name I<--kilobytes> is available as a deprecated synonym) . Libvirt rounds up to the nearest kibibyte. Some hypervisors require a larger granularity than KiB, and requests that are not an even multiple will be rounded up. For example, vSphere/ESX rounds the parameter up to mebibytes (1024 kibibytes). =item B<memtune> I<domain> [I<--hard-limit> B<size>] [I<--soft-limit> B<size>] [I<--swap-hard-limit> B<size>] [I<--min-guarantee> B<size>] [[I<--config>] [I<--live>] | [I<--current>]] -- 1.8.1.5

2 2

[libvirt] [PATCH] lxc: Prevent shutting down the host
by Martin Kletzander 25 Mar '13

25 Mar '13

When the container has the same '/dev' mount as host (no chroot), calling domainShutdown(WithFlags) shouldn't shutdown the host it is running on. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- This is also valid for 1.0.[23]-maint branches, so in case this gets ACK'd I'll either send a follow-up for those or push it there as well (if the ACK says so). src/lxc/lxc_driver.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 8603078..ba14db7 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 Red Hat, Inc. + * Copyright (C) 2010-2013 Red Hat, Inc. * Copyright IBM Corp. 2008 * * lxc_driver.c: linux container driver functions @@ -2778,13 +2778,19 @@ lxcDomainShutdownFlags(virDomainPtr dom, virLXCDriverPtr driver = dom->conn->privateData; virLXCDomainObjPrivatePtr priv; virDomainObjPtr vm; + virDomainFSDefPtr root; char *vroot = NULL; int ret = -1; - int rc; + int rc = 0; + bool methodSignal; + bool methodInitctl; virCheckFlags(VIR_DOMAIN_SHUTDOWN_INITCTL | VIR_DOMAIN_SHUTDOWN_SIGNAL, -1); + methodSignal = !!(flags & VIR_DOMAIN_SHUTDOWN_SIGNAL); + methodInitctl = !!(flags & VIR_DOMAIN_SHUTDOWN_INITCTL); + lxcDriverLock(driver); vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); lxcDriverUnlock(driver); @@ -2798,6 +2804,7 @@ lxcDomainShutdownFlags(virDomainPtr dom, } priv = vm->privateData; + root = virDomainGetRootFilesystem(vm->def); if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -2817,27 +2824,31 @@ lxcDomainShutdownFlags(virDomainPtr dom, goto cleanup; } - if (flags == 0 || - (flags & VIR_DOMAIN_SHUTDOWN_INITCTL)) { - if ((rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_POWEROFF, - vroot)) < 0) { + if (root && root->src) { + if (flags == 0) + methodSignal = methodInitctl = true; + } else if (methodInitctl) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Cannot shutdown container using initctl " + "without separated namespace")); + goto cleanup; + } else { + methodSignal = true; + } + + if (methodInitctl) { + rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_POWEROFF, vroot); + if (rc < 0) goto cleanup; - } - if (rc == 0 && flags != 0 && - ((flags & ~VIR_DOMAIN_SHUTDOWN_INITCTL) == 0)) { + if (rc == 0 && !methodSignal) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Container does not provide an initctl pipe")); goto cleanup; } - } else { - rc = 0; } - - if (rc == 0 && - (flags == 0 || - (flags & VIR_DOMAIN_SHUTDOWN_SIGNAL))) { - if (kill(priv->initpid, SIGTERM) < 0 && - errno != ESRCH) { + if (rc == 0 && methodSignal) { + ret = kill(priv->initpid, SIGTERM); + if (ret < 0 && errno != ESRCH) { virReportSystemError(errno, _("Unable to send SIGTERM to init pid %llu"), (unsigned long long)priv->initpid); -- 1.8.1.5

3 4

[libvirt] [PATCH] make: obey WITH_TESTS; do not run test suite when --enable-test-suite=no
by TJ 25 Mar '13

25 Mar '13

make: obey WITH_TESTS; do not run test suite when --enable-test-suite=no Even when --enable-test-suite=no a build would run the test suite. Fix the Makefile so that tests are conditional on WITH_TESTS. Signed-off-by: TJ <libvirt(a)iam.tj> --- Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5b1e27e..3b5e7a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,10 +7,14 @@ LCOV = lcov GENHTML = genhtml SUBDIRS = gnulib/lib include src daemon tools docs gnulib/tests \ - python tests po examples/domain-events/events-c examples/hellolibvirt \ + python po examples/domain-events/events-c examples/hellolibvirt \ examples/dominfo examples/domsuspend examples/python examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap +if WITH_TESTS +SUBDIRS += tests +endif + ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 XML_EXAMPLES = \ -- 1.8.1.2.433.g9808ce0.dirty

2 1

[libvirt] [PATCH v2 0/4]Add startupPolicy attribute support for hard disks
by Guannan Ren 25 Mar '13

25 Mar '13

v1 to v2: added relax schema for disk of block and dir type removed original patch 3/5. The set of patches is trying to add 'startupPolicy' attribute support to the source element of hard disks. Policy levels are using the mandatory, requisite, optional levels as originally documented. For the 'optional' policy, there is a little difference from CDROM and Floppy which only drop its source path, for disks, if missing, the checking function will drop their definitions, because qemu doesn't allow missing source path for hard disk. If guest is using per-device boot element for its devices, after dropping one or more bootable device, the boot order will not be contiguous, the way here I use is to reorder them to make them contiguous. In this way, I introduce two new bit-operating functions virBitmapNextLastSetBit: Search for the last set bit before certain position. virBitmapNextLastClearBit: Search for the last clear bit before certain position. Guannan Ren [PATCH v2 1/4] conf: add startupPolicy attribute for harddisk [PATCH v2 2/4] util: add two functions to find last set or unset bit in bitmap [PATCH v2 3/4] qemu: drop disk definition if missing and reorder per-device boot sequence [PATCH v2 4/4] event: add hard disk dropping event reason enum docs/formatdomain.html.in | 9 ++++++--- docs/schemas/domaincommon.rng | 6 ++++++ include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 21 +++++++++++++++------ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 2 ++ src/qemu/qemu_domain.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------- src/util/virbitmap.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virbitmap.h | 6 ++++++ tests/virbitmaptest.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 10 files changed, 278 insertions(+), 21 deletions(-)

1 5

[libvirt] [libvirt-sandbox][PATCH] Avoid segfault in gvir_sandbox_config_add_host_include_file
by Alex Jia 25 Mar '13

25 Mar '13

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=924574 Valgrind defects memory error: ==19297== Invalid free() / delete / delete[] / realloc() ==19297== at 0x4A077A6: free (vg_replace_malloc.c:446) ==19297== by 0x350F24D79E: g_free (in /usr/lib64/libglib-2.0.so.0.3400.2) ==19297== by 0x4C2C03F: gvir_sandbox_config_add_host_include_file (libvirt-sandbox-config.c:1319) ==19297== by 0x401FB7: main (virt-sandbox.c:171) ==19297== Address 0x4f2094c is 12 bytes inside a block of size 18 alloc'd ==19297== at 0x4A0883C: malloc (vg_replace_malloc.c:270) ==19297== by 0x350F24D68E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3400.2) ==19297== by 0x350F263F0B: g_strdup (in /usr/lib64/libglib-2.0.so.0.3400.2) ==19297== by 0x4C2BF95: gvir_sandbox_config_add_host_include_file (libvirt-sandbox-config.c:1292) ==19297== by 0x401FB7: main (virt-sandbox.c:171) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- libvirt-sandbox/libvirt-sandbox-config.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-config.c b/libvirt-sandbox/libvirt-sandbox-config.c index 665a9fb..135eef1 100644 --- a/libvirt-sandbox/libvirt-sandbox-config.c +++ b/libvirt-sandbox/libvirt-sandbox-config.c @@ -1285,6 +1285,7 @@ gboolean gvir_sandbox_config_add_host_include_file(GVirSandboxConfig *config, error))) { const gchar *host; gchar *guest; + const gchar *relguest; GVirSandboxConfigMount *mnt = NULL; GList *mnts = NULL; gchar *tmp; @@ -1302,7 +1303,7 @@ gboolean gvir_sandbox_config_add_host_include_file(GVirSandboxConfig *config, mnt = GVIR_SANDBOX_CONFIG_MOUNT(mnts->data); const gchar *target = gvir_sandbox_config_mount_get_target(mnt); if (g_str_has_prefix(guest, target)) { - guest = guest + strlen(target); + relguest = guest + strlen(target); break; } mnt = NULL; @@ -1315,7 +1316,7 @@ gboolean gvir_sandbox_config_add_host_include_file(GVirSandboxConfig *config, return FALSE; } - gvir_sandbox_config_mount_add_include(GVIR_SANDBOX_CONFIG_MOUNT(mnt), host, guest); + gvir_sandbox_config_mount_add_include(GVIR_SANDBOX_CONFIG_MOUNT(mnt), host, relguest); g_free(guest); g_free(line); } -- 1.7.1

2 2

[libvirt] [PATCH] Move FUSE mount to /var/lib/libvirt/lxc/$NAME.fuse
by Daniel P. Berrange 25 Mar '13

25 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Instead of using /var/lib/libvirt/lxc/$NAME for the FUSE filesystem, use /var/lib/libvirt/lxc/$NAME.fuse. This allows room for other temporary mounts in the same directory --- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_fuse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 4d09791..bf17a38 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -604,7 +604,7 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def, char *meminfo_path = NULL; if ((ret = virAsprintf(&meminfo_path, - "%s/%s/%s/meminfo", + "%s/%s/%s.fuse/meminfo", srcprefix ? srcprefix : "", LXC_STATE_DIR, def->name)) < 0) return ret; diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index c4be58e..fbd0d56 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -291,7 +291,7 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def) if (virMutexInit(&fuse->lock) < 0) goto cleanup2; - if (virAsprintf(&fuse->mountpoint, "%s/%s/", LXC_STATE_DIR, + if (virAsprintf(&fuse->mountpoint, "%s/%s.fuse/", LXC_STATE_DIR, def->name) < 0) { virReportOOMError(); goto cleanup1; -- 1.7.11.7

4 3

[libvirt] [PATCH] configure: fix incorrect AC_ENABLE_ARG([test-suite], ...)
by TJ 25 Mar '13

25 Mar '13

configure: fix incorrect AC_ENABLE_ARG([test-suite], ...) Configure incorrectly required --with-test-suite instead of --enable-test-suite and it was therefore impossible to disable/enable the test-suite option manually as it would always adopt the 'check' value. Signed-off-by: TJ <libvirt(a)iam.tj> --- configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index b62170e..f1b41a8 100644 --- a/configure.ac +++ b/configure.ac @@ -1945,24 +1945,24 @@ AC_SUBST([PYTHON_INCLUDES]) dnl Allow perl overrides AC_PATH_PROG([PERL], [perl]) -AC_ARG_ENABLE([with-test-suite], - AC_HELP_STRING([--with-test-suite], [build test suite by default @<:@default=check@:>@]), - [case "${withval}" in +AC_ARG_ENABLE([test-suite], + AC_HELP_STRING([--enable-test-suite=yes|no|check], [build test suite by default @<:@default=check@:>@]), + [case "${enable_test_suite}" in yes|no|check) ;; - *) AC_MSG_ERROR([bad value ${withval} for tests option]) ;; + *) AC_MSG_ERROR([bad value ${enable_test_suite} for tests option]) ;; esac], - [withval=check]) + [enable_test_suite=check]) AC_MSG_CHECKING([Whether to build test suite by default]) -if test "$withval" = "check" ; then +if test "$enable_test_suite" = "check" ; then if test -d $srcdir/.git ; then - withval=yes + enable_test_suite=yes else - withval=no + enable_test_suite=no fi fi -AC_MSG_RESULT([$withval]) -AM_CONDITIONAL([WITH_TESTS], [test "$withval" = "yes"]) +AC_MSG_RESULT([$enable_test_suite]) +AM_CONDITIONAL([WITH_TESTS], [test "$enable_test_suite" = "yes"]) AC_ARG_ENABLE([test-coverage], AC_HELP_STRING([--enable-test-coverage], [turn on code coverage instrumentation @<:@default=no@:>@]), -- 1.8.1.2.433.g9808ce0.dirty

1 0

[libvirt] Problems with <filesystem type='block'>
by Lars Kellogg-Stedman 24 Mar '13

24 Mar '13

Using libvirt 1.0.1, I'm trying to start an LXC container using the '<filesytem type="block">' syntax, like this: <filesystem type="block" accessmode="passthrough"> <source dev="/dev/vg_files/vm-foobar-root" /> <target dir="/" /> </filesystem> The specified block device exists: # ls -lL /dev/vg_files/vm-foobar-root brw-rw---- 1 root disk 253, 19 Dec 21 22:23 /dev/vg_files/vm-foobar-root If I start the domain, it appears to start without any errors... # virsh start foobar Domain foobar started ...but it's not actually running. The log files (with loglevel=2) don't seem to be very interesting; this is everything from the instance log file: 2012-12-22 04:10:57.862+0000: starting up PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin LIBVIRT_DEBUG=2 LIBVIRT_LOG_OUTPUTS=2:stderr /usr/lib/libvirt/libvirt_lxc --name foobar --console 22 --security=none --handshake 25 --background --veth veth1 2012-12-22 04:10:57.967+0000: 1468: info : libvirt version: 1.0.1 2012-12-22 04:10:57.967+0000: 1468: info : lxcCapsInit:151 : No driver, not initializing security driver PATH=/bin:/sbin TERM=linux container=lxc-libvirt container_uuid=9041e32e-1df2-00c2-4660-dfa5b41510b7 LIBVIRT_LXC_UUID=9041e32e-1df2-00c2-4660-dfa5b41510b7 LIBVIRT_LXC_NAME=foobar /sbin/init 2012-12-22 04:10:58.198+0000: 1: warning : lxcContainerDropCapabilities:1788 : libcap-ng support not compiled in, unable to clear capabilities 2012-12-22 04:10:58.198+0000: 1493: warning : lxcControllerClearCapabilities:679 : libcap-ng support not compiled in, unable to clear capabilities Running an "strace" on the libvirtd process (strace -p <libvirtd_pid> -f ...), it doesn't look like libvirt is ever trying to mount the referenced filesystem. Is this supposed to work? It seems like the support for having libvirt mount the block device is relatively recent, and I haven't had much luck finding examples of other folks using this capability. Thanks, -- Lars

4 8

[libvirt] [PATCH 0/4] Multiple problems with saving to block devices
by Daniel P. Berrange 24 Mar '13

24 Mar '13

This patch series makes it possible to save to a block device, instead of a plain file. There were multiple problems - WHen save failed, we might de-reference a NULL pointer - When save failed, we unlinked the device node !! - The approach of using >> to append, doesn't work with block devices - CGroups was blocking QEMU access to the block device when enabled One remaining problem is not in libvirt, but rather QEMU. The QEMU exec: based migration often fails to detect failure of the command and will thus hang forever attempting a migration that'll never succeed! Fortunately you can now work around this in libvirt using the virsh domjobabort command

4 21

[libvirt] [PATCH RFC 0/2] Report OOM on VIR_ALLOC failure
by Michal Privoznik 23 Mar '13

23 Mar '13

Currently, our code is plenty of following scheme: if (VIR_ALLOC(dummyPtr) < 0) { virReportOOMError(); goto cleanup; } or something similar. What if we just move the OOM reporting into VIR_ALLOC? It would have three nice features: 1) sizeof(code base) gets lower. A lot lower. 2) even for callers which don't follow the schema described above, there is no harm reporting so serious error in the logs. No matter that the callee may fall back and return success. 3) Removing virReportOOMError() from the schema does not need to be done at once, but can be split into several patches. In the worst case scenario - the error gets reported twice. But before I start working on other areas of code, I want to make sure there's an agreement if this is even desired. As an example, how much the code base will lose on weight, I've done the conversion under src/util/: 30 files changed, 81 insertions(+), 221 deletions(-) Michal Privoznik (2): viralloc: Report OOM error on failure util: Don't report OOM twice src/util/iohelper.c | 4 +--- src/util/viralloc.c | 23 ++++++++++++++++++----- src/util/viralloc.h | 13 ++++++++----- src/util/virauthconfig.c | 8 ++------ src/util/vircommand.c | 13 +++---------- src/util/virconf.c | 10 ++-------- src/util/virdnsmasq.c | 19 +++++++------------ src/util/virerror.c | 2 +- src/util/vireventpoll.c | 4 +--- src/util/virfile.c | 4 +--- src/util/virhash.c | 10 ++-------- src/util/virkeyfile.c | 4 +--- src/util/virlockspace.c | 11 +++-------- src/util/virnetdev.c | 4 +--- src/util/virnetdevbandwidth.c | 12 +++--------- src/util/virnetdevmacvlan.c | 4 ++-- src/util/virnetdevvlan.c | 4 +--- src/util/virnetdevvportprofile.c | 4 +--- src/util/virnetlink.c | 8 ++------ src/util/virobject.c | 9 ++++----- src/util/virpci.c | 13 +++---------- src/util/virprocess.c | 4 +--- src/util/virsexpr.c | 4 +--- src/util/virstoragefile.c | 24 ++++++------------------ src/util/virstring.c | 5 +++-- src/util/virsysinfo.c | 8 +++----- src/util/virthreadpool.c | 21 +++++---------------- src/util/virtime.c | 8 ++------ src/util/virtypedparam.c | 36 +++++++++--------------------------- src/util/viruri.c | 2 +- src/util/virusb.c | 8 ++------ src/util/virutil.c | 36 ++++++++---------------------------- src/util/virxml.c | 1 - 33 files changed, 108 insertions(+), 232 deletions(-) -- 1.8.1.5

4 7

[libvirt] [PATCH] storage: fix unlikely memory leak in rbd backend
by Laine Stump 23 Mar '13

23 Mar '13

virStorageBackendRBDRefreshPool() first allocates an array big enough to hold 1024 names, then calls rbd_list(), which returns ERANGE if the array isn't big enough. When that happens, the VIR_ALLOC_N is called again with a larger size. Unfortunately, the original array isn't freed before allocating a new one. --- src/storage/storage_backend_rbd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 8a0e517..e815192 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -317,6 +317,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_WARN("%s", _("A problem occurred while listing RBD images")); goto cleanup; } + VIR_FREE(names); } for (i = 0, name = names; name < names + max_size; i++) { -- 1.7.11.7

3 3

[libvirt] [PATCH] Make virsh support '~' and '$HOME' in interactive mode
by Zhang Xiaohe 23 Mar '13

23 Mar '13

This patch makes '~' and '$HOME' can be recognized by virsh in interactive mode. These two variables are replaced with real path. eg: virsh # pwd /home/libvirt virsh # cd ~/rpmbuild virsh # pwd /root/rpmbuild see https://bugzilla.redhat.com/show_bug.cgi?id=806793 Signed-off-by: Zhang Xiaohe <zhangxh(a)cn.fujitsu.com> --- tools/virsh.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index b574d7e..5c8df6b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1232,6 +1232,27 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) * --------------- */ static void +vshExpandPath(vshControl *ctl, char **tkdata) +{ + char *argstr = NULL; + char *buf = NULL; + char *p = NULL; + const char *home = getenv("HOME"); + size_t len = strlen(home) + strlen(*tkdata); + + buf = vshMalloc(ctl, len); + p = buf; + buf = virStrcpy(buf, home, len); + argstr = strchr(*tkdata, '/'); + if (argstr) { + buf += strlen(home); + buf = virStrcpy(buf, argstr, strlen(*tkdata)); + } + VIR_FREE(*tkdata); + *tkdata = p; +} + +static void vshCommandOptFree(vshCmdOpt * arg) { vshCmdOpt *a = arg; @@ -1855,6 +1876,10 @@ get_data: /* save option */ vshCmdOpt *arg = vshMalloc(ctl, sizeof(vshCmdOpt)); + /* replace the ~ or $HOME with real path */ + if (tkdata[0] == '~' || STRPREFIX(tkdata, "$HOME")) + vshExpandPath(ctl, &tkdata); + arg->def = opt; arg->data = tkdata; arg->next = NULL; -- 1.7.1

4 9

[libvirt] [PATCH v2] nwfilter: probe for inverted ctdir
by Stefan Berger 23 Mar '13

23 Mar '13

Linux netfilter at some point inverted the meaning of the '--ctdir reply' and newer netfilter implementations now expect '--ctdir original' instead and vice-versa. We probe for this netfilter change via a UDP message over loopback and 3 filtering rules applied to INPUT. If the sent byte arrives, the newer netfilter implementation has been detected. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- v1->v2: - using virSocketAddrParseIPv4 --- src/nwfilter/nwfilter_ebiptables_driver.c | 121 ++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -27,6 +27,10 @@ #include <string.h> #include <sys/stat.h> #include <fcntl.h> +#include <arpa/inet.h> +#include <sys/select.h> +#include <sys/time.h> +#include <unistd.h> #include "internal.h" @@ -85,6 +89,12 @@ static char *iptables_cmd_path; static char *ip6tables_cmd_path; static char *grep_cmd_path; +/* + * --ctdir original vs. --ctdir reply's meaning was inverted in netfilter + * at some point. We probe for it. + */ +static bool iptables_ctdir_corrected = false; + #define PRINT_ROOT_CHAIN(buf, prefix, ifname) \ snprintf(buf, sizeof(buf), "libvirt-%c-%s", prefix, ifname) #define PRINT_CHAIN(buf, prefix, ifname, suffix) \ @@ -1262,6 +1272,9 @@ iptablesEnforceDirection(int directionIn virNWFilterRuleDefPtr rule, virBufferPtr buf) { + if (iptables_ctdir_corrected) + directionIn = !directionIn; + if (rule->tt != VIR_NWFILTER_RULE_DIRECTION_INOUT) virBufferAsprintf(buf, " -m conntrack --ctdir %s", (directionIn) ? "Original" @@ -4304,6 +4317,111 @@ ebiptablesDriverTestCLITools(void) return ret; } +static void +ebiptablesDriverProbeCtdir(void) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + static const char cmdline[] = + "$IPT -%c INPUT %c -i lo -p udp --dport %hu " + "-m state --state ESTABLISHED -j ACCEPT " CMD_SEPARATOR + "$IPT -%c INPUT %c -i lo -p udp --dport %hu " + "-m conntrack --ctdir original -j ACCEPT " CMD_SEPARATOR + "$IPT -%c INPUT %c -i lo -p udp --dport %hu -j DROP"; + /* + * Above '--ctdir original' gets this test to receive a message on + * 'fixed' netfilter. + */ + unsigned short port; + int ssockfd = -1, csockfd = -1; + virSocketAddr saddr; + struct sockaddr_in *serveraddr = &saddr.data.inet4; + fd_set readfds; + struct timeval timeout = { + .tv_sec = 0, + .tv_usec = 1000 * 200, + }; + int n; + + if (virSocketAddrParseIPv4(&saddr, "127.0.0.1") < 0) { + VIR_ERROR(_("Could not parse IP address")); + goto cleanup; + } + + if ((ssockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0 || + (csockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { + VIR_ERROR(_("Could not open UDP socket")); + goto cleanup; + } + + for (port = 0xffff; port > 1024; port--) { + serveraddr->sin_port = htons(port); + if (bind(ssockfd, (struct sockaddr *)serveraddr, + sizeof(*serveraddr)) == 0) + break; + } + if (port == 1024) { + VIR_ERROR(_("Could not bind to any UDP socket")); + goto cleanup; + } + + NWFILTER_SET_IPTABLES_SHELLVAR(&buf); + virBufferAsprintf(&buf, cmdline, + 'I', '1', port, + 'I', '2', port, + 'I', '3', port); + + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + + if (ebiptablesExecCLI(&buf, NULL, NULL) < 0) { + VIR_ERROR(_("Could not apply iptables rules")); + goto cleanup_iptables; + } + + if (sendto(csockfd, cmdline, 1, 0, (struct sockaddr *)serveraddr, + sizeof(*serveraddr)) < 0) { + VIR_ERROR(_("Could not send to UDP socket")); + goto cleanup_iptables; + } + + FD_ZERO(&readfds); + FD_SET(ssockfd, &readfds); + + while (true) { + n = select(ssockfd + 1, &readfds, NULL, NULL, &timeout); + if (n < 0) { + if (errno == EINTR) + continue; + VIR_ERROR(_("Select failed")); + goto cleanup_iptables; + } + if (n == 0) { + VIR_INFO("Ctdir probing received no data -- 'old' netfilter"); + goto cleanup_iptables; + } + VIR_INFO("Ctdir probing received data -- 'fixed' netfilter"); + iptables_ctdir_corrected = true; + break; + } + +cleanup_iptables: + virBufferFreeAndReset(&buf); + + NWFILTER_SET_IPTABLES_SHELLVAR(&buf); + virBufferAsprintf(&buf, cmdline, + 'D', ' ', port, + 'D', ' ', port, + 'D', ' ', port); + ebiptablesExecCLI(&buf, NULL, NULL); + +cleanup: + virBufferFreeAndReset(&buf); + VIR_FORCE_CLOSE(ssockfd); + VIR_FORCE_CLOSE(csockfd); +} + static int ebiptablesDriverInit(bool privileged) { @@ -4341,6 +4459,9 @@ ebiptablesDriverInit(bool privileged) return -ENOTSUP; } + if (iptables_cmd_path) + ebiptablesDriverProbeCtdir(); + ebiptables_driver.flags = TECHDRV_FLAG_INITIALIZED; return 0;

3 6

[libvirt] [PATCH 0/5] Refactoring of cgroups usage
by Daniel P. Berrange 23 Mar '13

23 Mar '13

Currently libvirtd creates its basic cgroup hierarchy when it starts up. This is bad because if people mount cgroups after libvirtd it is running it doesn't detect this. The second issue is that the driver code re-creates the virCgroupPtr instance for a domain over & over again, which is inefficient and bloats the code. Finally, if the driver is configured to only use a couple of the cgroups controllers, we are still creating the directories under all of them

2 6

[libvirt] [PATCH] Fix free of uninitialized value in LXC numad setup
by Daniel P. Berrange 23 Mar '13

23 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The 'nodeset' variable was never initialized, causing a later VIR_FREE(nodeset) to free uninitialized memory. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_controller.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed under trivial rule diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 37e3ce9..bb369e2 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -517,7 +517,7 @@ static int virLXCControllerGetNumadAdvice(virLXCControllerPtr ctrl, virBitmapPtr *mask) { virBitmapPtr nodemask = NULL; - char *nodeset; + char *nodeset = NULL; int ret = -1; /* Get the advisory nodeset from numad if 'placement' of -- 1.7.11.7

2 1

[libvirt] [PATCH] Ensure root filesystem is mounted if a file/block mount.
by Daniel P. Berrange 23 Mar '13

23 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> For a root filesystem with type=file or type=block, the LXC container was forgetting to actually mount it, before doing the pivot root step. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index be9bc6c..002dba1 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -105,6 +105,9 @@ struct __lxc_child_argv { int handshakefd; }; +static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, + const char *srcprefix); + /* * reboot(LINUX_REBOOT_CMD_CAD_ON) will return -EINVAL @@ -406,6 +409,51 @@ static int lxcContainerChildMountSort(const void *a, const void *b) # define MS_SLAVE (1<<19) #endif +static int lxcContainerPrepareRoot(virDomainDefPtr def, + virDomainFSDefPtr root) +{ + char *dst; + char *tmp; + + if (root->type == VIR_DOMAIN_FS_TYPE_MOUNT) + return 0; + + if (root->type == VIR_DOMAIN_FS_TYPE_FILE) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unexpected root filesystem without loop device")); + return -1; + } + + if (root->type != VIR_DOMAIN_FS_TYPE_BLOCK) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported root filesystem type %s"), + virDomainFSTypeToString(root->type)); + return -1; + } + + if (virAsprintf(&dst, "%s/%s.root", + LXC_STATE_DIR, def->name) < 0) { + virReportOOMError(); + return -1; + } + + tmp = root->dst; + root->dst = dst; + + if (lxcContainerMountFSBlock(root, "") < 0) { + root->dst = tmp; + VIR_FREE(dst); + return -1; + } + + root->dst = tmp; + root->type = VIR_DOMAIN_FS_TYPE_MOUNT; + VIR_FREE(root->src); + root->src = dst; + + return 0; +} + static int lxcContainerPivotRoot(virDomainFSDefPtr root) { int ret; @@ -1926,6 +1974,10 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (lxcContainerIdentifyCGroups(&mounts, &nmounts, &cgroupRoot) < 0) goto cleanup; + /* Ensure the root filesystem is mounted */ + if (lxcContainerPrepareRoot(vmDef, root) < 0) + goto cleanup; + /* Gives us a private root, leaving all parent OS mounts on /.oldroot */ if (lxcContainerPivotRoot(root) < 0) goto cleanup; -- 1.7.11.7

3 2

[libvirt] [PATCH] Mount temporary devpts on /var/lib/libvirt/lxc/$NAME.devpts
by Daniel P. Berrange 23 Mar '13

23 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently the lxc controller sets up the devpts instance on $rootfsdef->src, but this only works if $rootfsdef is using type=mount. To support type=block or type=file for the root filesystem, we must use /var/lib/libvirt/lxc/$NAME.devpts for the temporary devpts mount in the controller --- src/lxc/lxc_container.c | 43 +++++++++++++++++++++++++------------------ src/lxc/lxc_controller.c | 13 ++++--------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index bf17a38..be9bc6c 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -627,15 +627,17 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def ATTRIBUTE_UNUSED, } #endif -static int lxcContainerMountFSDevPTS(virDomainFSDefPtr root) +static int lxcContainerMountFSDevPTS(virDomainDefPtr def, + const char *srcprefix) { - char *devpts = NULL; - int rc = -1; + int ret; + char *path = NULL; - if (virAsprintf(&devpts, "/.oldroot%s/dev/pts", root->src) < 0) { - virReportOOMError(); - goto cleanup; - } + if ((ret = virAsprintf(&path, + "%s/%s/%s.devpts", + srcprefix ? srcprefix : "", LXC_STATE_DIR, + def->name)) < 0) + return ret; if (virFileMakePath("/dev/pts") < 0) { virReportSystemError(errno, "%s", @@ -643,19 +645,20 @@ static int lxcContainerMountFSDevPTS(virDomainFSDefPtr root) goto cleanup; } - VIR_DEBUG("Trying to move %s to %s", devpts, "/dev/pts"); - if ((rc = mount(devpts, "/dev/pts", NULL, MS_MOVE, NULL)) < 0) { - virReportSystemError(errno, "%s", - _("Failed to mount /dev/pts in container")); + VIR_DEBUG("Trying to move %s to /dev/pts", path); + + if ((ret = mount(path, "/dev/pts", + NULL, MS_MOVE, NULL)) < 0) { + virReportSystemError(errno, + _("Failed to mount %s on /dev/pts"), + path); goto cleanup; } - rc = 0; - - cleanup: - VIR_FREE(devpts); +cleanup: + VIR_FREE(path); - return rc; + return ret; } static int lxcContainerPopulateDevices(char **ttyPaths, size_t nttyPaths) @@ -1961,7 +1964,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, goto cleanup; /* Mounts /dev/pts */ - if (lxcContainerMountFSDevPTS(root) < 0) + if (lxcContainerMountFSDevPTS(vmDef, "/.oldroot") < 0) goto cleanup; /* Populates device nodes in /dev/ */ @@ -2204,7 +2207,11 @@ static int lxcContainerChild(void *data) if (argv->nttyPaths) { if (root) { - if (virAsprintf(&ttyPath, "%s%s", root->src, argv->ttyPaths[0]) < 0) { + const char *tty = argv->ttyPaths[0]; + if (STRPREFIX(tty, "/dev/pts/")) + tty += strlen("/dev/pts/"); + if (virAsprintf(&ttyPath, "%s/%s.devpts/%s", + LXC_STATE_DIR, vmDef->name, tty) < 0) { virReportOOMError(); goto cleanup; } diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index bb369e2..1d1443c 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1219,15 +1219,10 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) mount_options = virSecurityManagerGetMountOptions(ctrl->securityManager, ctrl->def); - if (!virFileExists(root->src)) { - virReportSystemError(errno, - _("root source %s does not exist"), - root->src); - goto cleanup; - } - - if (virAsprintf(&devpts, "%s/dev/pts", root->src) < 0 || - virAsprintf(&ctrl->devptmx, "%s/dev/pts/ptmx", root->src) < 0) { + if (virAsprintf(&devpts, "%s/%s.devpts", + LXC_STATE_DIR, ctrl->def->name) < 0 || + virAsprintf(&ctrl->devptmx, "%s/%s.devpts/ptmx", + LXC_STATE_DIR, ctrl->def->name) < 0) { virReportOOMError(); goto cleanup; } -- 1.7.11.7

3 2

[libvirt] [PATCH V2] Fix parsing of bond interface XML
by Jim Fehlig 22 Mar '13

22 Mar '13

Noticed that parsing bond interface XML containing the miimon element fails <interface type="bond" name="bond0"> ... <bond mode="active-backup"> <miimon freq="100" carrier="netif"/> ... </bond> </interface> This configuration does not contain the optional updelay and downdelay attributes, but parsing will fail due to returning the result of virXPathULong (a -1 when the attribute doesn't exist) from virInterfaceDefParseBond after examining the updelay attribute. While fixing this bug, cleanup the function to use virXPathInt instead of virXPathULong, and store the result directly instead of using a tmp variable. Using virXPathInt actually fixes a potential silent truncation bug noted by Eric Blake. Also, there is no cleaup in the error label. Remove the label, returning failure where failure occurs and success if the end of the function is reached. --- V2: Use virXPathInt instead of virXPathULong to avoid silent truncation, and store value directly in the def structure instead of using a tmp variable. src/conf/interface_conf.c | 63 ++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 9301ec0..7ca9c86 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -572,81 +572,72 @@ error: static int virInterfaceDefParseBond(virInterfaceDefPtr def, xmlXPathContextPtr ctxt) { - int ret = -1; - unsigned long tmp; + int res; def->data.bond.mode = virInterfaceDefParseBondMode(ctxt); if (def->data.bond.mode < 0) - goto error; + return -1; - ret = virInterfaceDefParseBondItfs(def, ctxt); - if (ret != 0) - goto error; + if (virInterfaceDefParseBondItfs(def, ctxt) != 0) + return -1; if (virXPathNode("./miimon[1]", ctxt) != NULL) { def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_MII; - ret = virXPathULong("string(./miimon/@freq)", ctxt, &tmp); - if ((ret == -2) || (ret == -1)) { + res = virXPathInt("string(./miimon/@freq)", ctxt, + &def->data.bond.frequency); + if ((res == -2) || (res == -1)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("bond interface miimon freq missing or invalid")); - goto error; + return -1; } - def->data.bond.frequency = (int) tmp; - ret = virXPathULong("string(./miimon/@downdelay)", ctxt, &tmp); - if (ret == -2) { + res = virXPathInt("string(./miimon/@downdelay)", ctxt, + &def->data.bond.downdelay); + if (res == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("bond interface miimon downdelay invalid")); - goto error; - } else if (ret == 0) { - def->data.bond.downdelay = (int) tmp; + return -1; } - ret = virXPathULong("string(./miimon/@updelay)", ctxt, &tmp); - if (ret == -2) { + res = virXPathInt("string(./miimon/@updelay)", ctxt, + &def->data.bond.updelay); + if (res == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("bond interface miimon updelay invalid")); - goto error; - } else if (ret == 0) { - def->data.bond.updelay = (int) tmp; + return -1; } def->data.bond.carrier = virInterfaceDefParseBondMiiCarrier(ctxt); - if (def->data.bond.carrier < 0) { - ret = -1; - goto error; - } + if (def->data.bond.carrier < 0) + return -1; } else if (virXPathNode("./arpmon[1]", ctxt) != NULL) { def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_ARP; - ret = virXPathULong("string(./arpmon/@interval)", ctxt, &tmp); - if ((ret == -2) || (ret == -1)) { + res = virXPathInt("string(./arpmon/@interval)", ctxt, + &def->data.bond.interval); + if ((res == -2) || (res == -1)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("bond interface arpmon interval missing or invalid")); - goto error; + return -1; } - def->data.bond.interval = (int) tmp; def->data.bond.target = virXPathString("string(./arpmon/@target)", ctxt); if (def->data.bond.target == NULL) { virReportError(VIR_ERR_XML_ERROR, "%s", _("bond interface arpmon target missing")); - ret = -1; - goto error; + return -1; } def->data.bond.validate = virInterfaceDefParseBondArpValid(ctxt); - if (def->data.bond.validate < 0) { - ret = -1; - goto error; - } + if (def->data.bond.validate < 0) + return -1; } -error: - return ret; + + return 0; } static int -- 1.8.0.1

2 3

[libvirt] Schedule for the next release suggestions
by Daniel Veillard 22 Mar '13

22 Mar '13

The 1.0.3 release was on the 5th March, and right now we have accumulated 'only' 150 commits since the release. Based on this I would suggest to wait a couple of weeks before to enter a freeze for the following release. This mean we drift from the usual end of month, but the ratio of freeze/devel will remain more or less constant as well as the expected size of change in the new release. So if this is fine I would suggest to enter freeze for 1.0.4 on the 5th of April for a release around the 12. Unless there is a reason to push a release earlier, Opinions ? 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/

3 7

[libvirt] Build failed in Jenkins: libvirt-syntax-check #759
by Jenkins CI 22 Mar '13

22 Mar '13

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/759/> ------------------------------------------ Started by upstream project "libvirt-build" build number 856 [workspace] $ /bin/sh -xe /tmp/hudson8330114436432330964.sh + make syntax-check GEN bracket-spacing-check GFDL_version 0.88 GFDL_version TAB_in_indentation 0.59 TAB_in_indentation Wundef_boolean 0.38 Wundef_boolean avoid_attribute_unused_in_header 0.40 avoid_attribute_unused_in_header avoid_ctype_macros 0.81 avoid_ctype_macros avoid_if_before_free 8.18 avoid_if_before_free avoid_strcase 0.91 avoid_strcase avoid_write 0.55 avoid_write bindtextdomain 0.46 bindtextdomain cast_of_argument_to_free 0.76 cast_of_argument_to_free cast_of_x_alloc_return_value 0.73 cast_of_x_alloc_return_value changelog 0.32 changelog const_long_option 0.52 const_long_option copyright_address 0.87 copyright_address copyright_check 1.06 copyright_check copyright_format 2.39 copyright_format correct_id_types 1.00 correct_id_types error_message_period 0.72 error_message_period error_message_warn_fatal 0.73 error_message_warn_fatal flags_debug 1.72 flags_debug flags_usage 1.68 flags_usage libvirt_unmarked_diagnostics 2.57 libvirt_unmarked_diagnostics m4_quote_check 0.38 m4_quote_check makefile_TAB_only_indentation 0.37 makefile_TAB_only_indentation makefile_at_at_check 0.31 makefile_at_at_check po_check 19.90 po_check preprocessor_indentation maint.mk: skipping test sc_preprocessor_indentation: cppi not installed 0.06 preprocessor_indentation prohibit_HAVE_MBRTOWC 0.86 prohibit_HAVE_MBRTOWC prohibit_PATH_MAX 0.87 prohibit_PATH_MAX prohibit_VIR_ERR_NO_MEMORY 0.83 prohibit_VIR_ERR_NO_MEMORY prohibit_access_xok 0.88 prohibit_access_xok prohibit_always-defined_macros 3.47 prohibit_always-defined_macros prohibit_always_true_header_tests 0.95 prohibit_always_true_header_tests prohibit_argmatch_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.58 prohibit_argmatch_without_use prohibit_asprintf 0.90 prohibit_asprintf prohibit_assert_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.61 prohibit_assert_without_use prohibit_backup_files 0.22 prohibit_backup_files prohibit_c_ctype_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.58 prohibit_c_ctype_without_use prohibit_canonicalize_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.57 prohibit_canonicalize_without_use prohibit_cloexec_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.57 prohibit_cloexec_without_use prohibit_close 1.70 prohibit_close prohibit_close_stream_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.70 prohibit_close_stream_without_use prohibit_cross_inclusion 9.89 prohibit_cross_inclusion prohibit_ctype_h 0.87 prohibit_ctype_h prohibit_cvs_keyword 0.89 prohibit_cvs_keyword prohibit_defined_have_decl_tests 0.87 prohibit_defined_have_decl_tests prohibit_diagnostic_without_format 1.95 prohibit_diagnostic_without_format prohibit_dirent_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.61 prohibit_dirent_without_use prohibit_doubled_word 8.83 prohibit_doubled_word prohibit_empty_lines_at_EOF 0.52 prohibit_empty_lines_at_EOF prohibit_error_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.58 prohibit_error_without_use prohibit_exit_in_tests 0.72 prohibit_exit_in_tests prohibit_fork_wrappers 0.99 prohibit_fork_wrappers prohibit_gethostby 0.86 prohibit_gethostby prohibit_gethostname 0.88 prohibit_gethostname prohibit_getopt_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.59 prohibit_getopt_without_use prohibit_gettext_markup 0.92 prohibit_gettext_markup prohibit_gettext_noop 0.86 prohibit_gettext_noop prohibit_hash_pjw_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.57 prohibit_hash_pjw_without_use prohibit_have_config_h 0.84 prohibit_have_config_h prohibit_ignore_value_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.57 prohibit_ignore_value_without_use prohibit_internal_functions 0.99 prohibit_internal_functions prohibit_intprops_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.58 prohibit_intprops_without_use prohibit_inttostr_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.56 prohibit_inttostr_without_use prohibit_long_options_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.54 prohibit_long_options_without_use prohibit_magic_number_exit 1.23 prohibit_magic_number_exit prohibit_mkstemp 0.85 prohibit_mkstemp prohibit_newline_at_end_of_diagnostic 0.95 prohibit_newline_at_end_of_diagnostic prohibit_nonreentrant 38.00 prohibit_nonreentrant prohibit_openat_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.57 prohibit_openat_without_use prohibit_path_max_allocation 0.85 prohibit_path_max_allocation prohibit_posixver_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.58 prohibit_posixver_without_use prohibit_raw_allocation 1.02 prohibit_raw_allocation prohibit_readlink 0.87 prohibit_readlink prohibit_return_as_function 0.89 prohibit_return_as_function prohibit_reversed_compare_failure 0.74 prohibit_reversed_compare_failure prohibit_risky_id_promotion 0.97 prohibit_risky_id_promotion prohibit_root_dev_ino_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.55 prohibit_root_dev_ino_without_use prohibit_safe_read_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.58 prohibit_safe_read_without_use prohibit_same_without_use grep: write error grep: write error sed: couldn't write 1 item to stdout: Broken pipe sed: couldn't write 49 items to stdout: Broken pipe 0.57 prohibit_same_without_use prohibit_semicolon_at_eol_in_python python/generator.py:1493: classes.write("=0"); maint.mk: Don't use semicolon at eol in python files make: *** [sc_prohibit_semicolon_at_eol_in_python] Error 1 Build step 'Execute shell' marked build as failure

4 6

[libvirt] [PATCH] [TCK] nwfilter: probe for inverted ctdir
by Stefan Berger 22 Mar '13

22 Mar '13

Linux netfilter at some point inverted the meaning of the '--ctdir reply' and newer netfilter implementations now expect '--ctdir original' instead and vice-versa. We probe for this netfilter change via an IMCP message over loopback and 3 filtering rules applied to INPUT. If the sent byte arrives, the newer netfilter implementation has been detected and we convert the strings in the iptables output to now match that inversion implemented by libvirt. The downside of this is that probing of libvirt and this test tool are independent and this test tool will only work correctly for all cases if used with libvirt probing for 'ctdir inversion' as well. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- scripts/nwfilter/nwfilter2vmtest.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) Index: libvirt-tck/scripts/nwfilter/nwfilter2vmtest.sh =================================================================== --- libvirt-tck.orig/scripts/nwfilter/nwfilter2vmtest.sh +++ libvirt-tck/scripts/nwfilter/nwfilter2vmtest.sh @@ -28,6 +28,10 @@ FLAG_LIBVIRT_TEST="$((1<<3))" FLAG_TAP_TEST="$((1<<4))" FLAG_FORCE_CLEAN="$((1<<5))" +# --ctdir original vs. --ctdir reply's meaning was inverted in +# netfilter at some point. We probe for it. +IPTABLES_CTRDIR_CORRECTED=0 + failctr=0 passctr=0 attachfailctr=0 @@ -100,6 +104,15 @@ mktmpdir() { return 0 } +probeIptablesCtdir() { + iptables -I INPUT 1 -i lo -p icmp -m state --state ESTABLISHED -j ACCEPT + iptables -I INPUT 2 -i lo -p icmp -m conntrack --ctdir ORIGINAL -j ACCEPT + iptables -I INPUT 3 -i lo -p icmp -j DROP + IPTABLES_CTDIR_CORRECTED=$(ping 127.0.0.1 -c 1 | sed -n 's/.*, $[0-9]*$ received,.*/\1/p') + iptables -D INPUT -i lo -p icmp -m state --state ESTABLISHED -j ACCEPT + iptables -D INPUT -i lo -p icmp -m conntrack --ctdir ORIGINAL -j ACCEPT + iptables -D INPUT -i lo -p icmp -j DROP +} checkExpectedOutput() { xmlfile="$1" @@ -160,6 +173,14 @@ checkExpectedOutput() { break fi + if [ $IPTABLES_CTDIR_CORRECTED -ne 0 ]; then + #change --ctdir ORIGINAL to --ctdir REPLY + #and --ctdir REPLY to --ctdir ORIGINAL + sed -i "s/ctdir[ ]*ORIGINAL/ctdir _REPLY/" ${tmpfile} + sed -i "s/ctdir[ ]*REPLY/ctdir ORIGINAL/" ${tmpfile} + sed -i "s/ctdir _REPLY/ctdir REPLY/" ${tmpfile} + fi + diff -w ${tmpfile} ${tmpfile2} >/dev/null if [ $? -ne 0 ]; then @@ -551,6 +572,8 @@ main() { echo "This script will only run on Linux." fi exit 1; + else + probeIptablesCtdir fi if [ $(($flags & $FLAG_TAP_TEST)) -ne 0 ]; then

1 0

[libvirt] [PATCH] Fix thread safety in LXC callback handling
by Daniel P. Berrange 22 Mar '13

22 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Some of the LXC callbacks did not lock the virDomainObjPtr instance. This caused transient errors like error: Failed to start domain busy-mount error: cannot rename file '/var/run/libvirt/lxc/busy-mount.xml.new' as '/var/run/libvirt/lxc/busy-mount.xml': No such file or directory as 2 threads tried to update the status file concurrently Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_process.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 670a032..39a6ea2 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -610,8 +610,13 @@ static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED virLXCMonitorExitStatus status, virDomainObjPtr vm) { + virLXCDriverPtr driver = lxc_driver; virLXCDomainObjPrivatePtr priv = vm->privateData; + lxcDriverLock(driver); + virObjectLock(vm); + lxcDriverUnlock(driver); + switch (status) { case VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN: priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; @@ -629,6 +634,8 @@ static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED } VIR_DEBUG("Domain shutoff reason %d (from status %d)", priv->stopReason, status); + + virObjectUnlock(vm); } static int @@ -667,9 +674,15 @@ static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED pid_t initpid, virDomainObjPtr vm) { - virLXCDomainObjPrivatePtr priv = vm->privateData; + virLXCDriverPtr driver = lxc_driver; + virLXCDomainObjPrivatePtr priv; ino_t inode; + lxcDriverLock(driver); + virObjectLock(vm); + lxcDriverUnlock(driver); + + priv = vm->privateData; priv->initpid = initpid; if (virLXCProcessGetNsInode(initpid, "pid", &inode) < 0) { @@ -684,6 +697,8 @@ static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED if (virDomainSaveStatus(lxc_driver->xmlconf, lxc_driver->stateDir, vm) < 0) VIR_WARN("Cannot update XML with PID for LXC %s", vm->def->name); + + virObjectUnlock(vm); } static virLXCMonitorCallbacks monitorCallbacks = { -- 1.7.11.7

2 1

[libvirt] [PATCH] Remove bogus filtering from virDomainGetRootFilesystem
by Daniel P. Berrange 22 Mar '13

22 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virDomainGetRootFilesystem was only returning filesystems with type=mount. This is bogus - any type of filesystem is valid as the root, if dst=/. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/conf/domain_conf.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0ef67be..4cae0d3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15635,9 +15635,6 @@ virDomainGetRootFilesystem(virDomainDefPtr def) int i; for (i = 0 ; i < def->nfss ; i++) { - if (def->fss[i]->type != VIR_DOMAIN_FS_TYPE_MOUNT) - continue; - if (STREQ(def->fss[i]->dst, "/")) return def->fss[i]; } -- 1.7.11.7

2 1

[libvirt] [PATCH] virsh: don't print --(null) in vol-name and vol-pool
by Ján Tomko 22 Mar '13

22 Mar '13

Don't print the pool option name if it's null. Before: virsh # vol-name vol error: failed to get vol 'vol', specifying --(null) might help error: Storage volume not found: no storage vol with matching path vol After: virsh # vol-name vol error: failed to get vol 'vol' error: Storage volume not found: no storage vol with matching path vol Bug: https://bugzilla.redhat.com/show_bug.cgi?id=924571 --- tools/virsh-volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 89ad8ea..0ca295f 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -88,7 +88,7 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, } if (!vol) { - if (pool) + if (pool || !pooloptname) vshError(ctl, _("failed to get vol '%s'"), n); else vshError(ctl, _("failed to get vol '%s', specifying --%s " -- 1.8.1.5

2 2

[libvirt] [PATCH] util: fix virAllocVar's comment
by Ján Tomko 22 Mar '13

22 Mar '13

--- Pushed under the trivial rule. src/util/viralloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/viralloc.c b/src/util/viralloc.c index 342b0eb..8f219bf 100644 --- a/src/util/viralloc.c +++ b/src/util/viralloc.c @@ -389,7 +389,7 @@ virDeleteElementsN(void *ptrptr, size_t size, size_t at, } /** - * Vir_Alloc_Var: + * virAllocVar: * @ptrptr: pointer to hold address of allocated memory * @struct_size: size of initial struct * @element_size: size of array elements -- 1.8.1.5

1 0

[libvirt] [PATCH] viralloc: Export virAllocTest*
by Michal Privoznik 22 Mar '13

22 Mar '13

If users build with --enable-test-oom configure option, they get this error saying, virAllocTest* functions are not defined within tests/testutils.c. --- src/libvirt_private.syms | 4 ++++ src/util/viralloc.c | 24 ++++++++++++++++++++++++ src/util/viralloc.h | 7 ------- tests/testutils.c | 2 +- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9529265..f241ec4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -993,6 +993,10 @@ virSecurityManagerVerify; # util/viralloc.h virAlloc; virAllocN; +virAllocTestCount; +virAllocTestHook; +virAllocTestInit; +virAllocTestOOM; virAllocVar; virDeleteElementsN; virExpandN; diff --git a/src/util/viralloc.c b/src/util/viralloc.c index 807de04..342b0eb 100644 --- a/src/util/viralloc.c +++ b/src/util/viralloc.c @@ -74,6 +74,30 @@ static int virAllocTestFail(void) testMallocNext++; return fail; } + +#else + +void virAllocTestOOM(int n ATTRIBUTE_UNUSED, + int m ATTRIBUTE_UNUSED) +{ + /* nada */ +} + +int virAllocTestCount(void) +{ + return 0; +} + +void virAllocTestInit(void) +{ + /* nada */ +} + +void virAllocTestHook(void (*func)(int, void*) ATTRIBUTE_UNUSED, + void *data ATTRIBUTE_UNUSED) +{ + /* nada */ +} #endif diff --git a/src/util/viralloc.h b/src/util/viralloc.h index 6f46d0b..7be7f82 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -376,15 +376,8 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); # define VIR_FREE(ptr) virFree((void *) &(ptr)) # endif - - -# if TEST_OOM void virAllocTestInit(void); int virAllocTestCount(void); void virAllocTestOOM(int n, int m); void virAllocTestHook(void (*func)(int, void*), void *data); -# endif - - - #endif /* __VIR_MEMORY_H_ */ diff --git a/tests/testutils.c b/tests/testutils.c index ea46c09..0fb69ec 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -697,7 +697,7 @@ int virtTestMain(int argc, if (worker) { _exit(ret); } else { - int i, status; + int i; for (i = 0 ; i < mp ; i++) { if (virProcessWait(workers[i], NULL) < 0) ret = EXIT_FAILURE; -- 1.8.1.5

2 1

[libvirt] [libvirt-designer] Add GvirDesignerDomain::osinfo-db
by Christophe Fergeau 22 Mar '13

22 Mar '13

virtxml was doing its own loading of the libosinfo database, and gvir_designer_init() was loading it a second time. By adding a GVirDesignerDomain::osinfo_db property, applications can share the same OsinfoDb as libvirt-designer. The association is made per libvirt-designer domain for more flexibility. --- examples/virtxml.c | 2 +- libvirt-designer/libvirt-designer-domain.c | 34 ++++++++++++++++++++++++++-- libvirt-designer/libvirt-designer-domain.h | 3 ++- libvirt-designer/libvirt-designer-internal.h | 3 --- libvirt-designer/libvirt-designer-main.c | 12 ---------- libvirt-designer/libvirt-designer-main.h | 2 ++ 6 files changed, 37 insertions(+), 19 deletions(-) diff --git a/examples/virtxml.c b/examples/virtxml.c index a68843d..c5a5e24 100644 --- a/examples/virtxml.c +++ b/examples/virtxml.c @@ -558,7 +558,7 @@ main(int argc, char *argv[]) goto cleanup; } - domain = gvir_designer_domain_new(os, platform, caps); + domain = gvir_designer_domain_new(db, os, platform, caps); gvir_designer_domain_setup_machine(domain, &error); CHECK_ERROR; diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index 3e31bd1..49e8068 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -35,6 +35,7 @@ struct _GVirDesignerDomainPrivate { GVirConfigDomain *config; GVirConfigCapabilities *caps; + OsinfoDb *osinfo_db; OsinfoOs *os; OsinfoPlatform *platform; @@ -66,6 +67,7 @@ enum { PROP_OS, PROP_PLATFORM, PROP_CAPS, + PROP_OSINFO_DB, }; static void gvir_designer_domain_get_property(GObject *object, @@ -83,6 +85,10 @@ static void gvir_designer_domain_get_property(GObject *object, g_value_set_object(value, priv->config); break; + case PROP_OSINFO_DB: + g_value_set_object(value, priv->osinfo_db); + break; + case PROP_OS: g_value_set_object(value, priv->os); break; @@ -112,6 +118,11 @@ static void gvir_designer_domain_set_property(GObject *object, GVirDesignerDomainPrivate *priv = design->priv; switch (prop_id) { + case PROP_OSINFO_DB: + if (priv->osinfo_db) + g_object_unref(priv->osinfo_db); + priv->osinfo_db = g_value_dup_object(value); + break; case PROP_OS: if (priv->os) g_object_unref(priv->os); @@ -147,6 +158,8 @@ static void gvir_designer_domain_finalize(GObject *object) g_object_unref(priv->caps); if (priv->deployment) g_object_unref(priv->deployment); + if (priv->osinfo_db) + g_object_unref(priv->osinfo_db); G_OBJECT_CLASS(gvir_designer_domain_parent_class)->finalize(object); } @@ -171,6 +184,16 @@ static void gvir_designer_domain_class_init(GVirDesignerDomainClass *klass) G_PARAM_STATIC_STRINGS)); g_object_class_install_property(object_class, + PROP_OSINFO_DB, + g_param_spec_object("osinfo-db", + "Osinfo Database", + "libosinfo database", + OSINFO_TYPE_DB, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(object_class, PROP_OS, g_param_spec_object("os", "Os", @@ -215,11 +238,13 @@ static void gvir_designer_domain_init(GVirDesignerDomain *design) } -GVirDesignerDomain *gvir_designer_domain_new(OsinfoOs *os, +GVirDesignerDomain *gvir_designer_domain_new(OsinfoDb *db, + OsinfoOs *os, OsinfoPlatform *platform, GVirConfigCapabilities *caps) { return GVIR_DESIGNER_DOMAIN(g_object_new(GVIR_DESIGNER_TYPE_DOMAIN, + "osinfo-db", db, "os", os, "platform", platform, "capabilities", caps, @@ -721,7 +746,12 @@ gvir_designer_domain_get_preferred_device(GVirDesignerDomain *design, OsinfoDeviceLink *dev_link = NULL; if (!deployment) { - priv->deployment = deployment = osinfo_db_find_deployment(osinfo_db, + if (!priv->osinfo_db) { + g_set_error(error, GVIR_DESIGNER_DOMAIN_ERROR, 0, + "Unable to find any deployment in libosinfo database"); + goto cleanup; + } + priv->deployment = deployment = osinfo_db_find_deployment(priv->osinfo_db, priv->os, priv->platform); if (!deployment) { diff --git a/libvirt-designer/libvirt-designer-domain.h b/libvirt-designer/libvirt-designer-domain.h index 38731a2..4d68ff6 100644 --- a/libvirt-designer/libvirt-designer-domain.h +++ b/libvirt-designer/libvirt-designer-domain.h @@ -66,7 +66,8 @@ struct _GVirDesignerDomainClass GType gvir_designer_domain_get_type(void); -GVirDesignerDomain *gvir_designer_domain_new(OsinfoOs *os, +GVirDesignerDomain *gvir_designer_domain_new(OsinfoDb *osinfo_db, + OsinfoOs *os, OsinfoPlatform *platform, GVirConfigCapabilities *caps); diff --git a/libvirt-designer/libvirt-designer-internal.h b/libvirt-designer/libvirt-designer-internal.h index bbef922..e95edfc 100644 --- a/libvirt-designer/libvirt-designer-internal.h +++ b/libvirt-designer/libvirt-designer-internal.h @@ -24,7 +24,4 @@ #ifndef __LIBVIRT_DESIGNER_INTERNAL_H__ #define __LIBVIRT_DESIGNER_INTERNAL_H__ -extern OsinfoLoader *osinfo_loader; -extern OsinfoDb *osinfo_db; - #endif /* __LIBVIRT_DESIGNER_INTERNAL_H__ */ diff --git a/libvirt-designer/libvirt-designer-main.c b/libvirt-designer/libvirt-designer-main.c index 5c70b57..927eb21 100644 --- a/libvirt-designer/libvirt-designer-main.c +++ b/libvirt-designer/libvirt-designer-main.c @@ -30,9 +30,6 @@ #include <libvirt-designer/libvirt-designer.h> #include <libvirt-gconfig/libvirt-gconfig.h> -OsinfoLoader *osinfo_loader = NULL; -OsinfoDb *osinfo_db = NULL; - /** * gvir_designer_init: * @argc: (inout): pointer to application's argc @@ -57,7 +54,6 @@ static void gvir_log_handler(const gchar *log_domain G_GNUC_UNUSED, fprintf(stderr, "%s\n", message); } - /** * gvir_designer_init_check: * @argc: (inout): pointer to application's argc @@ -85,13 +81,5 @@ gboolean gvir_designer_init_check(int *argc, gvir_log_handler, NULL); #endif - /* Init libosinfo and load databases from default paths */ - /* XXX maybe we want to let users tell a different path via - * env variable or argv */ - osinfo_loader = osinfo_loader_new(); - osinfo_loader_process_default_path(osinfo_loader, NULL); - - osinfo_db = osinfo_loader_get_db(osinfo_loader); - return TRUE; } diff --git a/libvirt-designer/libvirt-designer-main.h b/libvirt-designer/libvirt-designer-main.h index 2500ef7..5e82f8a 100644 --- a/libvirt-designer/libvirt-designer-main.h +++ b/libvirt-designer/libvirt-designer-main.h @@ -24,6 +24,8 @@ #error "Only <libvirt-gdesigner/libvirt-gdesigner.h> can be included directly." #endif +#include <osinfo/osinfo.h> + #ifndef __LIBVIRT_DESIGNER_MAIN_H__ #define __LIBVIRT_DESIGNER_MAIN_H__ -- 1.8.1.4

3 3

[libvirt] QEMU has applied for Google Summer of Code 2013
by Stefan Hajnoczi 22 Mar '13

22 Mar '13

QEMU.org has applied for Google Summer of Code 2013 and also aims to be an umbrella organization for libvirt and the KVM kernel module. Accepted mentoring organizations will be announced on April 8 at 19:00 UTC at http://google-melange.com/. This year we have proposed 5 QEMU project ideas, 1 KVM kernel module project idea, and 4 libvirt project ideas: http://qemu-project.org/Google_Summer_of_Code_2013 Thanks to everyone who has volunteered to be a mentor! Also thanks to Anthony Liguori for being backup org admin. Fingers crossed, Stefan

1 0

[libvirt] Cannot initialize thread local for current identity
by Gao feng 22 Mar '13

22 Mar '13

When I play with the latest libvirt,my libvirtd force me out of console of domain. I find the problem is introduced by commit ebf78be4c277cffae57d99daa199a9b3c1cf9804 "Set the current client identity during API call dispatch". Below is the error message Error polling connection 'qemu:///system': Cannot initialize thread local for current identity. I don't know if there are something wrong with my configuration, But when I reset to the commit id before this commit, everything runs well. If you need some debug information, Please let me know,It's my pleasure. Thanks.

2 2

[libvirt] [PATCH] python:remove semicolon in python code
by Guannan Ren 22 Mar '13

22 Mar '13

This breaked "make syntax-check" testing Pushed under trivial rule --- python/generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/generator.py b/python/generator.py index fbaf797..0237374 100755 --- a/python/generator.py +++ b/python/generator.py @@ -1490,7 +1490,7 @@ def buildWrappers(module): classes.write(", %s" % arg[0]) n = n + 1 if arg[0] == "flags": - classes.write("=0"); + classes.write("=0") classes.write("):\n") writeDoc(module, name, args, ' ', classes) n = 0 -- 1.7.11.2

1 0

[libvirt] [PATCH] qemu: add support for LSI MegaRAID SAS1078 (aka megasas) SCSI controller
by Paolo Bonzini 22 Mar '13

22 Mar '13

This does nothing more than adding the new device and capability. The device is present since QEMU 1.2.0. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- docs/formatdomain.html.in | 6 ++-- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 ++++++++- src/vmx/vmx.c | 3 +- tests/qemuhelptest.c | 6 ++-- .../qemuxml2argv-disk-scsi-megasas.args | 9 ++++++ .../qemuxml2argv-disk-scsi-megasas.xml | 32 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ tests/qemuxml2xmltest.c | 1 + 13 files changed, 73 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c2cf75f..8bf0736 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2091,9 +2091,9 @@ control how many devices can be connected through the controller. A "scsi" controller has an optional attribute <code>model</code>, which is one of "auto", "buslogic", - "ibmvscsi", "lsilogic", "lsias1068", "virtio-scsi" or "vmpvscsi". - A "usb" controller has an optional attribute <code>model</code>, - which is one of "piix3-uhci", "piix4-uhci", "ehci", + "ibmvscsi", "lsilogic", "lsisas1068", "lsisas1078", "virtio-scsi" or + "vmpvscsi". A "usb" controller has an optional attribute + <code>model</code>, which is one of "piix3-uhci", "piix4-uhci", "ehci", "ich9-ehci1", "ich9-uhci1", "ich9-uhci2", "ich9-uhci3", "vt82c686b-uhci", "pci-ohci" or "nec-xhci". Additionally, <span class="since">since 0.10.0</span>, if the USB bus needs to be diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index fae5c0d..a136ae8 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1391,6 +1391,7 @@ <value>vmpvscsi</value> <value>ibmvscsi</value> <value>virtio-scsi</value> + <value>lsisas1078</value> <value>piix3-uhci</value> <value>piix4-uhci</value> <value>ehci</value> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 159a23d..0ef67be 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -304,7 +304,8 @@ VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAS "lsisas1068", "vmpvscsi", "ibmvscsi", - "virtio-scsi"); + "virtio-scsi", + "lsisas1078"); VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "piix3-uhci", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a750a1f..c3b2608 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -695,6 +695,7 @@ enum virDomainControllerModelSCSI { VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI, + VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 50f8084..3840b41 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -212,6 +212,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "rng-egd", "virtio-ccw", "dtb", + "megasas", ); struct _virQEMUCaps { @@ -1329,6 +1330,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-s390", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI }, + { "megasas", QEMU_CAPS_SCSI_MEGASAS }, { "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC }, { "qxl-vga", QEMU_CAPS_DEVICE_QXL_VGA }, { "qxl", QEMU_CAPS_DEVICE_QXL }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b0f8c5b..7101f67 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -173,6 +173,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_OBJECT_RNG_EGD = 131, /* EGD protocol daemon for rng */ QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */ QEMU_CAPS_DTB = 133, /* -dtb file */ + QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 006f83d..a0c278f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -500,7 +500,7 @@ qemuSetScsiControllerModel(virDomainDefPtr def, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support " - "lsi scsi controller")); + "the LSI 53C895A SCSI controller")); return -1; } break; @@ -515,6 +515,14 @@ qemuSetScsiControllerModel(virDomainDefPtr def, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: /*TODO: need checking work here if necessary */ break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_MEGASAS)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support " + "the LSI SAS1078 controller")); + return -1; + } + break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller model: %s"), @@ -3544,6 +3552,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: virBufferAddLit(&buf, "spapr-vscsi"); break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: + virBufferAddLit(&buf, "megasas"); + break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller model: %s"), diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index c604bd2..d7eee09 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -511,7 +511,8 @@ VIR_ENUM_IMPL(virVMXControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST, "lsisas1068", "pvscsi", "UNUSED ibmvscsi", - "UNUSED virtio-scsi"); + "UNUSED virtio-scsi", + "UNUSED lsisas1078"); diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 059fa86..a28109a 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -912,7 +912,8 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_USB_SERIAL, QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DTB); + QEMU_CAPS_DTB, + QEMU_CAPS_SCSI_MEGASAS); DO_TEST("qemu-kvm-1.2.0", 1002000, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -1017,7 +1018,8 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_USB_SERIAL, QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DTB); + QEMU_CAPS_DTB, + QEMU_CAPS_SCSI_MEGASAS); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args new file mode 100644 index 0000000..c4d5f87 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args @@ -0,0 +1,9 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ +unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device \ +megasas,id=scsi0,bus=pci.0,addr=0x3 -usb -drive file=/dev/HostVG/QEMUGuest1,\ +if=none,id=drive-ide0-0-0 -device ide-drive,bus=ide.0,unit=0,\ +drive=drive-ide0-0-0,id=ide0-0-0 -drive file=/tmp/scsidisk.img,if=none,\ +id=drive-scsi0-0-4-0 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,\ +drive=drive-scsi0-0-4-0,id=scsi0-0-4-0 -device virtio-balloon-pci,\ +id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.xml new file mode 100644 index 0000000..9a496ae --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='4' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <controller type='scsi' index='0' model='lsisas1078'/> + <controller type='usb' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5e7adf5..38787ac 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -550,6 +550,9 @@ mymain(void) DO_TEST("disk-scsi-virtio-scsi", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("disk-scsi-megasas", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_MEGASAS); DO_TEST("disk-sata-device", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 899414d..ba9aa96 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -179,6 +179,7 @@ mymain(void) DO_TEST("disk-scsi-device"); DO_TEST("disk-scsi-vscsi"); DO_TEST("disk-scsi-virtio-scsi"); + DO_TEST("disk-scsi-megasas"); DO_TEST_FULL("disk-mirror", false, WHEN_ACTIVE); DO_TEST_FULL("disk-mirror", true, WHEN_INACTIVE); DO_TEST("graphics-listen-network"); -- 1.8.1.4

2 2