- Devel - libvirt List Archives

[libvirt] [PATCH] Added Storage Volume support to VIrtualBox
by Pritesh Kothari 04 Sep '09

04 Sep '09

Hi All, I have added support for Storage Volumes in VirtualBox, the patch for the same is attached here. (needs the "little bit cleanup" patch previously posted) Regards, Pritesh

2 1

[libvirt] [PATCH] openvz_conf.c: don't use undefined local, "net"
by Jim Meyering 04 Sep '09

04 Sep '09

This looks like a real bug. >From 170af3320e68a0ac2cfe854fba28abe0e4040d2c Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 3 Sep 2009 11:24:44 +0200 Subject: [PATCH] openvz_conf.c: don't use undefined local, "net" * src/openvz_conf.c (openvzReadNetworkConf): Upon openvzRead... failure, simply return -1, rather than "goto error;" where an uninitialized "net" could be dereferenced. --- src/openvz_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/openvz_conf.c b/src/openvz_conf.c index a172fe3..b1cb31a 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -197,7 +197,7 @@ openvzReadNetworkConf(virConnectPtr conn, openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not read 'IP_ADDRESS' from config for container %d"), veid); - goto error; + return -1; } else if (ret > 0) { token = strtok_r(temp, " ", &saveptr); while (token != NULL) { -- 1.6.4.2.395.ge3d52

3 4

[libvirt] [PATCH] storage_backend.c: assure clang that inputvol can't be NULL
by Jim Meyering 04 Sep '09

04 Sep '09

clang was complaining that a NULL inputvol would be dereferenced in that "could not open..." diagnostic. Since the two sole callers of this function are careful to call it only when inputvol is non-NULL, this is a good case for giving the parameter the nonnull attribute: >From 314278acb021a1f2e63494fab352bd6e9a4a38bb Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 3 Sep 2009 10:22:57 +0200 Subject: [PATCH] storage_backend.c: assure clang that inputvol can't be NULL * src/storage_backend.c (virStorageBackendCopyToFD): Declare inputvol parameter to be "nonnull". Remove test for non-NULL inputvol. Both callers ensure it's non-NULL. --- src/storage_backend.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/storage_backend.c b/src/storage_backend.c index c818142..8d1187e 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -1,7 +1,7 @@ /* * storage_backend.c: internal storage driver backend contract * - * Copyright (C) 2007-2008 Red Hat, Inc. + * Copyright (C) 2007-2009 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -106,7 +106,7 @@ enum { static int virStorageBackendCopyToFD(virConnectPtr conn, virStorageVolDefPtr vol, - virStorageVolDefPtr inputvol, + virStorageVolDefPtr inputvol ATTRIBUTE_NONNULL, int fd, unsigned long long *total, int is_dest_file) @@ -119,13 +119,11 @@ virStorageBackendCopyToFD(virConnectPtr conn, char zerobuf[512]; char *buf = NULL; - if (inputvol) { - if ((inputfd = open(inputvol->target.path, O_RDONLY)) < 0) { - virReportSystemError(conn, errno, - _("could not open input path '%s'"), - inputvol->target.path); - goto cleanup; - } + if ((inputfd = open(inputvol->target.path, O_RDONLY)) < 0) { + virReportSystemError(conn, errno, + _("could not open input path '%s'"), + inputvol->target.path); + goto cleanup; } bzero(&zerobuf, sizeof(zerobuf)); -- 1.6.4.2.395.ge3d52

3 4

[libvirt] [PATCH] little bit cleanup
by Pritesh Kothari 04 Sep '09

04 Sep '09

Hi All, Just cleaned up some code to make the it more readable. The patch is attached here with. Directly applies to the HEAD as of today. Regards, Pritesh

3 2

[libvirt] [PATCH] Minor comment changes.
by Laine Stump 04 Sep '09

04 Sep '09

Fix some minor grammer (and one other) nits in comments that end up in generated API reference documentation. No functional/binary differences. --- src/libvirt.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index ca8e003..ce3d6ba 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -592,9 +592,9 @@ virRegisterNetworkDriver(virNetworkDriverPtr driver) /** * virRegisterInterfaceDriver: - * @driver: pointer to a interface driver block + * @driver: pointer to an interface driver block * - * Register a interface virtualization driver + * Register an interface virtualization driver * * Returns the driver priority or -1 in case of error. */ @@ -5365,7 +5365,7 @@ error: /** * virNetworkGetXMLDesc: * @network: a network object - * @flags: and OR'ed set of extraction flags, not used yet + * @flags: an OR'ed set of extraction flags, not used yet * * Provide an XML description of the network. The description may be reused * later to relaunch the network with virNetworkCreateXML(). @@ -5545,7 +5545,7 @@ error: /** * virInterfaceGetConnect: - * @iface: pointer to a interface + * @iface: pointer to an interface * * Provides the connection pointer associated with an interface. The * reference counter on the connection is not increased by this @@ -5819,7 +5819,7 @@ error: /** * virInterfaceGetName: - * @iface: a interface object + * @iface: an interface object * * Get the public name for that interface * @@ -5842,9 +5842,9 @@ virInterfaceGetName(virInterfacePtr iface) /** * virInterfaceGetMACString: - * @iface: a interface object + * @iface: an interface object * - * Get the MAC for a interface as string. For more information about + * Get the MAC for an interface as string. For more information about * MAC see RFC4122. * * Returns a pointer to the MAC address (in null-terminated ASCII @@ -5867,11 +5867,11 @@ virInterfaceGetMACString(virInterfacePtr iface) /** * virInterfaceGetXMLDesc: - * @iface: a interface object - * @flags: and OR'ed set of extraction flags, not used yet + * @iface: an interface object + * @flags: an OR'ed set of extraction flags, not used yet * * Provide an XML description of the interface. The description may be reused - * later to recreate the interface with virInterfaceCreateXML(). + * later to redefine the interface with virInterfaceDefineXML(). * * Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. * the caller must free() the returned value. @@ -6100,7 +6100,7 @@ error: * This method is typically useful for applications where multiple * threads are using a connection, and it is required that the * connection remain open until all threads have finished using - * it. ie, each new thread using a interface would increment + * it. ie, each new thread using an interface would increment * the reference count. * * Returns 0 in case of success, -1 in case of failure. @@ -6121,7 +6121,7 @@ virInterfaceRef(virInterfacePtr iface) /** * virInterfaceFree: - * @iface: a interface object + * @iface: an interface object * * Free the interface object. The interface itself is unaltered. * The data structure is freed and should not be used thereafter. -- 1.6.2.5

3 2

[libvirt] [PATCH] Fix a memory leak in virsh.
by Laine Stump 04 Sep '09

04 Sep '09

I found this while looking for examples of using virNodeDeviceGetXMLDesc(). AFAIK, *all* of the *GetXMLDesc() functions return a newly allocated chunk of memory that is owned by the caller, who must free it when they're done... --- src/virsh.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index 15e0cef..910d860 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -5521,6 +5521,7 @@ cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd) { const char *name; virNodeDevicePtr device; + char *xml; if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; @@ -5531,7 +5532,14 @@ cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd) return FALSE; } - vshPrint(ctl, "%s\n", virNodeDeviceGetXMLDesc(device, 0)); + xml = virNodeDeviceGetXMLDesc(device, 0); + if (!xml) { + virNodeDeviceFree(device); + return FALSE; + } + + vshPrint(ctl, "%s\n", xml); + free(xml); virNodeDeviceFree(device); return TRUE; } -- 1.6.2.5

3 2

[libvirt] [PATCH] Fix sexpr2string() to handle empty list
by Jim Fehlig 04 Sep '09

04 Sep '09

Finally have some time to submit this small patch for a bug I'm seeing with Xen 3.3.1. If s-expression returned by xend contains an empty list, sexpr2string() failed to serialize it. E.g. sexpr containing (cpus (()())) would cause sexpr2string() to fail. I spoke with danpb on IRC about this bug and he suggested adding a XML/sexpr pair that exhibits the problem to tests/xml2sexprtest.c. I can easily produce the sexpr but not the case with XML. The empty cpus lists indicate no explicit affinity and AFAIK the only way to express this in XML is absence of cpuset attribute in vcpu element. But IMO we should not produce the (cpus (()()...)) sexpr in this case. It should only be produced when user has explicitly specified affinity. Does this sound reasonable? Regards, Jim

2 1

[libvirt] [PATCH] Fix ID field in virDomainPtr after starting Xen guest
by Daniel P. Berrange 04 Sep '09

04 Sep '09

* src/xend_internal.c: Lookup guest after starting persistent config in order to refresh the domain ID field --- src/xend_internal.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/xend_internal.c b/src/xend_internal.c index 7bcee7d..459b6bc 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -4537,6 +4537,8 @@ virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) { int xenDaemonDomainCreate(virDomainPtr domain) { xenUnifiedPrivatePtr priv; + int ret; + virDomainPtr tmp; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, @@ -4549,7 +4551,17 @@ int xenDaemonDomainCreate(virDomainPtr domain) if (priv->xendConfigVersion < 3) return(-1); - return xend_op(domain->conn, domain->name, "op", "start", NULL); + ret = xend_op(domain->conn, domain->name, "op", "start", NULL); + + if (ret != -1) { + /* Need to force a refresh of this object's ID */ + tmp = virDomainLookupByName(domain->conn, domain->name); + if (tmp) { + domain->id = tmp->id; + virDomainFree(tmp); + } + } + return ret; } int xenDaemonDomainUndefine(virDomainPtr domain) -- 1.6.4

2 1

[libvirt] Save & Restore Synchronization
by Erkan Unal 04 Sep '09

04 Sep '09

Hi, I am using libvirt for qemu/kvm. I have following questions in terms of save and restore (Version 0.6.2): 1) As I checked the libvirt code, restore command is asynchronous. There is a macro called VIR_EXEC_NONBLOCK but there is no macro called VIR_EXEC_BLOCK. Is it possible to execute the restore in blocking mode so that I can measure the whole restore time? 2) I tried to measure the time spent to save the VM. I am executing save command and getting a timing. However when I execute the following operations in order I got an error right after script issues the restore operation (No delay between them): "save->restore->save" ... the error is: 20:19:02.478: error : internal error Unable to open monitor path /dev/pts/3 libvir: QEMU error : internal error Unable to open monitor path /dev/pts/3 20:19:02.478: error : internal error unable to start guest: char device redirected to /dev/pts/3 inet_listen: bind(ipv4,127.0.0.1,5912): Address already in use inet_listen: FAILED libvir: QEMU error : internal error unable to start guest: char device redirected to /dev/pts/3 inet_listen: bind(ipv4,127.0.0.1,5912): Address already in use inet_listen: FAILED 20:19:02.482: error : operation failed: failed to start VM libvir: QEMU error : operation failed: failed to start VM error: Failed to restore domain from /path/to/the/save/file error: operation failed: failed to start VM (You can find the detailed error report in the attachement when LIBVIRT_DEBUG flag is 1) I think that some of the cleanup is non-blocking which are cleanup of pty device and vncserver. However, I am not sure if destroying the qemu process is asynchronous?? P.S.: If I put one second delay between first save and restore, there is no error. Save and restore work fine. Thanks, Erkan Unal 20:26:07.506: debug : virInitialize:287 : register drivers 20:26:07.506: debug : virRegisterDriver:660 : registering Test as driver 0 20:26:07.506: debug : virRegisterNetworkDriver:560 : registering Test as network driver 0 20:26:07.506: debug : virRegisterStorageDriver:591 : registering Test as storage driver 0 20:26:07.506: debug : virRegisterDeviceMonitor:622 : registering Test as device driver 0 20:26:07.506: debug : virRegisterDriver:660 : registering Xen as driver 1 20:26:07.506: debug : virRegisterDriver:660 : registering OPENVZ as driver 2 20:26:07.506: debug : virRegisterDriver:660 : registering remote as driver 3 20:26:07.506: debug : virRegisterNetworkDriver:560 : registering remote as network driver 1 20:26:07.506: debug : virRegisterStorageDriver:591 : registering remote as storage driver 1 20:26:07.506: debug : virRegisterDeviceMonitor:622 : registering remote as device driver 1 20:26:07.506: debug : virConnectOpenAuth:1089 : name=qemu:///session, auth=0x7fa21cbae660, flags=0 20:26:07.506: debug : do_open:909 : name "qemu:///session" to URI components: scheme qemu opaque (null) authority (null) server (null) user (null) port 0 path /session 20:26:07.506: debug : do_open:919 : trying driver 0 (Test) ... 20:26:07.506: debug : do_open:925 : driver 0 Test returned DECLINED 20:26:07.506: debug : do_open:919 : trying driver 1 (Xen) ... 20:26:07.506: debug : do_open:925 : driver 1 Xen returned DECLINED 20:26:07.506: debug : do_open:919 : trying driver 2 (OPENVZ) ... 20:26:07.506: debug : do_open:925 : driver 2 OPENVZ returned DECLINED 20:26:07.506: debug : do_open:919 : trying driver 3 (remote) ... 20:26:07.506: debug : remoteOpen:974 : Auto-remote UNIX socket 20:26:07.506: debug : remoteOpen:992 : Auto-spawn user daemon instance 20:26:07.506: debug : doRemoteOpen:511 : proceeding with name = qemu:///session 20:26:07.507: debug : call:6473 : Doing call 66 (nil) 20:26:07.507: debug : call:6543 : We have the buck 66 0x7fa21bdb5010 0x7fa21bdb5010 20:26:07.507: debug : processCallRecvLen:6131 : Got length, now need 36 total (32 more) 20:26:07.507: debug : processCalls:6399 : Giving up the buck 66 0x7fa21bdb5010 (nil) 20:26:07.507: debug : call:6574 : All done with our call 66 (nil) 0x7fa21bdb5010 20:26:07.507: debug : call:6473 : Doing call 1 (nil) 20:26:07.507: debug : call:6543 : We have the buck 1 0xf86d80 0xf86d80 20:26:07.509: debug : processCallRecvLen:6131 : Got length, now need 28 total (24 more) 20:26:07.509: debug : processCalls:6399 : Giving up the buck 1 0xf86d80 (nil) 20:26:07.509: debug : call:6574 : All done with our call 1 (nil) 0xf86d80 20:26:07.509: debug : doRemoteOpen:822 : Adding Handler for remote events 20:26:07.509: debug : doRemoteOpen:829 : virEventAddHandle failed: No addHandleImpl defined. continuing without events. 20:26:07.509: debug : do_open:925 : driver 3 remote returned SUCCESS 20:26:07.509: debug : do_open:945 : network driver 0 Test returned DECLINED 20:26:07.509: debug : do_open:945 : network driver 1 remote returned SUCCESS 20:26:07.509: debug : do_open:967 : storage driver 0 Test returned DECLINED 20:26:07.509: debug : do_open:967 : storage driver 1 remote returned SUCCESS 20:26:07.510: debug : do_open:988 : node driver 0 Test returned DECLINED 20:26:07.510: debug : do_open:988 : node driver 1 remote returned SUCCESS 20:26:07.510: debug : virDomainRestore:2012 : conn=0xf82430, from=/path/to/save/file 20:26:07.510: debug : call:6473 : Doing call 54 (nil) 20:26:07.510: debug : call:6543 : We have the buck 54 0xf86d80 0xf86d80 20:26:07.625: error : internal error Unable to open monitor path /dev/pts/3 libvir: QEMU error : internal error Unable to open monitor path /dev/pts/3 20:26:07.625: error : internal error unable to start guest: char device redirected to /dev/pts/3 inet_listen: bind(ipv4,127.0.0.1,5912): Address already in use inet_listen: FAILED libvir: QEMU error : internal error unable to start guest: char device redirected to /dev/pts/3 inet_listen: bind(ipv4,127.0.0.1,5912): Address already in use inet_listen: FAILED 20:26:07.629: error : operation failed: failed to start VM libvir: QEMU error : operation failed: failed to start VM 20:26:07.629: debug : processCallRecvLen:6131 : Got length, now need 160 total (156 more) 20:26:07.629: debug : processCalls:6399 : Giving up the buck 54 0xf86d80 (nil) 20:26:07.629: debug : call:6574 : All done with our call 54 (nil) 0xf86d80 error: Failed to restore domain from /path/to/save/file error: operation failed: failed to start VM 20:26:07.629: debug : virConnectClose:1107 : conn=0xf82430 20:26:07.629: debug : call:6473 : Doing call 2 (nil) 20:26:07.629: debug : call:6543 : We have the buck 2 0xf86d80 0xf86d80 20:26:07.629: debug : processCallRecvLen:6131 : Got length, now need 28 total (24 more) 20:26:07.629: debug : processCalls:6399 : Giving up the buck 2 0xf86d80 (nil) 20:26:07.629: debug : call:6574 : All done with our call 2 (nil) 0xf86d80 20:26:07.629: debug : virUnrefConnect:210 : unref connection 0xf82430 1 20:26:07.629: debug : virReleaseConnect:171 : release connection 0xf82430

2 1

[libvirt] libvirt socket closed unexpectedly / libvirt broken pipe
by Dave 04 Sep '09

04 Sep '09

Hello, I'm trying to get eucalyptus v1.5.2 working with debian lenny, the relevant versions of libvirt software installed are from the apt-get repos, which are: # dpkg -l|grep libvirt ii libvirt-bin 0.4.6-10 the programs for the libvirt library ii libvirt0 0.4.6-10 library for interfacing with different virtualization systems The the conf file looks like so: # cat libvirtd.conf|grep -v '#' unix_sock_group = "libvirt" unix_sock_rw_perms = "0770" auth_unix_ro = "none" auth_unix_rw = "none" ----- my eucalyptus nc.log has the following error, which i believe is the issue, basically any instance i start, terminates about a minute later by itself, any guidance or help is much appreciated [Sat Aug 15 03:20:41 2009][004602][EUCAERROR ] libvirt: socket closed unexpectedly (code=39) [Sat Aug 15 03:20:43 2009][004602][EUCAERROR ] libvirt: Broken pipe (code=38) thoughts? ideas?

2 1

[libvirt] [PATCH] Allow libvirtd to RPC to external libvirtd.
by Chris Lalancette 04 Sep '09

04 Sep '09

Allow the daemon itself to make RPCs to an external libvirtd, but only if the URI is fully specified. While this isn't used at the moment, it will be for the tunnelled migration support in the future. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/remote_internal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote_internal.c b/src/remote_internal.c index bc69c70..a416cf3 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -1001,7 +1001,7 @@ remoteOpen (virConnectPtr conn, int ret, rflags = 0; const char *autostart = getenv("LIBVIRT_AUTOSTART"); - if (inside_daemon) + if (inside_daemon && (!conn->uri || (conn->uri && !conn->uri->server))) return VIR_DRV_OPEN_DECLINED; if (!(priv = remoteAllocPrivateData(conn))) -- 1.6.0.6

2 3

[libvirt] On pidfile security and using -daemonize to start qemu/kvm
by Charles Duffy 03 Sep '09

03 Sep '09

I had a brief conversation with Daniel Berrange on IRC this morning regarding race conditions in libvirt's invocation of qemu domains. The preferred approach from qemu's maintainership is using -daemonize at invocation, and then waiting for the process to exit before attempting to connect to the monitor; after this occurs, qemu guarantees monitor availability, so no retry/timeout behavior is necessary. Dan pointed out an issue with this approach: To determine the PID of the qemu instance started, the -pidfile argument to qemu needs to be used with -daemonize. However, -pidfile writes the requested pidfile with qemu's permissions; if the guest were subverted, it could rewrite its pidfile and lead libvirt to kill other, arbitrary processes. Neither changing permissions with -runas rather than prior to invocation nor chown'ing the pidfile from libvirt after creation helps, as qemu keeps a file handle on it open throughout operation (to maintain a POSIX lock on the file). However, a workaround exists, and it meshes well with a security fix which needs to be implemented anyhow: At present, on initial startup or libvirtd restart, we read the PIDs associated with vCPUs from the monitor in virDetectVcpuPIDs(); doing this on libvirtd restart poses a security risk for the reason given above, so we need to have libvirtd record the PIDs on initial startup (before any untrusted code within the guest is ever run) regardless. If we also read the libvirtd pidfile at this same early time (before the guest has been started and thus had an opportunity to run untrusted code) and include its contents when writing out the vCPU PIDs, this would eliminate the issue with pidfile ownership blocking use of -daemonize. Thoughts?

2 1

[libvirt] [PATCH] xen_internal.c: remove two unused local variables
by Jim Meyering 03 Sep '09

03 Sep '09

Obviously unnecessary. Maybe someone had plans for these long ago? >From 94730ec1d99076cd18b04b950adad7c7a576071f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 3 Sep 2009 17:11:14 +0200 Subject: [PATCH] xen_internal.c: remove two unused local variables * src/xen_internal.c (xenHypervisorSetSchedulerParameters): Remove set-but-never-used local variables, cap_set and weight_set. --- src/xen_internal.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/src/xen_internal.c b/src/xen_internal.c index ae78f84..30fd8bd 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -1299,9 +1299,6 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain, TODO return(-1); case XEN_SCHEDULER_CREDIT: { - int weight_set = 0; - int cap_set = 0; - memset(&op_dom, 0, sizeof(op_dom)); op_dom.cmd = XEN_V2_OP_SCHEDULER; op_dom.domain = (domid_t) domain->id; @@ -1326,7 +1323,6 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain, return(-1); } op_dom.u.getschedinfo.u.credit.weight = val; - weight_set = 1; } else if (STREQ (params[i].field, str_cap) && params[i].type == VIR_DOMAIN_SCHED_FIELD_UINT) { val = params[i].value.ui; @@ -1336,7 +1332,6 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain, return(-1); } op_dom.u.getschedinfo.u.credit.cap = val; - cap_set = 1; } else { virXenErrorFunc (domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, "Credit scheduler accepts 'cap' and 'weight' integer parameters", -- 1.6.4.2.395.ge3d52

2 1

[libvirt] [PATCH] python: let libvirt_virConnectDomainEventCallback indicate success
by Jim Meyering 03 Sep '09

03 Sep '09

First dead-store-related bug fix: >From 6024fb05dfa2dd408ad79abbac88791f5048af11 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 3 Sep 2009 14:09:49 +0200 Subject: [PATCH] python: let libvirt_virConnectDomainEventCallback indicate success * python/libvir.c (libvirt_virConnectDomainEventCallback): Return 0 when successful, rather than always returning -1. clang flagged this function for its dead-store of "ret=0". Once "ret" was set to 0, it was never used, and the function would always return -1. --- python/libvir.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/libvir.c b/python/libvir.c index e2c196a..0c00b80 100644 --- a/python/libvir.c +++ b/python/libvir.c @@ -4,7 +4,7 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2005, 2007, 2008 Red Hat, Inc. + * Copyright (C) 2005, 2007-2009 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ @@ -1812,7 +1812,7 @@ libvirt_virConnectDomainEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, cleanup: LIBVIRT_RELEASE_THREAD_STATE; - return -1; + return ret; } static PyObject * -- 1.6.4.2.395.ge3d52

2 1

[libvirt] [PATCH 0/3] QEMU directory/monitor socket fixes/cleanup
by Daniel P. Berrange 03 Sep '09

03 Sep '09

This patch series does three things - Moves QEMU monitor sockets in /var/lib/libvirt/qemu, since this is created file and thus should be separate from libvirtd created data to avoid risk from QEMU compromise. - Sets QEMU directory ownership to match configured qemu user/group - Fixes a minor memory leak / socket unlink

2 4

[libvirt] [PATCH 2/2]: VirtualBox: Updated vboxNetworkUndefine() and vboxNetworkDestroy()
by Pritesh Kothari 03 Sep '09

03 Sep '09

Hi All, I have made some changes to the functions vboxNetworkCreateXML(), vboxNetworkDefineXML(), vboxNetworkUndefine() and vboxNetworkDestroy() to handle multiple host only interfaces as multiple host only interfaces are supported by VirtualBox 3.0 and greater. The patch's are as below: PATCH 1/2: Merged vboxNetworkCreateXML() and vboxNetworkDefineXML() and added code to handle multiple hostonly interfaces. PATCH 2/2: Merged vboxNetworkUndefine() and vboxNetworkDestroy() and added code to handle multiple hostonly interfaces. Regards, Pritesh

3 2

[libvirt] [PATCH] esx_vi: remove unreachable code
by Jim Meyering 03 Sep '09

03 Sep '09

This removes dead code and suppresses a warning from clang. However, see below: >From 2ed548cbe948aa7ef37ccd121bd084bd05019ac8 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 3 Sep 2009 16:35:47 +0200 Subject: [PATCH] esx_vi: remove unreachable code * src/esx/esx_vi.c (esxVI_Enumeration_Deserialize): Remove unreachable code. --- src/esx/esx_vi.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 0da908b..c689a7a 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -857,8 +857,6 @@ esxVI_Enumeration_Deserialize(virConnectPtr conn, failure: goto cleanup; - - result = -1; } -------------------------------------------- This function does not allow the caller to distinguish via its return value whether it has failed. It always returns 0. I see that this function's return value is used in numerous places (each esxVI_.*Deserialize function), so this should be fixed. int esxVI_Enumeration_Deserialize(virConnectPtr conn, const esxVI_Enumeration *enumeration, xmlNodePtr node, int *value) { int i; int result = 0; char *name = NULL; if (value == NULL) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); goto failure; } *value = 0; /* undefined */ if (esxVI_String_DeserializeValue(conn, node, &name) < 0) { goto failure; } for (i = 0; enumeration->values[i].name != NULL; ++i) { if (STREQ(name, enumeration->values[i].name)) { *value = enumeration->values[i].value; goto cleanup; } } ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Unknown value '%s' for %s", name, enumeration->type); cleanup: VIR_FREE(name); return result; failure: goto cleanup; }

2 2

[libvirt] [PATCH 0/1] Support huge pages in guests
by Daniel P. Berrange 03 Sep '09

03 Sep '09

This patch is an update of John Cooper's original work from last month http://www.redhat.com/archives/libvir-list/2009-July/msg00753.html Changes since that patch - We create a directory $MOUNTPOINT/libvirt/qemu inside the hugetlbfs mount point. This is neccessary because QEMU now runs as 'qemu:qemu' in Fedora and thus cannot create files in the root. libvirtd will automatically chown() this subdir to allow QEMU guests access - Don't automatically probe for hugetlbfs mount if runing as an unprivileged libvirtd, since user won't have access to the mount unless administrator has manually created them a subdir. - Change the XML to look like <memoryBacking> <hugepages/> </memoryBacking> This is because I fear we may have more config options for memory backing store in the future, such as whether KVM can use KSM for sharing on the guest. - Add a test case for it in the XML -> ARGV convetor - Document the new XML options - Add the new XML options to the RNG schema - Fix setup & auto-detection of hugetlbfs mount if no qemu.conf file exists at all - Add config parameter to the augeas schema - Move the code which finds a mount point into util.c since its not specific to QEMU

4 5

[libvirt] PATCH 0/0: Support setting a disk drive serial (number) v2
by Daniel P. Berrange 03 Sep '09

03 Sep '09

This is a second version of the patch posted here http://www.redhat.com/archives/libvir-list/2009-August/msg00341.html In this version, I make the QEMU driver refuse to run with any serial that doesn't contain 0-9, a-Z, -, _, since there's no way to escape special chars in QEMU command line args. Hopefully we can lift this restriction in a future version of QEMU I also add a check that serial=s is actually supported by QEMU

3 3

[libvirt] [PATCH] mdns.c: remove dead initialization
by Jim Meyering 03 Sep '09

03 Sep '09

The only following uses of group look like this: (always preceded by initialization): AVAHI_DEBUG("Client collision/connecting %p", mdns->client); group = mdns->group; while (group) { if (group->handle) avahi_entry_group_reset(group->handle); group = group->next; } So the value used in the initialization at the top is never used. >From 515e4a4542ce396b8775c618cbe17a30b78299b4 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 3 Sep 2009 13:45:22 +0200 Subject: [PATCH] mdns.c: remove dead initialization * qemud/mdns.c (libvirtd_mdns_client_callback): Remove dead initialization. --- qemud/mdns.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/qemud/mdns.c b/qemud/mdns.c index ae6ff08..73b7d11 100644 --- a/qemud/mdns.c +++ b/qemud/mdns.c @@ -178,7 +178,7 @@ static void libvirtd_mdns_create_services(struct libvirtd_mdns_group *group) { static void libvirtd_mdns_client_callback(AvahiClient *c, AvahiClientState state, void *userdata) { struct libvirtd_mdns *mdns = (struct libvirtd_mdns *)userdata; - struct libvirtd_mdns_group *group = mdns->group; + struct libvirtd_mdns_group *group; if (!mdns->client) mdns->client = c; -- 1.6.4.2.395.ge3d52

2 1

[libvirt] [PATCH] node_device_conf.c: remove dead initialization
by Jim Meyering 03 Sep '09

03 Sep '09

The following use of "caps" is the assignment in a for-loop, so the initialization is unnecessary. >From 7032a0b370db1a9489cf19fce0cabbb6959320ab Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 3 Sep 2009 13:38:57 +0200 Subject: [PATCH] node_device_conf.c: remove dead initialization * src/node_device_conf.c (virNodeDeviceDefFormat): Remove dead initialization. --- src/node_device_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/node_device_conf.c b/src/node_device_conf.c index 56a9bb5..5b25bb7 100644 --- a/src/node_device_conf.c +++ b/src/node_device_conf.c @@ -213,7 +213,7 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, const virNodeDeviceDefPtr def) { virBuffer buf = VIR_BUFFER_INITIALIZER; - virNodeDevCapsDefPtr caps = def->caps; + virNodeDevCapsDefPtr caps; char *tmp; virBufferAddLit(&buf, "<device>\n"); -- 1.6.4.2.395.ge3d52

2 1

[libvirt] [PATCH] Fix misc OOM bugs
by Daniel P. Berrange 03 Sep '09

03 Sep '09

* tests/testutils.c: Run test function twice, once to prime it for static allocations, once to count the non-static allocations. * tests/testutilsqemu.c: Initialize variable correctl * src/capabilities.c: Don't free machines variable upon failure since caller must do that * src/xm_internal.c: Add missing check for OOM in building VIF config param --- src/capabilities.c | 17 +++++++++-------- src/xm_internal.c | 3 +++ tests/testutils.c | 12 ++++++++---- tests/testutilsqemu.c | 2 +- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/capabilities.c b/src/capabilities.c index 193a9fe..289180d 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -354,10 +354,6 @@ virCapabilitiesAddGuest(virCapsPtr caps, if (loader && (guest->arch.defaultInfo.loader = strdup(loader)) == NULL) goto no_memory; - if (nmachines) { - guest->arch.defaultInfo.nmachines = nmachines; - guest->arch.defaultInfo.machines = machines; - } if (VIR_REALLOC_N(caps->guests, caps->nguests + 1) < 0) @@ -365,6 +361,11 @@ virCapabilitiesAddGuest(virCapsPtr caps, caps->guests[caps->nguests] = guest; caps->nguests++; + if (nmachines) { + guest->arch.defaultInfo.nmachines = nmachines; + guest->arch.defaultInfo.machines = machines; + } + return guest; no_memory: @@ -407,10 +408,6 @@ virCapabilitiesAddGuestDomain(virCapsGuestPtr guest, if (loader && (dom->info.loader = strdup(loader)) == NULL) goto no_memory; - if (nmachines) { - dom->info.nmachines = nmachines; - dom->info.machines = machines; - } if (VIR_REALLOC_N(guest->arch.domains, guest->arch.ndomains + 1) < 0) @@ -418,6 +415,10 @@ virCapabilitiesAddGuestDomain(virCapsGuestPtr guest, guest->arch.domains[guest->arch.ndomains] = dom; guest->arch.ndomains++; + if (nmachines) { + dom->info.nmachines = nmachines; + dom->info.machines = machines; + } return dom; diff --git a/src/xm_internal.c b/src/xm_internal.c index 71b852e..66f1e1c 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -2048,6 +2048,9 @@ static int xenXMDomainConfigFormatNet(virConnectPtr conn, virBufferVSprintf(&buf, ",vifname=%s", net->ifname); + if (virBufferError(&buf)) + goto cleanup; + if (VIR_ALLOC(val) < 0) { virReportOOMError(conn); goto cleanup; diff --git a/tests/testutils.c b/tests/testutils.c index 7a1dbdc..5072fec 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -367,10 +367,7 @@ int virtTestMain(int argc, } } - if (testOOM) - virAllocTestInit(); - - /* Run once to count allocs, and ensure it passes :-) */ + /* Run once to prime any static allocations & ensure it passes */ ret = (func)(argc, argv); if (ret != EXIT_SUCCESS) goto cleanup; @@ -385,6 +382,13 @@ int virtTestMain(int argc, testOOM++; virSetErrorFunc(NULL, virtTestErrorFuncQuiet); + virAllocTestInit(); + + /* Run again to count allocs, and ensure it passes :-) */ + ret = (func)(argc, argv); + if (ret != EXIT_SUCCESS) + goto cleanup; + approxAlloc = virAllocTestCount(); testCounter++; if (testDebug) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 58707e1..6b6a185 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -9,7 +9,7 @@ virCapsPtr testQemuCapsInit(void) { struct utsname utsname; virCapsPtr caps; virCapsGuestPtr guest; - virCapsGuestMachinePtr *machines; + virCapsGuestMachinePtr *machines = NULL; int nmachines; static const char *const x86_machines[] = { "pc", "isapc" -- 1.6.2.5

2 2

[libvirt] [PATCH] remote_internal.c: don't dereference a NULL "conn"
by Jim Meyering 03 Sep '09

03 Sep '09

Here's the test just before the else-if in the patch below: if (conn && conn->driver && STREQ (conn->driver->name, "remote")) { So, in the else-branch, "conn" is guaranteed to be NULL. And dereferenced. This may be only a theoretical risk, but if so, the test of "conn" above should be changed to an assertion, and/or the parameter should get the nonnull attribute. >From a1b1d36d96f6b50ddf514539af85da20ca671bf5 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 2 Sep 2009 11:54:38 +0200 Subject: [PATCH] remote_internal.c: don't dereference a NULL "conn" * src/remote_internal.c (remoteDevMonOpen): Avoid NULL-dereference. --- src/remote_internal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote_internal.c b/src/remote_internal.c index ea50c11..141fef9 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -5148,7 +5148,7 @@ remoteDevMonOpen(virConnectPtr conn, conn->devMonPrivateData = priv; remoteDriverUnlock(priv); return VIR_DRV_OPEN_SUCCESS; - } else if (conn->networkDriver && + } else if (conn && conn->networkDriver && STREQ (conn->networkDriver->name, "remote")) { struct private_data *priv = conn->networkPrivateData; remoteDriverLock(priv); -- 1.6.4.2.395.ge3d52

5 9

[libvirt] [PATCH] test.c: don't use undefined local, "def"
by Jim Meyering 03 Sep '09

03 Sep '09

another real bug: >From fd41bd47252654f84684830e02ecbeb3d26e7dee Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 3 Sep 2009 12:12:19 +0200 Subject: [PATCH] test.c: don't use undefined local, "def" * src/test.c (testOpenVolumesForPool): Upon early virAsprintf or virXPathNodeSet failure, "goto error" would take us to virStorageVolDefFree(def), but with "def" not defined. Initialize it to NULL. --- src/test.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test.c b/src/test.c index 7c8f85b..895cce1 100644 --- a/src/test.c +++ b/src/test.c @@ -435,7 +435,7 @@ static int testOpenVolumesForPool(virConnectPtr conn, char *vol_xpath; int i, ret, func_ret = -1; xmlNodePtr *vols = NULL; - virStorageVolDefPtr def; + virStorageVolDefPtr def = NULL; /* Find storage volumes */ if (virAsprintf(&vol_xpath, "/node/pool[%d]/volume", poolidx) < 0) { -- 1.6.4.2.395.ge3d52

2 1

[libvirt] Support for XCI (Xen Client)
by Andreas Sommer 03 Sep '09

03 Sep '09

Hi, I just wondered whether the Xen Client project (http://www.xen.org/products/xci.html) has been tested, or is supported by libvirt at all? I'm not sure if it has a different Xen API, but it definitely has different domain configuration files - that's why I ask. Best regards

2 1