- Devel - libvirt List Archives

[libvirt] [PATCH] docs: Fix typo in path for storage pool
by John Ferlan 10 Dec '14

10 Dec '14

Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial docs/formatstorage.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 0951daa..933268c 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -386,7 +386,7 @@ like the logical choice, however, devices nodes there are not guaranteed stable across reboots, since they are allocated on demand. It is preferable to use a stable location such as one - of the <code>/dev/disk/by-{path,id,uuid,label</code> locations. + of the <code>/dev/disk/by-{path|id|uuid|label}</code> locations. <span class="since">Since 0.4.1</span> </dd> <dt><code>permissions</code></dt> -- 1.9.3

1 0

[libvirt] [PATCH] conf: Ignore device address for guestfwd channel
by Martin Kletzander 10 Dec '14

10 Dec '14

It make no sense at all to have it there. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_conf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index db3369e..ec45b8c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8456,8 +8456,13 @@ virDomainChrDefParseXML(xmlXPathContextPtr ctxt, } } - if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) + if (def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && + def->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD) { + VIR_DEBUG("Ignoring device address for gustfwd channel"); + } else if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) { goto error; + } + if (def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && def->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB && -- 2.2.0

2 1

[libvirt] [PATCH v2] storage: Check stderr when matching parted output
by Hao Liu 10 Dec '14

10 Dec '14

In old version of parted like parted-2.1-25, error message is shown in stdout when printing a disk info without disk label. Error: /dev/sda: unrecognised disk label This line has been moved to stderr in newer version of parted. So we should check both stdout and stderr when locating this message. This should fix bug: https://bugzilla.redhat.com/show_bug.cgi?id=1172468 Signed-off-by: Hao Liu <hliu(a)redhat.com> --- V2: (Courtesy of Luyang Huang) Fixed memory leak; Fixed curly brace style; src/storage/storage_backend_disk.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 4b05e8c..3f97fd9 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -370,21 +370,26 @@ virStorageBackendDiskFindLabel(const char* device) }; virCommandPtr cmd = virCommandNew(PARTED); char *output = NULL; + char *error = NULL; int ret = -1; virCommandAddArgSet(cmd, args); virCommandAddEnvString(cmd, "LC_ALL=C"); virCommandSetOutputBuffer(cmd, &output); + virCommandSetErrorBuffer(cmd, &error); /* if parted succeeds we have a valid partition table */ ret = virCommandRun(cmd, NULL); if (ret < 0) { - if (strstr(output, "unrecognised disk label")) + if (strstr(output, "unrecognised disk label") || + strstr(error, "unrecognised disk label")) { ret = 1; + } } virCommandFree(cmd); VIR_FREE(output); + VIR_FREE(error); return ret; } -- 1.8.3.1

2 1

[libvirt] [PATCH] maint: clean up the unused variable 'caps' in src/qemu/qemu_*.c
by Wang Rui 10 Dec '14

10 Dec '14

Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- src/qemu/qemu_driver.c | 9 --------- src/qemu/qemu_hotplug.c | 5 ----- 2 files changed, 14 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index be37c8f..3406385 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1864,7 +1864,6 @@ static int qemuDomainResume(virDomainPtr dom) virObjectEventPtr event = NULL; int state; virQEMUDriverConfigPtr cfg = NULL; - virCapsPtr caps = NULL; if (!(vm = qemuDomObjFromDomain(dom))) return -1; @@ -1901,8 +1900,6 @@ static int qemuDomainResume(virDomainPtr dom) VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); } - if (!(caps = virQEMUDriverGetCapabilities(driver, false))) - goto endjob; if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) goto endjob; ret = 0; @@ -1916,7 +1913,6 @@ static int qemuDomainResume(virDomainPtr dom) virObjectUnlock(vm); if (event) qemuDomainEventQueue(driver, event); - virObjectUnref(caps); virObjectUnref(cfg); return ret; } @@ -7108,7 +7104,6 @@ qemuDomainChangeDiskMediaLive(virConnectPtr conn, { virDomainDiskDefPtr disk = dev->data.disk; virDomainDiskDefPtr orig_disk = NULL; - virCapsPtr caps = NULL; int ret = -1; if (virStorageTranslateDiskSourcePool(conn, disk) < 0) @@ -7129,9 +7124,6 @@ qemuDomainChangeDiskMediaLive(virConnectPtr conn, goto end; } - if (!(caps = virQEMUDriverGetCapabilities(driver, false))) - goto end; - /* Add the new disk src into shared disk hash table */ if (qemuAddSharedDevice(driver, dev, vm->def->name) < 0) goto end; @@ -7154,7 +7146,6 @@ qemuDomainChangeDiskMediaLive(virConnectPtr conn, } end: - virObjectUnref(caps); return ret; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0d97b57..9530451 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -758,7 +758,6 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, { virDomainDiskDefPtr disk = dev->data.disk; virDomainDiskDefPtr orig_disk = NULL; - virCapsPtr caps = NULL; int ret = -1; const char *driverName = virDomainDiskGetDriver(disk); const char *src = virDomainDiskGetSource(disk); @@ -796,9 +795,6 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, goto end; } - if (!(caps = virQEMUDriverGetCapabilities(driver, false))) - goto end; - if (qemuDomainChangeEjectableMedia(driver, conn, vm, orig_disk, disk->src, false) < 0) goto end; @@ -837,7 +833,6 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, end: if (ret != 0) ignore_value(qemuRemoveSharedDevice(driver, dev, vm->def->name)); - virObjectUnref(caps); return ret; } -- 1.7.12.4

2 1

[libvirt] [PATCH v2] docs: Fix missing curly braces
by Hao Liu 10 Dec '14

10 Dec '14

Signed-off-by: Hao Liu <hliu(a)redhat.com> --- docs/hacking.html.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index a73b1e0..53786b7 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -481,8 +481,9 @@ <pre> while (expr1 && - expr2) // multi-line, at same indentation, {} required + expr2) { // multi-line, at same indentation, {} required single_line_stmt(); + } </pre> <p> -- 1.8.3.1

2 1

[libvirt] [PATCH v1 0/3] Forbid negative values in config files
by Michal Privoznik 10 Dec '14

10 Dec '14

*** BLURB HERE *** Michal Privoznik (3): virConfSetValue: Simplify condition virConfType: switch to VIR_ENUM_{DECL,IMPL} virconf: Introduce VIR_CONF_ULONG daemon/libvirtd-config.c | 55 ++++++++++++++++++++++++--------------- src/libvirt_private.syms | 2 ++ src/locking/lock_daemon_config.c | 24 ++++++++++++----- src/locking/lock_driver_lockd.c | 4 +-- src/locking/lock_driver_sanlock.c | 6 ++--- src/lxc/lxc_conf.c | 6 ++--- src/qemu/qemu_conf.c | 43 ++++++++++++++++++++---------- src/util/virconf.c | 12 +++++++-- src/util/virconf.h | 29 +++++++-------------- src/xenconfig/xen_common.c | 6 ++--- tests/libvirtdconftest.c | 9 ++++--- 11 files changed, 119 insertions(+), 77 deletions(-) -- 2.0.4

2 6

[libvirt] [PATCH] util: check for an illegal character in a XML namespace prefix
by Erik Skultety 10 Dec '14

10 Dec '14

When user tries to insert element metadata providing a namespace declaration as well, currently we insert the element without any validation check for XML prefix (if provided). The next VM start would then fail with parse error. This patch fixes this issue by adding a call to xmlValidateNCName function to check for illegal characters in the prefix. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1143921 --- src/util/virxml.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util/virxml.c b/src/util/virxml.c index 7f591fb..93f8590 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1066,6 +1066,12 @@ virXMLInjectNamespace(xmlNodePtr node, { xmlNsPtr ns; + if (xmlValidateNCName((const unsigned char *)key, 1) != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to validate prefix for a new XML namespace")); + return -1; + } + if (!(ns = xmlNewNs(node, (const unsigned char *)uri, (const unsigned char *)key))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create a new XML namespace")); -- 1.9.3

2 2

[libvirt] [PATCH] docs: Fix missing curly braces
by Hao Liu 10 Dec '14

10 Dec '14

Signed-off-by: Hao Liu <hliu(a)redhat.com> --- HACKING | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/HACKING b/HACKING index 884e78c..94d9d2c 100644 --- a/HACKING +++ b/HACKING @@ -383,8 +383,9 @@ single-'statement' loop: each has only one 'line' in its body. single_line_stmt(); // {} is optional (not enforced either way) while (expr1 && - expr2) // multi-line, at same indentation, {} required + expr2) { // multi-line, at same indentation, {} required single_line_stmt(); + } However, the moment your loop/if/else body extends on to a second line, for whatever reason (even if it's just an added comment), then you should add -- 1.8.3.1

2 1

[libvirt] [PATCH v4 00/15] parallels: rewrite driver with parallels SDK
by Dmitry Guryanov 10 Dec '14

10 Dec '14

This patch series replaces all code, which used prlctl command to interact with parallels cloud server with calls to parallels sdk functions. The model of this driver remain almost the same - in creates a list of virDomainObj objects on connect and then functions, which returns different information get info from this list. Changes in v2: * Rebase to latest libvirt sources * Use only "parallels" prefix for functions in parallelsDriver, so that make check will pass * Update privconn->domains in case we change something from current connection. Changes in v3: * in parallels: get domain info with SDK: replace + case VIR_ARCH_X86_64: with + case PCM_CPU_MODE_64: Changes in v4: * handle onReboot, onPoweroff and onCrash properly * handle disks cache mode * don't set net interface name if virDomainNetDef.ifname is NULL * improve error handling Alexander Burluka (4): parallels: get domain info with SDK parallels: handle events from parallels server parallels: added function virDomainIsActive() parallels: Add domainCreateWithFlags() function. Dmitry Guryanov (11): parallels: move IS_CT macro to parallels_utils.h parallels: move parallelsDomNotFoundError to parallels_utils.h parallels: reimplement functions, which change domain state parallels: rewrite parallelsApplyConfig with SDK parallels: create VMs and containers with sdk parallels: refactor parallelsDomainDefineXML parallels: add cdroms support parallels: implement domainUndefine and domainUndefineFlags parallels: return PRL_RESULT from waitJob and getJobResult parallels: fix getJobResultHelper parallels: report proper error in Create/Destroy/Suspend e.t.c. src/parallels/parallels_driver.c | 2456 +++++++----------------------------- src/parallels/parallels_sdk.c | 2544 +++++++++++++++++++++++++++++++++++++- src/parallels/parallels_sdk.h | 25 + src/parallels/parallels_utils.h | 11 + 4 files changed, 3033 insertions(+), 2003 deletions(-) -- 1.9.3

4 21

[libvirt] [PATCH] storage: Check stderr when matching parted output
by Hao Liu 10 Dec '14

10 Dec '14

In old version of parted like parted-2.1-25, error message is shown in stdout when printing a disk info without disk label. Error: /dev/sda: unrecognised disk label This line has been moved to stderr in newer version of parted. So we should check both stdout and stderr when locating this message. This should fix bug: https://bugzilla.redhat.com/show_bug.cgi?id=1172468 Signed-off-by: Hao Liu <hliu(a)redhat.com> --- src/storage/storage_backend_disk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 4b05e8c..d57b67d 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -370,16 +370,19 @@ virStorageBackendDiskFindLabel(const char* device) }; virCommandPtr cmd = virCommandNew(PARTED); char *output = NULL; + char *error = NULL; int ret = -1; virCommandAddArgSet(cmd, args); virCommandAddEnvString(cmd, "LC_ALL=C"); virCommandSetOutputBuffer(cmd, &output); + virCommandSetErrorBuffer(cmd, &error); /* if parted succeeds we have a valid partition table */ ret = virCommandRun(cmd, NULL); if (ret < 0) { - if (strstr(output, "unrecognised disk label")) + if (strstr(output, "unrecognised disk label") || + strstr(error, "unrecognised disk label")) ret = 1; } -- 1.8.3.1

1 0