- Devel - libvirt List Archives

[libvirt] [PATCH] qemu migration: avoid NULL-deref given an invalid input
by Jim Meyering 15 Dec '09

15 Dec '09

The fix here is to add the missing "goto". Nearly every other use of qemudReportError is followed closely by a goto or a return statement. >From 898033ec5bb0399f7cc6a22ffd9f351552ced85b Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 14 Dec 2009 17:02:56 +0100 Subject: [PATCH] qemu migration: avoid NULL-deref given an invalid input * src/qemu/qemu_driver.c (doNonTunnelMigrate): Don't let a NULL "uri_out" provoke a NULL-dereference in doNativeMigrate: supply omitted goto-after-qemudReportError. --- src/qemu/qemu_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c782f0d..9ef6c35 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7430,6 +7430,7 @@ static int doNonTunnelMigrate(virDomainPtr dom, if (uri_out == NULL) { qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare2 did not set uri")); + goto cleanup; } if (doNativeMigrate(dom, driver, vm, uri_out, flags, dname, resource) < 0) -- 1.6.6.rc2.275.g51e2d

3 2

[libvirt] [PATCH] qemu_driver.c: don't unlink(NULL) on OOM error path
by Jim Meyering 15 Dec '09

15 Dec '09

Not terribly likely, but not impossible, either: >From dc8fe76ed209d04b1e962b94b20da17a077e102f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 14 Dec 2009 16:41:11 +0100 Subject: [PATCH] qemu_driver.c: don't unlink(NULL) on OOM error path * src/qemu/qemu_driver.c (qemudDomainMigratePrepareTunnel): Upon an out of memory error, we would end up with unixfile==NULL and attempt to unlink(NULL). Skip the unlink when it's NULL. --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 56bcec5..04b2511 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6903,7 +6903,8 @@ endjob: cleanup: virDomainDefFree(def); - unlink(unixfile); + if (unixfile) + unlink(unixfile); VIR_FREE(unixfile); if (vm) virDomainObjUnlock(vm); -- 1.6.6.rc2.275.g51e2d

3 3

[libvirt] [PATCH] qemu_driver.c: avoid double free on error path
by Jim Meyering 15 Dec '09

15 Dec '09

Note that there's nearly identical code in the same file where there is already an "event = NULL;" statement right after two identical lines. >From 69f3c74b6cdc36fb4958f4c9cc2d4497a03d40c1 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 14 Dec 2009 15:55:19 +0100 Subject: [PATCH] qemu_driver.c: avoid double free on error path * src/qemu/qemu_driver.c (qemudDomainMigrateFinish2): Set "event" to NULL after qemuDomainEventQueue frees it, so a subsequent free (after endjob label) upon qemuMonitorStartCPUs failure does not cause a double free. --- src/qemu/qemu_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 34fa582..43f7927 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7668,6 +7668,7 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn, VIR_DOMAIN_EVENT_DEFINED_UPDATED); if (event) qemuDomainEventQueue(driver, event); + event = NULL; } qemuDomainObjPrivatePtr priv = vm->privateData; -- 1.6.6.rc2.275.g51e2d

3 2

[libvirt] [PATCH] virsh: avoid double-free
by Jim Meyering 15 Dec '09

15 Dec '09

I didn't try to trigger the double free, but it looks feasible. >From 864cc161ffaf6c08cb980e66a673b53ac5ea52ab Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 14 Dec 2009 14:34:29 +0100 Subject: [PATCH] virsh: avoid double-free * tools/virsh.c (vshCommandParse): Avoid double-free of "tkdata". Set it to NULL immediately after free in the (cmd == NULL) case, just as in the other case, in case the final free(tkdata) is triggered by a syntax error. --- tools/virsh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 62c1270..0312945 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8044,6 +8044,7 @@ vshCommandParse(vshControl *ctl, char *cmdstr) goto syntaxError; /* ... or ignore this command only? */ } free(tkdata); + tkdata = NULL; } else if (tk == VSH_TK_OPTION) { if (!(opt = vshCmddefGetOption(cmd, tkdata))) { vshError(ctl, -- 1.6.6.rc2.275.g51e2d

3 2

[libvirt] [PATCH] remote_driver.c: also zero out ->saslDecodedOffset member
by Jim Meyering 15 Dec '09

15 Dec '09

Technically, the initialization of ->saslDecodedOffset is not required, but... What could go wrong if saslDecodedOffset is left with some positive value in the if-block below? Well, in that same if-block priv->saslDecoded is set to NULL, and in that case, the code above *usually* sets priv->saslDecodedOffset to 0, but not if we hit one of the intervening returns. In that case, you have to wonder if priv->saslDecoded can be set to non-NULL, yet with priv->saslDecodedOffset still left with the now-bogus positive value. In that case, with an initial saslDecodedLength of 0, we'd compute this: wantData = (priv->saslDecodedLength - priv->saslDecodedOffset and that would be negative. The very next statement would cause trouble, as the negative value treated-as-size_t would wreak havoc: memcpy(priv->buffer + priv->bufferOffset, priv->saslDecoded + priv->saslDecodedOffset, wantData); Luckily, the semantics of sasl_decode ensure that does not happen. Hence, an alternate (though riskier) patch would be to skip that of priv->saslDecodedOffset altogether. >From a3578fc03714a210678e6bcf62d162d92c9d07c0 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 14 Dec 2009 13:00:01 +0100 Subject: [PATCH] remote_driver.c: also zero out ->saslDecodedOffset member * src/remote/remote_driver.c (remoteIOReadMessage): ...rather than zeroing out priv->saslDecodedLength twice. --- src/remote/remote_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index affeb0f..77962fe 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7782,7 +7782,7 @@ remoteIOReadMessage(virConnectPtr conn, struct private_data *priv, priv->saslDecodedOffset += wantData; priv->bufferOffset += wantData; if (priv->saslDecodedOffset == priv->saslDecodedLength) { - priv->saslDecodedLength = priv->saslDecodedLength = 0; + priv->saslDecodedOffset = priv->saslDecodedLength = 0; priv->saslDecoded = NULL; } -- 1.6.6.rc2.275.g51e2d

2 1

[libvirt] problem connecting to vbox
by anuj rampal 15 Dec '09

15 Dec '09

Hi, I have installed VBOX 3.0.12 on fc12 which is running libvirt-0.7.1. Now when i try to connect using virsh using uri "virsh -c vbox+tcp:///system" this is the error i get: error: internal error unable to initialize VirtualBox driver API error: failed to connect to the hypervisor But it connects successfully with this ur: "virsh -c vbox:///system" i have also qemu installed on the same machine and connects successfully with uri "virsh -c qemu+tcp:///system" Libvirt is listening on tcp port:16509 any idea what am i doing wrong? Here is a detailed message: LIBVIRT_DEBUG=1 virsh -c vbox+tcp:///system 11:10:45.469: debug : virInitialize:279 : register drivers 11:10:45.495: debug : virRegisterDriver:776 : registering Test as driver 0 11:10:45.495: debug : virRegisterNetworkDriver:614 : registering Test as network driver 0 11:10:45.495: debug : virRegisterInterfaceDriver:645 : registering Test as interface driver 0 11:10:45.495: debug : virRegisterStorageDriver:676 : registering Test as storage driver 0 11:10:45.495: debug : virRegisterDeviceMonitor:707 : registering Test as device driver 0 11:10:45.495: debug : virRegisterSecretDriver:738 : registering Test as secret driver 0 11:10:45.496: debug : virRegisterDriver:776 : registering Xen as driver 1 11:10:45.496: debug : virRegisterDriver:776 : registering OPENVZ as driver 2 11:10:45.496: debug : virRegisterDriver:776 : registering PHYP as driver 3 11:10:45.506: debug : vboxRegister:80 : VBoxCGlueInit found API version: 3.0.12 (3000012) 11:10:45.506: debug : vboxRegister:92 : VirtualBox API version: 3.0 11:10:45.506: debug : virRegisterDriver:776 : registering VBOX as driver 4 11:10:45.506: debug : virRegisterNetworkDriver:614 : registering VBOX as network driver 1 11:10:45.506: debug : virRegisterStorageDriver:676 : registering VBOX as storage driver 1 11:10:45.506: debug : virRegisterDriver:776 : registering ESX as driver 5 11:10:45.506: debug : virRegisterDriver:776 : registering remote as driver 6 11:10:45.506: debug : virRegisterNetworkDriver:614 : registering remote as network driver 2 11:10:45.506: debug : virRegisterInterfaceDriver:645 : registering remote as interface driver 1 11:10:45.506: debug : virRegisterStorageDriver:676 : registering remote as storage driver 2 11:10:45.506: debug : virRegisterDeviceMonitor:707 : registering remote as device driver 1 11:10:45.506: debug : virRegisterSecretDriver:738 : registering remote as secret driver 1 11:10:45.506: debug : virConnectOpenAuth:1273 : name=vbox+tcp:///system, auth=0x43d940, flags=0 11:10:45.506: debug : do_open:1042 : name "vbox+tcp:///system" to URI components: scheme vbox+tcp opaque (null) authority (null) server (null) user (null) port 0 path /system 11:10:45.506: debug : do_open:1052 : trying driver 0 (Test) ... 11:10:45.506: debug : do_open:1058 : driver 0 Test returned DECLINED 11:10:45.506: debug : do_open:1052 : trying driver 1 (Xen) ... 11:10:45.506: debug : do_open:1058 : driver 1 Xen returned DECLINED 11:10:45.506: debug : do_open:1052 : trying driver 2 (OPENVZ) ... 11:10:45.506: debug : do_open:1058 : driver 2 OPENVZ returned DECLINED 11:10:45.506: debug : do_open:1052 : trying driver 3 (PHYP) ... 11:10:45.506: debug : do_open:1058 : driver 3 PHYP returned DECLINED 11:10:45.506: debug : do_open:1052 : trying driver 4 (VBOX) ... 11:10:45.506: debug : do_open:1058 : driver 4 VBOX returned DECLINED 11:10:45.506: debug : do_open:1052 : trying driver 5 (ESX) ... 11:10:45.506: debug : do_open:1058 : driver 5 ESX returned DECLINED 11:10:45.506: debug : do_open:1052 : trying driver 6 (remote) ... 11:10:45.506: debug : doRemoteOpen:535 : proceeding with name = vbox:///system 11:10:45.508: debug : remoteIO:7421 : Do proc=66 serial=0 length=28 wait=(nil) 11:10:45.508: debug : remoteIO:7483 : We have the buck 66 0xb75df008 0xb75df008 11:10:45.509: debug : remoteIODecodeMessageLength:7032 : Got length, now need 64 total (60 more) 11:10:45.509: debug : remoteIOEventLoop:7347 : Giving up the buck 66 0xb75df008 (nil) 11:10:45.509: debug : remoteIO:7514 : All done with our call 66 (nil) 0xb75df008 11:10:45.509: debug : remoteIO:7421 : Do proc=1 serial=1 length=56 wait=(nil) 11:10:45.509: debug : remoteIO:7483 : We have the buck 1 0x9fb2ea8 0x9fb2ea8 11:10:45.510: debug : remoteIODecodeMessageLength:7032 : Got length, now need 208 total (204 more) 11:10:45.510: debug : remoteIOEventLoop:7347 : Giving up the buck 1 0x9fb2ea8 (nil) 11:10:45.510: debug : remoteIO:7514 : All done with our call 1 (nil) 0x9fb2ea8 11:10:45.510: debug : do_open:1058 : driver 6 remote returned ERROR 11:10:45.510: debug : virUnrefConnect:257 : unref connection 0x9fb0b30 1 11:10:45.510: debug : virReleaseConnect:214 : release connection 0x9fb0b30 error: internal error unable to initialize VirtualBox driver API error: failed to connect to the hypervisor Regards Anuj

1 1

Re: [libvirt] getSchedulerParameters() always returning nullpointerexception in JAVA
by Marc Gonzalez Mateo 15 Dec '09

15 Dec '09

Hi Bryan, I've applied and tested the PATCH and still does not work. Here is the console output: -> [chipiron04, Domain-0, XenTest, XenTest2, chipiron03] Dec 15, 2009 9:49:14 AM net.emotivecloud.virtmonitor.VirtMonitor getCPUPriority SEVERE: Error: getting CPU priority of "XenTest".class java.lang.NullPointerException java.lang.NullPointerException at org.libvirt.SchedParameter.create(Unknown Source) at org.libvirt.Domain.getSchedulerParameters(Unknown Source) at net.emotivecloud.virtmonitor.VirtMonitor.getCPUPriority(VirtMonitor.java:495) at net.emotivecloud.virtmonitor.VirtMonitor.main(VirtMonitor.java:775) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:616) at org.codehaus.mojo.exec.ExecJavaMojo$1.run(ExecJavaMojo.java:283) at java.lang.Thread.run(Thread.java:636) -1 Dec 15, 2009 9:49:14 AM net.emotivecloud.virtmonitor.VirtMonitor getCPUCapacity SEVERE: Error: getting CPU capacity of "XenTest". java.lang.NullPointerException at org.libvirt.SchedParameter.create(Unknown Source) at org.libvirt.Domain.getSchedulerParameters(Unknown Source) at net.emotivecloud.virtmonitor.VirtMonitor.getCPUCapacity(VirtMonitor.java:470) at net.emotivecloud.virtmonitor.VirtMonitor.main(VirtMonitor.java:776) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:616) at org.codehaus.mojo.exec.ExecJavaMojo$1.run(ExecJavaMojo.java:283) at java.lang.Thread.run(Thread.java:636) -1 Both GetCPUCapacity and GetCPUPriority use the schedparameter type. Here is the code and the main. getDomain method just returns the domain object itself and I've also tested it's not null value at this point of the code: public int getCPUCapacity(String name) { int ret = -1; try { Domain d = getDomain(name); SchedParameter[] pars= d.getSchedulerParameters(); for (SchedParameter pri : pars) { if (pri.field=="cap") ret=Integer.parseInt(pri.getValueAsString()); } } catch (Exception e) { log.error(" Error: getting CPU capacity of \""+name+"\"."); e.printStackTrace(); } return ret; } /** * Returns CPU Priority assigned to VM name * @param name * @return */ public int getCPUPriority(String name) { int res=-1; try { Domain d = getDomain(name); SchedParameter[] pars = d.getSchedulerParameters(); for (SchedParameter pri : pars) { if (pri.field=="weight") res=Integer.parseInt(pri.getValueAsString()); } } catch (Exception e) { log.error(" Error: getting CPU priority of \""+name+"\"." + e.getClass()); e.printStackTrace(); } return res; } public static void main(String args[]) { VirtMonitor virt = new VirtMonitor(); System.out.println(" -> " + virt.getDomains()); System.out.println(virt.getCPUPriority("XenTest")); System.out.println(virt.getCPUCapacity("XenTest")); } Thanks in advance, Marc Gonzalez Mateo marcg(a)ac.upc.edu Universitat Politècnica de Catalunya El 14/12/2009, a las 16:41, Bryan Kearney escribió: Can you send me more info on the use case.. and I will try and recreate it? In the mean time.. tell me if the patched jar file at: http://bkearney.fedorapeople.org/libvirt-0.4.0-PATCH.jar works. You will need to download this and copy it into /usr/share/java/libvirt-0.4.0.jar -- bk On 12/14/2009 04:22 AM, Marc Gonzalez Mateo wrote: OK, let's see if Bryan has an idea/solution about this. Thanks guys! MARC El 11/12/2009, a las 14:29, Daniel Veillard escribió: On Fri, Dec 11, 2009 at 02:01:36PM +0100, Marc Gonzalez Mateo wrote: Hi everyvody, I'm developing a new API based on libvirt. I'm currently stucked using getSchedulerParameters, always is returning a nullpointerexception, no matter which Xen Domain I'm passing to the function. Enclosing both the code and the error console: public int getCPUPriority(String name) { int res=-1; try { Domain d = getDomain(name); SchedParameter[] pars = d.getSchedulerParameters(); Hum, it seems Domain.getSchedulerParameters() does SchedParameter[] returnValue = new SchedParameter[0]; and public static SchedParameter create(virSchedParameter vParam) { SchedParameter returnValue = null; switch (vParam.type) { case (1): and the create method getting there gets a null pointer as the initialization argument, which it first dereference ... so not surprizing looking at the code, maybe Bryan has an idea of what is going on there, I'm a bit lost in this initialization process ... Daniel for (SchedParameter pri : pars) { if (pri.field=="weight") res=Integer.parseInt(pri.getValueAsString()); } } catch (LibvirtException e) { log.error(" Error: getting CPU priority of \""+name+"\"." + e.getClass()); e.printStackTrace(); } return res; } Dec 11, 2009 1:04:18 PM net.emotivecloud.virtmonitor.VirtMonitor getCPUCapacity SEVERE: Error: getting CPU capacity of "XenTest". java.lang.NullPointerException at org.libvirt.SchedParameter.create(Unknown Source) at org.libvirt.Domain.getSchedulerParameters(Unknown Source) at net.emotivecloud.virtmonitor.VirtMonitor.getCPUCapacity(VirtMonitor.java:462) at net.emotivecloud.virtmonitor.VirtMonitor.main(VirtMonitor.java:763) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:616) at org.codehaus.mojo.exec.ExecJavaMojo$1.run(ExecJavaMojo.java:283) at java.lang.Thread.run(Thread.java:636) Any ideas? Thanks in advance, Marc Gonzalez Mateo -- Libvir-list mailing list Libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH v2 00/13] CPU selection patches
by Jiri Denemark 15 Dec '09

15 Dec '09

Hi, This is a second version of CPU selection patchset. Changes in version 2: - virConnectGetHostCPU() API call was completely removed - 'CPU driver implementation' (11/14) patch was dropped - virConnectCompareCPU() API call is implemented directly by hypervisor drivers - new cpuCompareXML() internal function to make virConnectCompareCPU() simpler Jirka Jiri Denemark (13): XML schema for CPU flags XML parsing/formating code for CPU flags Public API Internal driver API Public API implementation Wire protocol format Remote driver Server side dispatcher CPU selection infrastructure CPU map for models and features Set cpuCompare handler in drivers Implement CPU selection in QEMU driver Implement virsh commands configure.in | 20 + daemon/remote.c | 22 + docs/schemas/capability.rng | 46 ++- docs/schemas/domain.rng | 62 +++ include/libvirt/libvirt.h.in | 13 + include/libvirt/virterror.h | 1 + src/Makefile.am | 23 +- src/conf/capabilities.c | 31 ++- src/conf/capabilities.h | 6 + src/conf/cpu_conf.c | 366 ++++++++++++++ src/conf/cpu_conf.h | 116 +++++ src/conf/domain_conf.c | 15 + src/conf/domain_conf.h | 2 + src/cpu/cpu.c | 242 +++++++++ src/cpu/cpu.h | 129 +++++ src/cpu/cpu_generic.c | 123 +++++ src/cpu/cpu_generic.h | 32 ++ src/cpu/cpu_map.c | 130 +++++ src/cpu/cpu_map.h | 41 ++ src/cpu/cpu_map.xml | 304 +++++++++++ src/cpu/cpu_x86.c | 1142 ++++++++++++++++++++++++++++++++++++++++++ src/cpu/cpu_x86.h | 31 ++ src/cpu/cpu_x86_data.h | 45 ++ src/driver.h | 5 + src/esx/esx_driver.c | 1 + src/libvirt.c | 41 ++ src/libvirt_private.syms | 19 + src/libvirt_public.syms | 5 + src/lxc/lxc_driver.c | 1 + src/openvz/openvz_driver.c | 1 + src/qemu/qemu_conf.c | 401 ++++++++++++++- src/qemu/qemu_conf.h | 7 + src/qemu/qemu_driver.c | 43 ++- src/remote/remote_driver.c | 27 + src/remote/remote_protocol.x | 12 +- src/test/test_driver.c | 1 + src/uml/uml_driver.c | 1 + src/util/virterror.c | 3 + src/vbox/vbox_tmpl.c | 1 + tools/virsh.c | 65 +++ 40 files changed, 3541 insertions(+), 35 deletions(-) create mode 100644 src/conf/cpu_conf.c create mode 100644 src/conf/cpu_conf.h create mode 100644 src/cpu/cpu.c create mode 100644 src/cpu/cpu.h create mode 100644 src/cpu/cpu_generic.c create mode 100644 src/cpu/cpu_generic.h create mode 100644 src/cpu/cpu_map.c create mode 100644 src/cpu/cpu_map.h create mode 100644 src/cpu/cpu_map.xml create mode 100644 src/cpu/cpu_x86.c create mode 100644 src/cpu/cpu_x86.h create mode 100644 src/cpu/cpu_x86_data.h

1 13

[libvirt] getSchedulerParameters() always returning nullpointerexception in JAVA
by Marc Gonzalez Mateo 15 Dec '09

15 Dec '09

Hi everyvody, I'm developing a new API based on libvirt. I'm currently stucked using getSchedulerParameters, always is returning a nullpointerexception, no matter which Xen Domain I'm passing to the function. Enclosing both the code and the error console: public int getCPUPriority(String name) { int res=-1; try { Domain d = getDomain(name); SchedParameter[] pars = d.getSchedulerParameters(); for (SchedParameter pri : pars) { if (pri.field=="weight") res=Integer.parseInt(pri.getValueAsString()); } } catch (LibvirtException e) { log.error(" Error: getting CPU priority of \""+name+"\"." + e.getClass()); e.printStackTrace(); } return res; } Dec 11, 2009 1:04:18 PM net.emotivecloud.virtmonitor.VirtMonitor getCPUCapacity SEVERE: Error: getting CPU capacity of "XenTest". java.lang.NullPointerException at org.libvirt.SchedParameter.create(Unknown Source) at org.libvirt.Domain.getSchedulerParameters(Unknown Source) at net.emotivecloud.virtmonitor.VirtMonitor.getCPUCapacity(VirtMonitor.java:462) at net.emotivecloud.virtmonitor.VirtMonitor.main(VirtMonitor.java:763) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:616) at org.codehaus.mojo.exec.ExecJavaMojo$1.run(ExecJavaMojo.java:283) at java.lang.Thread.run(Thread.java:636) Any ideas? Thanks in advance, Marc Gonzalez Mateo

4 4

[libvirt] [PATCH 00/14] CPU selection patches
by Jiri Denemark 15 Dec '09

15 Dec '09

Hi, Here it is, finally. Jirka Jiri Denemark (14): XML schema for CPU flags XML parsing/formating code for CPU flags Public API Internal driver API Public API implementation Wire protocol format Remote driver Server side dispatcher CPU selection infrastructure CPU map for models and features CPU driver implementation Set getHostCPU handler in drivers Implement CPU selection in QEMU driver Implement virsh commands configure.in | 20 + daemon/Makefile.am | 2 + daemon/libvirtd.c | 3 + daemon/remote.c | 42 ++ daemon/remote_dispatch_prototypes.h | 16 + docs/schemas/capability.rng | 46 ++- docs/schemas/domain.rng | 62 ++ include/libvirt/libvirt.h.in | 15 + include/libvirt/virterror.h | 2 + src/Makefile.am | 43 ++- src/conf/capabilities.c | 31 +- src/conf/capabilities.h | 6 + src/conf/cpu_conf.c | 366 +++++++++++ src/conf/cpu_conf.h | 116 ++++ src/conf/domain_conf.c | 15 + src/conf/domain_conf.h | 2 + src/cpu/cpu.c | 206 +++++++ src/cpu/cpu.h | 124 ++++ src/cpu/cpu_driver.c | 190 ++++++ src/cpu/cpu_driver.h | 40 ++ src/cpu/cpu_generic.c | 123 ++++ src/cpu/cpu_generic.h | 32 + src/cpu/cpu_map.c | 130 ++++ src/cpu/cpu_map.h | 41 ++ src/cpu/cpu_map.xml | 304 ++++++++++ src/cpu/cpu_x86.c | 1142 +++++++++++++++++++++++++++++++++++ src/cpu/cpu_x86.h | 31 + src/cpu/cpu_x86_data.h | 45 ++ src/datatypes.h | 2 + src/driver.h | 20 + src/esx/esx_driver.c | 1 + src/libvirt.c | 129 ++++ src/libvirt_private.syms | 19 + src/libvirt_public.syms | 6 + src/lxc/lxc_driver.c | 1 + src/openvz/openvz_driver.c | 1 + src/qemu/qemu_conf.c | 401 ++++++++++++- src/qemu/qemu_conf.h | 7 + src/qemu/qemu_driver.c | 37 +- src/remote/remote_driver.c | 125 ++++ src/remote/remote_protocol.c | 27 + src/remote/remote_protocol.x | 18 +- src/test/test_driver.c | 1 + src/uml/uml_driver.c | 1 + src/util/virterror.c | 8 + src/vbox/vbox_tmpl.c | 1 + tools/virsh.c | 65 ++ 47 files changed, 4029 insertions(+), 36 deletions(-) create mode 100644 src/conf/cpu_conf.c create mode 100644 src/conf/cpu_conf.h create mode 100644 src/cpu/cpu.c create mode 100644 src/cpu/cpu.h create mode 100644 src/cpu/cpu_driver.c create mode 100644 src/cpu/cpu_driver.h create mode 100644 src/cpu/cpu_generic.c create mode 100644 src/cpu/cpu_generic.h create mode 100644 src/cpu/cpu_map.c create mode 100644 src/cpu/cpu_map.h create mode 100644 src/cpu/cpu_map.xml create mode 100644 src/cpu/cpu_x86.c create mode 100644 src/cpu/cpu_x86.h create mode 100644 src/cpu/cpu_x86_data.h

1 15

[libvirt] [PATCH] libvirtd: avoid a NULL dereference on error path
by Jim Meyering 15 Dec '09

15 Dec '09

>From f124b132913884ced6e9fbae8233056e0e97cd0a Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 14 Dec 2009 16:45:11 +0100 Subject: [PATCH] libvirtd: avoid a NULL dereference on error path * daemon/libvirtd.c (qemudDispatchServer): Since "client" may be NULL in the "cleanup:" block, free client->rx only when it's not. --- daemon/libvirtd.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 6b7e33d..de6fc27 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1422,7 +1422,8 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket if (client && client->tlssession) gnutls_deinit (client->tlssession); close (fd); - VIR_FREE(client->rx); + if (client) + VIR_FREE(client->rx); VIR_FREE(client); return -1; } -- 1.6.6.rc2.275.g51e2d

2 2

[libvirt] libvirt -0.7.4 on fc8 gives "Starting libvirtd daemon: error: Unable to initialize network sockets"
by Nimal Prabudoss I 15 Dec '09

15 Dec '09

Hi, I'm trying to use the libvirt 0.7.4 in fc8. I have configured and done with make, make install. Virsh command also displays the version correctly as 0.7.4 But when I try to start the libvirtd service, I get the following error. "Starting libvirtd daemon: error: Unable to initialize network sockets [Failed]" My machine details is given below "2.6.21-2950.fc8xen #1 SMP Tue Oct 23 12:24:34 EDT 2007 i686 i686 i386 GNU/Linux" Have anybody encountered the same kind of error? Please help me on this. Thanks, Nimal.I

1 0

[libvirt] [PATCH] Fix and improve domain xml video element description
by Matthias Bolte 14 Dec '09

14 Dec '09

The description mismatched the actual structure since the video element was introduced. The nvram attribute is actually called vram. Specify the unit of the vram attribute. --- docs/formatdomain.html.in | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 5b7aa10..3d418b9 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -768,20 +768,34 @@ qemu-kvm -net nic,model=? /dev/null <pre> ... - <video type='vga' nvram='8192' heads='1'> - <acceleration accel3d='yes' accel3d='yes' /> + <video> + <model type='vga' vram='8192' heads='1'> + <acceleration accel3d='yes' accel3d='yes'/> + </model> </video> ...</pre> <dl> <dt><code>video</code></dt> - <dd>The <code>video</code> element has a mandatory <code>type</code> - attribute which takes the value "vga", "cirrus", "vmvga", "xen" or "vbox". - You can also provide the amount of video memory using <code>nvram</code>, - the number of screen with <code>heads</code>, and whether acceleration - should be enabled (if supported) using the <code>accel3d</code> and - <code>accel2d</code> attributes in the <code>acceleration</code> element. + <dd> + The <code>video</code> element is the a container for describing + video devices. + </dd> + + <dt><code>model</code></dt> + <dd> + The <code>model</code> element has a mandatory <code>type</code> + attribute which takes the value "vga", "cirrus", "vmvga", "xen" or "vbox". + You can also provide the amount of video memory in kilobytes using + <code>vram</code> and the number of screen with <code>heads</code>. + </dd> + <dt><code>acceleration</code></dt> + <dd> + If acceleration should be enabled (if supported) using the + <code>accel3d</code> and <code>accel2d</code> attributes in the + <code>acceleration</code> element. + </dd> </dl> <h4><a name="elementsConsole">Consoles, serial, parallel & channel devices</a></h4> -- 1.6.0.4

2 2

[libvirt] Python script and extension module directory handling
by Matthias Bolte 14 Dec '09

14 Dec '09

Commit 66137344feb488ea87b0d92f3c03844d9a7a7786 changed the Python detection mechanism in configure. This results in a changed install location for the Python bindings at least on Fedora 12 64bit systems. For the explanation below I assume a Fedora 12 64bit systems, libvirt is configured with prefix /usr and Python 2.6 is installed. Before this commit libvirt.py and libvirtmod.so were installed to /usr/lib64/python2.6/site-packages. After this commit both are installed to /usr/lib/python2.6/site-packages. This is at least wrong for libvirtmod.so, as it should be installed to /usr/lib64/python2.6/site-packages on a 64bit system. Before this commit pythondir was set manually to /usr/lib64/python2.6/site-packages and python/Makefile.am contains 'python_LTLIBRARIES = libvirtmod.la' that results in installing libvirtmod.so to pythondir. AM_PATH_PYTHON defines two variables: pythondir and pyexecdir. But according to the AM_PATH_PYTHON documentation [1] pythondir is the directory where Python scripts should be installed. /usr/lib/python2.6/site-packages in this case, because Python scripts are not architecture dependent in general. pyexecdir is the directory where Python extension modules (shared libraries) should be installed. AM_PATH_PYTHON detects pyexecdir correctly as /usr/lib64/python2.6/site-packages, but python/Makefile.am contains 'python_LTLIBRARIES = libvirtmod.la' that results in installing libvirtmod.so to pythondir. So python/Makefile.am must be changed: diff --git a/python/Makefile.am b/python/Makefile.am index 736631e..04342b7 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -32,7 +32,7 @@ mylibs = $(top_builddir)/src/libvirt.la all-local: libvirt.py -python_LTLIBRARIES = libvirtmod.la +pyexec_LTLIBRARIES = libvirtmod.la libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h # Python <= 2.4 header files contain a redundant decl, hence we Now libvirtmod.so is installed to the correct directory: /usr/lib64/python2.6/site-packages But libvirt.py gets installed to /usr/lib/python2.6/site-packages, this is different from the installation directory before the commit. A default Fedora 12 64bit installation has *.py files installed to /usr/lib/python2.6/site-packages and /usr/lib64/python2.6/site-packages. By looking at both directories the policy it pretty obvious: Packages that are pure Python go to /usr/lib/python2.6/site-packages and packages that are mixed (Python and shared libraries) go completely to /usr/lib64/python2.6/site-packages. So we restore the behavior from before the commit completely by applying this additional patch: diff --git a/python/Makefile.am b/python/Makefile.am index 736631e..04342b7 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -60,14 +60,14 @@ $(GENERATED): generated.stamp $(libvirtmod_la_OBJECTS): $(GENERATED) install-data-local: - $(mkinstalldirs) $(DESTDIR)$(pythondir) - @INSTALL@ -m 0644 libvirt.py $(DESTDIR)$(pythondir) + $(mkinstalldirs) $(DESTDIR)$(pyexecdir) + @INSTALL@ -m 0644 libvirt.py $(DESTDIR)$(pyexecdir) $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR) @(for doc in $(DOCS) ; \ do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done) uninstall-local: - rm -f $(DESTDIR)$(pythondir)/libvirt.py + rm -f $(DESTDIR)$(pyexecdir)/libvirt.py CLEANFILES= $(GENERATED) generated.stamp I discussed this with Daniel Veillard on IRC and there was some confusion what the actual problem was and how to solve it, so I wanted to recap it here. Also thanks to Daniel Hokka Zakrisson, who gave the important hint about pythondir vs pyexecdir on IRC. [1] http://www.gnu.org/software/hello/manual/automake/Python.html Matthias

3 3

[libvirt] [PATCH] node_device_driver.c: don't write beyond EOB for 4K-byte symlink
by Jim Meyering 14 Dec '09

14 Dec '09

Without this patch, a symlink pointing to a 4096-byte name could make this code write NUL into the byte beyond end of buffer: if ((n = readlink(driver_link, devpath, sizeof devpath - 1)) < 0) { virReportSystemError(conn, errno, _("cannot resolve driver link %s"), driver_link); goto cleanup; } devpath[n] = '\0'; >From a075e207bc8fb279c43c9f4f43a960ffbd9a8a70 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 14 Dec 2009 12:05:38 +0100 Subject: [PATCH] node_device_driver.c: don't write beyond EOB for 4K-byte symlink * src/node_device/node_device_driver.c (update_driver_name): Leave one byte for the trailing NUL we'll append. --- src/node_device/node_device_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index f083f16..eda5d5e 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -97,7 +97,7 @@ static int update_driver_name(virConnectPtr conn, goto cleanup; } - if ((n = readlink(driver_link, devpath, sizeof devpath)) < 0) { + if ((n = readlink(driver_link, devpath, sizeof devpath - 1)) < 0) { virReportSystemError(conn, errno, _("cannot resolve driver link %s"), driver_link); goto cleanup; -- 1.6.6.rc2.275.g51e2d

3 6

[libvirt] [PATCH] Allow versioned pc machines for QEmu
by Diego Elio Pettenò 14 Dec '09

14 Dec '09

* docs/schemas/domain.rng: add pattern for pc-0.10, pc-0.11 and similar machine types --- docs/schemas/domain.rng | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index d1d3efb..dd3f732 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -171,6 +171,9 @@ <value>xenfv</value> <value>pc</value> <value>isapc</value> + <data type="string"> + <param name="pattern">pc-[0-9\.]+</param> + </data> </choice> </attribute> </optional> -- 1.6.5.6

4 3

[libvirt] [PATCH] Fix owner and group in example volume XML
by Matthew Booth 14 Dec '09

14 Dec '09

The owner and group in the documentation examples were confusingly given as '0744'. They should be numeric uid and gid. Changed the examples to use the default uid and gid assigned to qemu in F12. * docs/formatstorage.html.in: Change example owner and group in volume XML --- docs/formatstorage.html.in | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index ccf5a91..5c41c39 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -119,8 +119,8 @@ <target> <path>/dev/disk/by-path</path> <permissions> - <owner>0744</owner> - <group>0744</group> + <owner>107</owner> + <group>107</group> <mode>0744</mode> <label>virt_image_t</label> </permissions> @@ -244,8 +244,8 @@ <path>/var/lib/virt/images/sparse.img</path> <format type='qcow2'/> <permissions> - <owner>0744</owner> - <group>0744</group> + <owner>107</owner> + <group>107</group> <mode>0744</mode> <label>virt_image_t</label> </permissions> @@ -294,8 +294,8 @@ <path>/var/lib/virt/images/master.img</path> <format>raw</format> <permissions> - <owner>0744</owner> - <group>0744</group> + <owner>107</owner> + <group>107</group> <mode>0744</mode> <label>virt_image_t</label> </permissions> @@ -368,8 +368,8 @@ <target> <path>/var/lib/virt/images/sparse.img</path> <permissions> - <owner>0744</owner> - <group>0744</group> + <owner>107</owner> + <group>107</group> <mode>0744</mode> <label>virt_image_t</label> </permissions> -- 1.6.5.2

3 2

[libvirt] [PATCH] add missing doc for device <shareable/> option
by Daniel Veillard 14 Dec '09

14 Dec '09

This has been there forever, but we never documented it in the domain format page. The description is not fantastic, so improvements welcome :-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] Eliminate failure to delete empty storage pools
by Laine Stump 14 Dec '09

14 Dec '09

virStorageBackendFileSystemDelete was incorrectly calling unlink() in an attempt to remove a directory. It should be calling rmdir() instead. (remove() would also work, but could potentially succeed on a non-empty pool if the pool was a symlink to somewhere else). --- src/storage/storage_backend_fs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 16e4bd9..b7d4bd6 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -693,9 +693,9 @@ virStorageBackendFileSystemDelete(virConnectPtr conn, { /* XXX delete all vols first ? */ - if (unlink(pool->def->target.path) < 0) { + if (rmdir(pool->def->target.path) < 0) { virReportSystemError(conn, errno, - _("cannot unlink path '%s'"), + _("failed to remove pool '%s'"), pool->def->target.path); return -1; } -- 1.6.6.rc2.5.g49666

3 2

[libvirt] [PATCH] Fix use of virEventAddHandleImpl()
by Jiri Denemark 14 Dec '09

14 Dec '09

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/node_device/node_device_udev.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index cf23be1..6b6e244 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -37,7 +37,7 @@ #include "uuid.h" #include "util.h" #include "buf.h" -#include "daemon/event.h" +#include "event.h" #define VIR_FROM_THIS VIR_FROM_NODEDEV @@ -1526,10 +1526,10 @@ static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) * enumeration. The alternative is to register the callback after * we enumerate, in which case we will fail to create any devices * that appear while the enumeration is taking place. */ - if (virEventAddHandleImpl(udev_monitor_get_fd(udev_monitor), - VIR_EVENT_HANDLE_READABLE, - udevEventHandleCallback, - NULL, NULL) == -1) { + if (virEventAddHandle(udev_monitor_get_fd(udev_monitor), + VIR_EVENT_HANDLE_READABLE, + udevEventHandleCallback, + NULL, NULL) == -1) { ret = -1; goto out; } -- 1.6.5.6

2 1

[libvirt] [PATCH] Cleanup temporary #define after use
by Matthew Booth 14 Dec '09

14 Dec '09

* src/qemu/qemu_driver.c: #undef LOOKUP_PTYS after use --- src/qemu/qemu_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7e55c23..4567a66 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1436,6 +1436,7 @@ qemudFindCharDevicePTYsMonitor(virConnectPtr conn, LOOKUP_PTYS(vm->def->serials, vm->def->nserials, "serial"); LOOKUP_PTYS(vm->def->parallels, vm->def->nparallels, "parallel"); LOOKUP_PTYS(vm->def->channels, vm->def->nchannels, "channel"); +#undef LOOKUP_PTYS return 0; } -- 1.6.5.2

2 1

[libvirt] [PATCH] implement --pool option for virsh vol-path
by Dave Allan 14 Dec '09

14 Dec '09

This patch fixes the problem reported in: https://bugzilla.redhat.com/show_bug.cgi?id=509306 The bug reporter says that vol-delete does not support the --pool option, but that's not the case in the current head. This patch makes vol-path behave the same way as vol-delete. Dave

2 1

[libvirt] [PATCH] nodedev: Add removable storage 'media_label' prop
by Cole Robinson 14 Dec '09

14 Dec '09

Provides the CDROM label for current media. Only implemented for the udev backend. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/schemas/nodedev.rng | 5 +++++ src/conf/node_device_conf.c | 8 ++++++++ src/conf/node_device_conf.h | 1 + src/node_device/node_device_udev.c | 5 +++++ tests/nodedevschemadata/DVD_with_media.xml | 16 ++++++++++++++++ tests/nodedevxml2xmltest.c | 1 + 6 files changed, 36 insertions(+), 0 deletions(-) create mode 100644 tests/nodedevschemadata/DVD_with_media.xml diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index 7060274..797b1af 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -314,6 +314,11 @@ <element name='media_size'> <ref name='uint'/> </element> + <optional> + <element name='media_label'> + <text/> + </element> + </optional> </element> </define> diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 6003ab1..a0d256c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -422,6 +422,11 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, "</media_available>\n", avl ? 1 : 0); virBufferVSprintf(&buf, " <media_size>%llu</media_size>\n", data->storage.removable_media_size); + if (data->storage.media_label) + virBufferVSprintf(&buf, + " <media_label>%s</media_label>\n", + data->storage.media_label); + if (data->storage.logical_block_size > 0) virBufferVSprintf(&buf, " <logical_block_size>%llu" "</logical_block_size>\n", @@ -575,6 +580,8 @@ virNodeDevCapStorageParseXML(virConnectPtr conn, if (virXPathBoolean(conn, "count(./media_available[. = '1']) > 0", ctxt)) data->storage.flags |= VIR_NODE_DEV_CAP_STORAGE_REMOVABLE_MEDIA_AVAILABLE; + data->storage.media_label = virXPathString(conn, "string(./media_label[1])", ctxt); + val = 0; if (virNodeDevCapsDefParseULongLong(conn, "number(./media_size[1])", ctxt, &val, def, _("no removable media size supplied for '%s'"), @@ -1431,6 +1438,7 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) VIR_FREE(data->storage.model); VIR_FREE(data->storage.vendor); VIR_FREE(data->storage.serial); + VIR_FREE(data->storage.media_label); break; case VIR_NODE_DEV_CAP_LAST: /* This case is here to shutup the compiler */ diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 7a20bd6..e409a76 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -154,6 +154,7 @@ struct _virNodeDevCapsDef { char *model; char *vendor; char *serial; + char *media_label; unsigned flags; /* virNodeDevStorageCapFlags bits */ } storage; } data; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 9b48052..c78643e 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -867,6 +867,11 @@ static int udevProcessCDROM(struct udev_device *device, def->caps->data.storage.flags |= VIR_NODE_DEV_CAP_STORAGE_REMOVABLE_MEDIA_AVAILABLE; + if (udevGetStringProperty(device, "ID_FS_LABEL", + &data->storage.media_label) == PROPERTY_ERROR) { + goto out; + } + if (udevGetUint64SysfsAttr(device, "size", &data->storage.num_blocks) == PROPERTY_ERROR) { diff --git a/tests/nodedevschemadata/DVD_with_media.xml b/tests/nodedevschemadata/DVD_with_media.xml new file mode 100644 index 0000000..673e88f --- /dev/null +++ b/tests/nodedevschemadata/DVD_with_media.xml @@ -0,0 +1,16 @@ +<device> + <name>DVD_GCC_4247N</name> + <parent>pci_8086_27df_scsi_host_scsi_device_lun0</parent> + <capability type='storage'> + <block>/dev/sr0</block> + <bus>scsi</bus> + <drive_type>cdrom</drive_type> + <model>RW/DVD GCC-4247N</model> + <vendor>HL-DT-ST</vendor> + <capability type='removable'> + <media_available>1</media_available> + <media_size>12345678</media_size> + <media_label>Windows_XP_Label</media_label> + </capability> + </capability> +</device> diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index 7621212..bf8be7e 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -80,6 +80,7 @@ mymain(int argc, char **argv) DO_TEST("computer"); DO_TEST("DVD_GCC_4247N"); + DO_TEST("DVD_with_media"); DO_TEST("net_00_13_02_b9_f9_d3"); DO_TEST("net_00_15_58_2f_e9_55"); DO_TEST("pci_1002_71c4"); -- 1.6.5.2

3 2

[libvirt] [PATCH] expose SR IOV physical/virtual function relationships
by Dave Allan 14 Dec '09

14 Dec '09

Attached is a patch that exposes the relationships between physical and virtual functions on SR IOV capable devices. Dave >From cc5b72f99cd472aa0c07d8115e0abc970feab704 Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Mon, 30 Nov 2009 15:58:47 -0500 Subject: [PATCH 1/2] Add SR IOV physical and virtual function relationships --- src/conf/node_device_conf.c | 16 ++++ src/conf/node_device_conf.h | 3 + src/node_device/node_device_driver.h | 10 +++ src/node_device/node_device_hal.c | 6 ++ src/node_device/node_device_linux_sysfs.c | 122 ++++++++++++++++++++++++++++- 5 files changed, 156 insertions(+), 1 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 6003ab1..4b5d17c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -246,6 +246,7 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, { virBuffer buf = VIR_BUFFER_INITIALIZER; virNodeDevCapsDefPtr caps; + unsigned int i = 0; char *tmp; virBufferAddLit(&buf, "<device>\n"); @@ -318,6 +319,16 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, data->pci_dev.vendor_name); else virBufferAddLit(&buf, " />\n"); + if (data->pci_dev.physical_function) { + virBufferEscapeString(&buf, " <physical_function>%s</physical_function>\n", + data->pci_dev.physical_function); + } + if (data->pci_dev.num_virtual_functions > 0) { + for (i = 0 ; i < data->pci_dev.num_virtual_functions ; i++) { + virBufferEscapeString(&buf, " <virtual_function>%s</virtual_function>\n", + data->pci_dev.virtual_functions[i]); + } + } break; case VIR_NODE_DEV_CAP_USB_DEV: virBufferVSprintf(&buf, " <bus>%d</bus>\n", data->usb_dev.bus); @@ -1387,6 +1398,7 @@ out: void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) { + int i = 0; union _virNodeDevCapData *data = &caps->data; switch (caps->type) { @@ -1402,6 +1414,10 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) case VIR_NODE_DEV_CAP_PCI_DEV: VIR_FREE(data->pci_dev.product_name); VIR_FREE(data->pci_dev.vendor_name); + VIR_FREE(data->pci_dev.physical_function); + for (i = 0 ; i < data->pci_dev.num_virtual_functions ; i++) { + VIR_FREE(data->pci_dev.virtual_functions[i]); + } break; case VIR_NODE_DEV_CAP_USB_DEV: VIR_FREE(data->usb_dev.product_name); diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 7a20bd6..11b7539 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -105,6 +105,9 @@ struct _virNodeDevCapsDef { unsigned class; char *product_name; char *vendor_name; + char *physical_function; + char **virtual_functions; + unsigned num_virtual_functions; } pci_dev; struct { unsigned bus; diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index 4f0822c..d358276 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -61,6 +61,14 @@ int check_fc_host_linux(union _virNodeDevCapData *d); #define check_vport_capable(d) check_vport_capable_linux(d) int check_vport_capable_linux(union _virNodeDevCapData *d); +#define get_physical_function(s,d) get_physical_function_linux(s,d) +int get_physical_function_linux(const char *sysfs_path, + union _virNodeDevCapData *d); + +#define get_virtual_functions(s,d) get_virtual_functions_linux(s,d) +int get_virtual_functions_linux(const char *sysfs_path, + union _virNodeDevCapData *d); + #define read_wwn(host, file, wwn) read_wwn_linux(host, file, wwn) int read_wwn_linux(int host, const char *file, char **wwn); @@ -68,6 +76,8 @@ int read_wwn_linux(int host, const char *file, char **wwn); #define check_fc_host(d) #define check_vport_capable(d) +#define get_physical_function(sysfs_path, d) +#define get_virtual_functions(sysfs_path, d) #define read_wwn(host, file, wwn) #endif /* __linux__ */ diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 31c1764..7cb931e 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -145,14 +145,20 @@ static int gather_pci_cap(LibHalContext *ctx, const char *udi, (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.slot); (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.function); } + + get_physical_function(sysfs_path, d); + get_virtual_functions(sysfs_path, d); + VIR_FREE(sysfs_path); } + (void)get_int_prop(ctx, udi, "pci.vendor_id", (int *)&d->pci_dev.vendor); if (get_str_prop(ctx, udi, "pci.vendor", &d->pci_dev.vendor_name) != 0) (void)get_str_prop(ctx, udi, "info.vendor", &d->pci_dev.vendor_name); (void)get_int_prop(ctx, udi, "pci.product_id", (int *)&d->pci_dev.product); if (get_str_prop(ctx, udi, "pci.product", &d->pci_dev.product_name) != 0) (void)get_str_prop(ctx, udi, "info.product", &d->pci_dev.product_name); + return 0; } diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index b7cf782..6b9738c 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -29,6 +29,7 @@ #include "virterror_internal.h" #include "memory.h" #include "logging.h" +#include <dirent.h> #define VIR_FROM_THIS VIR_FROM_NODEDEV @@ -70,7 +71,7 @@ int read_wwn_linux(int host, const char *file, char **wwn) char buf[64]; if (open_wwn_file(LINUX_SYSFS_FC_HOST_PREFIX, host, file, &fd) < 0) { - goto out; + goto out; } memset(buf, 0, sizeof(buf)); @@ -184,4 +185,123 @@ out: return retval; } + +static int get_sriov_function(const char *device_link, + char **pci_device) +{ + char *device_path = NULL, *device_name = NULL; + char errbuf[64]; + int ret = -1; + + VIR_DEBUG("Attempting to resolve device path from device link '%s'\n", + device_link); + + if (!virFileExists(device_link)) { + + VIR_DEBUG("SR IOV function link '%s' does not exist\n", device_link); + /* Not an SR IOV device, not an error, either. */ + ret = 0; + goto out; + + } + + device_path = realpath(device_link, device_path); + if (device_path == NULL) { + memset(errbuf, '\0', sizeof(errbuf)); + VIR_ERROR("Failed to resolve device link '%s': '%s'\n", device_link, + strerror_r(errno, errbuf, sizeof(errbuf))); + goto out; + } + + VIR_DEBUG("SR IOV device path is '%s'\n", device_path); + device_name = basename(device_path); + *pci_device = strdup(device_name); + if (*pci_device == NULL) { + VIR_ERROR0("Failed to allocate memory for PCI device name\n"); + goto out; + } + + VIR_DEBUG("SR IOV function is '%s'\n", *pci_device); + ret = 0; + +out: + VIR_FREE(device_path); + return ret; +} + + +int get_physical_function_linux(const char *sysfs_path, + union _virNodeDevCapData *d ATTRIBUTE_UNUSED) +{ + int ret = -1; + char *device_link = NULL; + + VIR_DEBUG("Attempting to get SR IOV physical function for device " + "with sysfs path '%s'\n", sysfs_path); + + if (virBuildPath(&device_link, sysfs_path, "physfn") == -1) { + virReportOOMError(NULL); + } else { + ret = get_sriov_function(device_link, &d->pci_dev.physical_function); + } + + VIR_FREE(device_link); + return ret; +} + + +int get_virtual_functions_linux(const char *sysfs_path, + union _virNodeDevCapData *d) +{ + int ret = -1; + DIR *dir = NULL; + struct dirent *entry = NULL; + char *device_link = NULL; + + VIR_DEBUG("Attempting to get SR IOV virtual functions for device" + "with sysfs path '%s'\n", sysfs_path); + + dir = opendir(sysfs_path); + if (dir == NULL) { + goto out; + } + + while ((entry = readdir(dir))) { + if (STRPREFIX(entry->d_name, "virtfn")) { + /* This local is just to avoid lines of code much > 80 col. */ + unsigned int *num_funcs = &d->pci_dev.num_virtual_functions; + + if (virBuildPath(&device_link, sysfs_path, entry->d_name) == -1) { + virReportOOMError(NULL); + goto out; + } + + VIR_DEBUG("Number of virtual functions: %d\n", *num_funcs); + if (VIR_REALLOC_N(d->pci_dev.virtual_functions, (*num_funcs) + 1) != 0) { + virReportOOMError(NULL); + goto out; + } + + if (get_sriov_function(device_link, + &d->pci_dev.virtual_functions[*num_funcs]) != 0) { + VIR_ERROR("Failed to get SR IOV function from device link '%s'\n", + device_link); + goto out; + } else { + (*num_funcs)++; + } + + VIR_FREE(device_link); + } + } + + closedir(dir); + + ret = 0; + +out: + VIR_FREE(device_link); + return 0; +} + #endif /* __linux__ */ -- 1.6.5.2

4 10

[libvirt] [PATCH 1/2] add --crash support to "virsh dump"
by Paolo Bonzini 14 Dec '09

14 Dec '09

This patch adds the --crash option (already present in "xm dump-core") to "virsh dump". virDomainCoreDump already has a flags argument, so the API/ABI is untouched. * include/libvirt/libvirt.h.in (virDomainCoreDumpFlags): New. * src/test/test_driver.c (testDomainCoreDump): Do not crash after dump unless VIR_DUMP_CRASH is given. * src/qemu/qemu_driver.c (qemudDomainCoreDump): Shutdown the domain instead of restarting it if --crash is passed. * src/xen/xend_internal.c (xenDaemonDomainCoreDump): Support --crash. * tools/virsh.c (opts_dump): Add --crash. (cmdDump): Map it to flags for virDomainCoreDump and pass them. --- include/libvirt/libvirt.h.in | 5 +++++ src/qemu/qemu_driver.c | 17 ++++++++++++++++- src/test/test_driver.c | 19 ++++++++++--------- src/xen/xend_internal.c | 6 ++++-- tools/virsh.c | 7 ++++++- 5 files changed, 41 insertions(+), 13 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 5bc7694..c04b552 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -334,6 +334,11 @@ struct _virDomainInterfaceStats { typedef virDomainInterfaceStatsStruct *virDomainInterfaceStatsPtr; +/* Domain core dump flags. */ +typedef enum { + VIR_DUMP_CRASH = (1 << 0), /* crash after dump */ +} virDomainCoreDumpFlags; + /* Domain migration flags. */ typedef enum { VIR_MIGRATE_LIVE = (1 << 0), /* live migration */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 92d4629..8e80144 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3543,6 +3543,7 @@ static int qemudDomainCoreDump(virDomainPtr dom, virDomainObjPtr vm; int resume = 0, paused = 0; int ret = -1, fd = -1; + virDomainEventPtr event = NULL; const char *args[] = { "cat", NULL, @@ -3633,10 +3634,17 @@ static int qemudDomainCoreDump(virDomainPtr dom, goto endjob; endjob: + if ((ret == 0) && (flags & VIR_DUMP_CRASH)) { + qemudShutdownVMDaemon(dom->conn, driver, vm); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_CRASHED); + } + /* Since the monitor is always attached to a pty for libvirt, it will support synchronous operations so we always get here after the migration is complete. */ - if (resume && paused) { + else if (resume && paused) { qemuDomainObjEnterMonitor(vm); if (qemuMonitorStartCPUs(priv->mon, dom->conn) < 0) { if (virGetLastError() == NULL) @@ -3647,12 +3655,19 @@ endjob: } qemuDomainObjEndJob(vm); + if ((ret == 0) && (flags & VIR_DUMP_CRASH) && !vm->persistent) { + virDomainRemoveInactive(&driver->domains, + vm); + vm = NULL; + } cleanup: if (ret != 0) unlink(path); if (vm) virDomainObjUnlock(vm); + if (event) + qemuDomainEventQueue(driver, event); return ret; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 35f7571..7db9a4c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1911,15 +1911,16 @@ static int testDomainCoreDump(virDomainPtr domain, goto cleanup; } - testDomainShutdownState(domain, privdom); - event = virDomainEventNewFromObj(privdom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_CRASHED); - - if (!privdom->persistent) { - virDomainRemoveInactive(&privconn->domains, - privdom); - privdom = NULL; + if (flags & VIR_DUMP_CRASH) { + testDomainShutdownState(domain, privdom); + event = virDomainEventNewFromObj(privdom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_CRASHED); + if (!privdom->persistent) { + virDomainRemoveInactive(&privconn->domains, + privdom); + privdom = NULL; + } } ret = 0; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 66d2e7f..360390d 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -3243,8 +3243,10 @@ xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename, return(-1); } - return xend_op(domain->conn, domain->name, "op", "dump", "file", filename, - "live", "0", "crash", "0", NULL); + return xend_op(domain->conn, domain->name, + "op", "dump", "file", filename, "live", "0", + "crash", (flags & VIR_DUMP_CRASH ? "1" : "0"), + NULL); } /** diff --git a/tools/virsh.c b/tools/virsh.c index 9faac35..65eaa3b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1431,6 +1431,7 @@ static const vshCmdInfo info_dump[] = { }; static const vshCmdOptDef opts_dump[] = { + {"crash", VSH_OT_BOOL, 0, gettext_noop("crash the domain after core dump")}, {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("where to dump the core")}, {NULL, 0, 0, NULL} @@ -1443,6 +1444,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) char *name; char *to; int ret = TRUE; + int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; @@ -1453,7 +1455,10 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return FALSE; - if (virDomainCoreDump(dom, to, 0) == 0) { + if (vshCommandOptBool (cmd, "crash")) + flags |= VIR_DUMP_CRASH; + + if (virDomainCoreDump(dom, to, flags) == 0) { vshPrint(ctl, _("Domain %s dumped to %s\n"), name, to); } else { vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); -- 1.6.5.2

4 15

[libvirt] [PATCH] add AppArmor test and examples to dist
by Jamie Strandboge 14 Dec '09

14 Dec '09

tests/virt-aa-helper-test and examples/apparmor are not included in official tarballs, but should be. Attached is a patch to fix that which works when apparmor is and is not available. Thanks to Daniel P. Berrange for pointing me in the right direction. Jamie -- Jamie Strandboge | http://www.canonical.com

3 2

[libvirt] [PATCH] fix various breakages in qemu "virsh dump"
by Paolo Bonzini 14 Dec '09

14 Dec '09

1) qemuMigrateToCommand uses ">>" so we have to truncate the file before starting the migration; 2) the command wasn't updated to chown the driver and set/restore the security lavels; 3) the VM does not have to be resumed if migration fails; 4) the file is not removed when migration fails. * src/qemu/qemu_driver.c (qemuDomainCoreDump): Truncate file before dumping, set/restore ownership and security labels for the file. --- src/qemu/qemu_driver.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c9b5ac2..92d4629 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3542,7 +3542,7 @@ static int qemudDomainCoreDump(virDomainPtr dom, struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; int resume = 0, paused = 0; - int ret = -1; + int ret = -1, fd = -1; const char *args[] = { "cat", NULL, @@ -3569,6 +3569,33 @@ static int qemudDomainCoreDump(virDomainPtr dom, goto endjob; } + /* Create an empty file with appropriate ownership. */ + if ((fd = open(path, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + _("failed to create '%s'"), path); + goto endjob; + } + + if (close(fd) < 0) { + virReportSystemError(dom->conn, errno, + _("unable to save file %s"), + path); + goto endjob; + } + + if (driver->privileged && + chown(path, driver->user, driver->group) < 0) { + virReportSystemError(NULL, errno, + _("unable to set ownership of '%s' to user %d:%d"), + path, driver->user, driver->group); + goto endjob; + } + + if (driver->securityDriver && + driver->securityDriver->domainSetSavedStateLabel && + driver->securityDriver->domainSetSavedStateLabel(dom->conn, vm, path) == -1) + goto endjob; + /* Migrate will always stop the VM, so once we support live dumping the resume condition will stay the same, independent of whether the stop command is issued. */ @@ -3590,8 +3617,22 @@ static int qemudDomainCoreDump(virDomainPtr dom, qemuDomainObjEnterMonitor(vm); ret = qemuMonitorMigrateToCommand(priv->mon, 0, args, path); qemuDomainObjExitMonitor(vm); - paused = 1; + paused |= (ret == 0); + + if (driver->privileged && + chown(path, 0, 0) < 0) { + virReportSystemError(NULL, errno, + _("unable to set ownership of '%s' to user %d:%d"), + path, 0, 0); + goto endjob; + } + if (driver->securityDriver && + driver->securityDriver->domainRestoreSavedStateLabel && + driver->securityDriver->domainRestoreSavedStateLabel(dom->conn, path) == -1) + goto endjob; + +endjob: /* Since the monitor is always attached to a pty for libvirt, it will support synchronous operations so we always get here after the migration is complete. */ @@ -3605,10 +3646,11 @@ static int qemudDomainCoreDump(virDomainPtr dom, qemuDomainObjExitMonitor(vm); } -endjob: qemuDomainObjEndJob(vm); cleanup: + if (ret != 0) + unlink(path); if (vm) virDomainObjUnlock(vm); return ret; -- 1.6.5.2

3 2

[libvirt] Improve the reliability of pty path parsing
by Matthew Booth 14 Dec '09

14 Dec '09

The following are improve the reliability of libvirt's mapping of character devices to pty paths. When qemu starts up it will output one or more lines of the form: char device redirected to /dev/pts/5 Note that the character device this refers to is not indicated, so the only way to match this up is by knowing the order they're written in. This is not a well-defined interface, and is therefore voodoo-magic. The current code works against current versions of QEMU. However, when using the -chardev syntax of newer QEMU, the output order changes (putting chardev first). The first patch works by making all character devices use -chardev if it's available. As well as being a better syntax, this makes the output of the redirection lines again match the order they're specified on the command line. The second patch uses this ordering to parse the ptys for channel devices from the log output. The third patch (almost) obsoletes the log output parsing method. If QEMU's monitor supports 'info chardev', this gives structured information about character devices, including pty mappings. The log output parsing method is still required because QEMU may not support info chardev, and because the monitor itself can be on a pty. The danger of the third patch is that it will fix errors in the log output parsing code, which may then bitrot. Matt

3 7

[libvirt] [PATCH 1/3] Make QEMU driver use -chardev everywhere when it's available
by Matthew Booth 14 Dec '09

14 Dec '09

Change -monitor, -serial and -parallel output to use -chardev if it is available. * src/qemu/qemu_conf.c: Update qemudBuildCommandLine to use -chardev where available. * tests/qemuxml2argvtest.c tests/qemuxml2argvdata/: Add -chardev equivalents for all current serial and parallel tests. --- src/qemu/qemu_conf.c | 108 +++++++++++++++++--- .../qemuxml2argv-channel-guestfwd.args | 2 +- .../qemuxml2argv-console-compat-chardev.args | 1 + .../qemuxml2argv-console-compat-chardev.xml | 28 +++++ .../qemuxml2argv-parallel-tcp-chardev.args | 1 + .../qemuxml2argv-parallel-tcp-chardev.xml | 27 +++++ .../qemuxml2argv-serial-dev-chardev.args | 1 + .../qemuxml2argv-serial-dev-chardev.xml | 30 ++++++ .../qemuxml2argv-serial-file-chardev.args | 1 + .../qemuxml2argv-serial-file-chardev.xml | 30 ++++++ .../qemuxml2argv-serial-many-chardev.args | 1 + .../qemuxml2argv-serial-many-chardev.xml | 32 ++++++ .../qemuxml2argv-serial-pty-chardev.args | 1 + .../qemuxml2argv-serial-pty-chardev.xml | 28 +++++ .../qemuxml2argv-serial-tcp-chardev.args | 1 + .../qemuxml2argv-serial-tcp-chardev.xml | 32 ++++++ .../qemuxml2argv-serial-tcp-telnet-chardev.args | 1 + .../qemuxml2argv-serial-tcp-telnet-chardev.xml | 32 ++++++ .../qemuxml2argv-serial-udp-chardev.args | 1 + .../qemuxml2argv-serial-udp-chardev.xml | 32 ++++++ .../qemuxml2argv-serial-unix-chardev.args | 1 + .../qemuxml2argv-serial-unix-chardev.xml | 30 ++++++ .../qemuxml2argv-serial-vc-chardev.args | 1 + .../qemuxml2argv-serial-vc-chardev.xml | 28 +++++ tests/qemuxml2argvtest.c | 12 ++ 25 files changed, 445 insertions(+), 17 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index a25fac6..86172c6 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1863,17 +1863,37 @@ int qemudBuildCommandLine(virConnectPtr conn, if (monitor_chr) { virBuffer buf = VIR_BUFFER_INITIALIZER; - if (monitor_json) - virBufferAddLit(&buf, "control,"); + /* Use -chardev if it's available */ + if (qemuCmdFlags & QEMUD_CMD_FLAG_CHARDEV) { + qemudBuildCommandLineChrDevChardevStr(monitor_chr, "monitor", &buf); + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } + + ADD_ARG_LIT("-chardev"); + ADD_ARG(virBufferContentAndReset(&buf)); + + if (monitor_json) + virBufferAddLit(&buf, "control,"); + + virBufferAddLit(&buf, "chardev:monitor"); + } + + else { + if (monitor_json) + virBufferAddLit(&buf, "control,"); + + qemudBuildCommandLineChrDevStr(monitor_chr, &buf); + } - qemudBuildCommandLineChrDevStr(monitor_chr, &buf); if (virBufferError(&buf)) { virBufferFreeAndReset(&buf); goto no_memory; } ADD_ARG_LIT("-monitor"); - ADD_ARG(virBufferContentAndReset(&buf)); + ADD_ARG_LIT(virBufferContentAndReset(&buf)); } if (def->localtime) @@ -2199,14 +2219,42 @@ int qemudBuildCommandLine(virConnectPtr conn, virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainChrDefPtr serial = def->serials[i]; - qemudBuildCommandLineChrDevStr(serial, &buf); - if (virBufferError(&buf)) { - virBufferFreeAndReset(&buf); - goto no_memory; + /* Use -chardev if it's available */ + if (qemuCmdFlags & QEMUD_CMD_FLAG_CHARDEV) { + char id[16]; + + if (snprintf(id, sizeof(id), "serial%i", i) > sizeof(id)) + goto error; + + qemudBuildCommandLineChrDevChardevStr(serial, id, &buf); + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } + + ADD_ARG_LIT("-chardev"); + ADD_ARG(virBufferContentAndReset(&buf)); + + virBufferVSprintf(&buf, "chardev:%s", id); + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } + + ADD_ARG_LIT("-serial"); + ADD_ARG(virBufferContentAndReset(&buf)); } - ADD_ARG_LIT("-serial"); - ADD_ARG(virBufferContentAndReset(&buf)); + else { + qemudBuildCommandLineChrDevStr(serial, &buf); + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } + + ADD_ARG_LIT("-serial"); + ADD_ARG(virBufferContentAndReset(&buf)); + } } } @@ -2218,14 +2266,42 @@ int qemudBuildCommandLine(virConnectPtr conn, virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainChrDefPtr parallel = def->parallels[i]; - qemudBuildCommandLineChrDevStr(parallel, &buf); - if (virBufferError(&buf)) { - virBufferFreeAndReset(&buf); - goto no_memory; + /* Use -chardev if it's available */ + if (qemuCmdFlags & QEMUD_CMD_FLAG_CHARDEV) { + char id[16]; + + if (snprintf(id, sizeof(id), "parallel%i", i) > sizeof(id)) + goto error; + + qemudBuildCommandLineChrDevChardevStr(parallel, id, &buf); + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } + + ADD_ARG_LIT("-chardev"); + ADD_ARG(virBufferContentAndReset(&buf)); + + virBufferVSprintf(&buf, "chardev:%s", id); + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } + + ADD_ARG_LIT("-parallel"); + ADD_ARG(virBufferContentAndReset(&buf)); } - ADD_ARG_LIT("-parallel"); - ADD_ARG(virBufferContentAndReset(&buf)); + else { + qemudBuildCommandLineChrDevStr(parallel, &buf); + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } + + ADD_ARG_LIT("-parallel"); + ADD_ARG(virBufferContentAndReset(&buf)); + } } } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args index b5bb46d..deaff92 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -chardev pipe,id=channel0,path=/tmp/guestfwd -net user,guestfwd=tcp:10.0.2.1:4600-chardev:channel0 -usb +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -chardev pipe,id=channel0,path=/tmp/guestfwd -net user,guestfwd=tcp:10.0.2.1:4600-chardev:channel0 -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args new file mode 100644 index 0000000..fbb94f4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev pty,id=serial0 -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml new file mode 100644 index 0000000..c16ae07 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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'/> + </disk> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args new file mode 100644 index 0000000..45d1759 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -chardev socket,id=parallel0,host=127.0.0.1,port=9999,server,nowait -parallel chardev:parallel0 -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml new file mode 100644 index 0000000..08176f1 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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'/> + </disk> + <parallel type='tcp'> + <source mode='bind' host='127.0.0.1' service='9999'/> + <protocol type='raw'/> + <target port='0'/> + </parallel> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args new file mode 100644 index 0000000..3036f13 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev tty,id=serial0,path=/dev/ttyS2 -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml new file mode 100644 index 0000000..2b8ef5a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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'/> + </disk> + <serial type='dev'> + <source path='/dev/ttyS2'/> + <target port='0'/> + </serial> + <console type='dev'> + <source path='/dev/ttyS2'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args new file mode 100644 index 0000000..1dcec2b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev file,id=serial0,path=/tmp/serial.log -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml new file mode 100644 index 0000000..3726816 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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'/> + </disk> + <serial type='file'> + <source path='/tmp/serial.log'/> + <target port='0'/> + </serial> + <console type='file'> + <source path='/tmp/serial.log'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args new file mode 100644 index 0000000..dd98fcb --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev pty,id=serial0 -serial chardev:serial0 -chardev file,id=serial1,path=/tmp/serial.log -serial chardev:serial1 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml new file mode 100644 index 0000000..444e85b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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'/> + </disk> + <serial type='pty'> + <target port='0'/> + </serial> + <serial type='file'> + <source path='/tmp/serial.log'/> + <target port='1'/> + </serial> + <console type='pty'> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args new file mode 100644 index 0000000..fbb94f4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev pty,id=serial0 -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml new file mode 100644 index 0000000..c16ae07 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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'/> + </disk> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args new file mode 100644 index 0000000..50cfeb0 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev socket,id=serial0,host=127.0.0.1,port=9999 -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml new file mode 100644 index 0000000..3bcf62d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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'/> + </disk> + <serial type='tcp'> + <source mode='connect' host='127.0.0.1' service='9999'/> + <protocol type='raw'/> + <target port='0'/> + </serial> + <console type='tcp'> + <source mode='connect' host='127.0.0.1' service='9999'/> + <protocol type='raw'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args new file mode 100644 index 0000000..86fa8af --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev socket,id=serial0,host=127.0.0.1,port=9999,telnet,server,nowait -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml new file mode 100644 index 0000000..bea4306 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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'/> + </disk> + <serial type='tcp'> + <source mode='bind' host='127.0.0.1' service='9999'/> + <protocol type='telnet'/> + <target port='0'/> + </serial> + <console type='tcp'> + <source mode='bind' host='127.0.0.1' service='9999'/> + <protocol type='telnet'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args new file mode 100644 index 0000000..45421a4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev udp,id=serial0,host=127.0.0.1,port=9998,localaddr=127.0.0.1,localport=9999 -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml new file mode 100644 index 0000000..115166d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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'/> + </disk> + <serial type='udp'> + <source mode='bind' host='127.0.0.1' service='9999'/> + <source mode='connect' host='127.0.0.1' service='9998'/> + <target port='0'/> + </serial> + <console type='udp'> + <source mode='bind' host='127.0.0.1' service='9999'/> + <source mode='connect' host='127.0.0.1' service='9998'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args new file mode 100644 index 0000000..f291156 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev socket,id=serial0,path=/tmp/serial.sock -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml new file mode 100644 index 0000000..4236b4c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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'/> + </disk> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'/> + <target port='0'/> + </serial> + <console type='unix'> + <source mode='connect' path='/tmp/serial.sock'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args new file mode 100644 index 0000000..a200225 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev vc,id=serial0 -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml new file mode 100644 index 0000000..1e5de8f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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'/> + </disk> + <serial type='vc'> + <target port='0'/> + </serial> + <console type='vc'> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c39cbbc..3b0aa2b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -273,6 +273,18 @@ mymain(int argc, char **argv) DO_TEST("parallel-tcp", 0); DO_TEST("console-compat", 0); + DO_TEST("serial-vc-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-pty-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-dev-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-file-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-unix-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-tcp-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-udp-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-tcp-telnet-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-many-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("parallel-tcp-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("console-compat-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("channel-guestfwd", QEMUD_CMD_FLAG_CHARDEV); DO_TEST("sound", 0); -- 1.6.5.2

2 3

[libvirt] [PATCH] Suppress cgroup error message on sucess in qemudStartVMDaemon
by Ryota Ozaki 14 Dec '09

14 Dec '09

Even if qemudStartVMDaemon suceeds, an error is logged such as 'qemuRemoveCgroup:1778 : internal error Unable to find cgroup for'. This is because qemudStartVMDaemon calls qemuRemoveCgroup to ensure that old cgroup does not remain. This workaround makes sense but leaving an error message may confuse users. This patch simply adds an option to suppress the error log if not needed. --- src/qemu/qemu_driver.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a4a87ac..84ee942 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1763,7 +1763,8 @@ cleanup: static int qemuRemoveCgroup(virConnectPtr conn, struct qemud_driver *driver, - virDomainObjPtr vm) + virDomainObjPtr vm, + int quiet) { virCgroupPtr cgroup; int rc; @@ -1773,9 +1774,10 @@ static int qemuRemoveCgroup(virConnectPtr conn, rc = virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0); if (rc != 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Unable to find cgroup for %s\n"), - vm->def->name); + if (!quiet) + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Unable to find cgroup for %s\n"), + vm->def->name); return rc; } @@ -2142,7 +2144,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, return -1; /* Ensure no historical cgroup for this VM is lieing around bogus settings */ - qemuRemoveCgroup(conn, driver, vm); + qemuRemoveCgroup(conn, driver, vm, 1); if ((vm->def->ngraphics == 1) && vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && @@ -2327,7 +2329,7 @@ cleanup: VIR_FREE(vm->def->seclabel.label); VIR_FREE(vm->def->seclabel.imagelabel); } - qemuRemoveCgroup(conn, driver, vm); + qemuRemoveCgroup(conn, driver, vm, 0); if ((vm->def->ngraphics == 1) && vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && vm->def->graphics[0]->data.vnc.autoport) @@ -2416,7 +2418,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn, qemuDomainReAttachHostDevices(conn, driver, vm->def); retry: - if ((ret = qemuRemoveCgroup(conn, driver, vm)) < 0) { + if ((ret = qemuRemoveCgroup(conn, driver, vm, 0)) < 0) { if (ret == -EBUSY && (retries++ < 5)) { usleep(200*1000); goto retry; -- 1.6.5.2

2 4

[libvirt] Having some issue with : virConnectRef
by anuj rampal 14 Dec '09

14 Dec '09

Hi, Im trying to call libvirt functions from a widows machine. The client version i'm using is 0.6.1. My application is a multi-Threaded application. This is the way my application works: 1. I connect to Libvirt using "virConnectOpen". (this done only once when my application starts). 2. For funther interaction with libvirt i just call "virConnectRef" and then i call some other function like "virNodeGetInfo". 3. Then i call "virConnectClose". Now my understanding is for every "virConnectRef" call there has to be a corrosponding "virConnectClose". In my application call to number of calls to "virConnectClose" is always equal to "virConnectRef". and "virConnectClose" corrosponding to "virConnectOpen" is called when the application is closed. So connection to libvirt should always be there till the time my application is running. But what is happening is, even if i call "virConnectRef" twice, a single call to "virConnectClose" closes the connection with libvirt. Is there anything that im doing wrong here...?? Regards Anuj

2 1

[libvirt] Expected wiki.libvirt.org downtime
by Daniel P. Berrange 14 Dec '09

14 Dec '09

The machine that hosts wiki.libvirt.org is being physically relocated this weekend. So expect the wiki to be unavailable for upto 48 hours across Sat/Sun Dec 12/13th Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 3

[libvirt] Toward the next 0.7.5 release
by Daniel Veillard 11 Dec '09

11 Dec '09

The last release was 0.7.4 on Nov 20, so if we try to keep with the one month release cycle, we would end up with a release on Friday 25, but I really plan on celebrating Chrismas with my familly that day instead of spending time in front of a computer (I plan to roast a pig and that requires all my attention :-) I would prefer to not wait too much, as there were some serious locking bugs in 0.7.4, and I would rather not wait until the end of the vacations either. So I'm tempted to push on Wed 23, with possibly a smaller timeframe for the bug fixes only window. We didn't (yet!) introduce major changes inside (except maybe for the VirtualBox driver and early bug have been reported) and Matthias has been debugging seriously with the TCK so things should be in relatively good shape out of git. So my plan right nw would be to enter freeze, next Friday the 18th and push the release 0f 0.7.5 on the 23rd. So send those patches along and if we forgot to ACK patches please raise our attention about them, thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] Out of band channels
by Matthew Booth 11 Dec '09

11 Dec '09

A libvirt client can connect to libvirt on a remote host. However, on its own this doesn't give the client a usable level of access. The reason for this is that libvirt doesn't expose some critical management interfaces. For QEMU this amounts to pretty much anything provided directly by the QEMU process, including: * VNC console [1] * Any character device [2] I'm undecided as to whether access to underlying storage falls into this bucket. It would certainly be convenient in certain circumstances. This means, for example that I need out of band access to: * See a graphical console * Connect to a serial console * Connect to a guest channel As these are fairly fundamental operations, I wonder if there has been any thought towards creating tunnels over a libvirt connection. In the first instance, I think this would require a generic method to multiplex multiple streams over a single remote connection. This would obviously be a significant protocol change. Would a messaging protocol, AMQP for instance, be a good candidate here? Secondly, I think interfaces which currently create local resources should have a default which is managed by libvirt itself. So you'd have: <serial> <target port='0'/> </serial> or <serial type='managed'> <target port='0'/> </serial> This would cause libvirt to create whichever host-side chardev is most convenient to it and connect itself. The API would then expose read and write APIs for the named connection. e.g: virDomainFoo foo;[3] if = virDomainGetFoo(domain, "serial0"); bytesIn = virDomainFooRead(foo, &buf, sizeof(buf)); A client application could expose this in a variety of ways locally. Matt [1] There's an open RFE for this one: https://bugzilla.redhat.com/show_bug.cgi?id=526953 [2] e.g. virsh # console RHEL3.FV.64.IDE error: Cannot connect to a remote console device [3] What would you call it? -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team M: +44 (0)7977 267231 GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490

3 2

[libvirt] [PATCH] Fix reference leak in remoteDispatchStorageVolCreateXmlFrom
by Matthias Bolte 11 Dec '09

11 Dec '09

--- daemon/remote.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 3117615..7a43046 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -4118,12 +4118,15 @@ remoteDispatchStorageVolCreateXmlFrom (struct qemud_server *server ATTRIBUTE_UNU clonevol = get_nonnull_storage_vol (conn, args->clonevol); if (clonevol == NULL) { + virStoragePoolFree(pool); remoteDispatchConnError(rerr, conn); return -1; } newvol = virStorageVolCreateXMLFrom (pool, args->xml, clonevol, args->flags); + virStorageVolFree(clonevol); + virStoragePoolFree(pool); if (newvol == NULL) { remoteDispatchConnError(rerr, conn); return -1; -- 1.6.0.4

2 2

[libvirt] [PATCH] Fix memory leak in virStorageBackendCopyToFD
by Matthias Bolte 11 Dec '09

11 Dec '09

--- src/storage/storage_backend.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index a3b4d5a..9dc801c 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -198,6 +198,8 @@ cleanup: if (inputfd != -1) close(inputfd); + VIR_FREE(buf); + return ret; } -- 1.6.0.4

2 2

[libvirt] simple LXC/libvirt busybox container (Unable to get cgroup)
by Tony Risinger 11 Dec '09

11 Dec '09

i'm trying to get even the simplest busybox container with libvirt+LXC with very limited success. I feel l am missing something supremely simple for me to be hung on this for weeks. i dont see anything interesting in domain log, but getting this error from "LIBVIRT_DEBUG=1 libvirtd": 05:27:56.113: error : lxcDomainGetInfo:462 : internal error Unable to get cgroup for arch-nano 05:27:56.113: debug : virDomainFree:2004 : domain=0x81d8e68 05:27:56.113: debug : virUnrefDomain:422 : unref domain 0x81d8e68 arch-nano 1 05:27:56.113: debug : virReleaseDomain:376 : release domain 0x81d8e68 arch-nano 05:27:56.113: debug : virReleaseDomain:392 : unref connection 0x81dc0f0 2 05:27:56.113: debug : remoteSerializeError:141 : prog=536903814 ver=1 proc=16 type=1 serial=4, msg=internal error Unable to get cgroup for arch-nano i've been using this root filesystem layout: [root@PHS-001 arch-nano]# tree . |-- bin | |-- cat -> ../sbin/busybox | |-- chdir -> ../sbin/busybox | |-- chmod -> ../sbin/busybox | |-- ls -> ../sbin/busybox | |-- rm -> ../sbin/busybox | |-- sh -> ../sbin/busybox | `-- vi -> ../sbin/busybox |-- dev | `-- pts |-- etc |-- proc |-- sbin | |-- busybox | `-- init -> busybox `-- sys all folders besides /bin and /sbin were created by libvirt. i tried using the /sbin/init script previously suggested: #!/sbin/busybox sh but i get a similar results either way (script/symlink): 8173 ? Ss 0:00 /usr/lib/libvirt-git/libvirt_lxc --name arch-nano --console 11 --background 8175 pts/0 Ss+ 0:00 init 8177 ? Ss 0:00 init 8181 ? Zs 0:00 [init] <defunct> 8182 ? Zs 0:00 [init] <defunct> 8183 ? Zs 0:00 [init] <defunct> "busybox init" doc says that without an /etc/inittab, sh will be started on /dev/tty2... im am using this config: <domain type='lxc'> <name>arch-nano</name> <memory>500000</memory> <os> <type>exe</type> <init>/sbin/init</init> </os> <devices> <filesystem type='mount'> <source dir='/vps/dom/arch-nano'/> <target dir='/'/> </filesystem> </devices> </domain> on this config i tried removing the console/serial section altogether, but i attempted many configurations of serial/console, including changing the <target> to "2", in attempt to match busybox default. [root@PHS-001 arch-nano]# virsh -c lxc:/// console arch-nano error: Unable to get domain status error: internal error Unable to get cgroup for arch-nano [root@PHS-001 arch-nano]# mount | grep cgroup none on /cgroup type cgroup (rw) if anyone can please point out what i am doing wrong to not be able to move the root and get a console, i'd greatly appreciate it. ive been really stuck on this; i'd rather not write a bunch of scripts/wrappers for lxc-* tools when libvirt does it all splendidly already! libvirt 0.7.4+ kernel 2.6.32 (am i missing a CONFIG_*?) thanks for your time

3 6

[libvirt] My beefs with the libvirt XML configuration format
by Diego Elio “Flameeyes” Pettenò 11 Dec '09

11 Dec '09

Hello, In a recent post on my blog [1] I ranted on about libvirt and in particular I complained that the configuration files look like what I call “almost XML”. The reasons why I say that are multiple, let me try to explain some. In the configuration files, at least those created by virt-manager there is no specification of what the file should be (no document type, no namespace, and, IMHO, a too generic root element name); given that some kind of distinction is needed for software like Emacs's nxml-mode to know how to deal with the file, I think that's pretty bad for interaction between different applications. While libvirt knows perfectly well what it's dealing with, other packages might not. Might not sound a major issue but it starts tickling my senses when this happens. The configuration seem somewhat contrived in places like the disk configuration: if the disk is file-backed it require the file attribute to the <source> element, while it needs the dev attribute if it's a block device; given that it's a path in both cases it would have sounded easier on the user if a single path attribute was used. But this is opinable. The third problem I called out for in the block is a lack of a schema for the files; Daniel corrected me pointing out that the schemas are distributed with the sources and installed. Sure thing, I was wrong. On the other hand I maintain that there are problems with those schemas. The first is that both the version distributed with 0.7.4 and the git version as of today suffer from bug #546254 [2] (secret.rng being not well formed) so it means nobody has even tested them as of lately; then there is the fact that they are never referenced by the human-readable documentation [3] which is why I didn't find it the first time around; add also to that some contrived syntax in those schema as well that causes trang to produce a non-valid rnc file out of them (nxml-mode uses rnc rather than rng). But I guess the one big problem with the schemas is that they don't seem to properly encode what the human-readable documentation says, or what virt-manager does. For instance (please follow me with selector-like syntax), virt-manager creates /domain/os/type[@machine='pc-0.11'] in the created XML; the same attribute seem to be documented: “There are also two optional attributes, arch specifying the CPU architecture to virtualization, and machine referring to the machine type”. The schema does not seem to accept that attribute though (“element type: Relax-NG validity error : Invalid attribute machine for element type” with xmllint, just to make sure that it's not a bug in any other piece of software, this is Daniel's libxml2). Now after voicing my opinions here, as Daniel dared me to do, I'd like to explain a second why I didn't post this on the list in the first place: of what I wrote here, my beefs for calling this aXML, the only things that can be solved easily are the schemas; schemas that, at the time I wrote the blog, I was unable to find. The syntax, and the lack of a “safe” identification of the files as libvirt's are the kind of legacy problems one has to deal with to avoid wasting users' time with migrations and corrections, so I don't really think they should be addressed unless a redesign of the configuration is intended. Just my two cents, you're free to take them as you wish, I cannot boast a curriculum like Daniel's, but I don't think I'm stepping out of place to point out these things. [1] http://blog.flameeyes.eu/2009/12/07/i-know-you-missed-them-virtualisation-r… [2] https://bugzilla.redhat.com/show_bug.cgi?id=546254 [3] http://libvirt.org/format.html -- Diego Elio Pettenò — “Flameeyes” http://blog.flameeyes.eu/ If you found a .asc file in this mail and know not what it is, it's a GnuPG digital signature: http://www.gnupg.org/

6 10

[libvirt] [PATCH] Fix detection of JSON when restarting libvirtd
by Daniel P. Berrange 11 Dec '09

11 Dec '09

The XML XPath for detecting JSON in the running VM statefile was wrong causing all VMs to get JSON mode enabled at libvirtd restart. In addition if a VM was running a JSON enabled QEMU once, and then altered to point to a non-JSON enabled QEMU later the 'monJSON' flag would not get reset to 0. * src/qemu/qemu_driver.c: Fix setting/detection of JSON mode --- src/qemu/qemu_driver.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0dccae6..3661ef0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -220,8 +220,11 @@ static int qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) priv->monConfig->type = VIR_DOMAIN_CHR_TYPE_PTY; VIR_FREE(tmp); - if (virXPathBoolean(NULL, "int(./monitor[1]/@json)", ctxt)) + if (virXPathBoolean(NULL, "count(./monitor[@json = '1']) > 0", ctxt)) { priv->monJSON = 1; + } else { + priv->monJSON = 0; + } switch (priv->monConfig->type) { case VIR_DOMAIN_CHR_TYPE_PTY: @@ -2361,7 +2364,9 @@ static int qemudStartVMDaemon(virConnectPtr conn, #if HAVE_YAJL if (qemuCmdFlags & QEMUD_CMD_FLAG_MONITOR_JSON) priv->monJSON = 1; + else #endif + priv->monJSON = 0; if ((ret = virFileDeletePid(driver->stateDir, vm->def->name)) != 0) { virReportSystemError(conn, ret, -- 1.6.5.2

2 1

[libvirt] [PATCH v2 0/3] Fix migration of paused VMs
by Paolo Bonzini 11 Dec '09

11 Dec '09

This is the final version of QEMU support for migrating paused VMs. The patch series is the same as what I posted on Nov 25, except for the check on the return value of virDomainGetInfo. Patch 2 also had some easily-solved conflicts upon rebasing. I haven't yet implemented an error message when inactive domains are migrated; I'll do so in a follow-up patch. Paolo include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 15 ++++++++++++++- src/qemu/qemu_driver.c | 37 ++++++++++++++++++++++++------------- src/xen/xend_internal.c | 9 +++++++++ tools/virsh.c | 5 ++++- tools/virsh.pod | 7 ++++--- 6 files changed, 56 insertions(+), 18 deletions(-) Paolo Bonzini (3): fix migration of paused vms upon failure add virsh --suspend retrieve paused/running state at the beginning of migration

3 5

[libvirt] [PATCH] Replace <optional><oneOrMore> with <zeroOrMore>.
by Diego Elio 'Flameeyes' Pettenò 11 Dec '09

11 Dec '09

The two syntax should be equivalent, but the former creates, with trang, an invalid Relax-NG Compact form file, as the output will contain the sequence "+?" which is not recognized by tools like rnv. --- docs/schemas/domain.rng | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 5b8f7f8..d1d3efb 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -980,27 +980,25 @@ </attribute> </define> <define name="qemucdevSrcDef"> - <optional> - <oneOrMore> - <element name="source"> - <optional> - <attribute name="mode"/> - </optional> - <optional> - <attribute name="path"/> - </optional> - <optional> - <attribute name="host"/> - </optional> - <optional> - <attribute name="service"/> - </optional> - <optional> - <attribute name="wiremode"/> - </optional> - </element> - </oneOrMore> - </optional> + <zeroOrMore> + <element name="source"> + <optional> + <attribute name="mode"/> + </optional> + <optional> + <attribute name="path"/> + </optional> + <optional> + <attribute name="host"/> + </optional> + <optional> + <attribute name="service"/> + </optional> + <optional> + <attribute name="wiremode"/> + </optional> + </element> + </zeroOrMore> <optional> <element name="protocol"> <optional> -- 1.6.5.5

2 1

[libvirt] [PATCH] Remove iptables.c from POTFILES.in
by Matthias Bolte 11 Dec '09

11 Dec '09

--- po/POTFILES.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index f8e9130..a429b19 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -50,7 +50,6 @@ src/uml/uml_conf.c src/uml/uml_driver.c src/util/bridge.c src/util/conf.c -src/util/iptables.c src/util/json.c src/util/logging.c src/util/pci.c -- 1.6.0.4

1 0

[libvirt] [PATCH, TCK] Install tests to /usr/share/... instead of /share/...
by Matthias Bolte 10 Dec '09

10 Dec '09

libvirt-tck expects the tests in /usr/share/libvirt-tck/tests. --- Build.PL | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Build.PL b/Build.PL index 453172c..c85a072 100644 --- a/Build.PL +++ b/Build.PL @@ -100,5 +100,5 @@ my $b = $class->new( $b->add_build_element("conf"); $b->add_build_element("pkgdata"); $b->install_path('conf' => File::Spec->catdir($b->install_base, "etc", "libvirt-tck")); -$b->install_path('pkgdata' => File::Spec->catdir($b->install_base, "share", "libvirt-tck", "tests")); +$b->install_path('pkgdata' => File::Spec->catdir($b->install_base, "usr/share", "libvirt-tck", "tests")); $b->create_build_script; -- 1.6.0.4

2 1

[libvirt] [PATCH, TCK] Add missing module Test::Exception to the required module list
by Matthias Bolte 10 Dec '09

10 Dec '09

--- Build.PL | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Build.PL b/Build.PL index df35abf..453172c 100644 --- a/Build.PL +++ b/Build.PL @@ -69,6 +69,7 @@ my $b = $class->new( 'TAP::Formatter::HTML' => 0, 'TAP::Harness' => 3.11, 'TAP::Harness::Archive' => 0, + 'Test::Exception' => 0, 'Test::Builder' => 0, 'Test::More' => 0, 'Sub::Uplevel' => 0, -- 1.6.0.4

2 1

[libvirt] [PATCH] qemu driver: Fix segfault in libvirt/libvirtd when uri->path is NULL
by Richard W.M. Jones 10 Dec '09

10 Dec '09

-- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

2 1

[libvirt] Segmentation fault when shutting down VMs
by Thomas Treutner 10 Dec '09

10 Dec '09

Hi, I'm facing another problem with latest git. This happens regularly when shutting down VM(s): http://pastebin.com/m4ef1d93f It doesn't depend on which or how many VM is/are shut down, or if I have a VNC connection to a VM that is shutting down. Sometimes after a segv, I get this: http://pastebin.com/m5260bf21 It seems to me that libvirt tries to query a qemu monitor that is no longer alive? kr,tom

3 4

[libvirt] [PATCH] Fix error in secret.rng schema.
by Diego Elio 'Flameeyes' Pettenò 10 Dec '09

10 Dec '09

Without this error the schema is not a well-formatted XML file. --- docs/schemas/secret.rng | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/schemas/secret.rng b/docs/schemas/secret.rng index 40e2b7f..39f8625 100644 --- a/docs/schemas/secret.rng +++ b/docs/schemas/secret.rng @@ -36,7 +36,7 @@ <optional> <element name='usage'> <choice> - <ref name='usagevolume'> + <ref name='usagevolume' />  </choice> </element> -- 1.6.5.5

2 1

[libvirt] [PATCH] Fix error in secret.rng schema.
by Diego Elio 'Flameeyes' Pettenò 10 Dec '09

10 Dec '09

With this error the schema is not a well-formed XML file. --- docs/schemas/secret.rng | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/schemas/secret.rng b/docs/schemas/secret.rng index 40e2b7f..39f8625 100644 --- a/docs/schemas/secret.rng +++ b/docs/schemas/secret.rng @@ -36,7 +36,7 @@ <optional> <element name='usage'> <choice> - <ref name='usagevolume'> + <ref name='usagevolume' />  </choice> </element> -- 1.6.5.5

1 0

[libvirt] [RFC] New libvirt API for domain memory statistics reporting
by Adam Litke 10 Dec '09

10 Dec '09

When using ballooning to manage overcommitted memory on a host, a system for guests to communicate their memory usage to the host can provide information that will minimize the impact of ballooning on the guests while maximizing efficient use of host memory. The design of such a communication channel was recently added to version 0.8.2 of the VirtIO Spec (See Appendix G): - http://ozlabs.org/~rusty/virtio-spec/virtio-spec-0.8.2.pdf Host-side and guest-side implementations have been accepted for inclusion in their respective projects: - Guest: http://lkml.org/lkml/2009/11/30/274 - Host: http://lists.gnu.org/archive/html/qemu-devel/2009-12/msg00380.html The following patch series implements a new libvirt interface to expose these memory statistics. Thank you for your review and comments. [PATCH 1/6] domMemStats: Add domainMemStats method to struct _virDriver [PATCH 2/6] domMemStats: Add public symbol to libvirt API [PATCH 3/6] qemu-driver: Enable domainMemStats in the qemu driver [PATCH 4/6] remote-driver: Add domainMemStats support [PATCH 5/6] virsh: Enable virDomainMemStats as a new command [PATCH 6/6] python: Add python bindings for virDomainMemStats

5 11

[libvirt] Apologies for miss-configured Out-of-Office auto-replies
by Konrad Eriksson1 10 Dec '09

10 Dec '09

Dear list members, I'm terribly sorry for my badly configured Out-of-Office auto-reply feature in my email client that might have caused several replies to libvir-list emails received by me. It should be solved now (thanks to Daniel Veillard for pointing it out). Again sorry for the unintentional spaming. Happy virtualization! Regards, Konrad Eriksson

1 0

[libvirt] libvirk KVM save (migrate) terribly slow
by Nikola Ciprich 10 Dec '09

10 Dec '09

Hi, I noticed that using libvirt to save running domain is terribly slow, I mean it can take even 10 minutes to save VM with 2GB RAM, although the host is almost idle (8CPU, 16GB RAM). If I understand correctly, libvirt first pauses the vm and then migrates it to file (optionally through gzip). Restoring it back to running state is almost instant. I guess this is not what should be expected, is there something particular I should check? Thanks a lot in advance with best regards nik -- ------------------------------------- Nikola CIPRICH LinuxBox.cz, s.r.o. 28. rijna 168, 709 01 Ostrava tel.: +420 596 603 142 fax: +420 596 621 273 mobil: +420 777 093 799 www.linuxbox.cz mobil servis: +420 737 238 656 email servis: servis(a)linuxbox.cz -------------------------------------

3 2

[libvirt] [PATCH 1/5] reload iptables rules simply by re-adding them
by Mark McLoughlin 10 Dec '09

10 Dec '09

Currently, when we add iptables rules, we keep them on a list so that we can easily reload them on e.g. 'service libvirtd reload'. However, we don't save this list to disk, so if libvirtd is restarted we lose the ability to reload the rules. The fix is simple - just re-add the damn things on reload. Note, we delete the rules before re-adding them, just like the current behaviour of iptRulesReload(). * src/network/bridge_driver.c: re-add the iptables rules on reload. --- src/network/bridge_driver.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 0342aa0..766f8cd 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -96,6 +96,8 @@ static int networkShutdownNetworkDaemon(virConnectPtr conn, struct network_driver *driver, virNetworkObjPtr network); +static void networkReloadIptablesRules(struct network_driver *driver); + static struct network_driver *driverState = NULL; @@ -291,12 +293,7 @@ networkReload(void) { &driverState->networks, driverState->networkConfigDir, driverState->networkAutostartDir); - - if (driverState->iptables) { - VIR_INFO0(_("Reloading iptables rules\n")); - iptablesReloadRules(driverState->iptables); - } - + networkReloadIptablesRules(driverState); networkAutostartConfigs(driverState); networkDriverUnlock(driverState); return 0; @@ -812,6 +809,27 @@ networkRemoveIptablesRules(struct network_driver *driver, iptablesSaveRules(driver->iptables); } +static void +networkReloadIptablesRules(struct network_driver *driver) +{ + unsigned int i; + + VIR_INFO0(_("Reloading iptables rules")); + + for (i = 0 ; i < driver->networks.count ; i++) { + virNetworkObjLock(driver->networks.objs[i]); + + if (virNetworkObjIsActive(driver->networks.objs[i])) { + networkRemoveIptablesRules(driver, driver->networks.objs[i]); + if (!networkAddIptablesRules(NULL, driver, driver->networks.objs[i])) { + /* failed to add but already logged */ + } + } + + virNetworkObjUnlock(driver->networks.objs[i]); + } +} + /* Enable IP Forwarding. Return 0 for success, -1 for failure. */ static int networkEnableIpForwarding(void) -- 1.6.5.2

2 10

[libvirt] hot swappable HD
by mbutubuntu 10 Dec '09

10 Dec '09

hello folks, in the real life a SATA Hard Drive is Hot swappable, is there any (non-usb) type of virtual device that is also hot swappable? if yes what of ide, scsi, virtio, xen ??? best regards Fabio Buda

2 1

[libvirt] Fix compilation failure if yajl is not available
by Daniel Veillard 10 Dec '09

10 Dec '09

I commited the following as it was a compile breaker for most people I assume and it's trivial commit a4e09c1ed81f7361ff03d95ad42eac49d4d60812 Author: Daniel Veillard <veillard(a)redhat.com> Date: Tue Dec 8 11:08:17 2009 +0100 Fix a compilation failure if yajl not avail configure: yajl: no CC libvirt_util_la-json.lo util/json.c:32:27: error: yajl/yajl_gen.h: No such file or directory util/json.c:33:29: error: yajl/yajl_parse.h: No such file or directory * src/util/json.c: remove the includes if yajl not configured in diff --git a/src/util/json.c b/src/util/json.c index 93b8186..35f6e52 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -29,8 +29,10 @@ #include "logging.h" #include "util.h" +#if HAVE_YAJL #include <yajl/yajl_gen.h> #include <yajl/yajl_parse.h> +#endif /* XXX fixme */ #define VIR_FROM_THIS VIR_FROM_NONE -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] fc12 virsh tap device problem
by Chiradeep Vittal 10 Dec '09

10 Dec '09

Hi, On a fresh FC12 system, I am able to create and run KVM-based vms with tap networking using the qemu-kvm command line but not using virsh. I have user and group set to "root" in /etc/libvirt/qemu.conf. "user mode networking" works with virsh, but not tap! I have this xml: <domain type='kvm'> <name>centos</name> <uuid>22d9d573-d82c-c18d-36c0-d3ffef057468</uuid> <memory>131072</memory> <vcpu>1</vcpu> <os> <type arch='x86_64'>hvm</type> </os> <features> <acpi/> <pae/> </features> <clock offset='utc'/> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <source file='/var/lib/images/centos.5-4.x86-64/centos-small.img'/> <target dev='hda' bus='ide'/> </disk> <interface type='user'> <mac address='52:54:00:7e:5b:58'/> </interface> <interface type='ethernet'> <mac address='52:54:00:2e:33:c8'/> <script path='/var/lib/images/centos.5-4.x86-64/qemu-ifup'/> </interface> <graphics type='vnc' port='5910' autoport='no' listen=''/> </devices> </domain> This won't start even when I execute virsh as root: [root@fc12 centos.5-4.x86-64]# virsh -c qemu+unix:///system create domr.xml error: Failed to create domain from domr.xml error: monitor socket did not show up.: No such file or directory [root@fc12 centos.5-4.x86-64]# tail -3 /var/log/libvirt/qemu/centos.log LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin QEMU_AUDIO_DRV=none /usr/bin/qemu-kvm -S -M pc-0.11 -m 128 -smp 1 -name centos -uuid 22d9d573-d82c-c18d-36c0-d3ffef057468 -monitor unix:/var/lib/libvirt/qemu/centos.monitor,server,nowait -boot c -drive file=/var/lib/images/centos.5-4.x86-64/centos-small.img,if=ide,index=0,boot=on -net nic,macaddr=52:54:00:7e:5b:58,vlan=0,name=nic.0 -net user,vlan=0,name=user.0 -net nic,macaddr=52:54:00:2e:33:c8,vlan=1,name=nic.1 -net tap,script=/var/lib/images/centos.5-4.x86-64/qemu-ifup,vlan=1,name=tap.0 -serial none -parallel none -usb -vnc :10 -vga cirrus warning: could not configure /dev/net/tun: no virtual network emulation qemu: Could not initialize device 'tap' '***** But I can execute the same command line and it works!!******** [root@fc12 centos.5-4.x86-64]# LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin QEMU_AUDIO_DRV=none /usr/bin/qemu-kvm -S -M pc-0.11 -m 128 -smp 1 -name centos -uuid 22d9d573-d82c-c18d-36c0-d3ffef057468 -monitor unix:/var/lib/libvirt/qemu/centos.monitor,server,nowait -boot c -drive file=/var/lib/images/centos.5-4.x86-64/centos-small.img,if=ide,index=0,boot=on -net nic,macaddr=52:54:00:7e:5b:58,vlan=0,name=nic.0 -net user,vlan=0,name=user.0 -net nic,macaddr=52:54:00:2e:33:c8,vlan=1,name=nic.1 -net tap,script=/var/lib/images/centos.5-4.x86-64/qemu-ifup,vlan=1,name=tap.0 -serial none -parallel none -usb -vnc :10 -vga cirrus & [2] 4543 [root@fc12 centos.5-4.x86-64]# ps -ef | grep qemu root 4543 3449 0 19:02 pts/12 00:00:00 /usr/bin/qemu-kvm -S -M pc-0.11 -m 128 -smp 1 -name centos -uuid 22d9d573-d82c-c18d-36c0-d3ffef057468 -monitor unix:/var/lib/libvirt/qemu/centos.monitor,server,nowait -boot c -drive file=/var/lib/images/centos.5-4.x86-64/centos-small.img,if=ide,index=0,boot=on -net nic,macaddr=52:54:00:7e:5b:58,vlan=0,name=nic.0 -net user,vlan=0,name=user.0 -net nic,macaddr=52:54:00:2e:33:c8,vlan=1,name=nic.1 -net tap,script=/var/lib/images/centos.5-4.x86-64/qemu-ifup,vlan=1,name=tap.0 -serial none -parallel none -usb -vnc :10 -vga cirrus

2 1

[libvirt] qemu smbios options in domain xml format
by Phillip Balli 10 Dec '09

10 Dec '09

Hello, I could not find any explicit mention of support for the -smbios options which are present in qemu 0.10.5+ in the domain xml format or the qemu/kvm hypervisor driver pages. Is there some way to specify commands and options which are not described in the xml config by adjusting something in the way libvirt processes the xml? Or is providing smbios options just not supported currently?

2 1

[libvirt] RE: [virt-tools-list] Questions about virt-manager running on Arch of Itanium 64
by Dustin Xiong 10 Dec '09

10 Dec '09

> >>.......<<< > >> > I downloaded and compiled the latest version of virtinst: > > virtinst-0.500.0.tar.gz. > >> > then compile the virt-manager-0.8.0, error changed as below: > >> > > >> > [root@kvm virt-manager-0.8.0]# make check > >> > Making check in src > >> > make[1]: Entering directory > > `/home/dustin/virt-manager/virt-manager-0.8.0/src' > >> > Making check in virtManager > >> > make[2]: Entering directory > > `/home/dustin/virt-manager/virt-manager-0.8.0/src/virtManager' > >> > make ch! eck-local > >> > make[3]: Entering directory `/home/dust! in/virt- > > manager/virt-manager-0.8.0/src/virtManager' > >> > PYTHONPATH=./..:../graphWidgets/.libs python about.py && touch > > .tstamp.about.py > >> > PYTHONPATH=./..:../graphWidgets/.libs python addhardware.py && touch > > .tstamp.addhardware.py > >> > Traceback (most recent call last): > >> > File "addhardware.py", line 35, in ? > >> > from virtManager.asyncjob import vmmAsyncJob > >> > File > > "/home/dustin/virt-manager/virt-manager-0.8.0/src/virtManager/asyncjob.py", > > line 30, in ? > >> > class vmmAsyncJob(gobject.GObject): > >> > File > > "/home/dustin/virt-manager/virt-manager-0.8.0/src/virtManager/asyncjob.py", > > line 40, in vmmAsyncJob > >> > def __init__(self, config, callback, args=None, > >> > NameError: name '_' is not defined > >> > > >> > Thanks for help.If you need any further infos please dont't hesitate > > to tell me. > >> > > >> > >> Ah, didn't notice the make check! in the first mail. 'make check' doesn't > >> work in the virt-manager code base, never taken the time to fix it. You > >> should just be able to 'make && make install', or 'make' and python > >> src/virt-manager.py to run from the source dir. If running virt-manager > >> then throws an error, report here and Ill try to help. > >> > > > > After make install, when i run virt-manager, the error is: > > > > starting the virt-manager error: 'gtk.TreeView' object has no attribute > > 'set_level_indentation' > > > > Details: > > raceback (most recent call last): > > File "/usr/local/share/virt-manager/virt-manager.py", line 377, in ? > > main() > > File "/usr/local/share/virt-manager/virt-manager.py", line 364, in main > > options.no_conn_auto) > > File "/usr/local/share/virt-manager/virt-manager.py", line 237, in > > show_engine > > engine.show_manager() > > File "/usr/local/share/virt-man! ager/virtManager/engine.py", line > > 365, in show_manager > > &nbs! p; self.get_manager().show() > > File "/usr/local/share/virt-manager/virtManager/engine.py", line 342, > > in get_manager > > self.windowManager = vmmManager(self.get_config(), self) > > File "/usr/local/share/virt-manager/virtManager/manager.py", line 167, > > in __init__ > > self.prepare_vmlist() > > File "/usr/local/share/virt-manager/virtManager/manager.py", line 826, > > in prepare_vmlist > > vmlist.set_level_indentation(-15) > > AttributeError: 'gtk.TreeView' object has no attribute > > 'set_level_indentation' > > > > thanks a lot > > > > - dustin > > > > I recently tested upstream virt-manager on older RHEL 5.3 and fixed several > back compat issues, including the one above. I'd recommend giving virt-manager > 0.8.1 a shot, and report back here if you still hit virt-manager errors. > I installed the virt-manager-0.8.1 and virtinst-0.500.1. And the error was fixed. The virt-manager gui can works. Thank you! At the same time, i still can't create vm with the virt-manager-0.8.1 the error as below: Unable to complete install 'libvirt.libvirtError internal error Domain as didn't show up Traceback (most recent call last): File "/usr/local/dvirt/share/virt-manager/virtManager/create.py", line 1429, in do_install dom = guest.start_install(False, meter = meter) File "/usr/lib/python2.4/site-packages/virtinst/Guest.py", line 660, in start_install return self._do_install(consolecb, meter, removeOld, wait) File "/usr/lib/python2.4/site-packages/virtinst/Guest.py", line 758, in _do_install self.domain = self.conn.createLinux(install_xml, 0) File "/usr/lib/python2.4/site-packages/libvirt.py", line 974, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed', conn=self) libvirtError: internal error Domain as didn't show up And the reason is as Daniel P. Berrange said, "'ia64' is not listed as a valid architecture in qemu_conf.c, RHEL-5 KVM only supports x86_64". In other words, the libvirt didn't support KVM emulator running on ia64 architecture. Thank you for your work on virt-manager. -dustin _________________________________________________________________ Keep your friends updated―even when you’re not signed in. http://www.microsoft.com/middleeast/windows/windowslive/see-it-in-action/so…

1 0

[libvirt] [PATCH] Add virBufferFreeAndReset() and replace free()
by Matthias Bolte 10 Dec '09

10 Dec '09

Replace free(virBufferContentAndReset()) with virBufferFreeAndReset(). Update documentation and replace all remaining calls to free() with calls to VIR_FREE(). Also add missing calls to virBufferFreeAndReset() and virReportOOMError() in OOM error cases. --- HACKING | 5 ++- daemon/libvirtd.c | 6 ++-- docs/hacking.html.in | 7 ++-- src/conf/capabilities.c | 4 ++- src/conf/domain_conf.c | 11 +++--- src/conf/interface_conf.c | 5 +-- src/conf/network_conf.c | 4 +-- src/conf/node_device_conf.c | 4 +-- src/conf/secret_conf.c | 4 +-- src/conf/storage_conf.c | 8 ++--- src/esx/esx_driver.c | 3 ++ src/esx/esx_vi.c | 10 ++--- src/esx/esx_vi_methods.c | 68 +++++++++--------------------------- src/esx/esx_vmx.c | 11 +----- src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 1 + src/opennebula/one_conf.c | 3 +- src/openvz/openvz_conf.c | 8 +++-- src/openvz/openvz_driver.c | 3 +- src/phyp/phyp_driver.c | 5 +-- src/qemu/qemu_conf.c | 39 ++++++++++++++------- src/qemu/qemu_driver.c | 5 ++- src/security/virt-aa-helper.c | 9 +++-- src/storage/storage_backend.c | 3 +- src/uml/uml_conf.c | 4 +-- src/util/buf.c | 13 +++++++ src/util/buf.h | 1 + src/util/conf.c | 5 ++- src/util/logging.c | 8 +++- src/util/qparams.c | 1 + src/xen/xend_internal.c | 14 +++++--- src/xen/xm_internal.c | 19 +++++----- tools/virsh.c | 4 +- 33 files changed, 146 insertions(+), 150 deletions(-) diff --git a/HACKING b/HACKING index 548e2a0..3fb1113 100644 --- a/HACKING +++ b/HACKING @@ -293,10 +293,11 @@ eg typical usage is as follows: ... virBufferAddLit(&buf, "</domain>\n"); - .... + ... if (virBufferError(&buf)) { - __virRaiseError(...); + virBufferFreeAndReset(&buf); + virReportOOMError(...); return NULL; } diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 1caa4ce..806970c 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -582,7 +582,7 @@ static int qemudListenUnix(struct qemud_server *server, cleanup: if (sock->fd) close(sock->fd); - free(sock); + VIR_FREE(sock); return -1; } @@ -803,8 +803,8 @@ static int qemudInitPaths(struct qemud_server *server, _("Resulting path too long for buffer in qemudInitPaths()")); cleanup: - free (dir_prefix); - free (sock_dir_prefix); + VIR_FREE(dir_prefix); + VIR_FREE(sock_dir_prefix); return ret; } diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 94b7238..af63411 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -306,14 +306,15 @@ ... virBufferAddLit(&buf, "<domain>\n"); - virBufferVSprint(&buf, " <memory>%d</memory>\n", memory); + virBufferVSprint(&buf, " <memory>%d</memory>\n", memory); ... virBufferAddLit(&buf, "</domain>\n"); - .... + ... if (virBufferError(&buf)) { - __virRaiseError(...); + virBufferFreeAndReset(&buf); + virReportOOMError(...); return NULL; } diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 6ebddf5..476bba6 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -769,8 +769,10 @@ virCapabilitiesFormatXML(virCapsPtr caps) virBufferAddLit(&xml, "</capabilities>\n"); - if (virBufferError(&xml)) + if (virBufferError(&xml)) { + virBufferFreeAndReset(&xml); return NULL; + } return virBufferContentAndReset(&xml); } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0a7eef7..355004b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3775,6 +3775,7 @@ virDomainCpuSetFormat(virConnectPtr conn, char *cpuset, int maxcpu) } if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); virReportOOMError(conn); return NULL; } @@ -4570,7 +4571,7 @@ char *virDomainDefFormat(virConnectPtr conn, virBuffer buf = VIR_BUFFER_INITIALIZER; unsigned char *uuid; char uuidstr[VIR_UUID_STRING_BUFLEN]; - const char *type = NULL, *tmp; + const char *type = NULL; int n, allones = 1; if (!(type = virDomainVirtTypeToString(def->virtType))) { @@ -4826,8 +4827,7 @@ char *virDomainDefFormat(virConnectPtr conn, no_memory: virReportOOMError(conn); cleanup: - tmp = virBufferContentAndReset(&buf); - VIR_FREE(tmp); + virBufferFreeAndReset(&buf); return NULL; } @@ -4835,7 +4835,7 @@ char *virDomainObjFormat(virConnectPtr conn, virDomainObjPtr obj, int flags) { - char *config_xml = NULL, *xml = NULL; + char *config_xml = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; const char *monitorpath; @@ -4887,8 +4887,7 @@ char *virDomainObjFormat(virConnectPtr conn, no_memory: virReportOOMError(conn); error: - xml = virBufferContentAndReset(&buf); - VIR_FREE(xml); + virBufferFreeAndReset(&buf); return NULL; } diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 31abf12..3c99027 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -1208,7 +1208,7 @@ char *virInterfaceDefFormat(virConnectPtr conn, const virInterfaceDefPtr def) { virBuffer buf = VIR_BUFFER_INITIALIZER; - const char *type = NULL, *tmp; + const char *type = NULL; if ((def == NULL) || ((def->name == NULL) && (def->type != VIR_INTERFACE_TYPE_VLAN))) { @@ -1271,8 +1271,7 @@ char *virInterfaceDefFormat(virConnectPtr conn, no_memory: virReportOOMError(conn); cleanup: - tmp = virBufferContentAndReset(&buf); - VIR_FREE(tmp); + virBufferFreeAndReset(&buf); return NULL; } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 62b3007..ab76f21 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -642,7 +642,6 @@ char *virNetworkDefFormat(virConnectPtr conn, { virBuffer buf = VIR_BUFFER_INITIALIZER; unsigned char *uuid; - char *tmp; char uuidstr[VIR_UUID_STRING_BUFLEN]; virBufferAddLit(&buf, "<network>\n"); @@ -731,8 +730,7 @@ char *virNetworkDefFormat(virConnectPtr conn, no_memory: virReportOOMError(conn); - tmp = virBufferContentAndReset(&buf); - VIR_FREE(tmp); + virBufferFreeAndReset(&buf); return NULL; } diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 6003ab1..4bf71da 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -246,7 +246,6 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, { virBuffer buf = VIR_BUFFER_INITIALIZER; virNodeDevCapsDefPtr caps; - char *tmp; virBufferAddLit(&buf, "<device>\n"); virBufferEscapeString(&buf, " <name>%s</name>\n", def->name); @@ -464,8 +463,7 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, no_memory: virReportOOMError(conn); - tmp = virBufferContentAndReset(&buf); - VIR_FREE(tmp); + virBufferFreeAndReset(&buf); return NULL; } diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 21215b2..538fa91 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -303,7 +303,6 @@ virSecretDefFormat(virConnectPtr conn, const virSecretDefPtr def) virBuffer buf = VIR_BUFFER_INITIALIZER; unsigned char *uuid; char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *tmp; virBufferVSprintf(&buf, "<secret ephemeral='%s' private='%s'>\n", def->ephemeral ? "yes" : "no", @@ -328,7 +327,6 @@ virSecretDefFormat(virConnectPtr conn, const virSecretDefPtr def) no_memory: virReportOOMError(conn); error: - tmp = virBufferContentAndReset(&buf); - VIR_FREE(tmp); + virBufferFreeAndReset(&buf); return NULL; } diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 065cd04..0aefa06 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -954,7 +954,7 @@ virStoragePoolDefFormat(virConnectPtr conn, no_memory: virReportOOMError(conn); cleanup: - free(virBufferContentAndReset(&buf)); + virBufferFreeAndReset(&buf); return NULL; } @@ -1292,7 +1292,6 @@ virStorageVolDefFormat(virConnectPtr conn, virStorageVolDefPtr def) { virStorageVolOptionsPtr options; virBuffer buf = VIR_BUFFER_INITIALIZER; - char *tmp; options = virStorageVolOptionsForPoolType(pool->type); if (options == NULL) @@ -1351,8 +1350,7 @@ virStorageVolDefFormat(virConnectPtr conn, no_memory: virReportOOMError(conn); cleanup: - tmp = virBufferContentAndReset(&buf); - VIR_FREE(tmp); + virBufferFreeAndReset(&buf); return NULL; } @@ -1742,7 +1740,7 @@ char *virStoragePoolSourceListFormat(virConnectPtr conn, no_memory: virReportOOMError(conn); cleanup: - free(virBufferContentAndReset(&buf)); + virBufferFreeAndReset(&buf); return NULL; } diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 5737fe9..ea464a3 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2293,6 +2293,7 @@ esxDomainDumpXML(virDomainPtr domain, int flags) return xml; failure: + virBufferFreeAndReset(&buffer); VIR_FREE(xml); goto cleanup; @@ -2723,6 +2724,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) return domain; failure: + virBufferFreeAndReset(&buffer); + domain = NULL; goto cleanup; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 04860e2..5725b2f 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -532,7 +532,7 @@ esxVI_Context_DownloadFile(virConnectPtr conn, esxVI_Context *ctx, return 0; failure: - free(virBufferContentAndReset(&buffer)); + virBufferFreeAndReset(&buffer); return -1; } @@ -708,7 +708,7 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, return 0; failure: - free(virBufferContentAndReset(&buffer)); + virBufferFreeAndReset(&buffer); esxVI_Response_Free(response); esxVI_Fault_Free(&fault); @@ -2065,7 +2065,7 @@ esxVI_StartSimpleVirtualMachineTask return result; failure: - free(virBufferContentAndReset(&buffer)); + virBufferFreeAndReset(&buffer); result = -1; @@ -2124,9 +2124,7 @@ esxVI_SimpleVirtualMachineMethod(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c index a80d1bf..06b5fd4 100644 --- a/src/esx/esx_vi_methods.c +++ b/src/esx/esx_vi_methods.c @@ -158,9 +158,7 @@ esxVI_Login(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -214,9 +212,7 @@ esxVI_Logout(virConnectPtr conn, esxVI_Context *ctx) return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -283,9 +279,7 @@ esxVI_SessionIsActive(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -352,9 +346,7 @@ esxVI_RetrieveProperties(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -451,9 +443,7 @@ esxVI_MigrateVM_Task(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -509,9 +499,7 @@ esxVI_ReconfigVM_Task(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -579,9 +567,7 @@ esxVI_RegisterVM_Task(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -630,9 +616,7 @@ esxVI_UnregisterVM(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -702,9 +686,7 @@ esxVI_CreateFilter(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -758,9 +740,7 @@ esxVI_DestroyPropertyFilter(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -824,9 +804,7 @@ esxVI_WaitForUpdates(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -928,9 +906,7 @@ esxVI_ValidateMigration(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -1003,9 +979,7 @@ esxVI_FindByIp(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -1089,9 +1063,7 @@ esxVI_FindByUuid(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -1165,9 +1137,7 @@ esxVI_QueryAvailablePerfMetric(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -1232,9 +1202,7 @@ esxVI_QueryPerfCounter(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; @@ -1299,9 +1267,7 @@ esxVI_QueryPerf(virConnectPtr conn, esxVI_Context *ctx, return result; failure: - if (request == NULL) { - request = virBufferContentAndReset(&buffer); - } + virBufferFreeAndReset(&buffer); result = -1; diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 9a9fe0a..ff08fdb 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -2150,7 +2150,6 @@ esxVMX_FormatConfig(virConnectPtr conn, esxVI_Context *ctx, int sched_cpu_affinity_length; unsigned char zero[VIR_UUID_BUFLEN]; virBuffer buffer = VIR_BUFFER_INITIALIZER; - char *vmx = NULL; memset(zero, 0, VIR_UUID_BUFLEN); @@ -2373,16 +2372,10 @@ esxVMX_FormatConfig(virConnectPtr conn, esxVI_Context *ctx, goto failure; } - vmx = virBufferContentAndReset(&buffer); - - return vmx; + return virBufferContentAndReset(&buffer); failure: - if (vmx == NULL) { - vmx = virBufferContentAndReset(&buffer); - } - - VIR_FREE(vmx); + virBufferFreeAndReset(&buffer); return NULL; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c473d49..f182630 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -11,6 +11,7 @@ virBufferAddChar; virBufferContentAndReset; virBufferError; virBufferURIEncodeString; +virBufferFreeAndReset; # caps.h diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 9b48052..10b4416 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -323,6 +323,7 @@ static int udevGenerateDeviceName(struct udev_device *device, } if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); VIR_ERROR("Buffer error when generating device name for device " "with sysname '%s'\n", udev_device_get_sysname(device)); ret = -1; diff --git a/src/opennebula/one_conf.c b/src/opennebula/one_conf.c index 415f832..a4768b1 100644 --- a/src/opennebula/one_conf.c +++ b/src/opennebula/one_conf.c @@ -278,7 +278,6 @@ char* xmlOneTemplate(virConnectPtr conn,virDomainDefPtr def) no_memory: virReportOOMError(conn); - char* tmp = virBufferContentAndReset(&buf); - VIR_FREE(tmp); + virBufferFreeAndReset(&buf); return NULL; }; diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 33c2fd3..930f841 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -345,10 +345,12 @@ openvz_replace(const char* str, str_start = offset + from_len; } - virBufferAdd(&buf, str_start, strlen(str_start)); + virBufferAdd(&buf, str_start, strlen(str_start)); - if(virBufferError(&buf)) - return NULL; + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + return NULL; + } return virBufferContentAndReset(&buf); } diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index aac2eb8..1c0fccc 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -792,8 +792,7 @@ openvzDomainSetNetworkConfig(virConnectPtr conn, return 0; exit: - param = virBufferContentAndReset(&buf); - VIR_FREE(param); + virBufferFreeAndReset(&buf); return -1; } diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index ea9555a..c21d99d 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -486,13 +486,12 @@ phypExec(LIBSSH2_SESSION * session, char *cmd, int *exit_status, err: (*exit_status) = SSH_CMD_ERR; - char *cleanup_buf = virBufferContentAndReset(&tex_ret); - - VIR_FREE(cleanup_buf); + virBufferFreeAndReset(&tex_ret); return NULL; exit: if (virBufferError(&tex_ret)) { + virBufferFreeAndReset(&tex_ret); virReportOOMError(conn); return NULL; } diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index f26e94d..09a298b 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1376,6 +1376,7 @@ qemuBuildHostNetStr(virConnectPtr conn, type_sep = ','; /* dead-store, but leave it, in case... */ } if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); virReportOOMError(conn); return -1; } @@ -1859,8 +1860,10 @@ int qemudBuildCommandLine(virConnectPtr conn, virBuffer buf = VIR_BUFFER_INITIALIZER; qemudBuildCommandLineChrDevStr(monitor_chr, &buf); - if (virBufferError(&buf)) - goto error; + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } ADD_ARG_LIT("-monitor"); ADD_ARG(virBufferContentAndReset(&buf)); @@ -2024,8 +2027,8 @@ int qemudBuildCommandLine(virConnectPtr conn, } if (virBufferError(&opt)) { - virReportOOMError(conn); - goto error; + virBufferFreeAndReset(&opt); + goto no_memory; } optstr = virBufferContentAndReset(&opt); @@ -2147,8 +2150,10 @@ int qemudBuildCommandLine(virConnectPtr conn, virDomainChrDefPtr serial = def->serials[i]; qemudBuildCommandLineChrDevStr(serial, &buf); - if (virBufferError(&buf)) - goto error; + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } ADD_ARG_LIT("-serial"); ADD_ARG(virBufferContentAndReset(&buf)); @@ -2164,8 +2169,10 @@ int qemudBuildCommandLine(virConnectPtr conn, virDomainChrDefPtr parallel = def->parallels[i]; qemudBuildCommandLineChrDevStr(parallel, &buf); - if (virBufferError(&buf)) - goto error; + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } ADD_ARG_LIT("-parallel"); ADD_ARG(virBufferContentAndReset(&buf)); @@ -2190,8 +2197,10 @@ int qemudBuildCommandLine(virConnectPtr conn, } qemudBuildCommandLineChrDevChardevStr(channel, id, &buf); - if (virBufferError(&buf)) - goto error; + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } ADD_ARG_LIT("-chardev"); ADD_ARG(virBufferContentAndReset(&buf)); @@ -2204,8 +2213,10 @@ int qemudBuildCommandLine(virConnectPtr conn, VIR_FREE(addr); - if (virBufferError(&buf)) - goto error; + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + goto no_memory; + } ADD_ARG_LIT("-net"); ADD_ARG(virBufferContentAndReset(&buf)); @@ -2263,8 +2274,10 @@ int qemudBuildCommandLine(virConnectPtr conn, virBufferVSprintf(&opt, "%d", def->graphics[0]->data.vnc.port - 5900); } - if (virBufferError(&opt)) + if (virBufferError(&opt)) { + virBufferFreeAndReset(&opt); goto no_memory; + } optstr = virBufferContentAndReset(&opt); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a4a87ac..d449669 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4308,8 +4308,11 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, tmp++; } - if (virBufferError(&buf)) + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + virReportOOMError(conn); goto cleanup; + } ret = virBufferContentAndReset(&buf); diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 62f0977..e1e141b 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -883,8 +883,9 @@ get_files(vahControl * ctl) goto clean; if (virBufferError(&buf)) { - vah_error(NULL, 0, "failed to allocate file buffer"); - goto clean; + virBufferFreeAndReset(&buf); + vah_error(NULL, 0, "failed to allocate file buffer"); + goto clean; } rc = 0; @@ -1048,8 +1049,10 @@ main(int argc, char **argv) if (ctl->files) virBufferVSprintf(&buf, "%s", ctl->files); - if (virBufferError(&buf)) + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); vah_error(ctl, 1, "failed to allocate buffer"); + } included_files = virBufferContentAndReset(&buf); diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index bb926cd..dd977f4 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -445,8 +445,7 @@ cleanup: conn->secretDriver->undefine(secret); virSecretFree(secret); } - xml = virBufferContentAndReset(&buf); - VIR_FREE(xml); + virBufferFreeAndReset(&buf); virSecretDefFree(def); VIR_FREE(enc_secret); return ret; diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 0ace58f..895a94d 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -163,7 +163,6 @@ umlBuildCommandLineNet(virConnectPtr conn, virDomainNetDefPtr def, int idx) { - char *ret; virBuffer buf = VIR_BUFFER_INITIALIZER; /* General format: ethNN=type,options */ @@ -265,8 +264,7 @@ umlBuildCommandLineNet(virConnectPtr conn, return virBufferContentAndReset(&buf); error: - ret = virBufferContentAndReset(&buf); - VIR_FREE(ret); + virBufferFreeAndReset(&buf); return NULL; } diff --git a/src/util/buf.c b/src/util/buf.c index 9681635..e683928 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -167,6 +167,19 @@ virBufferContentAndReset(const virBufferPtr buf) } /** + * virBufferFreeAndReset: + * @buf: the buffer to free and reset + * + * Frees the buffer content and resets the buffer structure. + */ +void virBufferFreeAndReset(const virBufferPtr buf) +{ + char *str = virBufferContentAndReset(buf); + + VIR_FREE(str); +} + +/** * virBufferError: * @buf: the buffer * diff --git a/src/util/buf.h b/src/util/buf.h index 94ee8a3..d9a1708 100644 --- a/src/util/buf.h +++ b/src/util/buf.h @@ -35,6 +35,7 @@ struct _virBuffer { #endif char *virBufferContentAndReset(const virBufferPtr buf); +void virBufferFreeAndReset(const virBufferPtr buf); int virBufferError(const virBufferPtr buf); unsigned int virBufferUse(const virBufferPtr buf); void virBufferAdd(const virBufferPtr buf, const char *str, int len); diff --git a/src/util/conf.c b/src/util/conf.c index 8126f69..0c7e556 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -927,15 +927,15 @@ virConfWriteFile(const char *filename, virConfPtr conf) } if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); virReportOOMError(NULL); return -1; } fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR ); if (fd < 0) { - char *tmp = virBufferContentAndReset(&buf); + virBufferFreeAndReset(&buf); virConfError(NULL, VIR_ERR_WRITE_FAILED, _("failed to open file")); - VIR_FREE(tmp); return -1; } @@ -983,6 +983,7 @@ virConfWriteMem(char *memory, int *len, virConfPtr conf) } if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); virReportOOMError(NULL); return -1; } diff --git a/src/util/logging.c b/src/util/logging.c index 757f78c..6bd8469 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -867,8 +867,10 @@ char *virLogGetFilters(void) { } virLogUnlock(); - if (virBufferError(&filterbuf)) + if (virBufferError(&filterbuf)) { + virBufferFreeAndReset(&filterbuf); return NULL; + } return virBufferContentAndReset(&filterbuf); } @@ -905,8 +907,10 @@ char *virLogGetOutputs(void) { } virLogUnlock(); - if (virBufferError(&outputbuf)) + if (virBufferError(&outputbuf)) { + virBufferFreeAndReset(&outputbuf); return NULL; + } return virBufferContentAndReset(&outputbuf); } diff --git a/src/util/qparams.c b/src/util/qparams.c index d0a84b3..9b96c2a 100644 --- a/src/util/qparams.c +++ b/src/util/qparams.c @@ -154,6 +154,7 @@ qparam_get_query (const struct qparam_set *ps) } if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); virReportOOMError(NULL); return NULL; } diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index d61e9e6..db21940 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -525,6 +525,7 @@ xend_op_ext(virConnectPtr xend, const char *path, char *error, } if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); virReportOOMError(NULL); return -1; } @@ -5279,8 +5280,10 @@ xenDaemonFormatSxprChr(virConnectPtr conn, break; } - if (virBufferError(buf)) + if (virBufferError(buf)) { + virReportOOMError(conn); return -1; + } return 0; } @@ -5605,8 +5608,10 @@ xenDaemonFormatSxprSound(virConnectPtr conn, virBufferVSprintf(buf, "%s%s", i ? "," : "", str); } - if (virBufferError(buf)) + if (virBufferError(buf)) { + virReportOOMError(conn); return -1; + } return 0; } @@ -5878,14 +5883,13 @@ xenDaemonFormatSxpr(virConnectPtr conn, if (virBufferError(&buf)) { virReportOOMError(conn); - return NULL; + goto error; } return virBufferContentAndReset(&buf); error: - tmp = virBufferContentAndReset(&buf); - VIR_FREE(tmp); + virBufferFreeAndReset(&buf); return NULL; } diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 2ee321f..7f43784 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1735,6 +1735,7 @@ int xenXMDomainPinVcpu(virDomainPtr domain, } if (virBufferError(&mapbuf)) { + virBufferFreeAndReset(&mapbuf); virReportOOMError(domain->conn); goto cleanup; } @@ -1965,7 +1966,6 @@ static int xenXMDomainConfigFormatDisk(virConnectPtr conn, { virBuffer buf = VIR_BUFFER_INITIALIZER; virConfValuePtr val, tmp; - char *str; if(disk->src) { if (disk->driverName) { @@ -1996,7 +1996,7 @@ static int xenXMDomainConfigFormatDisk(virConnectPtr conn, if (virBufferError(&buf)) { virReportOOMError(conn); - return -1; + goto cleanup; } if (VIR_ALLOC(val) < 0) { @@ -2017,8 +2017,7 @@ static int xenXMDomainConfigFormatDisk(virConnectPtr conn, return 0; cleanup: - str = virBufferContentAndReset(&buf); - VIR_FREE(str); + virBufferFreeAndReset(&buf); return -1; } @@ -2029,7 +2028,6 @@ static int xenXMDomainConfigFormatNet(virConnectPtr conn, { virBuffer buf = VIR_BUFFER_INITIALIZER; virConfValuePtr val, tmp; - char *str; xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; virBufferVSprintf(&buf, "mac=%02x:%02x:%02x:%02x:%02x:%02x", @@ -2093,8 +2091,10 @@ static int xenXMDomainConfigFormatNet(virConnectPtr conn, virBufferVSprintf(&buf, ",vifname=%s", net->ifname); - if (virBufferError(&buf)) + if (virBufferError(&buf)) { + virReportOOMError(conn); goto cleanup; + } if (VIR_ALLOC(val) < 0) { virReportOOMError(conn); @@ -2114,8 +2114,7 @@ static int xenXMDomainConfigFormatNet(virConnectPtr conn, return 0; cleanup: - str = virBufferContentAndReset(&buf); - VIR_FREE(str); + virBufferFreeAndReset(&buf); return -1; } @@ -2444,8 +2443,10 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, virBufferVSprintf(&buf, ",keymap=%s", def->graphics[0]->data.vnc.keymap); } - if (virBufferError(&buf)) + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); goto no_memory; + } vfbstr = virBufferContentAndReset(&buf); diff --git a/tools/virsh.c b/tools/virsh.c index 9faac35..94a99e9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3800,7 +3800,7 @@ static int buildPoolXML(const vshCmd *cmd, char **retname, char **xml) { return TRUE; cleanup: - free(virBufferContentAndReset(&buf)); + virBufferFreeAndReset(&buf); return FALSE; } @@ -4663,7 +4663,7 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) } cleanup: - free(virBufferContentAndReset(&buf)); + virBufferFreeAndReset(&buf); virStoragePoolFree(pool); return FALSE; } -- 1.6.0.4

2 2

[libvirt] [RFC] virDomain{Attach,Detach}Device
by Jim Fehlig 09 Dec '09

09 Dec '09

History I found that virDomainDetachDevice did not work with inactive domains and submitted a patch [1] to fix this. As it turns out, some drivers do not support attaching/detaching devices on inactive domains and it was preferred that virDomain{Attach,Detach}Device only be permitted on active domains. I posted a follow-up patch [2] that restricted virDomain{Attach,Detach}Device to active domains only, although as Daniel Veillard pointed out this restriction should have been enforced in the libvirt front-end. Cole Robinson suggested improving virsh [3] to handle the case of inactive vs. active by redefining the domain with new device (or removed device) when domain is inactive. While implementing this improvement I asked some questions on IRC that resulted in another approach suggested by Dan Berrange as outlined below. Introduce two new APIs virDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, unsigned flags) virDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, unsigned flags) with flags being one or more from VIR_DOMAIN_DEVICE_ATTACH_CURRENT, VIR_DOMAIN_DEVICE_ATTACH_LIVE, VIR_DOMAIN_DEVICE_ATTACH_CONFIG. (I'm not sure about the ATTACH in these names. Perhaps CHANGE or MODIFY would be more appropriate.) If caller specifies CURRENT (default), add or remove the device depending on the current state of domain. E.g. if domain is active add or remove the device to/from live domain, if it is inactive change the persistent config. If caller specifies LIVE, only change the active domain. If caller specifies CONFIG, only change persistent config - even if the domain is active. If caller specifies both LIVE and CONFIG, then change both. If a driver could not satisfy the exact requested flags it must return an error. E.g if user specified LIVE but the driver can only change live and persisted config, the driver must fail the request. The existing virDomain{Attach,Detach}Device would be declared to be equivalent to virDomain{Attach,Detach}DeviceFlags(LIVE). Finally, virsh {attach,detach}-{disk,interface,device} would be modified to add a --persistent flag in order to set the appropriate flags when calling the new APIs. Regards, Jim [1] https://www.redhat.com/archives/libvir-list/2009-November/msg00489.html [2] https://www.redhat.com/archives/libvir-list/2009-November/msg00571.html [3] https://www.redhat.com/archives/libvir-list/2009-November/msg00676.html

2 1

[libvirt] http URL for the git tree
by Shyam_Iyer＠Dell.com 09 Dec '09

09 Dec '09

Is there a http url for the git tree ? Below doesn't seem to work for me ? # git clone http://git.et.redhat.com/libvirt.git <tree_name> Initialized empty Git repository in /home/shyam_iyer/libvirt/.git/ fatal: http://git.et.redhat.com/libvirt.git/info/refs not found: did you run git update-server-info on the server? Firewall restrictions allow only http access for me (: -Shyam

3 5

[libvirt] [PATCH] Plumb domain description tag in xend backend
by Jim Fehlig 09 Dec '09

09 Dec '09

I sent this patch yesterday evening using git send-email on a test machine which did not have my .gitconfig, so the headers seem quite jacked. Resending ... /me still learning git :-/ Regards, Jim

3 2

[libvirt] C# (Mono) bindings for libvirt - Source
by Jaromír Červenka 09 Dec '09

09 Dec '09

In my previous mail I forgot include link to source :) : http://svn.i-tux.cz/filedetails.php?repname=SharpLibVirt&path=/trunk/SharpL… or svn co svn://i-tux.cz/sharplibvirt Greetings, Jaromír Červenka Official openSUSE community member Web: http://www.cervajz.com/ Jabber: cervajz(a)cervajz.com MSN: jara.cervenka(a)seznam.cz Tel.: +420 607 592 687 Alt. e-mails: jaromir.cervenka(a)opensuse.org, jaromir.cervenka(a)speel.cz

3 2

[libvirt] [PATCH] Fix bug in storage driver accessing wrong private data
by Daniel P. Berrange 09 Dec '09

09 Dec '09

* src/storage/storage_driver.c: Fix IsPersistent() and IsActivE() methods on storage pools to use 'storagePrivateData' instead of 'privateData'. Also fix naming convention of objects --- src/storage/storage_driver.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index fadba57..4a49089 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -466,17 +466,17 @@ cleanup: } -static int storagePoolIsActive(virStoragePoolPtr net) +static int storagePoolIsActive(virStoragePoolPtr pool) { - virStorageDriverStatePtr driver = net->conn->privateData; + virStorageDriverStatePtr driver = pool->conn->storagePrivateData; virStoragePoolObjPtr obj; int ret = -1; storageDriverLock(driver); - obj = virStoragePoolObjFindByUUID(&driver->pools, net->uuid); + obj = virStoragePoolObjFindByUUID(&driver->pools, pool->uuid); storageDriverUnlock(driver); if (!obj) { - virStorageReportError(net->conn, VIR_ERR_NO_STORAGE_POOL, NULL); + virStorageReportError(pool->conn, VIR_ERR_NO_STORAGE_POOL, NULL); goto cleanup; } ret = virStoragePoolObjIsActive(obj); @@ -487,17 +487,17 @@ cleanup: return ret; } -static int storagePoolIsPersistent(virStoragePoolPtr net) +static int storagePoolIsPersistent(virStoragePoolPtr pool) { - virStorageDriverStatePtr driver = net->conn->privateData; + virStorageDriverStatePtr driver = pool->conn->storagePrivateData; virStoragePoolObjPtr obj; int ret = -1; storageDriverLock(driver); - obj = virStoragePoolObjFindByUUID(&driver->pools, net->uuid); + obj = virStoragePoolObjFindByUUID(&driver->pools, pool->uuid); storageDriverUnlock(driver); if (!obj) { - virStorageReportError(net->conn, VIR_ERR_NO_STORAGE_POOL, NULL); + virStorageReportError(pool->conn, VIR_ERR_NO_STORAGE_POOL, NULL); goto cleanup; } ret = obj->configFile ? 1 : 0; -- 1.6.5.2

3 3

[libvirt] [PATCH] Make 'Miloslav Trmac' and 'Guido Guenther' display correctly
by Matthias Bolte 09 Dec '09

09 Dec '09

--- docs/news.html.in | 132 ++++++++++++++++++++++++++-------------------------- 1 files changed, 66 insertions(+), 66 deletions(-) diff --git a/docs/news.html.in b/docs/news.html.in index 83f0461..47d7f42 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -36,7 +36,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> qemu-kvm needs -enable-kvm flag for VT optimization (Steve Yarmie) fix deprecated iptables command syntax (Steve Yarmie) Ensure driver lock is released when entering QEMU monitor (Daniel P. Berrange) - only remove masquerade roles for VIR_NETWORK_FORWARD_NAT (Guido Günther) + only remove masquerade roles for VIR_NETWORK_FORWARD_NAT (Guido Günther) esx: Fix CPU clock Hz to MHz conversion (Matthias Bolte) esx: Fix memory leak in esxVI_HostCpuIdInfo_Free() (Matthias Bolte) esx: Fix MAC address formatting (Matthias Bolte) @@ -442,8 +442,8 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> <h3>0.7.1: Sep 15 2009</h3> <ul> <li>New features: - Add support for encrypted (qcow) volume creation. (Miloslav Trmač), - Secret manipulation public API (Miloslav Trmač), + Add support for encrypted (qcow) volume creation. (Miloslav Trmač), + Secret manipulation public API (Miloslav Trmač), Multipath storage support module (Dave Allan), VBox add Storage Volume support (Pritesh Kothari), Support configuration of huge pages in guests (Daniel P. Berrange), @@ -525,12 +525,12 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> Fix UUID handling in secrets/storage encryption APIs (Daniel P. Berrange), Save vcpuinfo in status file (Daniel P. Berrange), Restart libvirtd upon RPM upgrade (Daniel P. Berrange), - Add support for qcow encrypted volumes to qemu. (Miloslav Trmač), - Provide missing passphrase when creating a volume. (Miloslav Trmač), - Add virsh commands for secrets APIs (Miloslav Trmač), - Local file implementation of secret driver API (Miloslav Trmač), - Mask out flags used internally for virSecretGetValue (Miloslav Trmač), - Add <usage> to <secret> docs (Miloslav Trmač), + Add support for qcow encrypted volumes to qemu. (Miloslav Trmač), + Provide missing passphrase when creating a volume. (Miloslav Trmač), + Add virsh commands for secrets APIs (Miloslav Trmač), + Local file implementation of secret driver API (Miloslav Trmač), + Mask out flags used internally for virSecretGetValue (Miloslav Trmač), + Add <usage> to <secret> docs (Miloslav Trmač), also allow use of XZ for Qemu image compression (Jim Meyering), Support relabelling of USB and PCI devices (Daniel P. Berrange), Add helper APIs for iterating over PCI device resource files (Daniel P. Berrange), @@ -557,16 +557,16 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> Generic parsing support for video acceleration (Pritesh Kothari), VMware ESX: Allow ethernet address type 'vpx' (Matthias Bolte), Support for getting/setting number of cpus in VBox (Pritesh Kothari), - Make handling of monitor prompts more general. (Miloslav Trmač), - Attach encryption information to virDomainDiskDef. (Miloslav Trmač), - Recognize encryption format of qcow volumes. (Miloslav Trmač), - Attach encryption information to virStorageVolDef. (Miloslav Trmač), - Add volume encryption information handling. (Miloslav Trmač), - Secret manipulation API docs refresh and wire up python generator (Miloslav Trmač), - Secret manipulation remote client (Miloslav Trmač), - Secret manipulation libvirtd wire protocol and remote dispatcher (Miloslav Trmač), - Secret manipulation public API implementation (Miloslav Trmač), - Secret manipulation internal API (Miloslav Trmač), + Make handling of monitor prompts more general. (Miloslav Trmač), + Attach encryption information to virDomainDiskDef. (Miloslav Trmač), + Recognize encryption format of qcow volumes. (Miloslav Trmač), + Attach encryption information to virStorageVolDef. (Miloslav Trmač), + Add volume encryption information handling. (Miloslav Trmač), + Secret manipulation API docs refresh and wire up python generator (Miloslav Trmač), + Secret manipulation remote client (Miloslav Trmač), + Secret manipulation libvirtd wire protocol and remote dispatcher (Miloslav Trmač), + Secret manipulation public API implementation (Miloslav Trmač), + Secret manipulation internal API (Miloslav Trmač), Add test for recently fixed crash with latest XenD (Daniel P. Berrange), Don't expose 'vnet%d' to the user (Mark McLoughlin), Maintain a list of active PCI hostdevs and use it in pciResetDevice() (Mark McLoughlin), @@ -585,7 +585,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> Remove accidentally added UUID re-definition in storage schema (Daniel P. Berrange), ESX cleanup of CPU model strings (Matthias Bolte), Fix use of dlopen modules (Daniel P. Berrange), - Consolidate "cont" into qemudMonitorSendCont() (Miloslav Trmač), + Consolidate "cont" into qemudMonitorSendCont() (Miloslav Trmač), Cleanup sec driver error reporting to use virReportSystemError (Daniel P. Berrange), Port QEMU driver to use USB/PCI device helpers (Daniel P. Berrange), Simplify and fix qemudCanonicalizeMachine() (Mark McLoughlin), @@ -600,8 +600,8 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> openvz_conf.c: remove dead store to "p"; use strchrnul (Jim Meyering), Remove some tabs used for indent (Daniel Veillard), Updated a number of localizations and regenerated (Daniel Veillard), - Add a missing comment (Miloslav Trmač), - Fix a pasto in storage_encryption_conf.c (Miloslav Trmač), + Add a missing comment (Miloslav Trmač), + Fix a pasto in storage_encryption_conf.c (Miloslav Trmač), xm_internal.c: remove four useless comparisons after strchr (Jim Meyering), xm_internal.c: remove dead increment of "data" (Jim Meyering), network_driver.c: remove dead store to "err" (Jim Meyering), @@ -642,7 +642,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> Misc fixes to secrets API code (Daniel P. Berrange), Only add glusterfs dep for Fedora >= 11 (Daniel P. Berrange), Remove redundant base64 include file (Daniel P. Berrange), - Don't assume buffered output echoes the command. (Miloslav Trmač), + Don't assume buffered output echoes the command. (Miloslav Trmač), Update chinese, polish and spanish localizations (Daniel Veillard), OpenVZ: accept NULL as type for GetMaxVCPUs. (Chris Lalancette), Remove use of strncpy in qemudExtractMonitorPath. (Chris Lalancette), @@ -688,7 +688,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> Matthias Bolte to AUTHORS list (Daniel Veillard), doc: clone+build instructions (Jim Meyering), docs: say that the old repository is deprecated... (Jim Meyering), document tcp listen and raw - wire option (Guido Günther), Fix docs and code disagreements + wire option (Guido Günther), Fix docs and code disagreements for character devices. (Cole Robinson), Fix documentation of virStoragePoolUndefine return (Thomas Treutner), Fix gitweb link on download page. (Cole Robinson), update download informations after @@ -998,10 +998,10 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> docs for XML conversion APIs (Daniel Berrange), inconsistencies in storage volume docs and schemas (Ryota Ozaki)</li> <li>Bug fixes: fix hostdev managed handling (Mark McLoughlin), - lxc_controller should not cash without args (Guido Gunther), - bug fixes in I/O routines (Guido Gunther), fix migrationsave/restore + lxc_controller should not cash without args (Guido Günther), + bug fixes in I/O routines (Guido Günther), fix migrationsave/restore for QEmu 0.10.0 (Daniel Berrange), avoid crash on VBox init - (Guido Gunther), fix dev and cgroup init in LXC (Ryota Ozaki), + (Guido Günther), fix dev and cgroup init in LXC (Ryota Ozaki), QEmu startup fix (Cole Robinson), block node reboots from LXCs (Ryota Ozaki), QEmu argv detection fix for recent kvm (Daniel Berrange), fix watch/timer event deletion (Daniel Berrange), fix XML escaping @@ -1061,7 +1061,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> <li>Improvements: add SCSI storage rescan (David Allan), rootless LXC containers support improvements (Serge Hallyn), getHostname support for LXC (Dan Smith), cleanup and logging output of some - domain functions (Guido Günther), drop pool lock when allocating + domain functions (Guido Günther), drop pool lock when allocating volumes (Cole Robinson), LXC handle kernel without CLONE_NEWUSER support (Serge Hallyn), cpu pinning on defined Xen domains (Takahashi Tomohiro), dynamic bridge names support (Soren Hansen), LXC use @@ -1069,7 +1069,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> virNodeDeviceCreateXML and virNodeDeviceDestroy entry points (Dave Allan)</li> <li>Cleanups: don't hardcode getgrnam_r buffer to 1024 bytes (Guido - Günther), qemudBuildCommandLine API cleanup (Daniel Berrange), + Günther), qemudBuildCommandLine API cleanup (Daniel Berrange), </li> </ul> <h3>0.6.2: Apr 3 2009</h3> @@ -1138,15 +1138,15 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> to avoid crashes (Daniel Berrange), mark defined network descriptions as persistent (Cole Robinson), qemu+tls handshake negotiation hang (Chris Lalancette)</li> - <li>Improvements: don't hardcode ssh port (Guido Günther), new test + <li>Improvements: don't hardcode ssh port (Guido Günther), new test cases and testing infrastructure (Jim Meyering), improve the SExpr parser (John Levon), proper error reporting on xend shutdown command (John Levon), proper handling of errors when - saving QEmu domains state (Guido Günther), revamp of the internal + saving QEmu domains state (Guido Günther), revamp of the internal error memory APIs (John Levon), better virsh error reporting (John Levon), more daemon options to allow running multiple daemons (Jim - Meyering), error handling when creating a QEmu domain (Guido Günther), - fix timeouts in QEmu log reading (Guido Günther), migration with + Meyering), error handling when creating a QEmu domain (Guido Günther), + fix timeouts in QEmu log reading (Guido Günther), migration with xend 3.3 fixes (John Levon), virsh XML dump flags cleanup (Cole Robinson), fix build with loadable drivers (Maximilian Wilhelm), internal XML APIs to read long long and hexa values (Mark @@ -1160,7 +1160,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> (Jim Meyering), many error handling cleanups (Jim Meyering), XML module cleanups (Mark McLoughlin), compiler warning (Maximilian Wilhelm), daemon TCP listen cleanup (Cole Robinson), size_t type - cleanup (Guido Günther), parallel make fix (Michael Marineau), + cleanup (Guido Günther), parallel make fix (Michael Marineau), storage error diagnostic fix (Ryota Ozaki), remove redundant monitor watch variable (Cole Robinson), qemu AttachDevice error report improvement (Cole Robinson), virsh output cleanup (Jim Meyering), @@ -1172,7 +1172,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> <ul> <li>New features: thread safety of the API and event handling (Daniel Berrange), allow QEmu domains to survive daemon restart (Guido - Günther), extended logging capabilities, support copy-on-write + Günther), extended logging capabilities, support copy-on-write storage volumes (Daniel Berrange), support of storage cache control options for QEmu/KVM (Daniel Berrange)</li> <li>Portability: fix old DBus API problem, Debian portability fix @@ -1184,14 +1184,14 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> solaris Xen fixes (John Levon), RPC portability to Solaris (Daniel Berrange)</li> <li>Documentation: typo fixes (Richard Jones), logging support, - vnc keymap attributes (Guido Günther), HACKING file updates + vnc keymap attributes (Guido Günther), HACKING file updates (Jim Meyering), new PCI passthrough format, libvirt-qpid and UML driver documentation (Daniel Berrange), provide RNG schemas for all XML formats used in libvirt APIs (Daniel Berrange), </li> <li>Bug fixes: segfault on virtual network without bridge name (Cole Robinson), various locking fixes (Cole Robinson), fix serial - and parallel devices on tcp/unix/telnet (Guido Günther), leak - in daemon (Jim Meyering), storage driver segfault (Miloslav TrmaC), + and parallel devices on tcp/unix/telnet (Guido Günther), leak + in daemon (Jim Meyering), storage driver segfault (Miloslav Trmač), missing check in read-only connections (Daniel Berrange), OpenVZ crash and mutex fixes (Anton Protopopov), couple of daemon bug fixes (John Levon), OpenVZ MAC addresses generation @@ -1206,15 +1206,15 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> <li>Improvements: driver infrastructure and locking (Daniel Berrange), Test driver infrastructure (Daniel Berrange), parallelism in the daemon and associated config (Daniel Berrange), virsh help cleanups - (Jim Meyering), logrotate daemon logs (Guido Günther), more + (Jim Meyering), logrotate daemon logs (Guido Günther), more regression tests (Jim Meyering), QEmu SDL graphics (Itamar Heim), add --version flag to daemon (Dave Allan), memory consumption cleanup (Dave Allan), QEmu pid file and XML states for daemon - restart (Guido Günther), gnulib updates (Jim Meyering and + restart (Guido Günther), gnulib updates (Jim Meyering and Dan Berrange), PCI passthrough for KVM (Jason Krieg), generic internal thread API (Daniel Berrange), RHEL-5 specific Xen configure option and code (Markus Armbruster), save domain - state as string in status file (Guido Günther), add locking + state as string in status file (Guido Günther), add locking to all API entry points (Daniel Berrange), new ref counting APIs (Daniel Berrange), IP address for Xen bridges (John Levon), driver format for disk file types (Daniel Berrange), improve @@ -1227,15 +1227,15 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> (Jim Meyering), gethostby* cleanup and test (Jim Meyering), some code fixes (Dave Allan), various code cleanup (Jim Meyering), virsh argument handling cleanup (Jim Meyering), virAsprintf - cleanup replacement (Guido Günther), QEmu monitor reads (Cole - Robinson), Makefile cleanups (Guido Günther), Xen code cleanups + cleanup replacement (Guido Günther), QEmu monitor reads (Cole + Robinson), Makefile cleanups (Guido Günther), Xen code cleanups (John Levon), revamp of ELF export scripts (John Levon), domain event callback args (John Levon), enforce use of pid_t (John Levon), virsh pool-*-as XML code merge (Cole Robinson), xgettext warnings - (Jim Meyering), add virKillProcess (Guido Günther), add + (Jim Meyering), add virKillProcess (Guido Günther), add virGetHostname (David Lutterkort), add flags argument to the full - XML parsing stack (Guido Günther), various daemon code cleanups - (Guido Günther), handling of daemon missing config file (Jim + XML parsing stack (Guido Günther), various daemon code cleanups + (Guido Günther), handling of daemon missing config file (Jim Meyering), rpcgen invocation cleanup (Richard Jones), devhelp builkd makefile cleanups (John Levon), update error handling for threading (Daniel Berrange), remove all non-rentrant POSIX calls @@ -1255,7 +1255,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> <li>Bug fixes: add a delay in storage backend for disks to show up (Chris Lalancette), fix parsing for CDRom device with no source (Daniel Berrange), use xenstore to list domains to avoid some - bugs (Guido Günther), remove a leak in xen inotify code (Daniel + bugs (Guido Günther), remove a leak in xen inotify code (Daniel Berrange), UML driver freeing of uninitialialized variable (Ron Yorston), fix UML inotify code (Daniel Berrange), crash when adding storage without a format (Cole Robinson)</li> @@ -1263,8 +1263,8 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> max memory (Jim Fehlig), allow remote://hostname/ URI for automatic probe of hypervisors (Daniel Berrange), fix daemon configuration regression testing (Jim Meyering ), check /usr/bin/kvm for QEmu - driver init (Guido Günther), proper active vs. inactive - differentiation (Guido Günther), improve MTU setting on tap + driver init (Guido Günther), proper active vs. inactive + differentiation (Guido Günther), improve MTU setting on tap interfaces (Eduardo Habkost), increase timeout for initial QEmu monitor poll (Cole Robinson)</li> <li>Cleanups:fix improper initialisations (Jim Meyering)</li> @@ -1272,11 +1272,11 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> <h3>0.5.0: Nov 25 2008</h3> <ul> <li>New features: CPU and scheduler support for LXC (Dan Smith), SDL display configuration (Daniel Berrange), domain lifecycle event support for QEmu and Xen with python bindings (Ben Guthro and Daniel Berrange), KVM/QEmu migration support (Rich Jones and Chris Lalancette), User Mode Linux driver (Daniel Berrange), API for node device enumeration using HAL and DeviceKit with python bindings (David Lively), </li> - <li>Portability: RHEL build fixes, VPATH build (Guido Gunther), many MinGW related cleanups and fixes (Richard Jones), compilation without libvirtd (Richard Jones), Add a Windows icon (Richard Jones), sys/poll.h portability fixes (Daniel Berrange), gnulib and mingw cleanups (Jim Meyering), </li> + <li>Portability: RHEL build fixes, VPATH build (Guido Günther), many MinGW related cleanups and fixes (Richard Jones), compilation without libvirtd (Richard Jones), Add a Windows icon (Richard Jones), sys/poll.h portability fixes (Daniel Berrange), gnulib and mingw cleanups (Jim Meyering), </li> <li>Documentation: virsh man page cleanups (Mark McLoughlin), doc for NIC model selection (Richard Jones), monitoring section, link to AMQP bindings, inew APIs, UML driver docs (Daniel Berrange), </li> - <li>Bug fixes: Xen interfaces ordering (Jim Fehlig), startup timeout with multiple pty (Cole Robinson), segfault if QEmu without active virtual network (Cole Robinson), qemu small leak (Eduardo Habkost), index creation for more than 26 disks (Sanjay Rao and Chris Wright), virRealloc handling of 0 (Daniel Berrange), missing pointer initialization (Chris Lalancette), bus device index bug (Guido Günther), avoid crash in some error patch (Chris Lalancette), fix a problem in storage back-end (Chris Lalancette), minimum domain memory size check for Xen (Shigeki Sakamoto), switch off QEmu cache if device is shared (Charles Duffy), logical volume definition before scan bug (Chris Lalancette), a couple of memory leaks on QEmu vnc (Jim Meyering), lvs parsing fixes (Cole Robinson),</li> - <li>Improvements: LXC resources control and internal cgroup API (Dan Smith), virDomainCreateLinux renamed virDomainDefineXML, network driver modularization (Daniel Berrange), change the way domain and net are reported in errors (Jim Meyering), partition table scan on iSCSI (Chris Lalancette), qemudDiskDeviceName to handle normal disks (Guido Günther), qemudDomainBlockStats improvement (Guido Günther), scsi/virtio hotplug support for KVM (Guido Günther), USB hot addition in QEmu (Guido Günther), logical pool and storage backend XML dump improvement (Chris Lalancette), MAC addresses prefix per driver (Daniel Berrange), OpenVZ getVersion support (Daniel Berrange), hot removal of scsi/virtio disks for KVM (Guido Günther), test storage driver (Cole Robinson), iSCSI and disk storage driver improvement on path handling (Chris Lalancette), UUID and ID support for Xenner (Daniel Berrange), better logging when when executing commands (Cole Robinson), bridged network for OpenVZ (Daniel Berrange), OpenVZ config file params (Evgeniy Sokolov), allow to build drivers as libtool convenience libs (Daniel Berrange), fully versioned linker script for exported ABI (Daniel Berrange), Push URI probing down into drivers open (Daniel Berrange), move all stateful drivers into the daemon binary (Daniel Berrange), improve domain event with a detail field (Daniel Berrange), domain events for QEMU driver (Daniel Berrange), event unregister callback crash (David Lively), plug a few leaks (Daniel Berrange), internal APIs for handling node device XML config (David Lively), tweaks to node device implementation (Daniel Berrange), OpenVZ vCPUs values init (Evgeniy Sokolov)</li> - <li>Cleanups: C99 initializers (Guido Gunther), test output (Cole Robinson), debug macro centralization (Cole Robinson), various error handling (Guido Günther), safewrite use cleanup (Jim Meyering), centralize error reporting logic (Cole Robinson), avoid printf warnings (Daniel Berrange), use arrays instead of list for internal APIs (Daniel Berrange), remove many format string warnings Jim Meyering), avoid syntax check warnings (Chris Lalancette), improve po-check and list generation (Jim Meyering), .gitignore generation and handling (Jim Meyering), use ARRAY_CARDINALITY (Jim Meyering), gnulib updates and switch to use netdb.h (Jim Meyering), drop usage of socket_errno (Jim Meyering), remove socketcompat.h (Jim Meyering), more tests (Jim Meyering), drop virStringList (Daniel Berrange), reformatting and isolation of the error APIs (Daniel Berrange), cleanup internal.h and move internal APIs in specific headers (Daniel Berrange), move domain events helpers into domain_events.c (Daniel Berrange), cleanup the way optional modules are compiled (Daniel Berrange), add new logging module, optional dlopen of drivers (Daniel Berrange), various new tests (Jim Meyering), cleanups when Xen is not configured in (Daniel Berrange), add some missing functions comments (Jim Meyering),</li> + <li>Bug fixes: Xen interfaces ordering (Jim Fehlig), startup timeout with multiple pty (Cole Robinson), segfault if QEmu without active virtual network (Cole Robinson), qemu small leak (Eduardo Habkost), index creation for more than 26 disks (Sanjay Rao and Chris Wright), virRealloc handling of 0 (Daniel Berrange), missing pointer initialization (Chris Lalancette), bus device index bug (Guido Günther), avoid crash in some error patch (Chris Lalancette), fix a problem in storage back-end (Chris Lalancette), minimum domain memory size check for Xen (Shigeki Sakamoto), switch off QEmu cache if device is shared (Charles Duffy), logical volume definition before scan bug (Chris Lalancette), a couple of memory leaks on QEmu vnc (Jim Meyering), lvs parsing fixes (Cole Robinson),</li> + <li>Improvements: LXC resources control and internal cgroup API (Dan Smith), virDomainCreateLinux renamed virDomainDefineXML, network driver modularization (Daniel Berrange), change the way domain and net are reported in errors (Jim Meyering), partition table scan on iSCSI (Chris Lalancette), qemudDiskDeviceName to handle normal disks (Guido Günther), qemudDomainBlockStats improvement (Guido Günther), scsi/virtio hotplug support for KVM (Guido Günther), USB hot addition in QEmu (Guido Günther), logical pool and storage backend XML dump improvement (Chris Lalancette), MAC addresses prefix per driver (Daniel Berrange), OpenVZ getVersion support (Daniel Berrange), hot removal of scsi/virtio disks for KVM (Guido Günther), test storage driver (Cole Robinson), iSCSI and disk storage driver improvement on path handling (Chris Lalancette), UUID and ID support for Xenner (Daniel Berrange), better logging when when executing commands (Cole Robinson), bridged network for OpenVZ (Daniel Berrange), OpenVZ config file params (Evgeniy Sokolov), allow to build drivers as libtool convenience libs (Daniel Berrange), fully versioned linker script for exported ABI (Daniel Berrange), Push URI probing down into drivers open (Daniel Berrange), move all stateful drivers into the daemon binary (Daniel Berrange), improve domain event with a detail field (Daniel Berrange), domain events for QEMU driver (Daniel Berrange), event unregister callback crash (David Lively), plug a few leaks (Daniel Berrange), internal APIs for handling node device XML config (David Lively), tweaks to node device implementation (Daniel Berrange), OpenVZ vCPUs values init (Evgeniy Sokolov)</li> + <li>Cleanups: C99 initializers (Guido Günther), test output (Cole Robinson), debug macro centralization (Cole Robinson), various error handling (Guido Günther), safewrite use cleanup (Jim Meyering), centralize error reporting logic (Cole Robinson), avoid printf warnings (Daniel Berrange), use arrays instead of list for internal APIs (Daniel Berrange), remove many format string warnings Jim Meyering), avoid syntax check warnings (Chris Lalancette), improve po-check and list generation (Jim Meyering), .gitignore generation and handling (Jim Meyering), use ARRAY_CARDINALITY (Jim Meyering), gnulib updates and switch to use netdb.h (Jim Meyering), drop usage of socket_errno (Jim Meyering), remove socketcompat.h (Jim Meyering), more tests (Jim Meyering), drop virStringList (Daniel Berrange), reformatting and isolation of the error APIs (Daniel Berrange), cleanup internal.h and move internal APIs in specific headers (Daniel Berrange), move domain events helpers into domain_events.c (Daniel Berrange), cleanup the way optional modules are compiled (Daniel Berrange), add new logging module, optional dlopen of drivers (Daniel Berrange), various new tests (Jim Meyering), cleanups when Xen is not configured in (Daniel Berrange), add some missing functions comments (Jim Meyering),</li> </ul> <h3>0.4.6: Sep 23 2008</h3> <ul> @@ -1288,7 +1288,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> OpenVZ (Evgeniy Sokolov), fix parsing of pool without a source (Chris Lalancette and Daniel Berrange)</li> <li>Improvements: add storage disk volume delete (Cole Robinson), - KVM dynamic max CPU detection (Guido Günther), spec file improvement + KVM dynamic max CPU detection (Guido Günther), spec file improvement for minimal builds (Ben Guthro), improved error message in XM configuration module (Richard Jones), network config in OpenVZ support (Evgeniy Sokolov), enable stopping a pool in logical @@ -1303,7 +1303,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> unified XML domain and network parsing for all drivers (Daniel Berrange), OpenVZ features improvements (Evgeniy Sokolov), OpenVZ and Linux containers support now default, USB device - passthrough for QEmu/KVM (Guido Günther), storage pool source + passthrough for QEmu/KVM (Guido Günther), storage pool source discovery (David Lively)</li> <li>Portability: fixes for MinGW (Atsushi SAKAI and Daniel Berrange), detection of xen lib improvement (David Lively), @@ -1315,7 +1315,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> <li>Documentation: various typo fixes (Anton Protopopov, Toth István, Atsushi SAKAI, Nguyen Anh Quynh), Java bindings docs, remove Xen centric - comments (Guido Günther), various typo in comments (Chris + comments (Guido Günther), various typo in comments (Chris Lalancette), docs and API comments fixes (Charles Duffy), how to contribute to open source link (Richard Jones), memory unit fixups (matthew chan)</li> @@ -1325,14 +1325,14 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> in QEmu/KVM (Daniel Berrange), fix OpenVZ probe function (Evgeniy Sokolov), ID related lookup fixes in OpenVZ (Evgeniy Sokolov), pool cration for netfs (Cole Robinson), check for migrate support - with QEmu (Guido Günther), check against double create with QEmu - (Guido Günther), broken open failure detection in QEmu (Guido - Günther), UUID string conversions in QEmu (Guido Günther), + with QEmu (Guido Günther), check against double create with QEmu + (Guido Günther), broken open failure detection in QEmu (Guido + Günther), UUID string conversions in QEmu (Guido Günther), various small cleanup and bug fixes (Daniel Berrange), ID related fixes in the test driver (Daniel Berrange), better error reporting on XML parsing (Daniel Berrange), empty CD-ROM source device section (Chris Lalancette), avoid crashes for interface - without a name in QEmu (Guido Günther), provide the real + without a name in QEmu (Guido Günther), provide the real vncport (Charles Duffy), fix forward delay (Daniel Berrange), new VM state is initialized to be SHUTOFF (Daniel Berrange), virsh attach-disk bug fixes (Chris Lalancette), veth clash @@ -1364,7 +1364,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> (Daniel Berrange), virsh "edit" command (Richard Jones), save UUID of OpenVZ domains (Evgeniy Sokolov), improve xen blocks statistics (Chris Lalancette), gnulib updates (Jim Meyering), - allow to add disk as USB devices (Guido Günther), LXC container + allow to add disk as USB devices (Guido Günther), LXC container process should survive libvirtd restarts (Daniel Berrange), allow to define static host domain configs, number of CPU used by OpenVZ domains (Evgeniy Sokolov), private root fs for LXC (Daniel @@ -1496,9 +1496,9 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> driver (Cole Robinson), xen and hvm added to test driver capabilities (Cole Robinson)</li> <li>Code cleanup: remove unused getopt header (Jim Meyering), mark more - strings as translatable (Guido Günther and Jim Meyering), convert + strings as translatable (Guido Günther and Jim Meyering), convert error strings to something meaningful and translatable (Jim Meyering), - Linux Containers code cleanup, last error initializer (Guido Günther)</li> + Linux Containers code cleanup, last error initializer (Guido Günther)</li> </ul> <h3>0.4.1: Mar 3 2008</h3> <ul> @@ -1514,7 +1514,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> preserve vif order from config files (Hiroyuki Kaguchi), invalid pointer access (Jim Meyering), virDomainGetXMLDesc flag handling, device name conversion on stats (Daniel Berrange), double mutex lock - (Daniel Berrange), config file reading crashes (Guido Guenther), + (Daniel Berrange), config file reading crashes (Guido Günther), xenUnifiedDomainSuspend bug (Marcus Meissner), do not crash if /sys/hypervisor/capabilities is missing (Mark McLoughlin), virHashRemoveSet bug (Hiroyuki Kaguchi), close-on-exec flag for @@ -1523,7 +1523,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> MAC addresses checks (Shigeki Sakamoto and Richard Jones), allow to read non-seekable files (Jim Meyering)</li> <li>Improvements: Windows build (Richard Jones), KVM/QEmu shutdown - (Guido Guenther), catch virExec output on debug (Mark McLoughlin), + (Guido Günther), catch virExec output on debug (Mark McLoughlin), integration of iptables and lokkit (Mark McLoughlin), keymap parameter for VNC servers (Daniel Hokka Zakrisson), enable debug by default using VIR_DEBUG (Daniel Berrange), xen 3.2 fixes @@ -1545,7 +1545,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> for RHEL4 (Daniel Berrange), CR/LF cleanups (Richard Jones), various automatic code check and associated cleanups (Jim Meyering), various memory leaks (Jim Meyering), fix compilation when building - without Xen (Guido Guenther), mark translatables strings (Jim Meyering), + without Xen (Guido Günther), mark translatables strings (Jim Meyering), use virBufferAddLit for constant strings (Jim Meyering), fix make distcheck (Jim Meyering), return values for python bindings (Cole Robinson), trailing blanks fixes (Jim Meyering), gcc-4.3.0 fixes -- 1.6.0.4

3 4

[libvirt] [PATCH] Make QEMU text monitor parsing more robust
by Daniel P. Berrange 09 Dec '09

09 Dec '09

The QEMU 0.10.0 release (and possibly other 0.10.x) has a bug where it sometimes/often forgets to display the initial monitor greeting line, soley printing a (qemu). This in turn confuses the text console parsing because it has a '(qemu)' it is not expecting. The confusion results in a negative malloc. Bad things follow. This re-writes the text console handling to be more robust. The key idea is that it should only look for a (qemu), once it has seen the original command echo'd back. This ensures it'll skip the bogus stray (qemu) with broken QEMUs. * src/qemu/qemu_monitor.c: Add some (disabled) debug code * src/qemu/qemu_monitor_text.c: Re-write way command replies are detected --- src/qemu/qemu_monitor.c | 28 +++++++++++ src/qemu/qemu_monitor_text.c | 102 +++++++++++++++++++++++++++-------------- 2 files changed, 95 insertions(+), 35 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index abb763c..103cf28 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -39,6 +39,8 @@ #define VIR_FROM_THIS VIR_FROM_QEMU +#define QEMU_DEBUG_RAW_IO 0 + struct _qemuMonitor { virMutex lock; virCond notify; @@ -163,6 +165,24 @@ char *qemuMonitorEscapeShell(const char *in) } +#if QEMU_DEBUG_RAW_IO +#include <c-ctype.h> +static char * qemuMonitorEscapeNonPrintable(const char *text) +{ + int i; + virBuffer buf = VIR_BUFFER_INITIALIZER; + for (i = 0 ; text[i] != '\0' ; i++) { + if (c_isprint(text[i]) || + text[i] == '\n' || + (text[i] == '\r' && text[i+1] == '\n')) + virBufferVSprintf(&buf,"%c", text[i]); + else + virBufferVSprintf(&buf, "0x%02x", text[i]); + } + return virBufferContentAndReset(&buf); +} +#endif + void qemuMonitorLock(qemuMonitorPtr mon) { virMutexLock(&mon->lock); @@ -282,7 +302,15 @@ qemuMonitorIOProcess(qemuMonitorPtr mon) if (mon->msg && mon->msg->txOffset == mon->msg->txLength) msg = mon->msg; +#if QEMU_DEBUG_RAW_IO + char *str1 = qemuMonitorEscapeNonPrintable(msg ? msg->txBuffer : ""); + char *str2 = qemuMonitorEscapeNonPrintable(mon->buffer); + VIR_ERROR("Process %d %p %p [[[[%s]]][[[%s]]]", (int)mon->bufferOffset, mon->msg, msg, str1, str2); + VIR_FREE(str1); + VIR_FREE(str2); +#else VIR_DEBUG("Process %d", (int)mon->bufferOffset); +#endif if (mon->json) len = qemuMonitorJSONIOProcess(mon, mon->buffer, mon->bufferOffset, diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 0d5ad79..72cb2bb 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -94,46 +94,78 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED, /* Look for a non-zero reply followed by prompt */ if (msg && !msg->finished) { - const char *end; - - /* We might get a prompt for a password */ - end = strstr(data + used, PASSWORD_PROMPT); - if (end) { - VIR_DEBUG("Woooo passwowrd [%s]", data + used); - if (msg->passwordHandler) { - size_t consumed; - /* Try and handle the prompt */ - if (msg->passwordHandler(mon, msg, - data + used, - len - used, - msg->passwordOpaque) < 0) - return -1; + char *start = NULL; + char *end = NULL; + char *skip; - /* Skip over prompt now */ - consumed = (end + strlen(PASSWORD_PROMPT)) - - (data + used); - used += consumed; - } else { - errno = EACCES; - return -1; + /* If we're here, we've already sent the command. We now + * strip the trailing '\r' because it makes the matching + * code that follows a little easier ie we can just strstr() + * for the original command + */ + if (msg->txLength > 0) { + char *tmp; + if ((tmp = strchr(msg->txBuffer, '\r'))) { + *tmp = '\0'; } } - /* We use the arrival of BASIC_PROMPT to detect when we've got a - * complete reply available from a command */ - end = strstr(data + used, BASIC_PROMPT); - if (end) { - /* QEMU echos the command back to us, full of control - * character junk that we don't want. Fortunately this - * is all terminated by LINE_ENDING, so we can easily - * skip over the control character junk */ - const char *start = strstr(data + used, LINE_ENDING); - if (!start) - start = data + used; - else - start += strlen(LINE_ENDING); - int want = end - start; + /* QEMU echos the command back to us, full of control + * character junk that we don't want. We have to skip + * over this junk by looking for the first complete + * repetition of our command. Then we can look for + * the prompt that is supposed to follow + * + * NB, we can't optimize by immediately looking for + * LINE_ENDING, because QEMU 0.10 has bad problems + * when initially connecting where it might write a + * prompt in the wrong place. So we must not look + * for LINE_ENDING, or BASIC_PROMPT until we've + * seen our original command echod. + */ + skip = strstr(data + used, msg->txBuffer); + + /* After the junk we should have a line ending... */ + if (skip) { + start = strstr(skip + strlen(msg->txBuffer), LINE_ENDING); + } + + /* ... then our command reply data, following by a (qemu) prompt */ + if (start) { + char *passwd; + start += strlen(LINE_ENDING); + + /* We might get a prompt for a password before the (qemu) prompt */ + passwd = strstr(start, PASSWORD_PROMPT); + if (passwd) { + VIR_DEBUG("Seen a passwowrd prompt [%s]", data + used); + if (msg->passwordHandler) { + int i; + /* Try and handle the prompt */ + if (msg->passwordHandler(mon, msg, + start, + passwd - start + strlen(PASSWORD_PROMPT), + msg->passwordOpaque) < 0) + return -1; + + /* Blank out the password prompt so we don't re-trigger + * if we have to go back to sleep for more I/O */ + for (i = 0 ; i < strlen(PASSWORD_PROMPT) ; i++) + start[i] = ' '; + + /* Handled, so skip forward over password prompt */ + start = passwd; + } else { + errno = EACCES; + return -1; + } + } + end = strstr(start, BASIC_PROMPT); + } + + if (start && end) { + int want = end - start; /* Annoyingly some commands may not have any reply data * at all upon success, but since we've detected the * BASIC_PROMPT we can reasonably reliably cope */ -- 1.6.5.2

3 3

[libvirt] Functions issues
by Jaromír Červenka 09 Dec '09

09 Dec '09

Hi, while writing SharpLibVirt I ran into several problems with some functions: virDomainInterfaceStats ------------------------------------ It is not possible get any result, because of error "invalid argument in invalid path, 'user.0' is not a known interface". But inside LOG for this domain is "... -net user,vlan=0,name=user.0 ... " It is not possible get stats for nic.0 also. Tested on KVM hypervisor. virStoragePoolIsActive and virStoragePoolIsPersistent ------------------------------------------------------------------------------- Both cause crash of libvirt deamon. I dont know why. Tested on 0.7.4 and Qemu 0.11.0 Thanks for answer, Jaromír Červenka Official openSUSE community member Web: http://www.cervajz.com/ Jabber: cervajz(a)cervajz.com MSN: jara.cervenka(a)seznam.cz Tel.: +420 607 592 687 Alt. e-mails: jaromir.cervenka(a)opensuse.org, jaromir.cervenka(a)speel.cz

2 1

[libvirt] [PATCH] Use AM_PATH_PYTHON and python-config to detect Python configuration
by Matthias Bolte 09 Dec '09

09 Dec '09

Using AM_PATH_PYTHON solves the site-packages directory problem. At least in Ubuntu with Python 2.6 and later site-packages is renamed to dist-packages and site-packages is not part of sys.path anymore. So installing the libvirt Python bindings to site-packages renders them unusable, because they can be imported from there without manually including site-packages into sys.path. AM_PATH_PYTHON detects the correct site-packages/dist-packages directory. python-config --includes gives the correct include path for the Python header files. The old probing code stays there as fallback mechanism. * configure.in: use AM_PATH_PYTHON and python-config * python/Makefile.am: remove -I because PYTHON_INCLUDES contains it now --- configure.in | 110 +++++++++++++++++++++++++--------------------------- python/Makefile.am | 2 +- 2 files changed, 54 insertions(+), 58 deletions(-) diff --git a/configure.in b/configure.in index f735bba..d6e5979 100644 --- a/configure.in +++ b/configure.in @@ -1414,75 +1414,71 @@ AC_ARG_WITH([python], PYTHON_VERSION= PYTHON_INCLUDES= -PYTHON_SITE_PACKAGES= -PYTHON_TESTS= pythondir= if test "$with_python" != "no" ; then if test -x "$with_python/bin/python" then - echo Found python in $with_python/bin/python + AC_MSG_NOTICE(Found python in $with_python/bin/python) PYTHON="$with_python/bin/python" + with_python=yes else - if test -x "$with_python" - then - echo Found python in $with_python - PYTHON="$with_python" - else - if test -x "$PYTHON" - then - echo Found python in environment PYTHON=$PYTHON - with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` - else - AC_PATH_PROG([PYTHON], [python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5]) - fi - fi - fi - if test "$PYTHON" != "" - then - PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` - echo Found Python version $PYTHON_VERSION - fi - if test "$PYTHON_VERSION" != "" - then - if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ - -d $with_python/lib/python$PYTHON_VERSION/site-packages - then - PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION - PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages - else - if test -r $prefix/include/python$PYTHON_VERSION/Python.h - then - PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION - PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages - else - if test -r /usr/include/python$PYTHON_VERSION/Python.h - then - PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION - PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages - else - echo could not find python$PYTHON_VERSION/Python.h - fi - fi - if test ! -d "$PYTHON_SITE_PACKAGES" - then - PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` - fi - fi + if test -x "$with_python" + then + AC_MSG_NOTICE(Found python in $with_python) + PYTHON="$with_python" + with_python=yes + else + if test -x "$PYTHON" + then + AC_MSG_NOTICE(Found python in environment PYTHON=$PYTHON) + with_python=yes + fi + fi fi - if test "$with_python" != "yes" - then - pythondir='$(PYTHON_SITE_PACKAGES)' + + if test "$with_python" == "yes" ; then + AM_PATH_PYTHON(,, [:]) + + if test "$PYTHON" != : ; then + PYTHON_CONFIG="$PYTHON-config" + + if test -x "$PYTHON_CONFIG" + then + PYTHON_INCLUDES=`$PYTHON_CONFIG --includes` + else + if test -r $PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION/Python.h + then + PYTHON_INCLUDES=-I$PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION + else + if test -r $prefix/include/python$PYTHON_VERSION/Python.h + then + PYTHON_INCLUDES=-I$prefix/include/python$PYTHON_VERSION + else + if test -r /usr/include/python$PYTHON_VERSION/Python.h + then + PYTHON_INCLUDES=-I/usr/include/python$PYTHON_VERSION + else + AC_MSG_NOTICE([Could not find python$PYTHON_VERSION/Python.h, disabling bindings]) + with_python=no + fi + fi + fi + fi + else + AC_MSG_NOTICE([Could not find python interpreter, disabling bindings]) + with_python=no + fi else - pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' + AC_MSG_NOTICE([Could not find python in $with_python, disabling bindings]) + with_python=no fi -else - PYTHON= fi -AM_CONDITIONAL([WITH_PYTHON], test "$PYTHON_INCLUDES" != "") -AC_SUBST([pythondir]) +AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"]) AC_SUBST([PYTHON_VERSION]) AC_SUBST([PYTHON_INCLUDES]) -AC_SUBST([PYTHON_SITE_PACKAGES]) +AC_SUBST([pythondir]) + + AC_MSG_CHECKING([whether this host is running a Xen kernel]) RUNNING_XEN= diff --git a/python/Makefile.am b/python/Makefile.am index cda6559..736631e 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS= . tests INCLUDES = \ $(WARN_CFLAGS) \ - -I$(PYTHON_INCLUDES) \ + $(PYTHON_INCLUDES) \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_builddir)/$(subdir) -- 1.6.0.4

2 2

[libvirt] [PATCH] Add missing commas to the 0.7.4 news section
by Matthias Bolte 09 Dec '09

09 Dec '09

--- docs/news.html.in | 428 ++++++++++++++++++++++++++-------------------------- 1 files changed, 214 insertions(+), 214 deletions(-) diff --git a/docs/news.html.in b/docs/news.html.in index 47d7f42..3586071 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -3,240 +3,240 @@ <body> <h1 >Releases</h1> <p>Here is the list of official releases, however since it is early on in the -development of libvirt, it is preferable when possible to just use the <a href="downloads.html">CVS version or snapshot</a>, contact the mailing list +development of libvirt, it is preferable when possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> <h3>0.7.4: Nov 20 2009</h3> <ul> <li>Features: - Implement a node device backend using libudev (David Allan) - New APIs for checking some object properties (Daniel P. Berrange) - Fully asynchronous monitor I/O processing (Daniel P. Berrange) - add MAC address based port filtering to qemu (Gerhard Stenzel) + Implement a node device backend using libudev (David Allan), + New APIs for checking some object properties (Daniel P. Berrange), + Fully asynchronous monitor I/O processing (Daniel P. Berrange), + add MAC address based port filtering to qemu (Gerhard Stenzel), Support for IPv6 / multiple addresses per interfaces (Laine Stump) </li> <li>Documentation: - Document overriding domain interface target (Cole Robinson) - 514532 Fix man page, most operation are synchronous (Daniel Veillard) - Fix typo in error message (Matthew Booth) - esx: Add documentation to the website (Matthias Bolte) - AppArmor updates of examples (Jamie Strandboge) - Add documentation for <channel> domain element (Matthew Booth) - Separate character device doc guest and host parts (Matthew Booth) - Add a Python example that lists active ESX domains (Matthias Bolte) - LXC fix wrong or out-of-date function descriptions (Ryota Ozaki) - docs: <clock> property is 'offset', not 'sync' (Cole Robinson) - Update the documentation for virDomainMigrateToURI (Chris Lalancette) + Document overriding domain interface target (Cole Robinson), + 514532 Fix man page, most operation are synchronous (Daniel Veillard), + Fix typo in error message (Matthew Booth), + esx: Add documentation to the website (Matthias Bolte), + AppArmor updates of examples (Jamie Strandboge), + Add documentation for <channel> domain element (Matthew Booth), + Separate character device doc guest and host parts (Matthew Booth), + Add a Python example that lists active ESX domains (Matthias Bolte), + LXC fix wrong or out-of-date function descriptions (Ryota Ozaki), + docs: <clock> property is 'offset', not 'sync' (Cole Robinson), + Update the documentation for virDomainMigrateToURI (Chris Lalancette), fix virDomainMigrateToURI doc (Dan Kenigsberg) </li> <li>Bug fixes: - 504262 Check for duplicated UUID in XM Xen defines (Daniel Veillard) - 512069 fix domain XML schemas for backward compatibility (Daniel Veillard) - qemu-kvm needs -enable-kvm flag for VT optimization (Steve Yarmie) - fix deprecated iptables command syntax (Steve Yarmie) - Ensure driver lock is released when entering QEMU monitor (Daniel P. Berrange) - only remove masquerade roles for VIR_NETWORK_FORWARD_NAT (Guido Günther) - esx: Fix CPU clock Hz to MHz conversion (Matthias Bolte) - esx: Fix memory leak in esxVI_HostCpuIdInfo_Free() (Matthias Bolte) - esx: Fix MAC address formatting (Matthias Bolte) - Fix compilation of libvirt against xen-unstable (Jim Fehlig) - Fix probing for libpciaccess (Daniel P. Berrange) - Fix incorrect reference counting logic in qemu monitor open (Daniel P. Berrange) - Don't return fatal error in HAL driver init if HAL isn't running (Daniel P. Berrange) - Fix cleanup when state driver init fails (Daniel P. Berrange) - AppArmor handling of accesses to readonly files (Jamie Strandboge) - AppArmor require absolute paths (Jamie Strandboge) - Check that domain is running when starting console (Daniel P. Berrange) - Fix incorrect variable passed to LXC event callback (Daniel P. Berrange) - Fix race condition in HAL driver startup (Daniel P. Berrange) - Remove capng_lock() call when spawning LXC container init process (Daniel P. Berrange) - Fix initscript to check daemon pidfile (Daniel P. Berrange) - Filter out stale domains from xenstore listing (Daniel P. Berrange) - Fix logic in xenUnifiedNumOfDomains to match xenUnifiedListDomains (Jonas Eriksson) - Disable IPv6 socket auto-binding to IPv4 socket (Daniel P. Berrange) - Fix save and restore with non-privileged guests and SELinux (Daniel P. Berrange) - Prevent initializing ebtables if disabled in qemu.conf (Ryota Ozaki) - phyp: too much timeout when polling socket (Eduardo Otubo) - phyp: ssh authentication with public key fixed (Eduardo Otubo) - opennebula: Fix potential memory/mutex leak in state driver startup (Matthias Bolte) - phyp: Break potential infinite loops (Matthias Bolte) - phyp: Fix memory/session leaks and potential invalid frees (Matthias Bolte) - storage: conf: Fix memory leak in encryption parsing (Cole Robinson) - Fix improper error return in virInterfaceDefParseProtoIPvX (Laine Stump) - Fix virInterfaceIpDefPtr leak during virInterfaceIpDefFree (Laine Stump) - give up python interpreter lock before calling cb (Dan Kenigsberg) - ESX: Fix memory leak in list handling functions. (Matthias Bolte) - Fix --with-init-script configure option (Matthew Booth) - Don't let parent of daemon exit until basic initialization is done (Daniel P. Berrange) - Fix configure detection of device mapper (Pritesh Kothari) - Remote code caught EINTR making it ininterruptable (Daniel Veillard) - virterror: Add a missing 'break' for VIR_ERR_INVALID_SECRET (Cole Robinson) - Fix p2p migration without a passed uri. (Cole Robinson) - Fix problems in the Xen inotify driver. (Matthias Bolte) - Remove a completely bogus reference increment in the Xen driver. (Chris Lalancette) - 528575 avoid libvirtd crash on LCX domain autostart (Daniel Veillard) - Fix SELinux linking issues (Jim Fehlig) - node device: Fix locking issue in virNodeDeviceDestroy (Cole Robinson) - LXC fix virCgroupGetValueStr problem with \n (Ryota Ozaki) - Avoid crash in virBufferEscapeString (Laine Stump) + 504262 Check for duplicated UUID in XM Xen defines (Daniel Veillard), + 512069 fix domain XML schemas for backward compatibility (Daniel Veillard), + qemu-kvm needs -enable-kvm flag for VT optimization (Steve Yarmie), + fix deprecated iptables command syntax (Steve Yarmie), + Ensure driver lock is released when entering QEMU monitor (Daniel P. Berrange), + only remove masquerade roles for VIR_NETWORK_FORWARD_NAT (Guido Günther), + esx: Fix CPU clock Hz to MHz conversion (Matthias Bolte), + esx: Fix memory leak in esxVI_HostCpuIdInfo_Free() (Matthias Bolte), + esx: Fix MAC address formatting (Matthias Bolte), + Fix compilation of libvirt against xen-unstable (Jim Fehlig), + Fix probing for libpciaccess (Daniel P. Berrange), + Fix incorrect reference counting logic in qemu monitor open (Daniel P. Berrange), + Don't return fatal error in HAL driver init if HAL isn't running (Daniel P. Berrange), + Fix cleanup when state driver init fails (Daniel P. Berrange), + AppArmor handling of accesses to readonly files (Jamie Strandboge), + AppArmor require absolute paths (Jamie Strandboge), + Check that domain is running when starting console (Daniel P. Berrange), + Fix incorrect variable passed to LXC event callback (Daniel P. Berrange), + Fix race condition in HAL driver startup (Daniel P. Berrange), + Remove capng_lock() call when spawning LXC container init process (Daniel P. Berrange), + Fix initscript to check daemon pidfile (Daniel P. Berrange), + Filter out stale domains from xenstore listing (Daniel P. Berrange), + Fix logic in xenUnifiedNumOfDomains to match xenUnifiedListDomains (Jonas Eriksson), + Disable IPv6 socket auto-binding to IPv4 socket (Daniel P. Berrange), + Fix save and restore with non-privileged guests and SELinux (Daniel P. Berrange), + Prevent initializing ebtables if disabled in qemu.conf (Ryota Ozaki), + phyp: too much timeout when polling socket (Eduardo Otubo), + phyp: ssh authentication with public key fixed (Eduardo Otubo), + opennebula: Fix potential memory/mutex leak in state driver startup (Matthias Bolte), + phyp: Break potential infinite loops (Matthias Bolte), + phyp: Fix memory/session leaks and potential invalid frees (Matthias Bolte), + storage: conf: Fix memory leak in encryption parsing (Cole Robinson), + Fix improper error return in virInterfaceDefParseProtoIPvX (Laine Stump), + Fix virInterfaceIpDefPtr leak during virInterfaceIpDefFree (Laine Stump), + give up python interpreter lock before calling cb (Dan Kenigsberg), + ESX: Fix memory leak in list handling functions. (Matthias Bolte), + Fix --with-init-script configure option (Matthew Booth), + Don't let parent of daemon exit until basic initialization is done (Daniel P. Berrange), + Fix configure detection of device mapper (Pritesh Kothari), + Remote code caught EINTR making it ininterruptable (Daniel Veillard), + virterror: Add a missing 'break' for VIR_ERR_INVALID_SECRET (Cole Robinson), + Fix p2p migration without a passed uri. (Cole Robinson), + Fix problems in the Xen inotify driver. (Matthias Bolte), + Remove a completely bogus reference increment in the Xen driver. (Chris Lalancette), + 528575 avoid libvirtd crash on LCX domain autostart (Daniel Veillard), + Fix SELinux linking issues (Jim Fehlig), + node device: Fix locking issue in virNodeDeviceDestroy (Cole Robinson), + LXC fix virCgroupGetValueStr problem with \n (Ryota Ozaki), + Avoid crash in virBufferEscapeString (Laine Stump), LXC complement PATH environment variable (Ryota Ozaki) </li> <li>Improvements: - Enable udev instead of hal on F12 / RHEL-6 or later (Daniel P. Berrange) - python: Actually implement list*Interfaces bindings (Cole Robinson) - esx: Handle 'vmxnet3' in esxVMX_FormatEthernet() (Matthias Bolte) - Fix check for existance of cgroups at creation (Daniel P. Berrange) - Fix virt-aa-helper when host and os.type arch differ (Jamie Strandboge) - Add translation of PCI vendor and product IDs (David Allan) - Add scsi_target device type (David Allan) - Add several fields to node device capabilities (David Allan) - Add virConnectGetLibvirtVersion API (Cole Robinson) - Implement finer grained migration control for Xen (Maximilian Wilhelm) - Support for SATA Disks in virDomainDiskBus (pritesh) - LXC implement missing DomainInterfaceStats API (Ryota Ozaki) - disable mac_filter config switch by default (Gerhard Stenzel) - phyp: Reorder keyboard_interactive label in openSSHSession() (Eduardo Otubo) - Implmentation of new APIs to checking state/persistence of objects (Daniel P. Berrange) - Allow timeouts waiting for QEMU job lock (Daniel P. Berrange) - Release driver and domain lock when running monitor commands (Daniel P. Berrange) - Add reference counting on virDomainObjPtr objects (Daniel P. Berrange) - Locking of the qemuMonitorPtr object (Daniel P. Berrange) - Wrap text mode monitor APIs, pass qemuMonitorPtr directly to APIs (Daniel P. Berrange) - Move encryption lookup back into qemu driver file (Daniel P. Berrange) - Make use of private data structure for monitor state (Daniel P. Berrange) - Add a new timed condition variable wait API (Daniel P. Berrange) - Fix errno handling for pthreads wrappers (Daniel P. Berrange) - 524280 pass max lease option to dnsmasq (Daniel Veillard) - Store the range size when adding a DHCP range (Daniel Veillard) - qemu: Allow cpu pinning for all logical CPUs, not just physical (Cole Robinson) - qemu: Use same create/define overwrite logic for migration prepare. (Cole Robinson) - qemu: Break out function to check if we can create/define/restore (Cole Robinson) - Add sentinel attribute for NULL terminated arg lists (Paolo Bonzini) - test: Update inactive guest config on shutdown (Cole Robinson) - test: Add testDomainShutdownState helper (Cole Robinson) - Properly convert port numbers to/from network byte order (Matthew Booth) - phyp add create() and destroy() support (Eduardo Otubo) - Support for <channel> in domain and QEmu backend (Matthew Booth) - Detect availability of QEMU -chardev CLI option (Matthew Booth) - Allow character devices to have different target types (Matthew Booth) - LXC allow container to have ethN interfaces (Ryota Ozaki) - New ebtables module wrapper (Gerhard Stenzel) - test: Implement virDomainPinVcpu (Cole Robinson) - test: Implement virDomainGetVcpus (Cole Robinson) - test: Update vcpu runtime info in SetVcpus (Cole Robinson) - test: Use privateData to track running VM vcpu state (Cole Robinson) - test: Break out wrapper for setting up started domain state. (Cole Robinson) - test: Fixes for SetVcpus (Cole Robinson) - Make monitor type (miimon/arpmon) optional in bond xml (Laine Stump) - Support reporting live interface IP/netmask (Laine Stump) - Make startmode optional in toplevel interface definition (Laine Stump) - Move libvirtd event loop into background thread (Daniel P. Berrange) - Allow NULL mac address in virGetInterface (Laine Stump) - ESX: Don't automatically follow redirects. (Matthias Bolte) - ESX: Change disk selection for datastore detection. (Matthias Bolte) - ESX: Fallback to the preliminary name if the datastore cannot be found. (Matthias Bolte) - Set KMEMSIZE for OpenVZ domains being defined (Yuji NISHIDA) - Allow for a driver specific private data blob in virDomainObjPtr (Daniel P. Berrange) - More network utility functions (Matthew Booth) - Add symbols from new network.h module (Daniel Veillard) - Set of new network related utilities (Daniel Veillard) - Convert virDomainObjListPtr to use a hash of domain objects (Daniel P. Berrange) - qemu: migrate: Don't require manual URI to specify a port (Cole Robinson) - test: Support virStorageFindPoolSources (Cole Robinson) - storage: Add ParseSourceString function for use with FindPoolSources. (Cole Robinson) - Add support for an external TFTP boot server (Paolo Bonzini) - test: Support virNodeDeviceCreate and virNodeDeviceDestroy (Cole Robinson) - Consolidate virXPathNodeSet() (Daniel Veillard) - Support QEMU watchdog device. (Richard Jones) - Do not log rotate very small logs (Dan Kenigsberg) - LXC implement missing macaddr assignment feature (Ryota Ozaki) - tests: Initialize virRandom in for test suite. (Cole Robinson) - tests: Add storage volume XML 2 XML tests. (Cole Robinson) - tests: Add network XML to XML tests. (Cole Robinson) - schema: Update network schema. (Cole Robinson) - tests: Add XML 2 XML tests for storage pools. (Cole Robinson) - tests: Break out duplicate schema verification functionality. (Cole Robinson) - tests: Fix text output for interface XML 2 XML (Cole Robinson) - Add ocfs2 to list of fs pool types (Jim Fehlig) + Enable udev instead of hal on F12 / RHEL-6 or later (Daniel P. Berrange), + python: Actually implement list*Interfaces bindings (Cole Robinson), + esx: Handle 'vmxnet3' in esxVMX_FormatEthernet() (Matthias Bolte), + Fix check for existance of cgroups at creation (Daniel P. Berrange), + Fix virt-aa-helper when host and os.type arch differ (Jamie Strandboge), + Add translation of PCI vendor and product IDs (David Allan), + Add scsi_target device type (David Allan), + Add several fields to node device capabilities (David Allan), + Add virConnectGetLibvirtVersion API (Cole Robinson), + Implement finer grained migration control for Xen (Maximilian Wilhelm), + Support for SATA Disks in virDomainDiskBus (pritesh), + LXC implement missing DomainInterfaceStats API (Ryota Ozaki), + disable mac_filter config switch by default (Gerhard Stenzel), + phyp: Reorder keyboard_interactive label in openSSHSession() (Eduardo Otubo), + Implmentation of new APIs to checking state/persistence of objects (Daniel P. Berrange), + Allow timeouts waiting for QEMU job lock (Daniel P. Berrange), + Release driver and domain lock when running monitor commands (Daniel P. Berrange), + Add reference counting on virDomainObjPtr objects (Daniel P. Berrange), + Locking of the qemuMonitorPtr object (Daniel P. Berrange), + Wrap text mode monitor APIs, pass qemuMonitorPtr directly to APIs (Daniel P. Berrange), + Move encryption lookup back into qemu driver file (Daniel P. Berrange), + Make use of private data structure for monitor state (Daniel P. Berrange), + Add a new timed condition variable wait API (Daniel P. Berrange), + Fix errno handling for pthreads wrappers (Daniel P. Berrange), + 524280 pass max lease option to dnsmasq (Daniel Veillard), + Store the range size when adding a DHCP range (Daniel Veillard), + qemu: Allow cpu pinning for all logical CPUs, not just physical (Cole Robinson), + qemu: Use same create/define overwrite logic for migration prepare. (Cole Robinson), + qemu: Break out function to check if we can create/define/restore (Cole Robinson), + Add sentinel attribute for NULL terminated arg lists (Paolo Bonzini), + test: Update inactive guest config on shutdown (Cole Robinson), + test: Add testDomainShutdownState helper (Cole Robinson), + Properly convert port numbers to/from network byte order (Matthew Booth), + phyp add create() and destroy() support (Eduardo Otubo), + Support for <channel> in domain and QEmu backend (Matthew Booth), + Detect availability of QEMU -chardev CLI option (Matthew Booth), + Allow character devices to have different target types (Matthew Booth), + LXC allow container to have ethN interfaces (Ryota Ozaki), + New ebtables module wrapper (Gerhard Stenzel), + test: Implement virDomainPinVcpu (Cole Robinson), + test: Implement virDomainGetVcpus (Cole Robinson), + test: Update vcpu runtime info in SetVcpus (Cole Robinson), + test: Use privateData to track running VM vcpu state (Cole Robinson), + test: Break out wrapper for setting up started domain state. (Cole Robinson), + test: Fixes for SetVcpus (Cole Robinson), + Make monitor type (miimon/arpmon) optional in bond xml (Laine Stump), + Support reporting live interface IP/netmask (Laine Stump), + Make startmode optional in toplevel interface definition (Laine Stump), + Move libvirtd event loop into background thread (Daniel P. Berrange), + Allow NULL mac address in virGetInterface (Laine Stump), + ESX: Don't automatically follow redirects. (Matthias Bolte), + ESX: Change disk selection for datastore detection. (Matthias Bolte), + ESX: Fallback to the preliminary name if the datastore cannot be found. (Matthias Bolte), + Set KMEMSIZE for OpenVZ domains being defined (Yuji NISHIDA), + Allow for a driver specific private data blob in virDomainObjPtr (Daniel P. Berrange), + More network utility functions (Matthew Booth), + Add symbols from new network.h module (Daniel Veillard), + Set of new network related utilities (Daniel Veillard), + Convert virDomainObjListPtr to use a hash of domain objects (Daniel P. Berrange), + qemu: migrate: Don't require manual URI to specify a port (Cole Robinson), + test: Support virStorageFindPoolSources (Cole Robinson), + storage: Add ParseSourceString function for use with FindPoolSources. (Cole Robinson), + Add support for an external TFTP boot server (Paolo Bonzini), + test: Support virNodeDeviceCreate and virNodeDeviceDestroy (Cole Robinson), + Consolidate virXPathNodeSet() (Daniel Veillard), + Support QEMU watchdog device. (Richard Jones), + Do not log rotate very small logs (Dan Kenigsberg), + LXC implement missing macaddr assignment feature (Ryota Ozaki), + tests: Initialize virRandom in for test suite. (Cole Robinson), + tests: Add storage volume XML 2 XML tests. (Cole Robinson), + tests: Add network XML to XML tests. (Cole Robinson), + schema: Update network schema. (Cole Robinson), + tests: Add XML 2 XML tests for storage pools. (Cole Robinson), + tests: Break out duplicate schema verification functionality. (Cole Robinson), + tests: Fix text output for interface XML 2 XML (Cole Robinson), + Add ocfs2 to list of fs pool types (Jim Fehlig), Finer grained migration control (Chris Lalancette) </li> <li>Cleanups: - remove sysfs_path and parent_sysfs_path from XML (Dave Allan) - Removing devicePath member from dev struct (Dave Allan) - report OOM in two places in node_device_driver.c (Dave Allan) - Whitespace cleanup for pre-tags on the website (Matthias Bolte) - Fix type in configure output summary (Daniel P. Berrange) - Remove a compilation warning on uninitialized var (Daniel Veillard) - Change DTD references to use public instead of system identifier (Matthias Bolte) - Remove obsolete devicekit checks (Daniel P. Berrange) - Small guestfwd code cleanup (Matthew Booth) - Small indentation cleanup of domain schema (Matthew Booth) - AppArmor code cleanups (Jamie Strandboge) - Fix formatting of XML for an inactive guest (Daniel P. Berrange) - Remove DevKit node device backend (David Allan) - Exclude numactl on s390[x] (Daniel P. Berrange) - Fix error handling in qemuMonitorOpen (Ryota Ozaki) - Fix warning on make due to missing cast (int) (Ryota Ozaki) - Various fixes following a code review part 2 (Daniel Veillard) - Various fixes following a code review (Daniel Veillard) - Move code for low level QEMU monitor interaction into separate file (Daniel P. Berrange) - Make pciDeviceList struct opaque (Daniel P. Berrange) - Add missing OOM error checks, reports and cleanups (Matthias Bolte) - Removes the ebtablesSaveRules() function (Gerhard Stenzel) - phyp: Use actual error code instead of 0 (Matthias Bolte) - phyp: Don't use VIR_ALLOC if a stack variable is good enough (Matthias Bolte) - phyp: Fix several UUID table related problems (Matthias Bolte) - phyp: Check for exit_status < 0 before parsing the result (Matthias Bolte) - phyp: memcpy/memmove/memset can't fail, so don't check for error (Matthias Bolte) - phyp: Make generic domain listing functions return -1 in case of error (Matthias Bolte) - Fix configure check for libssh2 (Matthias Bolte) - Repair getIPv4Addr after the ntohl conversion (Daniel Veillard) - Cleanup whitespace in docs (Matthew Booth) - Use virBuffer when building QEMU char dev command line (Matthew Booth) - Cleanup virBuffer usage in qemdBuildCommandLine (Matthew Booth) - Fix some cut-and-paste error in migration code (Paolo Bonzini) - Ensure guestfwd address is IPv4 and various cleanups (Matthew Booth) - LXC cleanup deep indentation in lxcDomainSetAutostart (Ryota Ozaki) - LXC messages cleanup and fix lxcError (Ryota Ozaki) - qemu: Remove compiled out localhost migration support (Cole Robinson) - Various error reporting fixes (Cole Robinson) - Improve error reporting for virConnectGetHostname calls (Cole Robinson) - Fix up NLS warnings. (Chris Lalancette) - Remove redundant virFileDeletePID() call (Chris Lalancette) - Fix return value in virStateInitialize impl for LXC (Daniel P. Berrange) - ESX: Unify naming of VI API utility and convenience functions. (Matthias Bolte) - Rename internal APis (Daniel P. Berrange) - Pull signal setup code out into separate method (Daniel P. Berrange) - Fix duplicating logging of errors in libvirtd (Daniel P. Berrange) - Fix initialization order bugs (Daniel P. Berrange) - Misc cleanup to network socket init (Daniel P. Berrange) - Annotate many methods with ATTRIBUTE_RETURN_CHECK & fix problems (Daniel P. Berrange) - Don't use private struct member names of in6_addr (Matthias Bolte) - Fix typo in network.c function comments (Matthew Booth) - libvirt-devel should only require libvirt-client (Mark McLoughlin) - qemu: Fix an error message in GetVcpus (Cole Robinson) - storage: Break out function to add pool source to a SourceList. (Cole Robinson) - storage: Break out pool source parsing to a separate function. (Cole Robinson) - Fix some typos in comments (Dan Kenigsberg) - Fix error message in qemudLoadDriverConfig() (Matthias Bolte) - Add a new syntax-check rule for gethostname. (Chris Lalancette) - Various syntax-check fixes. (Chris Lalancette) - Tighten up nonreentrant syntax-check. (Chris Lalancette) - Replace a gethostname by virGetHostname in libvirtd.c (Chris Lalancette) - Replace two strcmp() by STREQ() in qemu_driver.c (Chris Lalancette) - Replace gethostname by virGetHostname in xend_internal.c (Chris Lalancette) - Add a default log_level to qemudSetLogging to remove a build warning. (Chris Lalancette) - Better error message when libvirtd fails to start. (Chris Lalancette) - Fix potential false-positive OOM error reporting. (Matthias Bolte) - Fix virsh.c compilation warning (Jim Fehlig) - Fix a make dist error due to wrong EXTRA_DIST paths (Daniel Veillard) - node device: Break out get_wwns and get_parent_node helpers (Cole Robinson) - tests: Centralize VIR_TEST_DEBUG lookup, and document it (Cole Robinson) - Remove bogus const annotations to hash iterator (Daniel P. Berrange) - Remove bashisms from schema tests. (Matthias Bolte) + remove sysfs_path and parent_sysfs_path from XML (Dave Allan), + Removing devicePath member from dev struct (Dave Allan), + report OOM in two places in node_device_driver.c (Dave Allan), + Whitespace cleanup for pre-tags on the website (Matthias Bolte), + Fix type in configure output summary (Daniel P. Berrange), + Remove a compilation warning on uninitialized var (Daniel Veillard), + Change DTD references to use public instead of system identifier (Matthias Bolte), + Remove obsolete devicekit checks (Daniel P. Berrange), + Small guestfwd code cleanup (Matthew Booth), + Small indentation cleanup of domain schema (Matthew Booth), + AppArmor code cleanups (Jamie Strandboge), + Fix formatting of XML for an inactive guest (Daniel P. Berrange), + Remove DevKit node device backend (David Allan), + Exclude numactl on s390[x] (Daniel P. Berrange), + Fix error handling in qemuMonitorOpen (Ryota Ozaki), + Fix warning on make due to missing cast (int) (Ryota Ozaki), + Various fixes following a code review part 2 (Daniel Veillard), + Various fixes following a code review (Daniel Veillard), + Move code for low level QEMU monitor interaction into separate file (Daniel P. Berrange), + Make pciDeviceList struct opaque (Daniel P. Berrange), + Add missing OOM error checks, reports and cleanups (Matthias Bolte), + Removes the ebtablesSaveRules() function (Gerhard Stenzel), + phyp: Use actual error code instead of 0 (Matthias Bolte), + phyp: Don't use VIR_ALLOC if a stack variable is good enough (Matthias Bolte), + phyp: Fix several UUID table related problems (Matthias Bolte), + phyp: Check for exit_status < 0 before parsing the result (Matthias Bolte), + phyp: memcpy/memmove/memset can't fail, so don't check for error (Matthias Bolte), + phyp: Make generic domain listing functions return -1 in case of error (Matthias Bolte), + Fix configure check for libssh2 (Matthias Bolte), + Repair getIPv4Addr after the ntohl conversion (Daniel Veillard), + Cleanup whitespace in docs (Matthew Booth), + Use virBuffer when building QEMU char dev command line (Matthew Booth), + Cleanup virBuffer usage in qemdBuildCommandLine (Matthew Booth), + Fix some cut-and-paste error in migration code (Paolo Bonzini), + Ensure guestfwd address is IPv4 and various cleanups (Matthew Booth), + LXC cleanup deep indentation in lxcDomainSetAutostart (Ryota Ozaki), + LXC messages cleanup and fix lxcError (Ryota Ozaki), + qemu: Remove compiled out localhost migration support (Cole Robinson), + Various error reporting fixes (Cole Robinson), + Improve error reporting for virConnectGetHostname calls (Cole Robinson), + Fix up NLS warnings. (Chris Lalancette), + Remove redundant virFileDeletePID() call (Chris Lalancette), + Fix return value in virStateInitialize impl for LXC (Daniel P. Berrange), + ESX: Unify naming of VI API utility and convenience functions. (Matthias Bolte), + Rename internal APis (Daniel P. Berrange), + Pull signal setup code out into separate method (Daniel P. Berrange), + Fix duplicating logging of errors in libvirtd (Daniel P. Berrange), + Fix initialization order bugs (Daniel P. Berrange), + Misc cleanup to network socket init (Daniel P. Berrange), + Annotate many methods with ATTRIBUTE_RETURN_CHECK & fix problems (Daniel P. Berrange), + Don't use private struct member names of in6_addr (Matthias Bolte), + Fix typo in network.c function comments (Matthew Booth), + libvirt-devel should only require libvirt-client (Mark McLoughlin), + qemu: Fix an error message in GetVcpus (Cole Robinson), + storage: Break out function to add pool source to a SourceList. (Cole Robinson), + storage: Break out pool source parsing to a separate function. (Cole Robinson), + Fix some typos in comments (Dan Kenigsberg), + Fix error message in qemudLoadDriverConfig() (Matthias Bolte), + Add a new syntax-check rule for gethostname. (Chris Lalancette), + Various syntax-check fixes. (Chris Lalancette), + Tighten up nonreentrant syntax-check. (Chris Lalancette), + Replace a gethostname by virGetHostname in libvirtd.c (Chris Lalancette), + Replace two strcmp() by STREQ() in qemu_driver.c (Chris Lalancette), + Replace gethostname by virGetHostname in xend_internal.c (Chris Lalancette), + Add a default log_level to qemudSetLogging to remove a build warning. (Chris Lalancette), + Better error message when libvirtd fails to start. (Chris Lalancette), + Fix potential false-positive OOM error reporting. (Matthias Bolte), + Fix virsh.c compilation warning (Jim Fehlig), + Fix a make dist error due to wrong EXTRA_DIST paths (Daniel Veillard), + node device: Break out get_wwns and get_parent_node helpers (Cole Robinson), + tests: Centralize VIR_TEST_DEBUG lookup, and document it (Cole Robinson), + Remove bogus const annotations to hash iterator (Daniel P. Berrange), + Remove bashisms from schema tests. (Matthias Bolte), Don't copy old machines from a domain which has none (Mark McLoughlin) </li> </ul> -- 1.6.0.4

2 2

[libvirt] [PATCH] Fix potential double free in virDomainObjParseXML()
by Matthias Bolte 08 Dec '09

08 Dec '09

--- src/conf/domain_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6a8fd5d..8730f37 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3493,6 +3493,7 @@ static virDomainObjPtr virDomainObjParseXML(virConnectPtr conn, error: VIR_FREE(nodes); virDomainChrDefFree(obj->monitor_chr); + obj->monitor_chr = NULL; virDomainObjUnref(obj); return NULL; } -- 1.6.0.4

2 2

[libvirt] C# (Mono) bindings for libvirt - SharpLibVirt
by Jaromír Červenka 08 Dec '09

08 Dec '09

Hello, following the example of email Richard W.M. Jones (https://www.redhat.com/archives/libvir-list/2008-September/msg00283.html) I decided to write libvirt interface for Mono. Everything is implemented in one C# file, including in-line help (see http://download.cervajz.com/sharplibvirt.png) which is taken from API documentation. All functions wich are implemented were tested on KVM hypervisor. Everything revolves around a few objects. It is possible call libvirt functions directly thru static class SharpLibVirt.libvirt (SharpLibVirt. virterror) or use my "helpers objects" - SharpLibVirt.slvConnection, SharpLibVirt.slvDomain, SharpLibVirt.slvStoragePool, SharpLibVirt.slvStorageVol, etc... Current status of binding is: Version: 0.7.4 virConnect: 95% virDommain: 95% virEvent: 0% virInterface: 0% virNetwork: 0% (I am currently working on it) virNodeDevice: 0% virNode: 98% virSecret: 0% virStoragePool: 100% virStorageVol: 100% virStream: 0% Others: 100% ----- virterror: 100% In the future I will keep SharpLibVirt up to date by C headers. Greetings, Jaromír "Cervajz" Červenka Official openSUSE community member Web: http://www.cervajz.com/ Jabber: cervajz(a)cervajz.com MSN: jara.cervenka(a)seznam.cz Tel.: +420 607 592 687 Alt. e-mails: jaromir.cervenka(a)opensuse.org, jaromir.cervenka(a)speel.cz

2 1

[libvirt] [PATCH] Fix virDomainObj ref handling in QEMU driver
by Daniel P. Berrange 08 Dec '09

08 Dec '09

Since the monitor I/O is processed out of band from the main thread(s) invoking monitor commands, the virDomainObj may be deleted by the I/O thread. The qemuDomainObjBeginJob takes an extra reference to protect against final deletion, but this reference is released by the corresponding EndJob call. THus after the EndJob call it may not be valid to reference the virDomainObj any more. To allow callers to detect this, the EndJob call is changed to return the remaining reference count. * src/conf/domain_conf.c: Make virDomainObjUnref return the remaining reference count * src/qemu/qemu_driver.c: Avoid referencing virDomainObjPtr after qemuDomainObjEndJob if it has been deleted. --- src/conf/domain_conf.c | 6 +- src/qemu/qemu_driver.c | 133 +++++++++++++++++++++++++++++------------------- 2 files changed, 84 insertions(+), 55 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 21d509d..dca2e49 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -231,7 +231,7 @@ static void virDomainObjListDeallocator(void *payload, const char *name ATTRIBUT { virDomainObjPtr obj = payload; virDomainObjLock(obj); - if (!virDomainObjUnref(obj)) + if (virDomainObjUnref(obj) > 0) virDomainObjUnlock(obj); } @@ -637,9 +637,9 @@ int virDomainObjUnref(virDomainObjPtr dom) if (dom->refs == 0) { virDomainObjUnlock(dom); virDomainObjFree(dom); - return 1; + return 0; } - return 0; + return dom->refs; } static virDomainObjPtr virDomainObjNew(virConnectPtr conn, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7dfd1e6..7e60d0e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -371,15 +371,18 @@ static int qemuDomainObjBeginJobWithDriver(struct qemud_driver *driver, * * To be called after completing the work associated with the * earlier qemuDomainBeginJob() call + * + * Returns remaining refcount on 'obj', maybe 0 to indicated it + * was deleted */ -static void qemuDomainObjEndJob(virDomainObjPtr obj) +static int ATTRIBUTE_RETURN_CHECK qemuDomainObjEndJob(virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; priv->jobActive = 0; virCondSignal(&priv->jobCond); - virDomainObjUnref(obj); + return virDomainObjUnref(obj); } @@ -3039,9 +3042,9 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, goto cleanup; /* XXXX free the 'vm' we created ? */ if (qemudStartVMDaemon(conn, driver, vm, NULL, -1) < 0) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, - vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, + vm); vm = NULL; goto endjob; } @@ -3054,8 +3057,9 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, if (dom) dom->id = vm->def->id; endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: virDomainDefFree(def); @@ -3110,7 +3114,8 @@ static int qemudDomainSuspend(virDomainPtr dom) { ret = 0; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -3169,7 +3174,8 @@ static int qemudDomainResume(virDomainPtr dom) { ret = 0; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -3213,7 +3219,8 @@ static int qemudDomainShutdown(virDomainPtr dom) { qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -3252,16 +3259,17 @@ static int qemudDomainDestroy(virDomainPtr dom) { VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_DESTROYED); if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, - vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, + vm); vm = NULL; } ret = 0; endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -3402,7 +3410,8 @@ static int qemudDomainSetMemory(virDomainPtr dom, unsigned long newmem) { ret = 0; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -3452,7 +3461,8 @@ static int qemudDomainGetInfo(virDomainPtr dom, err = qemuMonitorGetBalloonInfo(priv->mon, &balloon); qemuDomainObjExitMonitor(vm); if (err < 0) { - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; goto cleanup; } @@ -3462,7 +3472,10 @@ static int qemudDomainGetInfo(virDomainPtr dom, else info->memory = balloon; - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) { + vm = NULL; + goto cleanup; + } } else { info->memory = vm->def->memory; } @@ -3671,15 +3684,16 @@ static int qemudDomainSave(virDomainPtr dom, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_SAVED); if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, - vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, + vm); vm = NULL; } endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (fd != -1) @@ -3766,7 +3780,8 @@ static int qemudDomainCoreDump(virDomainPtr dom, } endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -3827,7 +3842,8 @@ static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) { ret = 0; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -4235,9 +4251,9 @@ static int qemudDomainRestore(virConnectPtr conn, fd = -1; if (ret < 0) { if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, - vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, + vm); vm = NULL; } goto endjob; @@ -4265,8 +4281,9 @@ static int qemudDomainRestore(virConnectPtr conn, ret = 0; endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: virDomainDefFree(def); @@ -4314,7 +4331,10 @@ static char *qemudDomainDumpXML(virDomainPtr dom, qemuDomainObjEnterMonitor(vm); err = qemuMonitorGetBalloonInfo(priv->mon, &balloon); qemuDomainObjExitMonitor(vm); - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) { + vm = NULL; + goto cleanup; + } if (err < 0) goto cleanup; if (err > 0) @@ -4547,7 +4567,8 @@ static int qemudDomainStart(virDomainPtr dom) { VIR_DOMAIN_EVENT_STARTED_BOOTED); endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -5338,7 +5359,8 @@ static int qemudDomainAttachDevice(virDomainPtr dom, ret = -1; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (cgroup) @@ -5672,7 +5694,8 @@ static int qemudDomainDetachDevice(virDomainPtr dom, ret = -1; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: virDomainDeviceDefFree(dev); @@ -5996,7 +6019,8 @@ qemudDomainBlockStats (virDomainPtr dom, qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: VIR_FREE(qemu_dev_name); @@ -6214,7 +6238,8 @@ qemudDomainMemoryPeek (virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: VIR_FREE(tmp); @@ -6708,8 +6733,8 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn, if (qemust == NULL) { qemudShutdownVMDaemon(NULL, driver, vm); if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } virReportSystemError(dconn, errno, @@ -6727,8 +6752,9 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn, ret = 0; endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: virDomainDefFree(def); @@ -6895,8 +6921,8 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, * should have already done that. */ if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } goto endjob; @@ -6908,8 +6934,9 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, ret = 0; endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: virDomainDefFree(def); @@ -7399,8 +7426,8 @@ qemudDomainMigratePerform (virDomainPtr dom, VIR_DOMAIN_EVENT_STOPPED_MIGRATED); if (!vm->persistent || (flags & VIR_MIGRATE_UNDEFINE_SOURCE)) { virDomainDeleteConfig(dom->conn, driver->configDir, driver->autostartDir, vm); - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } ret = 0; @@ -7424,8 +7451,9 @@ endjob: VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_MIGRATED); } - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -7523,15 +7551,16 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_FAILED); if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } } endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) -- 1.6.5.2

3 2

[libvirt] Add vncdisplay to virsh list
by Дмитрий Ильин 08 Dec '09

08 Dec '09

I think adding vncdisplay to virsh list output will be very usefull. For example output could be like this: Id Name State Display ---------------------------------------------------- 1 test1 running :2 2 test2 running :5 3 test3 running :13 4 server1 running n/g 5 sdltest running sdl - test4 shut off off - test5 shut off off :n - vnc display number n/g - no graphics sdl - sdl output You can use "--display" to enable it command: virsh list --all --display Also I would like to see "--pretend" option in virt-install. Just generate xml and dump it to stdout without doing anything else.

2 1

[libvirt] is libvirt test suite available
by Sharadha Prabhakar (3P) 08 Dec '09

08 Dec '09

Hi, I'd like to know if there is a client test suite available to test libvirt. If so Where can I locate it? Thanks, SP

2 1

[libvirt] [PATCH 0/3] fix migration of paused vms
by Paolo Bonzini 08 Dec '09

08 Dec '09

From: Paolo Bonzini <pbonzini(a)gnu.org> This is yet another try on fixing migration of paused vms. Since the driver-only solution didn't work out, I'm now fixing it directly in libvirt.c. The first two patches are the same as for the previous series. The first is a bugfix for failed migration for the QEMU driver; the second adds a "virsh migrate --suspend" option to leave the VM not running on the destination machine. As in the previous version of the patch, --suspend/VIR_MIGRATE_PAUSED is the bulk of implementing the new feature. I just query the domain state and, if it is paused, I implicitly add the VIR_MIGRATE_PAUSED flag to the migration. This is the third patch. I thought about transmitting the state in the end (since it works well if VIR_MIGRATE_PAUSED is passed only to MigrateFinish and not to MigratePerform), but I don't think it's a good idea to commit it now as it's basically untestable. It's in the fourth patch, but if you want it now and think the approach is sound, tell me and I'll test it more heavily.

2 10

[libvirt] [PATCH] udev_device_get_devpath might return NULL
by Guido Günther 08 Dec '09

08 Dec '09

Fix crash on daemon strdup in that case. udev_device_get_devpath returs NULL for '/sys/devices/virtual/block/dm-*' devices. In that case the later strdup segfaults. O.k. to apply? 19:12:46.319: info : udevGetDeviceProperty:111 : udev reports device 'dm-0' does not have property 'DRIVER' 19:12:46.319: debug : udevProcessStorage:954 : No devnode for '/devices/virtual/block/dm-0' 19:12:46.319: info : udevProcessDeviceListEntry:1261 : Failed to create node device for udev device '/sys/devices/virtual/block/dm-0' --- src/node_device/node_device_udev.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 9b48052..c7238fc 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -947,8 +947,14 @@ static int udevProcessStorage(struct udev_device *device, { union _virNodeDevCapData *data = &def->caps->data; int ret = -1; + const char* devnode; - data->storage.block = strdup(udev_device_get_devnode(device)); + devnode = udev_device_get_devnode(device); + if(!devnode) { + VIR_DEBUG("No devnode for '%s'\n", udev_device_get_devpath(device)); + goto out; + } + data->storage.block = strdup(devnode); if (udevGetStringProperty(device, "DEVNAME", &data->storage.block) == PROPERTY_ERROR) { -- 1.6.5.3

3 3

[libvirt] [PATCH] Avoid an type-punned pointer aliasing pbm
by Daniel Veillard 08 Dec '09

08 Dec '09

Anmother fix for a warning which I didn't commited yet: commit 3109546b28b5fc55bf451e62cdb80908cf025ff8 Author: Daniel Veillard <veillard(a)redhat.com> Date: Tue Dec 8 11:14:55 2009 +0100 Avoid an type-punned pointer aliasing pbm Fix this warning, there is no need to use an intermediate, different array pointer. network.c: In function 'getIPv6Addr': network.c:50: warning: dereferencing type-punned pointer will break strict-aliasing rules * src/util/network.c: avoid an intermediary pointer cast diff --git a/src/util/network.c b/src/util/network.c index aaea436..9b9b848 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -41,16 +41,13 @@ static int getIPv4Addr(virSocketAddrPtr addr, virIPv4AddrPtr tab) { } static int getIPv6Addr(virSocketAddrPtr addr, virIPv6AddrPtr tab) { - virIPv6AddrPtr val; int i; if ((addr == NULL) || (tab == NULL) || (addr->stor.ss_family != AF_INET6)) return(-1); - val = (virIPv6AddrPtr) &(addr->inet6.sin6_addr.s6_addr16); - for (i = 0;i < 8;i++) { - (*tab)[i] = ntohs((*val)[i]); + (*tab)[i] = ntohs(addr->inet6.sin6_addr.s6_addr16[i]); } return(0); -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Fix compilation for configure --disable-nls
by Matthias Bolte 07 Dec '09

07 Dec '09

--- src/opennebula/one_conf.c | 2 +- src/opennebula/one_driver.c | 16 ++++++++-------- src/phyp/phyp_driver.c | 22 +++++++++++----------- src/xen/xen_driver.c | 6 +++--- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/opennebula/one_conf.c b/src/opennebula/one_conf.c index 415f832..baef217 100644 --- a/src/opennebula/one_conf.c +++ b/src/opennebula/one_conf.c @@ -147,7 +147,7 @@ int oneSubmitVM(virConnectPtr conn, if ((oneid = c_oneAllocateTemplate(templ)) < 0) { oneError(conn, NULL, VIR_ERR_OPERATION_FAILED, - _("Error submitting virtual machine to OpenNebula")); + "%s", _("Error submitting virtual machine to OpenNebula")); VIR_FREE(templ); return -1; } diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index 4857f54..a30c110 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -280,13 +280,13 @@ static int oneDomainUndefine(virDomainPtr dom) vm =virDomainFindByUUID(&driver->domains, dom->uuid); if (!vm) { oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, - _("no domain with matching uuid")); + "%s", _("no domain with matching uuid")); goto return_point; } if (!vm->persistent) { oneError(dom->conn, dom, VIR_ERR_INTERNAL_ERROR, - _("cannot undefine transient domain")); + "%s", _("cannot undefine transient domain")); goto return_point; } virDomainRemoveInactive(&driver->domains, vm); @@ -499,7 +499,7 @@ static int oneDomainShutdown(virDomainPtr dom) if (c_oneShutdown(vm->pid)) { oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, - _("Wrong state to perform action")); + "%s", _("Wrong state to perform action")); goto return_point; } vm->state=VIR_DOMAIN_SHUTDOWN; @@ -535,7 +535,7 @@ static int oneDomainDestroy(virDomainPtr dom) /* VM not running, delete the instance at ONE DB */ if(c_oneFinalize(vm->pid)){ oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, - _("Wrong state to perform action")); + "%s", _("Wrong state to perform action")); goto return_point; } } @@ -570,11 +570,11 @@ static int oneDomainSuspend(virDomainPtr dom) goto return_point; } oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, - _("Wrong state to perform action")); + "%s", _("Wrong state to perform action")); goto return_point; } oneError(dom->conn,dom, VIR_ERR_OPERATION_INVALID, - _("domain is not running")); + "%s", _("domain is not running")); } else { oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, _("no domain with matching id %d"), dom->id); @@ -603,11 +603,11 @@ static int oneDomainResume(virDomainPtr dom) goto return_point; } oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, - _("Wrong state to perform action")); + "%s", _("Wrong state to perform action")); goto return_point; } oneError(dom->conn,dom, VIR_ERR_OPERATION_INVALID, - _("domain is not paused ")); + "%s", _("domain is not paused")); } else { oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, _("no domain with matching id %d"), dom->id); diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index ea9555a..dfbc968 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -91,19 +91,19 @@ phypOpen(virConnectPtr conn, if (conn->uri->server == NULL) { PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - _("Missing server name in phyp:// URI")); + "%s", _("Missing server name in phyp:// URI")); return VIR_DRV_OPEN_ERROR; } if (conn->uri->path == NULL) { PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - _("Missing managed system name in phyp:// URI")); + "%s", _("Missing managed system name in phyp:// URI")); return VIR_DRV_OPEN_ERROR; } if (conn->uri->user == NULL) { PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - _("Missing username in phyp:// URI")); + "%s", _("Missing username in phyp:// URI")); return VIR_DRV_OPEN_ERROR; } @@ -150,13 +150,13 @@ phypOpen(virConnectPtr conn, if (escape_specialcharacters(conn->uri->path, string, len) == -1) { PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - _("Error parsing 'path'. Invalid characters.")); + "%s", _("Error parsing 'path'. Invalid characters.")); goto failure; } if ((session = openSSHSession(conn, auth, &internal_socket)) == NULL) { PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - _("Error while opening SSH session.")); + "%s", _("Error while opening SSH session.")); goto failure; } //conn->uri->path = string; @@ -314,7 +314,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, LIBSSH2_ERROR_EAGAIN) ; if (rc) { PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - _("Failure establishing SSH session.")); + "%s", _("Failure establishing SSH session.")); goto disconnect; } @@ -344,7 +344,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, if (!auth || !auth->cb) { PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - _("No authentication callback provided.")); + "%s", _("No authentication callback provided.")); goto disconnect; } @@ -355,7 +355,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, if (!hasPassphrase) { PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - _("Required credentials are not supported.")); + "%s", _("Required credentials are not supported.")); goto disconnect; } @@ -364,7 +364,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, if (res < 0) { PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - _("Unable to fetch credentials.")); + "%s", _("Unable to fetch credentials.")); goto disconnect; } @@ -372,7 +372,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, password = creds[0].result; } else { PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - _("Unable to get password certificates")); + "%s", _("Unable to get password certificates")); goto disconnect; } @@ -383,7 +383,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, if (rc) { PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - _("Authentication failed")); + "%s", _("Authentication failed")); goto disconnect; } else goto exit; diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 4bfcce4..ed94bed 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1316,14 +1316,14 @@ xenUnifiedDomainMigrateFinish (virConnectPtr dconn, domain_xml = xenDaemonDomainDumpXML (dom, 0, NULL); if (! domain_xml) { xenUnifiedError(dconn, VIR_ERR_MIGRATE_PERSIST_FAILED, - _("failed to get XML representation of migrated domain")); + "%s", _("failed to get XML representation of migrated domain")); goto failure; } dom_new = xenDaemonDomainDefineXML (dconn, domain_xml); if (! dom_new) { - xenUnifiedError (dconn, VIR_ERR_MIGRATE_PERSIST_FAILED, - _("failed to define domain on destination host")); + xenUnifiedError(dconn, VIR_ERR_MIGRATE_PERSIST_FAILED, + "%s", _("failed to define domain on destination host")); goto failure; } -- 1.6.0.4

2 2

[libvirt] [BUG] connection to vbox 3.1 fails
by Florian Vichot 07 Dec '09

07 Dec '09

Hello all, As confirmed on IRC by Matthias, when trying to open a connection of any sort (vbox:///session or vbox:///system) to the vbox driver with a VirtualBox 3.1 installed, the connection fails with: "internal error nsIEventQueue object is null" This is printed by line 726 in vbox_tmpl.c. This is with the 3.1 support patch commited earlier today. The driver with a VirtualBox version 3.0.8 or 3.0.12 works fine with that patch. Thanks, Florian

3 4

[libvirt] Libvirt/LXC (lxcControllerMain:380 : EPOLLHUP from fd 7)
by Tony Risinger 07 Dec '09

07 Dec '09

hello, i am trying to use libvirt with LXC, and having some issues... everything seems ok when using lxc-* tools. host box is Arch Linux. ultimately i'm getting this error in the domain log: ..... 05:45:31.353: debug : lxcControllerMain:380 : EPOLLHUP from fd 7 i was getting this last night in #virt: ..... 20:49:57.545: error : lxcFdForward:230 : read of fd 7 failed: Input/output error libvir: Linux Container error : read of fd 7 failed: Input/output error instead of the former, but i can seem to reproduce now. i might have replaced 0.7.4 version with git version... i dont remember. right now the build is direct from master, and i am getting EPOLLHUP. didnt see anything interesting in virsh or libvirtd debug output, but i can paste/bin the whole thing or whatever else if need be. -----VERSIONS/SOURCES (loadmodconfig make target + below) kernel: Linux PHS-001 2.6.32-custom #1 SMP PREEMPT Sun Dec 6 05:29:37 CST 2009 i686 Intel(R) Xeon(TM) CPU 3.20GHz GenuineIntel GNU/Linux CONFIG_DEVPTS_MULTIPLE_INSTANCES=y CONFIG_GROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y CONFIG_CGROUP_SCHED=y CONFIG_CGROUPS=y CONFIG_CGROUP_NS=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_MM_OWNER=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_NET_CLS_CGROUP=y CONFIG_SECURITY_FILE_CAPABILITIES=y (built from master) libvirt: http://aur.archlinux.org/packages/libvirt-git/libvirt-git/PKGBUILD --with-capng --with-network --with-lxc --without-xen --without-xen-inotify --without-qemu --without-uml --without-openvz --without-vbox --without-one --without-esx libcap-ng: http://aur.archlinux.org/packages/libcap-ng/libcap-ng/PKGBUILD container: http://www.stgraber.org/2009/11/06/lxc-containers-or-extremely-fast-virtual… http://www.stgraber.org/download/lxc-ubuntu-8.04-i386.tar.gz -----CONFIGURATION # host ptmx symlinked to pts/ptmx [root@PHS-001 vps]# ls -l /dev/ptmx lrwxrwxrwx 1 root root 8 2009-12-08 04:40 /dev/ptmx -> pts/ptmx # guest ptmx symlinked to pts/ptmx [root@PHS-001 vps]# ls -l /vps/dom/ubuntu/root/dev/ptmx lrwxrwxrwx 1 root root 8 2009-12-06 04:11 /vps/dom/ubuntu/root/dev/ptmx -> pts/ptmx # host devpts mounted newinstance [root@PHS-001 vps]# mount | grep devpts none on /dev/pts type devpts (rw,newinstance) # single cgroup mount on host [root@PHS-001 vps]# mount | grep cgroup none on /cgroup type cgroup (rw) # libvirt config [root@PHS-001 vps]# grep -v -e '^#\|^ *$' /etc/libvirt/libvirtd.conf auth_unix_ro = "none" auth_unix_rw = "none" # guest config... # i have tried the legacy <console type='pty' /> with same results # i dont fully understand this, why do i need to specify a host/source pty? [root@PHS-001 vps]# cat /vps/def/exec/sys/ubuntu.xml <domain type='lxc'> <name>ubuntu</name> <memory>500000</memory> <os> <type arch='i686'>exe</type> <init>/sbin/init</init> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <filesystem type='mount'> <source dir='/vps/dom/ubuntu/root'/> <target dir='/'/> </filesystem> <console type='pty'> <source path='/dev/pts/4'/> <target port='0'/> </console> </devices> </domain> -----PROCEDURE [root@PHS-001 vps]# LIBVIRT_DEBUG=1 libvirtd --daemon 05:42:46.121: debug : virInitialize:278 : register drivers ..... [root@PHS-001 vps]# virsh -c lxc:/// define /vps/def/exec/sys/ubuntu.xml Domain ubuntu defined from /vps/def/exec/sys/ubuntu.xml [root@PHS-001 vps]# virsh -c lxc:/// define /vps/def/exec/sys/ubuntu.xml Domain ubuntu defined from /vps/def/exec/sys/ubuntu.xml [root@PHS-001 vps]# virsh -c lxc:/// start ubuntu Domain ubuntu started [root@PHS-001 vps]# virsh -c lxc:/// console ubuntu error: Unable to get domain status error: internal error Unable to get cgroup for ubuntu -----LOGS # /var/log/libvirt/lxc/ubuntu.log 05:45:31.105: debug : lxcControllerRun:540 : Setting up private /dev/pts 05:45:31.125: debug : lxcControllerRun:566 : Mouting 'devpts' on /vps/dom/ubuntu/root/dev/pts 05:45:31.125: debug : lxcControllerRun:581 : Opening tty on private /vps/dom/ubuntu/root/dev/pts/ptmx 05:45:31.125: debug : virCgroupNew:492 : New group / 05:45:31.125: debug : virCgroupDetect:230 : Detected mount/mapping 0:cpu at /cgroup in /1534 05:45:31.125: debug : virCgroupDetect:230 : Detected mount/mapping 1:cpuacct at /cgroup in /1534 05:45:31.125: debug : virCgroupDetect:230 : Detected mount/mapping 2:cpuset at /cgroup in /1534 05:45:31.125: debug : virCgroupDetect:230 : Detected mount/mapping 3:memory at /cgroup in /1534 05:45:31.125: debug : virCgroupDetect:230 : Detected mount/mapping 4:devices at /cgroup in /1534 05:45:31.125: debug : virCgroupDetect:230 : Detected mount/mapping 5:freezer at /cgroup in /1534 05:45:31.125: debug : virCgroupNew:492 : New group /libvirt 05:45:31.125: debug : virCgroupDetect:230 : Detected mount/mapping 0:cpu at /cgroup in /1534 05:45:31.125: debug : virCgroupDetect:230 : Detected mount/mapping 1:cpuacct at /cgroup in /1534 05:45:31.125: debug : virCgroupDetect:230 : Detected mount/mapping 2:cpuset at /cgroup in /1534 05:45:31.125: debug : virCgroupDetect:230 : Detected mount/mapping 3:memory at /cgroup in /1534 05:45:31.125: debug : virCgroupDetect:230 : Detected mount/mapping 4:devices at /cgroup in /1534 05:45:31.125: debug : virCgroupDetect:230 : Detected mount/mapping 5:freezer at /cgroup in /1534 05:45:31.125: debug : virCgroupMakeGroup:450 : Make group /libvirt 05:45:31.125: debug : virCgroupMakeGroup:462 : Make controller /cgroup/1534/libvirt/ 05:45:31.125: debug : virCgroupCpuSetInherit:416 : Setting up inheritance / -> /libvirt 05:45:31.126: debug : virCgroupGetValueStr:305 : Get value /cgroup/1534/cpuset.cpus 05:45:31.126: debug : virCgroupCpuSetInherit:429 : Inherit cpuset.cpus = 0-3 05:45:31.126: debug : virCgroupSetValueStr:275 : Set value /cgroup/1534/libvirt/cpuset.cpus 05:45:31.126: debug : virCgroupGetValueStr:305 : Get value /cgroup/1534/cpuset.mems 05:45:31.126: debug : virCgroupCpuSetInherit:429 : Inherit cpuset.mems = 0 05:45:31.126: debug : virCgroupSetValueStr:275 : Set value /cgroup/1534/libvirt/cpuset.mems 05:45:31.126: debug : virCgroupMakeGroup:462 : Make controller /cgroup/1534/libvirt/ 05:45:31.126: debug : virCgroupMakeGroup:462 : Make controller /cgroup/1534/libvirt/ 05:45:31.126: debug : virCgroupMakeGroup:462 : Make controller /cgroup/1534/libvirt/ 05:45:31.126: debug : virCgroupMakeGroup:462 : Make controller /cgroup/1534/libvirt/ 05:45:31.126: debug : virCgroupMakeGroup:462 : Make controller /cgroup/1534/libvirt/ 05:45:31.126: debug : virCgroupNew:492 : New group /libvirt/lxc 05:45:31.126: debug : virCgroupDetect:230 : Detected mount/mapping 0:cpu at /cgroup in /1534 05:45:31.126: debug : virCgroupDetect:230 : Detected mount/mapping 1:cpuacct at /cgroup in /1534 05:45:31.126: debug : virCgroupDetect:230 : Detected mount/mapping 2:cpuset at /cgroup in /1534 05:45:31.126: debug : virCgroupDetect:230 : Detected mount/mapping 3:memory at /cgroup in /1534 05:45:31.126: debug : virCgroupDetect:230 : Detected mount/mapping 4:devices at /cgroup in /1534 05:45:31.126: debug : virCgroupDetect:230 : Detected mount/mapping 5:freezer at /cgroup in /1534 05:45:31.126: debug : virCgroupMakeGroup:450 : Make group /libvirt/lxc 05:45:31.126: debug : virCgroupMakeGroup:462 : Make controller /cgroup/1534/libvirt/lxc/ 05:45:31.211: debug : lxcContainerStart:832 : clone() returned, 1536 05:45:31.353: debug : lxcControllerMain:380 : EPOLLHUP from fd 7 -----END i've tried endless variations of the <devices> section, but i just cant seem to get anything going with libvirt/LXC once i move the root to a new location for a system container. same container works fine with lxc-* tools (although i manually make a bridge). any help is appreciated, C Anthony Risinger

2 2

[libvirt] [PATCH 00/14] Introduce support for the JSON based QEMU monitor
by Daniel P. Berrange 07 Dec '09

07 Dec '09

This is an updated series fully implementing the new QEMU monitor protocol based on JSON instead of plain text. I previously posted a proof of concept here http://www.redhat.com/archives/libvir-list/2009-November/msg00098.html Since that time, the QEMU side is actually working, so I've been able todo a real impl for libvirt now & also test it. I threw out the JSON library code I used last time, since it turned out to be quite unreliable code. Instead I'm using YAJL which is a much nicer library & integrates with libvirt very nicely. Daniel

6 56

[libvirt] Synchronous commands block virsh?
by Matthew Richardson 07 Dec '09

07 Dec '09

I'm currently playing with libvirt on Ubuntu 9.10: Compiled against library: libvir 0.7.0 Using library: libvir 0.7.0 Using API: QEMU 0.7.0 Running hypervisor: QEMU 0.11.0 I've noticed that if I open virsh on a host and set a live migration going, then virsh doesn't return until the migration is complete. However, if I open a second virsh command, it too blocks on commands (e.g list), meaning that I can't perform any other operations against other domains until the initial migration is complete. Is this deliberate or accidental? Is there any way round this? Thanks, Matthew The University of Edinburgh is a charitable body, registered in Scotland, with registration number SC005336.

3 2

[libvirt] [PATCH] vbox: Use virIndexToDiskName() in vboxGenerateMediumName()
by Matthias Bolte 07 Dec '09

07 Dec '09

--- src/vbox/vbox_tmpl.c | 48 +++++++++--------------------------------------- 1 files changed, 9 insertions(+), 39 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 10cc1ed..33f5334 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -426,15 +426,14 @@ static void vboxUtf8toIID(virConnectPtr conn, char *uuidstr, vboxIID **iid) { * @param aMaxSlotPerPort Input array of max slot per device port * */ -static char *vboxGenerateMediumName(virConnectPtr conn, - PRUint32 storageBus, +static char *vboxGenerateMediumName(PRUint32 storageBus, PRInt32 deviceInst, PRInt32 devicePort, PRInt32 deviceSlot, PRUint32 *aMaxPortPerInst, PRUint32 *aMaxSlotPerPort) { + const char *prefix = NULL; char *name = NULL; - int len = 0; int total = 0; PRUint32 maxPortPerInst = 0; PRUint32 maxSlotPerPort = 0; @@ -453,48 +452,20 @@ static char *vboxGenerateMediumName(virConnectPtr conn, + (devicePort * maxSlotPerPort) + deviceSlot; - if ((total >= 0) && (total < 26)) - len = 4; - else if ((total >= 26) && (total < 26*26 + 26)) - len = 5; - else if ((total >= 26*26 + 26) && (total < 26*26*26 + 26*26 + 26)) - len = 6; - else - return NULL; - - if (VIR_ALLOC_N(name, len) < 0) { - virReportOOMError(conn); - return NULL; - } - - /* TODO: use virIndexToDiskName() here when available */ if (storageBus == StorageBus_IDE) { - name[0] = 'h'; - name[1] = 'd'; + prefix = "hd"; } else if ( (storageBus == StorageBus_SATA) || (storageBus == StorageBus_SCSI)) { - name[0] = 's'; - name[1] = 'd'; + prefix = "sd"; } else if (storageBus == StorageBus_Floppy) { - name[0] = 'f'; - name[1] = 'd'; + prefix = "fd"; } - if (len == 4) { - name[2] = (char)(97 + total); - } else if (len == 5) { - name[2] = (char)(96 + (total / 26)); - name[3] = (char)(97 + (total % 26)); - } else if (len == 6) { - name[2] = (char)(96 + (total / 26*26)); - name[3] = (char)(96 + ((total % (26*26)) / 26)); - name[4] = (char)(97 + ((total % (26*26)) % 26)); - } + name = virIndexToDiskName(total, prefix); - name[len - 1] = '\0'; - DEBUG("name=%s, len=%d, total=%d, storageBus=%u, deviceInst=%d, " + DEBUG("name=%s, total=%d, storageBus=%u, deviceInst=%d, " "devicePort=%d deviceSlot=%d, maxPortPerInst=%u maxSlotPerPort=%u", - name, len, total, storageBus, deviceInst, devicePort, + NULLSTR(name), total, storageBus, deviceInst, devicePort, deviceSlot, maxPortPerInst, maxSlotPerPort); return name; } @@ -2496,8 +2467,7 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) { imediumattach->vtbl->GetPort(imediumattach, &devicePort); imediumattach->vtbl->GetDevice(imediumattach, &deviceSlot); - def->disks[diskCount]->dst = vboxGenerateMediumName(dom->conn, - storageBus, + def->disks[diskCount]->dst = vboxGenerateMediumName(storageBus, deviceInst, devicePort, deviceSlot, -- 1.6.0.4

3 2

[libvirt] [PATCH] Export all symbols from xml.h for internal use
by Jiri Denemark 05 Dec '09

05 Dec '09

Some of the very useful calls for XML parsing provided by util/xml.[ch] were not exported as private symbols. This patch fixes this. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/libvirt_private.syms | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index edac3bc..0e53063 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -543,3 +543,9 @@ virXPathNodeSet; virXPathString; virXMLPropString; virXPathStringLimit; +virXPathBoolean; +virXPathNumber; +virXPathULong; +virXPathULongLong; +virXPathLongHex; +virXPathULongHex; -- 1.6.5.4

2 1

[libvirt] [PATCH 0/2] Xen: Add support for interface model='netfront'
by Jiri Denemark 04 Dec '09

04 Dec '09

Xen HVM guests with PV drivers end up with two network interfaces for each configured interface. One of them being emulated by qemu and the other one paravirtual. As this might not be desirable, the attached patch provides a way for users to specify that only paravirtual network interface should be presented to the guest. The configuration was inspired by qemu/kvm driver, for which users can specify model='virtio' to use paravirtual network interface. The patch adds support for model='netfront' which results in type=netfront instead of type=ioemu (or nothing for newer xen versions) in guests native configuration. Xen's qemu ignores interfaces with type != ioemu and only paravirtual network device will be seen in the guest. Four possible configuration scenarios follow: - no model specified in domain's XML - libvirt will behave like before this change; it will set type=ioemu for HVM guests on xen host which is not newer than XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU - covered by existing tests - PV guest, any model - no functional change, model is passed as is (and ignored by the hypervisor) - covered by existing tests (e.g., *-net-e1000.*) - HVM guest, model=netfront - type is set to "netfront", model is not specified - covered by new *-net-netfront.* tests - HVM guest, model != netfront - type is set to "ioemu", model is passed as is - covered by new *-net-ioemu.* tests The fourth scenario feels like a regression for xen newer than XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU as users who had a model specified in their guest's configuration won't see a paravirtual interface in their guests any more. On the other hand, the reason for specifying a model is most likely the fact that they want to use such model which implies emulated interface. Users of older xen won't be affected at all as their xen provides paravirtual interface regardless of the type used. In previous version of this patch, I used "xenpv" instead of "netfront" as it looked more like kvm/qemu's virtio. However, you can find several tips how to force PV network interface for HVM guest by using type="netfront" so I changed it to conform with those tips. It also matches guest's driver name used for that device. Jiri Denemark (2): Support for interface model='netfront' Tests for interface type/model configuration src/xen/xend_internal.c | 32 +++++++++++---- src/xen/xm_internal.c | 38 +++++++++++++++-- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr | 1 + tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 42 +++++++++++++++++++ .../sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr | 1 + tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 42 +++++++++++++++++++ tests/sexpr2xmltest.c | 3 + tests/xmconfigdata/test-fullvirt-net-ioemu.cfg | 25 +++++++++++ tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 43 ++++++++++++++++++++ tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 25 +++++++++++ tests/xmconfigdata/test-fullvirt-net-netfront.xml | 43 ++++++++++++++++++++ tests/xmconfigtest.c | 3 + tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml | 31 ++++++++++++++ .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml | 31 ++++++++++++++ tests/xml2sexprtest.c | 3 + 17 files changed, 352 insertions(+), 13 deletions(-) create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml create mode 100644 tests/xmconfigdata/test-fullvirt-net-ioemu.cfg create mode 100644 tests/xmconfigdata/test-fullvirt-net-ioemu.xml create mode 100644 tests/xmconfigdata/test-fullvirt-net-netfront.cfg create mode 100644 tests/xmconfigdata/test-fullvirt-net-netfront.xml create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml

3 4

[libvirt] [PATCH] Support for virtualbox version 3.1
by pritesh 04 Dec '09

04 Dec '09

Hi All, I have just added support for VirtualBox Version 3.1 (works for the beta as well) in the libvirt vbox driver. The patch for the same is attached below. Regards, Pritesh

3 8

[libvirt] libvirtd crashes
by Shi Jin 04 Dec '09

04 Dec '09

Hi there, My libvirtd built from the latest git code keeps on crashing on all machines. I turned on debugging and this is the information I have in the log file before crashing: 14:31:50.828: debug : virEventUpdateHandleImpl:146 : Update handle w=110 e=12 14:31:50.828: debug : virEventInterruptLocked:662 : Interrupting 14:31:50.828: debug : qemuMonitorCommandWithHandler:271 : Receive command reply ret=-1 errno=104 0 bytes '(null)' 14:31:50.828: error : qemuMonitorCommandWithHandler:290 : cannot send monitor command 'info cpus': Connection reset by peer 14:31:50.828: error : qemuMonitorTextGetCPUInfo:436 : internal error cannot run monitor command to fetch CPU thread info I am not sure if there is any other information needed to help identify the problem. My building options are: ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --without-xen --with-qemu --with-qemu-user=oneadmin --with-qemu-group=oneadmin --without-uml --without-vbox --without-openvz --without-lxc Please help me here. I can accept the service failing queries from time to time since I have error handling written so that they can be re-tried. But a crashing libvirtd takes the whole thing down. Thanks a lot. Shi -- Shi Jin, PhD

2 3

[libvirt] ANNOUNCE: New releases virt-manager 0.8.1 and virtinst 0.500.1
by Cole Robinson 03 Dec '09

03 Dec '09

I'm happy to announce two new releases: virt-manager 0.8.1: virt-manager is a desktop application for managing KVM and Xen virtual machines via libvirt. virtinst 0.500.1: virtinst is a collection of command line tools for provisioning libvirt virtual machines, including virt-install and virt-clone. The releases can be downloaded from: http://virt-manager.org/download.html The direct download links are: http://virt-manager.org/download/sources/virt-manager/virt-manager-0.8.1.ta… http://virt-manager.org/download/sources/virtinst/virtinst-0.500.1.tar.gz The virt-manager release includes: - VM Migration wizard, exposing various migration options - Enumerate CDROM and bridge devices on remote connections - Can once again list multiple graphs in the manager window (Jon Nordby) - Support disabling dhcp (Michal Novotny), and specifying 'routed' type for new virtual networks - Support storage pool source enumeration for LVM, NFS, and SCSI - Allow changing VM ACPI, APIC, clock offset, individual vcpu pinning, and video model (vga, cirrus, etc.) - Many improvements and bugfixes The virtinst release includes: - virt-install now attempts --os-variant detection by default. This can be disabled with '--os-variant none' (distro detection currently only works for URL installs) - New --disk option 'format', for creating image disks formats such as qcow2 or vmdk - Many improvements and bugfixes Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] both libvirt 0.7.4 and latest git crashing
by Nikola Ciprich 03 Dec '09

03 Dec '09

Hi, few days ago, I've reported problem with libvirt getting stuck while saving kvm. Today, I tried latest git and it seems the problem is solved which is great. Unfortunately, there seems to be another problem (which I noticed even for 0.7.4 although haven't reported yet) is that libvirtd sometimes crashes. I'm not 100% sure which action causes it to crash as it's being executed by cluster resource manager, but the backtrace might help those familiar with it's internals. (I think it's domain start) (gdb) bt #0 0x00007f4f46d03cd0 in pthread_mutex_unlock () from /lib64/libpthread.so.0 #1 0x000000000042da91 in qemuDomainObjExitMonitor (obj=0x980a80) at qemu/qemu_driver.c:287 #2 0x000000000043ca84 in qemudDomainGetInfo (dom=0x978d50, info=0x42690de0) at qemu/qemu_driver.c:3294 #3 0x00007f4f47ddf3fb in virDomainGetInfo (domain=0x978d50, info=0x42690de0) at libvirt.c:2786 #4 0x000000000041d79e in remoteDispatchDomainGetInfo (server=<value optimized out>, client=<value optimized out>, conn=0x961840, hdr=<value optimized out>, rerr=0x42690e70, args=<value optimized out>, ret=0x42690f50) at remote.c:1076 #5 0x000000000041f35c in remoteDispatchClientCall (server=0x95b780, client=0x97e310, msg=0x980b00) at dispatch.c:506 #6 0x000000000041f712 in remoteDispatchClientRequest (server=0x95b780, client=0x97e310, msg=0x980b00) at dispatch.c:388 #7 0x00000000004147e2 in qemudWorker (data=<value optimized out>) at libvirtd.c:1518 #8 0x00007f4f46d004a7 in start_thread () from /lib64/libpthread.so.0 #9 0x00007f4f46a76c2d in clone () from /lib64/libc.so.6 Could anyone please have a look at it? thanks a lot in advance nik -- ------------------------------------- Nikola CIPRICH LinuxBox.cz, s.r.o. 28. rijna 168, 709 01 Ostrava tel.: +420 596 603 142 fax: +420 596 621 273 mobil: +420 777 093 799 www.linuxbox.cz mobil servis: +420 737 238 656 email servis: servis(a)linuxbox.cz -------------------------------------

2 1

[libvirt] cannot read libvirt.org website...
by Matthew Woehlke 03 Dec '09

03 Dec '09

...because of this (in http://libvirt.org/generic.css) body { margin: 0em; padding: 0px; color: rgb(0,0,0); font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 80%; // font-size: 83%; } Black text on unspecified background is not legible on my setup. A background color *must* be specified when a foreground color is specified. Please fix this. (Apologies if this is not the right spot, but alas there is no webmaster AT libvirt.org, and I did not find anything obvious on who is the webmaster. If I should send this elsewhere, please let me know where.) -- Matthew Please do not quote my e-mail address unobfuscated in message bodies. -- Obscurity: +5

2 2

[libvirt] Move esxVMX_IndexToDiskName to util.c
by Matthias Bolte 03 Dec '09

03 Dec '09

I needed the inverse function to virDiskNameToIndex() for the ESX driver and added it to esx_vmx.c. The pending VirtualBox 3.1 patch needs disk index to disk name mapping too. So I want to move esxVMX_IndexToDiskName() to util.c. esxVMX_IndexToDiskName() handles indices up to 701. This limit comes from a gap in the disk name to disk index mapping of virDiskNameToIndex(): sdzy -> 700 sdzz -> 701 sdaaa -> 728 sdaab -> 729 This line in virDiskNameToIndex() causes this gap: idx = (idx + i) * 26; It can be fixed by altering this line to: idx = (idx + (i < 1 ? 0 : 1)) * 26; But this change breaks compatibility for indices > 701. So, I made two patches for either option and ask you for comments. Matthias

3 3

[libvirt] About libvirt API Support event notification mechanism problem
by ajia 03 Dec '09

03 Dec '09

Dear Daniel, Recently, I am writing test plan about libvirt asynchronous event mechanism, refering to the following bugs from the bugzilla: spice/vnc: https://bugzilla.redhat.com/show_bug.cgi?id=515268 disk error: https://bugzilla.redhat.com/show_bug.cgi?id=515270 I know libvirt can communicate with qemu monitor by QMP at present, can I use libvirt API to test it now?libvirt-0.7.4-1is ok? In addition,In qemu monitor with rhel6(2.6.31-31.el6.x86_64),"notify" command is nonexistent (Fedora12 is existent),if current qemu can't support event notification mechanism in rhel6,from libvirt point of view,I don't clear libvirt how to get asyns event notification?so I don't know how to test it.and I see qemu monitor protocol being patched,I am not sure current QMP status. I would be most grateful for any response . thank you very much. Best Regards, Alex Jia

2 1

[libvirt] [PATCH] Fix some locking issues
by Matthias Bolte 03 Dec '09

03 Dec '09

* src/conf/domain_conf.c: don't call virDomainObjUnlock twice * src/qemu/qemu_driver.c: relock driver lock if an error occurs in qemuDomainObjBeginJobWithDriver, enter/exit monitor with driver in qemudDomainSave --- src/conf/domain_conf.c | 1 - src/qemu/qemu_driver.c | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e9f79b7..21d509d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5230,7 +5230,6 @@ virDomainObjIsDuplicate(virDomainObjListPtr doms, } dupVM = 1; - virDomainObjUnlock(vm); } else { /* UUID does not match, but if a name matches, refuse it */ vm = virDomainFindByName(doms, def->name); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bf4557e..2a63de9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -353,6 +353,7 @@ static int qemuDomainObjBeginJobWithDriver(struct qemud_driver *driver, else virReportSystemError(NULL, errno, "%s", _("cannot acquire job mutex")); + qemuDriverLock(driver); return -1; } } @@ -3612,9 +3613,9 @@ static int qemudDomainSave(virDomainPtr dom, if (header.compressed == QEMUD_SAVE_FORMAT_RAW) { const char *args[] = { "cat", NULL }; qemuDomainObjPrivatePtr priv = vm->privateData; - qemuDomainObjEnterMonitor(vm); + qemuDomainObjEnterMonitorWithDriver(driver, vm); rc = qemuMonitorMigrateToCommand(priv->mon, 0, args, path); - qemuDomainObjExitMonitor(vm); + qemuDomainObjExitMonitorWithDriver(driver, vm); } else { const char *prog = qemudSaveCompressionTypeToString(header.compressed); qemuDomainObjPrivatePtr priv = vm->privateData; @@ -3623,9 +3624,9 @@ static int qemudDomainSave(virDomainPtr dom, "-c", NULL }; - qemuDomainObjEnterMonitor(vm); + qemuDomainObjEnterMonitorWithDriver(driver, vm); rc = qemuMonitorMigrateToCommand(priv->mon, 0, args, path); - qemuDomainObjExitMonitor(vm); + qemuDomainObjExitMonitorWithDriver(driver, vm); } if (rc < 0) -- 1.6.0.4

2 1

Re: [libvirt] [PATCH v2] Disk- and Controller Hotplug
by Wolfgang Mauerer 03 Dec '09

03 Dec '09

Hi, Some time ago, Daniel P. Berrange wrote: > On Tue, Nov 24, 2009 at 02:15:58PM +0100, Wolfgang Mauerer wrote: >> Daniel P. Berrange wrote: >>> On Mon, Nov 23, 2009 at 02:15:06PM +0100, Wolfgang Mauerer wrote: >>>> Daniel P. Berrange wrote: >>>>> Wolfgang Mauerer wrote: >> okay, to avoid flooding the mailing list with nearly identical >> patches, I've put the rebased versions into a repository at >> git://git.kiszka.org/libvirt.git queue > > I've been taking a closer look at this, and I think the final state > of patch series as a whole looks good. The minor issue is that the > intermediate patches don't compile, since they rely on compile fixes > at the end of the series. Rather than ask you to re-format the > patches yet again, I'm going to just merge the patches into a smaller > set myself. yes, I've sacrificed individual compilability when I did the forward porting because I the amount of time I can dedicate to this right now is a bit restricted for various reasons. Thanks for doing the missing cleanups! > I've got just one question I'd like to understand before doing this. > On the <disk> element's new <controller> element, you are allowing > two mutually exclusive ways of specifying the controller > > <disk> ... <controller name="<identifier>" bus="<number>" > unit="<number>"/> </disk> > > and > > <disk> ... <controller pci_addr="<addr>" bus="<number>" > unit="<number>"/> </disk> > > I think it is going to cause unneccessary pain for applications to > have to cope with two different ways of specifying the same > relationship. So my intention is to remove the 'pci_addr' variant, > since that information can easily be got directly from the separate > top level <controller> device itself Getting rid of pci_addr is perfectly okay. I've kept it in the current series for setups that don't provide <controller>s, but it's supposed to be eliminated by design. Just go ahead if you want to do this it already now ;-) > On a side note, once we've applied this initial series, I think we'll > also need to be automatically adding a <controller> element in all > guest domains which have IDE or SCSI controllers present by default. > This is going to also force us to hook into QEMU's 'info pci' monitor > command to figure out their PCI address. This is long overdue though > and needed for NIC & Disk devices added at startup too, so this is > good motivation :-) agreed. I can try to address this when I bring back hot-removal. Best regards, Wolfgang -- Siemens AG, Corporate Technology CT T DE IT 1 Corporate Competence Centre Embedded Linux

2 1

[libvirt] Re: virDomainCreate() response time
by Christopher Pyper 02 Dec '09

02 Dec '09

I am using xen with libvirt and I have very slow response times with calls to virDomainCreate(). It takes approximately 5-6 seconds to return. Other calls like virDomainReboot() or virtDomainShutdown() return immediately. Do you know what might be causing this, and how I might speed this up. Cheers.

2 1

[libvirt] Eventtest unit test failure
by Soren Hansen 01 Dec '09

01 Dec '09

Hi, guys. I've changed the libvirt package in Ubuntu to run the test suite with every build. However, on our build daemons, the eventtest unit test seems to almost[1] consistently fail. You can see an example build log here: http://launchpadlibrarian.net/36196282/buildlog_ubuntu-lucid-amd64.libvirt_… Does this look familiar to anyone? Any idea what might be causing this? FWIW, I cannot reproduce it locally, so it's likely environmental, but at this point, I don't really know where to begin to look. [1]: It actually succeeds on sparc and armel :-/ -- Soren Hansen | Lead virtualisation engineer | Ubuntu Server Team Canonical Ltd. | http://www.ubuntu.com/

2 3

[libvirt] how do I stop libvirt futzing with my network configuration?
by Nix 30 Nov '09

30 Nov '09

So I have an existing QEMU/KVM setup with networks connected to a bridge which is routed/forwarded to the host's other interfaces. I'm trying to switch to administering at least *some* of its VMs through libvirt (probably not all as I use QEMU snapshots extensively for some of them and libvirt doesn't support that yet, if ever). So libvirt has to be able to start guests connected to a particular host bridge, and give them appropriate IP addresses. I thought it was easy to teach libvirt about this: spindle:/etc/libvirt/qemu/networks# cat /etc/libvirt/qemu/networks/default.xml <network> <name>default</name> <uuid>ee573497-1d74-473b-a2cb-9916229209b8</uuid> <forward mode='route'/> <bridge name='vm-net' stp='on' delay='0' /> <ip address='192.168.20.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.20.1' end='192.168.20.254' /> </dhcp> </ip> </network> However, there appears to be no way to say 'this is what the network is already like'. That network is considered 'inactive' and can't be used by any guests, and if I try to make it active, I get this: virsh # net-start default error: Failed to start network default error: cannot create bridge 'vm-net': File exists Of course it bloody can't create that bridge: it's already there, has an IP address on the host, and has the host routing packets to it. There appears to be no option to allow libvirt to assign IPs on the host... ... should I fix that, 'net-start' tries to update iptables rules! How should I put this: I do not *not not* want libvirt pissing with the firewall in any way at all. If I want firewall rules, I'll create them. But there's no way to tell it 'hands off! This network is already active, don't try to *make* it active!' ... at least, there's none in the documentation, and there's none in the code that I can see. Or is there?

3 11

Re: [libvirt] how do I stop libvirt futzing with my network configuration?
by Ian Woodstock 30 Nov '09

30 Nov '09

----- "Nix" <nix(a)esperi.org.uk> wrote: > From: "Nix" <nix(a)esperi.org.uk> > To: "Daniel P. Berrange" <berrange(a)redhat.com> > Cc: libvir-list(a)redhat.com > Sent: Saturday, November 28, 2009 4:10:28 PM GMT -05:00 US/Canada Eastern > Subject: Re: [libvirt] how do I stop libvirt futzing with my network configuration? > > On 26 Nov 2009, Daniel P. Berrange spake thusly: > > > On Thu, Nov 26, 2009 at 06:25:07PM +0000, Nix wrote: > >> However, there appears to be no way to say 'this is what the network is > >> already like'. That network is considered 'inactive' and can't be used by > >> any guests, and if I try to make it active, I get this: > >> > >> virsh # net-start default > >> error: Failed to start network default > >> error: cannot create bridge 'vm-net': File exists > >> > >> Of course it bloody can't create that bridge: it's already there, has an > >> IP address on the host, and has the host routing packets to it. There > >> appears to be no option to allow libvirt to assign IPs on the host... > >> > >> ... should I fix that, 'net-start' tries to update iptables rules! > >> How should I put this: I do not *not not* want libvirt pissing with the > >> firewall in any way at all. If I want firewall rules, I'll create them. > >> But there's no way to tell it 'hands off! This network is already active, > >> don't try to *make* it active!' > > > > If you don't want libvirt to create the bridge + setup IPtables rules > > then don't use the net-XXX commands / XML. That functionality is > > not there for pointing libvirt to existing bridge devices. > > > > If you already have a bridge configured, then just point the guest > > directly at that bridge by name. > > OK, I still can't make this work: it worked briefly but then stopped. > As far as I can tell tools like virt-manager are unwilling to *let* you > connect to a network considered 'inactive', and networks are only > considered active if they have a configuration file under > /var/run/libvirt/network. These files are only created if libvirt has > created the bridge itself as well. If no networks are considerd active, > virt-manager won't let you create a guest at all: it insists on trying > to start the sodding network, and when that fails doesn't let you get > any further. > I've been running with this configuration for many months on dozens of hosts. - Created a bridge (the old fashion way) in /etc/sysconfig/network-scripts Bridge called br0 with one device eth1. - Created a VM in virt manager (or edit existing) Picked "Shared Physical Device" Device "eth1 (Bridge br0)" in the GUI. Or just add it to the VMs XML <interface type='bridge'> <mac address='52:54:00:4f:0a:76'/> <source bridge='br0'/> </interface> Works like a charm and there's certainly no configuration in libvirt for this interface, ie. nothing in /var/run/libvirt/network, and *nothing* set up in Virt Manager under "Host Details->Virtual networks You do need to make sure that you disable netfilter on the bridge or setup the appropriate iptables rules ( see http://wiki.libvirt.org/page/Networking#Bridged_networking_.28aka_.22shared…) > So as far as I can tell, if you don't want libvirt creating all your > bridges for you, you may as well give up hope of using virt-manager, or > start hacking all this stuff out of the source. > > I hoped I could use libvirt in conjunction with raw qemu. So much for > that, it seems :( it *really* wants to take over the world... > > > (aside: ideally I should not have to spend half an hour crawling around > the source to figure this out. The only other program I've ever seen > that was this hard to set up was Oracle! Whole *Linux distros* take less > work than this. I have half a dozen patches I'll send your way, but I > wasn't going to send any of them until I'd actually managed to get a VM > working. I got one up last night, somehow -- I no longer have any idea > how, obviously one network had somehow got marked active -- whereupon > KVM fell over. *sigh*) > > -- > Libvir-list mailing list > Libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list >

3 6

[libvirt] [PATCH v2] Disk- and Controller Hotplug
by wolfgang.mauerer＠siemens.com 30 Nov '09

30 Nov '09

Hi, this is the second revision of a patch series to improve disk hotadd support for libvirt. It focuses on the qemu backend, but is naturally designed to be compatible with other backends as well. The objective is two-fold: 1.) Split off controller from disk handling. This is done by introducing a new domain element <controller> that is used to describe disk controllers. Support for hotplugging such controllers is added. Support to reference controllers by name is also included. 2.) <disk>s can now be associated with a specific controller; this is done by means of a <controller> subelemnt for disks. This patch addresses the questions that were raised during the review of the initial submission, massages the code by fixing some whitespace issues, gets static controller configurations to work, and adds documentation. Notice that in contrast to the first submission I did not include the patch that adds support for disk- and controller hot_remove_. Since the qemu codebase is still in bit of a flux wrt. the necessary patches required for this functionality, it will reappear some time later as a separate submission. Best, Wolfgang daemon/libvirtd.c | 2 +- docs/formatdomain.html.in | 38 +++++ docs/schemas/domain.rng | 158 ++++++++++++++++----- src/conf/domain_conf.c | 314 +++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 62 ++++++++- src/libvirt_private.syms | 7 +- src/qemu/qemu_driver.c | 184 +++++++++++++++++++++++-- src/qemu/qemu_monitor_text.c | 197 ++++++++++++++++++++++++++ src/qemu/qemu_monitor_text.h | 7 + 9 files changed, 910 insertions(+), 59 deletions(-) -- Siemens AG, CT T DE Corporate Competence Centre Embedded Linux

3 20

[libvirt] questions on build qemu driver with non-root
by Shi Jin 30 Nov '09

30 Nov '09

Hi there, I have been successful in building the latest libvirt code from the git repository. The options I used to build is ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --without-xen --with-qemu --with-qemu-user=oneadmin --with-qemu-group=oneadmin --without-uml --without-vbox --without-openvz --without-lxc Please note that I have specified qemu user and group to be non-root. So far the libvirtd service and virsh both seem to work fine but I have a few issues 1. Before running "virsh create", the image belongs to user oneadmin. During the run, it still does. But the as soon as I shutdown/destroy the instance, the image ownership changes to -rw-rw—— 1 root root I don't understand why. Is this a bug? 2. From the documentation at http://libvirt.org/drvqemu.html, the directories /var/run/libvirt/qemu/, /var/lib/libvirt/qemu/ and /var/cache/libvirt/qemu/ must all have their ownership set to oneadmin:oneadmin. However, mine are still set to root:root and it does not seem to affect the running of libvirt/qemu/kvm. For example, oneadmin@test2:~$ ls /var/run/libvirt/qemu -la total 8 drwxr-xr-x 2 root root 80 2009-11-27 13:22 . drwxr-xr-x 3 root root 100 2009-11-27 13:07 .. -rw------- 1 root root 4 2009-11-27 13:22 client.pid -rw------- 1 root root 1250 2009-11-27 13:22 client.xml 3. The libvirtd service still shows the warning message: warning : qemudStartup:904 : Unable to create cgroup for driver: No such device or address I read from earlier posts that the --without-lxc option should get rid of this message. Thank you for your help. -- Shi Jin, PhD

3 2

[libvirt] About node device enumeration problem
by ajia 30 Nov '09

30 Nov '09

Hi all, I saw two sets of node device enumeration implementation in libvirt-0.7.4 source code: 1.libudev implementation 2.HAL-based implementation I want to know which kind is used in libvirt.if both are used, which kinds solution is better? in my opinion,their abstract layer is different,HAL-based implementation may be flexible, by contrast, libudev implementation may be with better performance.whether plan to merge them or reserve a kind of implementation? thank you very much.I would be most grateful for any response . Best Regards, Alex Jia

3 2