- Devel - libvirt List Archives

[libvirt] [PATCH v4 00/13] Introduce VIR_STRDUP
by Michal Privoznik 24 May '13

24 May '13

Previously this aimed on dropping OOM report from almost everywhere (v1), then just prepare the ground (v2). Now, it just aims on introducing VIR_STRDUP and VIR_STRNDUP which do report OOM error. This will cause rebase conflicts, for sure. Sorry. Patches available at: git://gitorious.org/~zippy2/libvirt/michal-staging.git branch oom5 Michal Privoznik (13): Adapt to VIR_STRDUP and VIR_STRNDUP in src/conf/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/openvz/* Change virConnectDomainEventGraphicsCallback signature _virConnectCredential: turn @prompt into char * Adapt to VIR_STRDUP and VIR_STRNDUP in src/qemu/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/remote/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/rpc/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/security/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/util/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/xen/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/xenapi/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/xenxs/* Introduce syntax-check rule to prefer VIR_STRDUP over strdup cfg.mk | 8 + include/libvirt/libvirt.h.in | 16 +- src/conf/capabilities.c | 30 +-- src/conf/cpu_conf.c | 20 +- src/conf/domain_conf.c | 119 +++-------- src/conf/domain_event.c | 41 ++-- src/conf/node_device_conf.c | 28 ++- src/conf/nwfilter_conf.c | 17 +- src/conf/nwfilter_params.c | 34 +--- src/conf/snapshot_conf.c | 11 +- src/conf/storage_conf.c | 13 +- src/conf/virchrdev.c | 12 +- src/openvz/openvz_conf.c | 45 ++-- src/openvz/openvz_driver.c | 29 +-- src/qemu/qemu_capabilities.c | 79 +++----- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 428 +++++++++++++++------------------------ src/qemu/qemu_conf.c | 64 +++--- src/qemu/qemu_domain.c | 26 +-- src/qemu/qemu_driver.c | 129 ++++-------- src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_migration.c | 17 +- src/qemu/qemu_monitor_json.c | 63 ++---- src/qemu/qemu_monitor_text.c | 15 +- src/qemu/qemu_process.c | 64 +++--- src/remote/remote_driver.c | 116 ++++------- src/rpc/gendispatch.pl | 21 +- src/rpc/virnetclient.c | 16 +- src/rpc/virnetmessage.c | 27 ++- src/rpc/virnetsaslcontext.c | 6 +- src/rpc/virnetserver.c | 6 +- src/rpc/virnetserverclient.c | 10 +- src/rpc/virnetservermdns.c | 6 +- src/rpc/virnetsocket.c | 10 +- src/rpc/virnetsshsession.c | 78 ++++--- src/rpc/virnettlscontext.c | 26 +-- src/security/security_apparmor.c | 20 +- src/security/security_dac.c | 21 +- src/security/security_nop.c | 7 +- src/security/security_selinux.c | 79 ++------ src/security/virt-aa-helper.c | 4 +- src/util/virauth.c | 17 +- src/util/virauthconfig.c | 8 +- src/util/virbitmap.c | 9 +- src/util/vircgroup.c | 37 ++-- src/util/vircommand.c | 33 ++- src/util/virconf.c | 34 +--- src/util/virdnsmasq.c | 22 +- src/util/virebtables.c | 34 ++-- src/util/virebtables.h | 2 +- src/util/virerror.c | 19 +- src/util/virfile.c | 28 ++- src/util/virhash.c | 5 +- src/util/viridentity.c | 14 +- src/util/virinitctl.c | 4 +- src/util/viriptables.c | 4 +- src/util/virjson.c | 18 +- src/util/virkeyfile.c | 13 +- src/util/virlockspace.c | 25 +-- src/util/virlog.c | 27 +-- src/util/virnetdevmacvlan.c | 16 +- src/util/virnetdevtap.c | 11 +- src/util/virnetdevvportprofile.c | 4 +- src/util/virobject.c | 16 +- src/util/virpci.c | 13 +- src/util/virscsi.c | 6 +- src/util/virsexpr.c | 37 +--- src/util/virsocketaddr.c | 9 +- src/util/virstoragefile.c | 18 +- src/util/virstring.c | 17 +- src/util/virsysinfo.c | 293 +++++++++++---------------- src/util/virtypedparam.c | 14 +- src/util/viruri.c | 58 +++--- src/util/virutil.c | 57 ++---- src/util/virxml.c | 5 +- src/xen/block_stats.c | 16 +- src/xen/xen_driver.c | 9 +- src/xen/xen_hypervisor.c | 19 +- src/xen/xen_inotify.c | 15 +- src/xen/xend_internal.c | 68 ++----- src/xen/xm_internal.c | 9 +- src/xen/xs_internal.c | 44 ++-- src/xenapi/xenapi_driver.c | 59 +++--- src/xenapi/xenapi_utils.c | 39 ++-- src/xenxs/xen_sxpr.c | 200 ++++++++---------- src/xenxs/xen_xm.c | 91 ++++----- 86 files changed, 1244 insertions(+), 2032 deletions(-) -- 1.8.2.1

4 44

[libvirt] [PATCH] virCgroupAddTaskStrController: s/-1/-ENOMEM/
by Michal Privoznik 24 May '13

24 May '13

Within whole vircgroup.c we 'return -errno', e.g. 'return -ENOMEM'. However, in this specific function virCgroupAddTaskStrController we weren't returning -ENOMEM but -1 despite fact that later in the function we are returning one of errno values indeed. --- Notes: Pushing under trivial rule. This change has been sort of ACKed previously though: https://www.redhat.com/archives/libvir-list/2013-May/msg01731.html However, Eric suggested to be pushed as a separate patch. src/util/vircgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index cc144a5..13b7332 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1028,7 +1028,7 @@ static int virCgroupAddTaskStrController(virCgroupPtr group, char *endp; if (!(str = strdup(pidstr))) - return -1; + return -ENOMEM; cur = str; while (*cur != '\0') { -- 1.8.2.1

1 0

[libvirt] [libvirt-sandbox][PATCH] Add missing get_unit_path function into class Container
by Alex Jia 24 May '13

24 May '13

RHBZ:https://bugzilla.redhat.com/show_bug.cgi?id=966307 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- With the patch, we can successfully clone an existing Secure container, but I met a Warning, I think it may be a LibvirtGObject question, # virt-sandbox-service clone http1 clonebox Created sandbox container dir /var/lib/libvirt/filesystems/clonebox Created unit file /etc/libvirt-sandbox/services/clonebox.sandbox /usr/lib64/python2.7/site-packages/gi/types.py:47: Warning: g_key_file_set_string: assertion `string != NULL' failed return info.invoke(*args, **kwargs) Created sandbox config /etc/libvirt-sandbox/services/clonebox.sandbox bin/virt-sandbox-service | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 4496b29..2595ea2 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -60,6 +60,7 @@ class Container: DEFAULT_PATH = "/var/lib/libvirt/filesystems" DEFAULT_IMAGE = "/var/lib/libvirt/images/%s.raw" SELINUX_FILE_TYPE = "svirt_lxc_file_t" + DEFAULT_UNIT = "/etc/systemd/system/%s_sandbox.service" def __init__(self, name=None, uri = "lxc:///", path = DEFAULT_PATH, config=None, create=False): self.uri = uri @@ -132,6 +133,11 @@ class Container: name = self.get_name() return self.DEFAULT_IMAGE % name + def get_unit_path(self, name = None): + if not name: + name = self.get_name() + return self.DEFAULT_UNIT % name + def set_image(self, size): self.use_image = True self.size = size * MB -- 1.7.1

1 0

[libvirt] [PATCH] xen: Resolve Coverity FORWARD_NULL issue
by John Ferlan 24 May '13

24 May '13

Commit '18b14012' refactored the Xen code resulting in a Coverity warning about possible NULL reference if the path where the XM driver takes puts the def on it's list. Moved/duplicated the virGetDomain() call to pacify the possible NULL deref. NOTE: I did ping Dan B, but he is away, so rather than wait or take the chance this ends up in the upcoming release, I made the change. --- src/xen/xen_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index cc6e486..9eab3fc 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1658,13 +1658,14 @@ xenUnifiedDomainDefineXML(virConnectPtr conn, const char *xml) if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (xenXMDomainDefineXML(conn, def) < 0) goto cleanup; + ret = virGetDomain(conn, def->name, def->uuid); def = NULL; /* XM driver owns it now */ } else { if (xenDaemonDomainDefineXML(conn, def) < 0) goto cleanup; + ret = virGetDomain(conn, def->name, def->uuid); } - ret = virGetDomain(conn, def->name, def->uuid); if (ret) ret->id = -1; -- 1.8.1.4

2 2

[libvirt] [PATCH] docs: domain: /dev/urandom isn't a valid rng patch
by Cole Robinson 24 May '13

24 May '13

Only /dev/random and /dev/hwrng are accepted, list them explicitly. --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3a200aa..755d084 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4666,7 +4666,7 @@ qemu-kvm -net nic,model=? /dev/null <dd> <p> This backend type expects a non-blocking character device as input. - Examples of such devices are /dev/random and /dev/urandom. The file + The only accepted paths are /dev/random and /dev/hwrng. The file name is specified as contents of the <code>backend</code> element. When no file name is specified the hypervisor default is used. </p> -- 1.8.2.1

2 2

[libvirt] [PATCH] conf: add missing OOM errors
by Ján Tomko 24 May '13

24 May '13

--- Pushed under the trivial rule. src/conf/virchrdev.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 17b1f05..36fbb97 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -89,8 +89,10 @@ static char *virChrdevLockFilePath(const char *dev) ++p; } - if (virAsprintf(&path, "%s/LCK..%s", VIR_CHRDEV_LOCK_FILE_PATH, filename) < 0) + if (virAsprintf(&path, "%s/LCK..%s", VIR_CHRDEV_LOCK_FILE_PATH, filename) < 0) { + virReportOOMError(); goto cleanup; + } sanitizedPath = virFileSanitizePath(path); @@ -136,8 +138,10 @@ static int virChrdevLockFileCreate(const char *dev) /* ensure correct format according to filesystem hierarchy standard */ /* http://www.pathname.com/fhs/pub/fhs-2.3.html#VARLOCKLOCKFILES */ - if (virAsprintf(&pidStr, "%10lld\n", (long long) getpid()) < 0) + if (virAsprintf(&pidStr, "%10lld\n", (long long) getpid()) < 0) { + virReportOOMError(); goto cleanup; + } /* create the lock file */ if ((lockfd = open(path, O_WRONLY | O_CREAT | O_EXCL, 00644)) < 0) { -- 1.8.1.5

1 0

[libvirt] [PATCH] qemu: fix NBD migration to hosts with IPv6 enabled
by Ján Tomko 24 May '13

24 May '13

Since f03dcc5 we use [::] as the listening address both on qemu command line in -incoming and in nbd-server-start QMP command. However the latter requires just :: without the braces. --- src/qemu/qemu_migration.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 4767908..73ced73 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1112,6 +1112,12 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, unsigned short port = 0; char *diskAlias = NULL; size_t i; + const char *host; + + if (STREQ(listenAddr, "[::]")) + host = "::"; + else + host = listenAddr; for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk = vm->def->disks[i]; @@ -1133,7 +1139,7 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, if (!port && ((virPortAllocatorAcquire(driver->remotePorts, &port) < 0) || - (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0))) { + (qemuMonitorNBDServerStart(priv->mon, host, port) < 0))) { qemuDomainObjExitMonitor(driver, vm); goto cleanup; } -- 1.8.1.5

2 2

[libvirt] [PATCH] conf: fix use after free in virChrdevOpen
by Ján Tomko 24 May '13

24 May '13

Don't free the stream on error if we've successfully added it to the hash table, since it will be freed by virChrdevHashEntryFree callback. Preserve the error message before calling virStreamFree, since it resets the error. Reported by Sergey Fionov on libvir-list. --- src/conf/virchrdev.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 025d4a8..879c27c 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -343,6 +343,8 @@ int virChrdevOpen(virChrdevsPtr devs, virStreamPtr savedStream; const char *path; int ret; + bool added = false; + virErrorPtr savedError; switch (source->type) { case VIR_DOMAIN_CHR_TYPE_PTY: @@ -399,6 +401,7 @@ int virChrdevOpen(virChrdevsPtr devs, if (virHashAddEntry(devs->hash, path, st) < 0) goto error; + added = true; cbdata->devs = devs; if (!(cbdata->path = strdup(path))) { @@ -433,8 +436,16 @@ int virChrdevOpen(virChrdevsPtr devs, return 0; error: - virStreamFree(st); - virHashRemoveEntry(devs->hash, path); + savedError = virSaveLastError(); + + if (added) + virHashRemoveEntry(devs->hash, path); + else + virStreamFree(st); + + virSetError(savedError); + virFreeError(savedError); + if (cbdata) VIR_FREE(cbdata->path); VIR_FREE(cbdata); -- 1.8.1.5

2 2

[libvirt] Possible bug in OpenVZ guest interface name assignment
by ALVARO POLO VALDENEBRO 24 May '13

24 May '13

Hi, I think I've found a possible bug in the way OpenVZ is assigning the guest interface names when network is bridged. It's manifested at least in 1.0.5 version and master branch. As we can see in openvzDomainSetNetwork() function (openvz/openvz_driver.c:822), the field data.ethernet.dev of virDomainNetDefPtr type is used as guest interface name. If not found, then it generates a new one as ethX, calculating the next X value appropriate for the target domain. That's fine for network types other than VIR_DOMAIN_NET_TYPE_BRIDGE. But with bridged networks, there is no chance to populate data.ethernet.dev from the XML descriptor. We could guest that in such circumstance the code will detect that no name is given to data.ethernet.dev, so it will generate a new one. But that's incorrect. The virDomainNetDef.data field is a union, so data.ethernet.dev and data.bridge.brname are located in the same memory offset. That makes the openvzDomainSetNetwork() function to assign the bridge name as guest interface name every time it's invoked for bridged networks. Ideally, for bridged networking openvzDomainSetNetwork() should assign a random ethX device name instead of using the bridge name. Could somebody confirm all this? If so, I could open a new ticket in bugzilla and submit a patch. Best, Alvaro Polo Valdenebro Product Development & Innovation / Telefónica Digital C/ Don Ramón de la Cruz 82-84 Madrid 28006 (+34) 609 087 054 apv(a)tid.es ________________________________ Este mensaje se dirige exclusivamente a su destinatario. Puede consultar nuestra política de envío y recepción de correo electrónico en el enlace situado más abajo. This message is intended exclusively for its addressee. We only send and receive email on the basis of the terms set out at: http://www.tid.es/ES/PAGINAS/disclaimer.aspx

2 1

Re: [libvirt] [virt-tools-list] Q on virsh attach-disk , why no network disk ?
by Cole Robinson 24 May '13

24 May '13

On 05/22/2013 08:55 AM, Deepak C Shetty wrote: > Hi All, > I was looking at virsh attach-disk and i see the below > [snip] > > DESCRIPTION > Attach new disk device. > > OPTIONS > [--domain] <string> domain name, id or uuid > [--source] <string> source of disk device > [--target] <string> target of disk device > ... > ... > > *--sourcetype <string> type of source (block|file)* > [/snip] > > I was wondering why the sourcetype only support block|file only ? What if i > wanted to add a network (disk type=network) based drive ? Is this a constraint > of virsh or QEMU itself doesn't allow hotplu of network block device disk ? > virsh questions go to libvirt-list, CC'd. It's just a missing feature, not a deliberate omission. Patches welcome. - Cole

2 1