- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: vnc: error out for invalid port number
by Pavel Hrdina 13 May '15

13 May '15

In the XML we have the vnc port number, but QEMU takes on command line a vnc screen number, it's port-5900. We should fail with error message that only ports in range [5900,65535] are valid. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1164966 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_command.c | 96 +++++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 43 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8ccbe82..5d0a167 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7591,50 +7591,60 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, virBufferAsprintf(&opt, "unix:%s", graphics->data.vnc.socket); - } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_COLON)) { - switch (virDomainGraphicsListenGetType(graphics, 0)) { - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - listenAddr = virDomainGraphicsListenGetAddress(graphics, 0); - break; - - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - listenNetwork = virDomainGraphicsListenGetNetwork(graphics, 0); - if (!listenNetwork) - break; - ret = networkGetNetworkAddress(listenNetwork, &netAddr); - if (ret <= -2) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("network-based listen not possible, " - "network driver not present")); - goto error; - } - if (ret < 0) - goto error; - - listenAddr = netAddr; - /* store the address we found in the <graphics> element so it will - * show up in status. */ - if (virDomainGraphicsListenSetAddress(graphics, 0, - listenAddr, -1, false) < 0) - goto error; - break; - } - - if (!listenAddr) - listenAddr = cfg->vncListen; - - escapeAddr = strchr(listenAddr, ':') != NULL; - if (escapeAddr) - virBufferAsprintf(&opt, "[%s]", listenAddr); - else - virBufferAdd(&opt, listenAddr, -1); - virBufferAsprintf(&opt, ":%d", - graphics->data.vnc.port - 5900); - - VIR_FREE(netAddr); } else { - virBufferAsprintf(&opt, "%d", - graphics->data.vnc.port - 5900); + if (!graphics->data.vnc.autoport && + (graphics->data.vnc.port < 5900 || + graphics->data.vnc.port > 65535)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vnc port must be in range [5900,65535]")); + goto error; + } + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_COLON)) { + switch (virDomainGraphicsListenGetType(graphics, 0)) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + listenAddr = virDomainGraphicsListenGetAddress(graphics, 0); + break; + + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + listenNetwork = virDomainGraphicsListenGetNetwork(graphics, 0); + if (!listenNetwork) + break; + ret = networkGetNetworkAddress(listenNetwork, &netAddr); + if (ret <= -2) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("network-based listen not possible, " + "network driver not present")); + goto error; + } + if (ret < 0) + goto error; + + listenAddr = netAddr; + /* store the address we found in the <graphics> element so it + * will show up in status. */ + if (virDomainGraphicsListenSetAddress(graphics, 0, + listenAddr, -1, false) < 0) + goto error; + break; + } + + if (!listenAddr) + listenAddr = cfg->vncListen; + + escapeAddr = strchr(listenAddr, ':') != NULL; + if (escapeAddr) + virBufferAsprintf(&opt, "[%s]", listenAddr); + else + virBufferAdd(&opt, listenAddr, -1); + virBufferAsprintf(&opt, ":%d", + graphics->data.vnc.port - 5900); + + VIR_FREE(netAddr); + } else { + virBufferAsprintf(&opt, "%d", + graphics->data.vnc.port - 5900); + } } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_COLON)) { -- 2.3.6

2 2

[libvirt] time: event poll may become un-triggerable after changing system clock.
by zhang bo 13 May '15

13 May '15

event poll may become un-triggerable after changing system clock. The steps to reproduce the problem: 1 run event-test 1 define and start a domain with name vm1. 2 destroy vm1 3 change system time to 1 hour before when timer.expiresAt has been set in virEventPollUpdateTimeout (and before virEventPollDispatchTimeouts()). 4 event-test will recive no message until 1 hour later. The reasons for the problem is : 1 The value of timer.expiresAt is set by virTimeMillisNowRaw. virTimeMillisNowRaw is effectable by settimeofday(), bacause it uses CLOCK_REALTIME to get time. 2 If we change the system time to a time long before now, after that timer.expiresAt has been set. timer.expiresAt is not affected, while virEventPollDispatchTimeouts is. Suppose it's now May 12th, and we set it to 10th, then the expiresAt is 12th, and the time virEventPollDispatchTimeouts got is 10th. if (eventLoop.timeouts[i].expiresAt <= (now+20)) { // expiresAt will not be less than now until 2 days later. *Solution(not good enough)*: 1 change the clock mode in virTimeMillisNowRaw from REALTIME to MONOTONIC, which would not be affected by settimeofday(). 2 add the time got from clock_gettime(*MONOTONIC*) with the system-start-time from epoch, making it equal to the value got from REALTIME. 3 As that the timestamp of the log message should follow system time, so we keep it to REALTIME as before. However, there's still problems: 1 pthread_cond_wait() gets time with REALTIME mode. When we change system time, pthread_cond_wait() may still be affected. So, Is there any other better solution? thanks in advance. oscar

2 3

[libvirt] [PATCH 0/2] Couple of sysinfo fixes
by Michal Privoznik 13 May '15

13 May '15

I've just tried sysinfo on my RPi, and found some bugs there. Michal Privoznik (2): virSysinfoParseProcessor: Drop useless check for NULL sysinfo: Fix reports on arm src/util/virsysinfo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.3.6

3 5

[libvirt] [PATCH] libxl: Disallow save or migrate when host devices are assigned to a guest.
by Konrad Rzeszutek Wilk 13 May '15

13 May '15

It is unhealthy. If the device is not doing any DMA operations it would work - but if you are saving and there are DMA operations happening the chance of corruption (outstanding DMAs) increase. As such re-use the check migration used. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk(a)oracle.com> --- src/libxl/libxl_domain.c | 19 +++++++++++++++++++ src/libxl/libxl_domain.h | 3 +++ src/libxl/libxl_driver.c | 6 ++++++ src/libxl/libxl_migration.c | 15 +-------------- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 5e0ab56..c038989 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -178,6 +178,25 @@ libxlDomainObjEndJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, return virObjectUnref(obj); } +/* + * Checks whether the domain has host devices (PCIe) to disallow + * migration or saving of guest - unless they are detached. + * + * Returns true if the domain has host devices, otherwise false. + */ +bool +libxlDomainHasHostDevices(virDomainDefPtr def) +{ + /* Migration is not allowed if definition contains any hostdevs */ + if (def->nhostdevs > 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain has assigned host devices")); + return true; + } + + return false; +} + static void * libxlDomainObjPrivateAlloc(void) { diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index aa647b8..76c0c8d 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -95,6 +95,9 @@ char * libxlDomainManagedSavePath(libxlDriverPrivatePtr driver, virDomainObjPtr vm); +bool +libxlDomainHasHostDevices(virDomainDefPtr def); + int libxlDomainSaveImageOpen(libxlDriverPrivatePtr driver, libxlDriverConfigPtr cfg, diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 9eb071e..b9faba8 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1650,6 +1650,9 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, const char *dxml, goto endjob; } + if (libxlDomainHasHostDevices(vm->def)) + goto endjob; + if (libxlDoDomainSave(driver, vm, to) < 0) goto endjob; @@ -1876,6 +1879,9 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int flags) goto endjob; } + if (libxlDomainHasHostDevices(vm->def)) + goto endjob; + name = libxlDomainManagedSavePath(driver, vm); if (name == NULL) goto endjob; diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 4010506..aaed448c 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -209,19 +209,6 @@ libxlDoMigrateSend(libxlDriverPrivatePtr driver, return ret; } -static bool -libxlDomainMigrationIsAllowed(virDomainDefPtr def) -{ - /* Migration is not allowed if definition contains any hostdevs */ - if (def->nhostdevs > 0) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain has assigned host devices")); - return false; - } - - return true; -} - char * libxlDomainMigrationBegin(virConnectPtr conn, virDomainObjPtr vm, @@ -251,7 +238,7 @@ libxlDomainMigrationBegin(virConnectPtr conn, def = vm->def; } - if (!libxlDomainMigrationIsAllowed(def)) + if (libxlDomainHasHostDevices(def)) goto endjob; xml = virDomainDefFormat(def, VIR_DOMAIN_DEF_FORMAT_SECURE); -- 2.1.0

3 7

[libvirt] [PATCH] qemu: fix double free when fail to cold-plug a rng device
by Luyao Huang 13 May '15

13 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1220809 When cold-plug a rng device and get failed in qemuDomainAssignAddresses, we will double free the rng device. Free the pointer after we Insert the device success to fix this issue. ... 5 0x00007fb7d180ac8a in virFree at util/viralloc.c:582 6 0x00007fb7d1895cdd in virDomainRNGDefFree at conf/domain_conf.c:19786 7 0x00007fb7d1895d99 in virDomainDeviceDefFree at conf/domain_conf.c:2022 8 0x00007fb7b92b8baf in qemuDomainAttachDeviceFlags at qemu/qemu_driver.c:8785 9 0x00007fb7d190c5d7 in virDomainAttachDeviceFlags at libvirt-domain.c:8488 10 0x00007fb7d23af9d2 in remoteDispatchDomainAttachDeviceFlags at remote_dispatch.h:2842 ... Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 33c1cfd..f922a28 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8359,11 +8359,10 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, if (virDomainRNGInsert(vmdef, dev->data.rng, false) < 0) return -1; + dev->data.rng = NULL; if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0) return -1; - - dev->data.rng = NULL; break; case VIR_DOMAIN_DEVICE_MEMORY: -- 1.8.3.1

3 2

[libvirt] [PATCHv2] conf: fix no error when set an unsupport string in ./devices/shmem/msi[@ioeventfd]
by Luyao Huang 13 May '15

13 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1220265 Pass the return value to an enum directly is not safe. When pass a invalid @ioeventfd and virTristateSwitchTypeFromString return -1 to def->msi.ioeventfd, and this value transform to 4294967295, so no error when the parse failed. To fix this issue, folter the value using int and then assign it to virTristateSwitch as it's done. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v2: a new way to fix this issue. src/conf/domain_conf.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4cd36a1..04cce50 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10847,12 +10847,16 @@ virDomainShmemDefParseXML(xmlNodePtr node, } VIR_FREE(tmp); - if ((tmp = virXMLPropString(msi, "ioeventfd")) && - (def->msi.ioeventfd = virTristateSwitchTypeFromString(tmp)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid msi ioeventfd setting for shmem: '%s'"), - tmp); - goto cleanup; + if ((tmp = virXMLPropString(msi, "ioeventfd"))) { + int val; + + if ((val = virTristateSwitchTypeFromString(tmp)) <= 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid msi ioeventfd setting for shmem: '%s'"), + tmp); + goto cleanup; + } + def->msi.ioeventfd = val; } VIR_FREE(tmp); } -- 1.8.3.1

3 2

[libvirt] [PATCH] libxl: support VNC passwd
by Jim Fehlig 12 May '15

12 May '15

While implementing support for SPICE, noticed VNC passwd was never copied to libxl_device_vfb's vnc.passwd field. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index fccada5..35b1d04 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1283,6 +1283,8 @@ libxlMakeVfb(virPortAllocatorPtr graphicsports, if (VIR_STRDUP(x_vfb->vnc.listen, listenAddr) < 0) return -1; } + if (VIR_STRDUP(x_vfb->vnc.passwd, l_vfb->data.vnc.auth.passwd) < 0) + return -1; if (VIR_STRDUP(x_vfb->keymap, l_vfb->data.vnc.keymap) < 0) return -1; break; -- 1.8.4.5

2 2

[libvirt] [v3 0/2] Remove host name checking from iSCSI duplicate source checks
by John Ferlan 12 May '15

12 May '15

Only a v3 because the first two series "Addition host name check for network storage pools" were not well received. If someone wants to pick up/use the the hostname checking code from the v2, then have at it. Patch 1, 2, 7, & 8 use the virSocketAddr code. This series just focuses on the iSCSI duplicate source checks and in particular the removal of the host name checks to be replaced primarily by the duplicate source device path (or IQN) check. For iSCSI devices, checking the resolved host name was not feasible. Instead, if the source device path (IQN) of the new definition is the same as a running pool, then the new definition will be rejected. The secondary check is for an undocumented <inititor> element to define the initiator iqn (see bz 488142). The first patch is "new" - it's something I discovered while doing some extra testing with the v2 of the series. The second patch provides the change and modifies the documentation. It resolves two bz's as listed in the patch description. v2 here: http://www.redhat.com/archives/libvir-list/2015-April/msg01197.html Much discussion took place in v1 though in 7/7: http://www.redhat.com/archives/libvir-list/2015-April/msg00880.html John Ferlan (2): conf: Adjust duplicate source host port check conf: Remove source host name check for iSCSI docs/formatstorage.html.in | 18 ++++++++++++++---- docs/storage.html.in | 8 +++++++- src/conf/storage_conf.c | 7 +++---- 3 files changed, 24 insertions(+), 9 deletions(-) -- 2.1.0

2 3

[libvirt] [PATCH 0/2] Cleanup storage migration code a bit
by Jiri Denemark 12 May '15

12 May '15

Jiri Denemark (2): qemu: Keep track of what disks are being migrated qemu: Don't give up on first error in qemuMigrationCancelDriverMirror src/conf/domain_conf.h | 2 ++ src/qemu/qemu_migration.c | 36 +++++++++++++++++------------------- 2 files changed, 19 insertions(+), 19 deletions(-) -- 2.4.0

2 4

[libvirt] [PATCH] daemon: logging: Suppress logging of VIR_ERR_NO_DOMAIN_METADATA
by Peter Krempa 12 May '15

12 May '15

Similarly to other error codes that notify the user that the object does not exist lower the priority of VIR_ERR_NO_DOMAIN_METADATA to VIR_LOG_DEBUG when writing the log entry. --- daemon/libvirtd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 107b88d..3e7f87c 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -320,6 +320,7 @@ static int daemonErrorLogFilter(virErrorPtr err, int priority) case VIR_ERR_NO_SECRET: case VIR_ERR_NO_DOMAIN_SNAPSHOT: case VIR_ERR_OPERATION_INVALID: + case VIR_ERR_NO_DOMAIN_METADATA: return VIR_LOG_DEBUG; } -- 2.3.5

2 2