- Devel - libvirt List Archives

[libvirt] [PATCH] docs: fix typos
by Eric Blake 16 Feb '11

16 Feb '11

* docs/drvopenvz.html.in: Spell administrator correctly. * docs/drvuml.html.in: Likewise. * src/qemu/qemu.conf: Likewise. Fix other typos, too. --- Pushing under the obvious rule. docs/drvopenvz.html.in | 2 +- docs/drvuml.html.in | 2 +- src/qemu/qemu.conf | 25 +++++++++++++------------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/docs/drvopenvz.html.in b/docs/drvopenvz.html.in index 485d209..ddd6ac1 100644 --- a/docs/drvopenvz.html.in +++ b/docs/drvopenvz.html.in @@ -55,7 +55,7 @@ openvz+ssh://root@example.com/system (remote access, SSH tunnelled) OpenVZ releases later than 3.0.23 ship with a standard network device setup script that is able to setup bridging, named <code>/usr/sbin/vznetaddbr</code>. For releases prior to 3.0.23, this - script must be created manually by the host OS adminstrator. The + script must be created manually by the host OS administrator. The simplest way is to just download the latest version of this script from a newer OpenVZ release, or upstream source repository. Then a generic configuration file <code>/etc/vz/vznetctl.conf</code> diff --git a/docs/drvuml.html.in b/docs/drvuml.html.in index 9e5db95..d18e9cc 100644 --- a/docs/drvuml.html.in +++ b/docs/drvuml.html.in @@ -7,7 +7,7 @@ guests built for User Mode Linux. UML requires no special support in the host kernel, so can be used by any user of any linux system, provided they have enough free RAM for their guest's needs, though there are - certain restrictions on network connectivity unless the adminstrator + certain restrictions on network connectivity unless the administrator has pre-created TAP devices. </p> diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 66310d4..8c6b996 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -47,7 +47,7 @@ # The default TLS configuration only uses certificates for the server # allowing the client to verify the server's identity and establish -# and encrypted channel. +# an encrypted channel. # # It is possible to use x509 certificates for authentication too, by # issuing a x509 certificate to every client who needs to connect. @@ -62,9 +62,9 @@ # VNC passwords. This parameter is only used if the per-domain # XML config does not already provide a password. To allow # access without passwords, leave this commented out. An empty -# string will still enable passwords, but be rejected by QEMU +# string will still enable passwords, but be rejected by QEMU, # effectively preventing any use of VNC. Obviously change this -# example here before you set this +# example here before you set this. # # vnc_password = "XYZ12345" @@ -115,7 +115,7 @@ # server-cert.pem - the server certificate signed with ca-cert.pem # server-key.pem - the server private key # -# This option allows the certificate directory to be changed +# This option allows the certificate directory to be changed. # # spice_tls_x509_cert_dir = "/etc/pki/libvirt-spice" @@ -124,8 +124,8 @@ # per-domain XML config does not already provide a password. To # allow access without passwords, leave this commented out. An # empty string will still enable passwords, but be rejected by -# QEMU effectively preventing any use of SPICE. Obviously change -# this example here before you set this +# QEMU, effectively preventing any use of SPICE. Obviously change +# this example here before you set this. # # spice_password = "XYZ12345" @@ -134,15 +134,15 @@ # on the host, then the security driver will automatically disable # itself. If you wish to disable QEMU SELinux security driver while # leaving SELinux enabled for the host in general, then set this -# to 'none' instead +# to 'none' instead. # # security_driver = "selinux" -# The user ID for QEMU processes run by the system instance +# The user ID for QEMU processes run by the system instance. #user = "root" -# The group ID for QEMU processes run by the system instance +# The group ID for QEMU processes run by the system instance. #group = "root" # Whether libvirt should dynamically change file ownership @@ -155,14 +155,15 @@ # # - 'cpu' - use for schedular tunables # - 'devices' - use for device whitelisting +# - 'memory' - use for memory tunables # # NB, even if configured here, they won't be used unless -# the adminsitrator has mounted cgroups. eg +# the administrator has mounted cgroups, e.g.: # # mkdir /dev/cgroup # mount -t cgroup -o devices,cpu,memory none /dev/cgroup # -# They can be mounted anywhere, and different controlers +# They can be mounted anywhere, and different controllers # can be mounted in different locations. libvirt will detect # where they are located. # @@ -175,7 +176,7 @@ # all sound device, and all PTY devices are allowed. # # This will only need setting if newer QEMU suddenly -# wants some device we don't already know a bout. +# wants some device we don't already know about. # #cgroup_device_acl = [ # "/dev/null", "/dev/full", "/dev/zero", -- 1.7.4

2 1

[libvirt] Anyone looked at GXemul - the ARM emulator?
by Justin Clift 16 Feb '11

16 Feb '11

Hi all, Just came across an ARM emulator project that seems well developed and going decently: http://gxemul.sourceforge.net Kind of wondering if anyone has tried it out? Obviously also thinking it would be interesting if someone knows of a libvirt driver for it. :> Regards and best wishes, Justin Clift

1 0

[libvirt] [PATCH 0/2] Fix tests failures on some architectures
by Jiri Denemark 15 Feb '11

15 Feb '11

This fixes the following test failures seen on some architectures: TEST: qemuxml2argvtest ........................................ 40 ........................................ 80 .............................!.!!!!! 116 FAIL Jiri Denemark (2): tests: Fake host capabilities properly qemu: Fix command line generation with faked host CPU src/qemu/qemu_command.c | 8 +++++--- tests/testutilsqemu.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) -- 1.7.4.1

3 7

[libvirt] [PATCH] Avoid empty strings when --with-packager(-version) is not specified
by Matthias Bolte 15 Feb '11

15 Feb '11

I pushed this patch already ACKed by Eric: https://www.redhat.com/archives/libvir-list/2011-February/msg00550.html Matthias

1 0

[libvirt] [PATCH] build: address clang reports about virCommand
by Eric Blake 15 Feb '11

15 Feb '11

clang had 5 reports against virCommand; three were false positives (a NULL deref in ProcessIO solved by sa_assert, and two uninitialized memory operations solved by adding an initializer), but two were real. * src/util/command.c (virCommandProcessIO): Fix real bug of possible NULL dereference. Teach clang that buf is never NULL. (virCommandRun): Teach clang that infd is only ever accessed when initialized. --- src/util/command.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index abd2dc4..0845db4 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -1,7 +1,7 @@ /* * command.c: Child command execution * - * Copyright (C) 2010 Red Hat, Inc. + * Copyright (C) 2010-2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -881,6 +881,8 @@ virCommandProcessIO(virCommandPtr cmd) buf = cmd->errbuf; len = &errlen; } + /* Silence a false positive from clang. */ + sa_assert(buf); done = read(fds[i].fd, data, sizeof(data)); if (done < 0) { @@ -930,9 +932,9 @@ virCommandProcessIO(virCommandPtr cmd) ret = 0; cleanup: - if (*cmd->outbuf) + if (cmd->outbuf && *cmd->outbuf) (*cmd->outbuf)[outlen] = '\0'; - if (*cmd->errbuf) + if (cmd->errbuf && *cmd->errbuf) (*cmd->errbuf)[errlen] = '\0'; return ret; } @@ -950,7 +952,7 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) int ret = 0; char *outbuf = NULL; char *errbuf = NULL; - int infd[2]; + int infd[2] = { -1, -1 }; struct stat st; bool string_io; bool async_io = false; -- 1.7.4

2 2

[libvirt] [PATCH] qemu: don't mask real error with oom report
by Eric Blake 15 Feb '11

15 Feb '11

* src/qemu/qemu_command.c (qemuBuildCommandLine): Don't report oom after qemuBuildControllerDevStr, which reported its own errors. --- src/qemu/qemu_command.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3ba0950..63d5edc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3102,7 +3102,7 @@ qemuBuildCommandLine(virConnectPtr conn, char *devstr; if (!(devstr = qemuBuildControllerDevStr(def->controllers[i], qemuCmdFlags))) - goto no_memory; + goto error; virCommandAddArg(cmd, devstr); VIR_FREE(devstr); -- 1.7.4

2 2

[libvirt] [PATCH] virsh: Fix improper freecell --cellno command behavior
by Michal Privoznik 15 Feb '11

15 Feb '11

Non-digit characters were accepted in --cellno resulting in unwanted behavior: 'virsh freecell --cellno foo' wasn't rejected. --- This fix addresses bug 639587 tools/virsh.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index c2d165d..765566d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2283,7 +2283,7 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) { int func_ret = FALSE; int ret; - int cell, cell_given; + int cell, cell_given, cellStr_given; unsigned long long memory; unsigned long long *nodes = NULL; int all_given; @@ -2295,6 +2295,13 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) cell = vshCommandOptInt(cmd, "cellno", &cell_given); all_given = vshCommandOptBool(cmd, "all"); + vshCommandOptString(cmd, "cellno", &cellStr_given); + + if (cellStr_given && !cell_given) { + vshError(ctl, "%s", _("cell number must not contain any " + "non-digit characters.")); + goto cleanup; + } if (all_given && cell_given) { vshError(ctl, "%s", _("--cellno and --all are mutually exclusive. " -- 1.7.3.5

2 1

[libvirt] [PATCH] qemu: avoid NULL derefs
by Eric Blake 15 Feb '11

15 Feb '11

The processWatchdogEvent fix is real, although it can only trigger on OOM, since bad things happen if doCoreDump is called with a NULL pathname argument. The other fixes silence clang, but aren't a real bug because virReportErrorHelper tolerates a NULL format string even though *printf does not. * src/qemu/qemu_driver.c (processWatchdogEvent): Exit on OOM. (qemuDomainIsActive, qemuDomainIsPersistent, qemuDomainIsUpdated): Provide valid message. --- Another valid clang finding. Maybe we whould mark virReportErrorHelper as ATTRIBUTE_NONNULL for the format string argument, and require all clients to pass in a valid error string (after all, that's what the printf attritube already assumes, and passing NULL just means that we aren't giving back any useful error information to the user); but that can be a separate cleanup. src/qemu/qemu_driver.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c581cfe..82a2210 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3489,7 +3489,10 @@ static int qemuDomainIsActive(virDomainPtr dom) obj = virDomainFindByUUID(&driver->domains, dom->uuid); qemuDriverUnlock(driver); if (!obj) { - qemuReportError(VIR_ERR_NO_DOMAIN, NULL); + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + qemuReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); goto cleanup; } ret = virDomainObjIsActive(obj); @@ -3510,7 +3513,10 @@ static int qemuDomainIsPersistent(virDomainPtr dom) obj = virDomainFindByUUID(&driver->domains, dom->uuid); qemuDriverUnlock(driver); if (!obj) { - qemuReportError(VIR_ERR_NO_DOMAIN, NULL); + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + qemuReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); goto cleanup; } ret = obj->persistent; @@ -3531,7 +3537,10 @@ static int qemuDomainIsUpdated(virDomainPtr dom) obj = virDomainFindByUUID(&driver->domains, dom->uuid); qemuDriverUnlock(driver); if (!obj) { - qemuReportError(VIR_ERR_NO_DOMAIN, NULL); + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + qemuReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); goto cleanup; } ret = obj->updated; @@ -4981,12 +4990,14 @@ static void processWatchdogEvent(void *data, void *opaque) case VIR_DOMAIN_WATCHDOG_ACTION_DUMP: { char *dumpfile; - int i; - i = virAsprintf(&dumpfile, "%s/%s-%u", + if (virAsprintf(&dumpfile, "%s/%s-%u", driver->autoDumpPath, wdEvent->vm->def->name, - (unsigned int)time(NULL)); + (unsigned int)time(NULL)) < 0) { + virReportOOMError(); + break; + } qemuDriverLock(driver); virDomainObjLock(wdEvent->vm); -- 1.7.4

2 2

[libvirt] [PATCH] virDomainMemoryStats: avoid null dereference
by Eric Blake 15 Feb '11

15 Feb '11

* src/libvirt.c (virDomainMemoryStats): Check domain before flags. --- Another valid bug found by clang. User's generally should't call virDomainMemoryStats(NULL,...), but we don't forbid it elsewhere, and doing so is not supposed to crash libvirt. All other flags checks in this file occur after validating the object first. src/libvirt.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 479a9b5..f65cc24 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -4411,12 +4411,6 @@ int virDomainMemoryStats (virDomainPtr dom, virDomainMemoryStatPtr stats, VIR_DOMAIN_DEBUG(dom, "stats=%p, nr_stats=%u", stats, nr_stats); - if (flags != 0) { - virLibDomainError(VIR_ERR_INVALID_ARG, - _("flags must be zero")); - goto error; - } - virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN (dom)) { @@ -4424,6 +4418,12 @@ int virDomainMemoryStats (virDomainPtr dom, virDomainMemoryStatPtr stats, virDispatchError(NULL); return -1; } + if (flags != 0) { + virLibDomainError(VIR_ERR_INVALID_ARG, + _("flags must be zero")); + goto error; + } + if (!stats || nr_stats == 0) return 0; -- 1.7.4

2 2

[libvirt] libvirt 0.8.7 tests failure on arm and ppc
by Serge E. Hallyn 15 Feb '11

15 Feb '11

Hi, as per the message after the tests fail, I'm reporting this on the list. Hopefully someone has seen this before. I've not yet tried this with the latest git snapshot. With 0.8.7, I get: TEST: qemuxml2argvtest ........................................ 40 ........................................ 80 .............................!.!!!!! 116 FAIL -serge

4 9