- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/3] nwfilter: Create common virNWFilterObj* APIs
by John Ferlan 13 Apr '17

13 Apr '17

v1: https://www.redhat.com/archives/libvir-list/2017-April/msg00299.html Effectively move code from nwfilter_driver.c into virnwfiltereobj to count the number of devices, to return a list of names, and to return an array of filters. FWIW: This is part of the common driver objects code I've been working through. I figured I will post each driver separately rather than one larger series. v2: Differences: - Remove memset() from *GetName - Change "if (aclfilter && aclfilter())" to "if (!aclfilter || aclfilter())" John Ferlan (3): nwfilter: Introduce virNWFilterObjNumOfNWFilters nwfilter: Introduce virNWFilterObjGetNames nwfilter: Introduce virNWFilterObjListExport src/conf/virnwfilterobj.c | 103 +++++++++++++++++++++++++++++++++++++++++ src/conf/virnwfilterobj.h | 22 +++++++++ src/libvirt_private.syms | 3 ++ src/nwfilter/nwfilter_driver.c | 86 +++++----------------------------- 4 files changed, 139 insertions(+), 75 deletions(-) -- 2.9.3

2 4

[libvirt] [PATCH] conf: Add check for non scsi_host parent during vport delete
by John Ferlan 13 Apr '17

13 Apr '17

https://bugzilla.redhat.com/show_bug.cgi?id=1420740 If the parent is not a scsi_host, then we can just happily return since we won't be removing a vport. Fixes a bug with the following output: $ virsh pool-destroy host4_hba_pool error: Failed to destroy pool host4_hba_pool error: internal error: Invalid adapter name 'pci_0000_10_00_1' for SCSI pool $ Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/conf/node_device_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 7d0baa9..cc3fad8 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2074,6 +2074,13 @@ virNodeDeviceDeleteVport(virConnectPtr conn, if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name))) goto cleanup; + /* If the parent is not a scsi_host, then this is a pool backed + * directly to an HBA and there's no vHBA to remove - so we're done */ + if (!STRPREFIX(vhba_parent, "scsi_host")) { + ret = 0; + goto cleanup; + } + if (virSCSIHostGetNumber(vhba_parent, &parent_host) < 0) goto cleanup; } -- 2.9.3

2 2

[libvirt] [PATCH 0/4] Allow some cross pool type source device path checks
by John Ferlan 13 Apr '17

13 Apr '17

https://bugzilla.redhat.com/show_bug.cgi?id=1233129 Refactor the virStoragePoolSourceFindDuplicateDevices code a bit to make it a bit easier to read, then allow pool def type's that use a pool source device to define the source device to perform cross pool source device conflicts. John Ferlan (4): conf: Introduce virStoragePoolObjSourceMatchTypeDIR conf: Introduce virStoragePoolObjSourceMatchTypeISCSI conf: Introduce virStoragePoolObjSourceMatchTypeDEVICE conf: Check for storage conflicts across pool types src/conf/virstorageobj.c | 241 +++++++++++++++++++++++++++-------------------- 1 file changed, 140 insertions(+), 101 deletions(-) -- 2.9.3

2 6

[libvirt] [PATCH] qemu: Report shutdown event details
by Martin Kletzander 13 Apr '17

13 Apr '17

QEMU will likely report the details of it shutting down, particularly the system it received in case it was killed. We should forward that information along. Since the only way we can extend information provided to the user is adding event details, we might as well emit multiple events (one with the reason for the shutdown and keep the one for the shutdown being finished for clarity and compatibility). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1384007 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- This is waiting for a patch in QEMU [1] that I tested this with. [1] https://lists.gnu.org/archive/html/qemu-devel/2017-04/msg01098.html examples/object-events/event-test.c | 9 +++++++++ include/libvirt/libvirt-domain.h | 3 +++ src/qemu/qemu_monitor.c | 6 +++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 4 ++-- src/qemu/qemu_process.c | 20 ++++++++++++++++++++ tools/virsh-domain.c | 6 +++++- 7 files changed, 44 insertions(+), 7 deletions(-) diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 12690cac09ce..b4e1dd7970d9 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -240,6 +240,15 @@ eventDetailToString(int event, case VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED: return "Finished"; + case VIR_DOMAIN_EVENT_SHUTDOWN_SIGINT: + return "Killed with SIGINT"; + + case VIR_DOMAIN_EVENT_SHUTDOWN_SIGHUP: + return "Killed with SIGHUP"; + + case VIR_DOMAIN_EVENT_SHUTDOWN_SIGTERM: + return "Killed with SIGTERM"; + case VIR_DOMAIN_EVENT_SHUTDOWN_LAST: break; } diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 501996bc84f1..b3619c4baae7 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2984,6 +2984,9 @@ typedef enum { */ typedef enum { VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED = 0, /* Guest finished shutdown sequence */ + VIR_DOMAIN_EVENT_SHUTDOWN_SIGINT = 1, /* Guest is shutting down due to SIGINT */ + VIR_DOMAIN_EVENT_SHUTDOWN_SIGHUP = 2, /* Guest is shutting down due to SIGHUP */ + VIR_DOMAIN_EVENT_SHUTDOWN_SIGTERM = 3, /* Guest is shutting down due to SIGKILL */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_SHUTDOWN_LAST diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 1d40d521a9b3..044b58ff090d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1323,12 +1323,12 @@ qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, int -qemuMonitorEmitShutdown(qemuMonitorPtr mon) +qemuMonitorEmitShutdown(qemuMonitorPtr mon, const char *signal) { int ret = -1; - VIR_DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p signal=%s", mon, NULLSTR(signal)); - QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm); + QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm, signal); return ret; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 12f98beba763..c6ecee66a140 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -130,6 +130,7 @@ typedef int (*qemuMonitorDomainEventCallback)(qemuMonitorPtr mon, void *opaque); typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, + const char *signal, void *opaque); typedef int (*qemuMonitorDomainResetCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, @@ -344,7 +345,7 @@ int qemuMonitorGetDiskSecret(qemuMonitorPtr mon, int qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, long long seconds, unsigned int micros, const char *details); -int qemuMonitorEmitShutdown(qemuMonitorPtr mon); +int qemuMonitorEmitShutdown(qemuMonitorPtr mon, const char *signal); int qemuMonitorEmitReset(qemuMonitorPtr mon); int qemuMonitorEmitPowerdown(qemuMonitorPtr mon); int qemuMonitorEmitStop(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index aeb777d37c12..4f67b4496b43 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -523,9 +523,9 @@ qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword) } -static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) +static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr data) { - qemuMonitorEmitShutdown(mon); + qemuMonitorEmitShutdown(mon, virJSONValueObjectGetString(data, "signal")); } static void qemuMonitorJSONHandleReset(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5e119a237fba..3265db8f1590 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -634,10 +634,12 @@ qemuProcessHandleEvent(qemuMonitorPtr mon ATTRIBUTE_UNUSED, static int qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, + const char *signal, void *opaque) { virQEMUDriverPtr driver = opaque; qemuDomainObjPrivatePtr priv; + virObjectEventPtr pre_event = NULL; virObjectEventPtr event = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); @@ -662,6 +664,23 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjSetState(vm, VIR_DOMAIN_SHUTDOWN, VIR_DOMAIN_SHUTDOWN_UNKNOWN); + + if (signal) { + virDomainEventShutdownDetailType detail = 0; + + if (STREQ(signal, "int")) + detail = VIR_DOMAIN_EVENT_SHUTDOWN_SIGINT; + else if (STREQ(signal, "hup")) + detail = VIR_DOMAIN_EVENT_SHUTDOWN_SIGHUP; + else if (STREQ(signal, "term")) + detail = VIR_DOMAIN_EVENT_SHUTDOWN_SIGTERM; + + if (detail) + pre_event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SHUTDOWN, + detail); + } + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SHUTDOWN, VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED); @@ -678,6 +697,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, unlock: virObjectUnlock(vm); + qemuDomainEventQueue(driver, pre_event); qemuDomainEventQueue(driver, event); virObjectUnref(cfg); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index db8accfe436b..12c1908c44f9 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12220,7 +12220,11 @@ VIR_ENUM_IMPL(virshDomainEventStopped, VIR_ENUM_DECL(virshDomainEventShutdown) VIR_ENUM_IMPL(virshDomainEventShutdown, VIR_DOMAIN_EVENT_SHUTDOWN_LAST, - N_("Finished")) + N_("Finished"), + N_("Killed with SIGINT"), + N_("Killed with SIGHUP"), + N_("Killed with SIGTERM"), + ) VIR_ENUM_DECL(virshDomainEventPMSuspended) VIR_ENUM_IMPL(virshDomainEventPMSuspended, -- 2.12.2

3 3

[libvirt] [PATCH] util: add missing equal sign in initialization
by Ján Tomko 13 Apr '17

13 Apr '17

Fix the build with clang: util/virperf.c:86:27: error: use of GNU 'missing =' extension in designator [-Werror,-Wgnu-designator] [VIR_PERF_EVENT_MBML] { ^ = --- src/util/virperf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed. diff --git a/src/util/virperf.c b/src/util/virperf.c index 9ac27c1..fa5b6cc 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -83,7 +83,7 @@ static struct virPerfEventAttr attrs[] = { .attrType = 0, .attrConfig = 2 }, - [VIR_PERF_EVENT_MBML] { + [VIR_PERF_EVENT_MBML] = { .attrType = 0, .attrConfig = 3 }, -- 2.10.2

2 1

[libvirt] [PATCH] daemon: Fix domain name leak in error path
by Wang King 13 Apr '17

13 Apr '17

domain name duplicated in make_nonnull_domain, but not freed when virTypedParamsSerialize return negative. --- daemon/remote.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/daemon/remote.c b/daemon/remote.c index 1610fea..edee981 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1066,8 +1066,10 @@ remoteRelayDomainEventTunable(virConnectPtr conn, if (virTypedParamsSerialize(params, nparams, (virTypedParameterRemotePtr *) &data.params.params_val, &data.params.params_len, - VIR_TYPED_PARAM_STRING_OKAY) < 0) + VIR_TYPED_PARAM_STRING_OKAY) < 0) { + VIR_FREE(data.dom.name); return -1; + } remoteDispatchObjectEventSend(callback->client, remoteProgram, REMOTE_PROC_DOMAIN_EVENT_CALLBACK_TUNABLE, -- 2.8.3

2 1

[libvirt] [PATCH 0/9] Support more options for intel-iommu
by Ján Tomko 13 Apr '17

13 Apr '17

https://bugzilla.redhat.com/show_bug.cgi?id=1427005 Ján Tomko (9): conf: add <irqchip mode> to <features> qemu: format kernel_irqchip on the command line Split out virDomainIOMMUDefFormat conf: add <driver intremap> to <iommu> qemu: allow conditional device property probing qemu: refactor qemuBuildIOMMUCommandLine qemu: format intremap= on intel-iommu command line conf: add caching attribute to iommu device qemu: format caching-mode on iommu command line docs/formatdomain.html.in | 41 +++++++- docs/schemas/domaincommon.rng | 30 ++++++ src/conf/domain_conf.c | 103 +++++++++++++++++-- src/conf/domain_conf.h | 15 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 111 +++++++++++++++------ src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 53 ++++++++-- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 22 ++-- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 24 +++-- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 24 +++-- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 37 +++++-- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 + .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 49 +++++++-- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 + .../qemuxml2argv-intel-iommu-caching.args | 19 ++++ .../qemuxml2argv-intel-iommu-caching.xml | 28 ++++++ .../qemuxml2argv-intel-iommu-irqchip.args | 19 ++++ .../qemuxml2argv-intel-iommu-irqchip.xml | 31 ++++++ tests/qemuxml2argvtest.c | 10 ++ .../qemuxml2xmlout-intel-iommu-caching.xml | 28 ++++++ .../qemuxml2xmlout-intel-iommu-irqchip.xml | 31 ++++++ tests/qemuxml2xmltest.c | 4 + 37 files changed, 641 insertions(+), 89 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-irqchip.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-irqchip.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-irqchip.xml -- 2.10.2

2 19

[libvirt] [PATCH] conf: remove unused assignment statement in virSysinfoBaseBoardParseXML
by Wang King 13 Apr '17

13 Apr '17

Assigning value 0 to @nboards in success path, that stored value is not used. --- src/conf/domain_conf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 80baa09..52f4c7a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13086,7 +13086,6 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt, *baseBoard = boards; *nbaseBoard = nboards; boards = NULL; - nboards = 0; ret = 0; cleanup: VIR_FREE(boards); -- 2.8.3

2 1

[libvirt] [PATCH] tools: remove unused assignment statement in virshStorageVolListCollect
by Wang King 13 Apr '17

13 Apr '17

Assigning value true to @success if there is no volumes, that stored value is not used. --- tools/virsh-volume.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index ddd41d2..66fe70e 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1282,10 +1282,8 @@ virshStorageVolListCollect(vshControl *ctl, goto cleanup; } - if (nvols == 0) { - success = true; + if (nvols == 0) return list; - } /* Retrieve the list of volume names in the pool */ names = vshCalloc(ctl, nvols, sizeof(*names)); -- 2.8.3

2 1

[libvirt] [PATCH] src: test: remove unused variate @maxcpu in testDomainGetVcpus
by Wang King 13 Apr '17

13 Apr '17

The @maxcpu variate isn't used anymore. --- src/test/test_driver.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 46ebdcc..919b265 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2467,7 +2467,7 @@ static int testDomainGetVcpus(virDomainPtr domain, virDomainObjPtr privdom; virDomainDefPtr def; size_t i; - int maxcpu, hostcpus; + int hostcpus; int ret = -1; struct timeval tv; unsigned long long statbase; @@ -2493,10 +2493,6 @@ static int testDomainGetVcpus(virDomainPtr domain, statbase = (tv.tv_sec * 1000UL * 1000UL) + tv.tv_usec; hostcpus = VIR_NODEINFO_MAXCPUS(privconn->nodeInfo); - maxcpu = maplen * 8; - if (maxcpu > hostcpus) - maxcpu = hostcpus; - if (!(allcpumap = virBitmapNew(hostcpus))) goto cleanup; -- 2.8.3

2 1

[libvirt] [PATCH] esx: Fix incorrect memory compare size in esxStoragePoolLookupByUUID
by Wang King 13 Apr '17

13 Apr '17

Use MD5_DIGEST_SIZE or VIR_UUID_BUFLEN rather than VIR_UUID_STRING_BUFLEN when compare @uuid with @md5. --- src/esx/esx_storage_backend_iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index 96b472e..b106c51 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -220,7 +220,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, target; target = target->_next) { md5_buffer(target->iScsiName, strlen(target->iScsiName), md5); - if (memcmp(uuid, md5, VIR_UUID_STRING_BUFLEN) == 0) + if (memcmp(uuid, md5, VIR_UUID_BUFLEN) == 0) break; } -- 2.8.3

2 1

[libvirt] [PATCH] esx: Fix memory leak
by Wang King 13 Apr '17

13 Apr '17

Variable def going out of scope leaks the storage def.source.hosts points to. --- src/esx/esx_storage_backend_vmfs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index a1a660b..940e5d1 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -513,6 +513,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) xml = virStoragePoolDefFormat(&def); cleanup: + VIR_FREE(def.source.hosts); esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); esxVI_DatastoreHostMount_Free(&hostMount); -- 2.8.3

2 1

[libvirt] [PATCH] util: Fix resource leak
by Wang King 13 Apr '17

13 Apr '17

The virRotatingFileWriterAppend method leaks the file->entry on the virRotatingFileWriterEntryNew failing path. --- src/util/virrotatingfile.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 9144729..83a695f 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -483,18 +483,19 @@ virRotatingFileWriterAppend(virRotatingFileWriterPtr file, if ((file->entry->pos == file->maxlen && len) || forceRollover) { - virRotatingFileWriterEntryPtr tmp = file->entry; + virRotatingFileWriterEntryPtr tmp; VIR_DEBUG("Hit max size %zu on %s (force=%d)\n", file->maxlen, file->basepath, forceRollover); if (virRotatingFileWriterRollover(file) < 0) return -1; - if (!(file->entry = virRotatingFileWriterEntryNew(file->basepath, - file->mode))) + if (!(tmp = virRotatingFileWriterEntryNew(file->basepath, + file->mode))) return -1; - virRotatingFileWriterEntryFree(tmp); + virRotatingFileWriterEntryFree(file->entry); + file->entry = tmp; } } -- 2.8.3

2 1

[libvirt] [PATCH] qemu: fix crash on getting block stats for empty cdrom
by Nikolay Shirokovskiy 13 Apr '17

13 Apr '17

Looks like it was introduced in c5f61513. Before this commit handling empty cdrom was correct becase physical sizes of non block disks are not updated. Now when all types are supported we need to check for empty drives. [1] crash backtrace 0 __strrchr_sse42 () at ../sysdeps/x86_64/multiarch/strrchr.S:138 1 0x00007ffff7242192 in virFileIsSharedFSType (path=0x0, fstypes=63) at util/virfile.c:3351 2 0x00007ffff7242a5b in virFileIsSharedFS (path=0x0) at util/virfile.c:3557 3 0x00007fffdb835443 in qemuOpenFileAs (fallback_uid=0, fallback_gid=107, dynamicOwnership=true, path=0x0, oflags=0, needUnlink=0x0, bypassSecurityDriver=0x0) at qemu/qemu_driver.c:2927 4 0x00007fffdb83539b in qemuOpenFile (driver=0x7fffcc1062f0, vm=0x7fffcc25aa50, path=0x0, oflags=0, needUnlink=0x0, bypassSecurityDriver=0x0) at qemu/qemu_driver.c:2908 5 0x00007fffdb84d2d3 in qemuDomainStorageOpenStat (driver=0x7fffcc1062f0, cfg=0x7fffcc188880, vm=0x7fffcc25aa50, src=0x7fffcc256920, ret_fd=0x7fffe6a49488, ret_sb=0x7fffe6a49490) at qemu/qemu_driver.c:11266 6 0x00007fffdb84d4ff in qemuDomainStorageUpdatePhysical (driver=0x7fffcc1062f0, cfg=0x7fffcc188880, vm=0x7fffcc25aa50, src=0x7fffcc256920) at qemu/qemu_driver.c:11319 7 0x00007fffdb8661e7 in qemuDomainGetStatsOneBlock (driver=0x7fffcc1062f0, cfg=0x7fffcc188880, dom=0x7fffcc25aa50, record=0x7fffa8000e70, maxparams=0x7fffe6a49790, disk=0x7fffcc2565a0, src=0x7fffcc256920, block_idx=7, backing_idx=0, stats=0x7fffa8000e90) at qemu/qemu_driver.c:19223 8 0x00007fffdb86652b in qemuDomainGetStatsBlock (driver=0x7fffcc1062f0, dom=0x7fffcc25aa50, record=0x7fffa8000e70, maxparams=0x7fffe6a49790, privflags=1) at qemu/qemu_driver.c:19282 9 0x00007fffdb8669f7 in qemuDomainGetStats (conn=0x7fffb80009a0, dom=0x7fffcc25aa50, stats=127, record=0x7fffe6a49870, flags=1) at qemu/qemu_driver.c:19444 10 0x00007fffdb866dc8 in qemuConnectGetAllDomainStats (conn=0x7fffb80009a0, doms=0x0, ndoms=0, stats=127, retStats=0x7fffe6a499a0, flags=1) at qemu/qemu_driver.c:19534 11 0x00007ffff7388376 in virConnectGetAllDomainStats (conn=0x7fffb80009a0, stats=0, retStats=0x7fffe6a499a0, flags=1) at libvirt-domain.c:11311 --- src/qemu/qemu_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bc5e448..16b435a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19170,6 +19170,7 @@ qemuDomainGetStatsOneBlock(virQEMUDriverPtr driver, QEMU_ADD_NAME_PARAM(record, maxparams, "block", "name", block_idx, disk->dst); + if (virStorageSourceIsLocalStorage(src) && src->path) QEMU_ADD_NAME_PARAM(record, maxparams, "block", "path", block_idx, src->path); @@ -19216,7 +19217,7 @@ qemuDomainGetStatsOneBlock(virQEMUDriverPtr driver, if (entry->capacity) QEMU_ADD_BLOCK_PARAM_ULL(record, maxparams, block_idx, "capacity", entry->capacity); - if (entry->physical) { + if (entry->physical || virStorageSourceIsEmpty(src)) { QEMU_ADD_BLOCK_PARAM_ULL(record, maxparams, block_idx, "physical", entry->physical); } else { -- 1.8.3.1

1 1

[libvirt] [PATCH] test: virsh-optparse: Fix expected test output with new error checking
by Peter Krempa 13 Apr '17

13 Apr '17

Commit 4f4c3b1397c4b5d16af added code to remember errors during freeing of domain objects. This changed the output when testing scaled numbers parsing in virsh-optparse. Adjust the expected output. --- I didn't run it with VIR_TEST_RUN_EXPENSIVE. I'll look into whether that variable still makes sense. Pushed under the build-breaker rule. tests/virsh-optparse | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/virsh-optparse b/tests/virsh-optparse index cb0f3d4f3..1aef8d8d9 100755 --- a/tests/virsh-optparse +++ b/tests/virsh-optparse @@ -212,6 +212,7 @@ compare exp-err err || fail=1 # Numeric value with invalid suffix cat <<\EOF > exp-err || framework_failure error: Scaled numeric value '42WB' for <size> option is malformed or out of range +error: invalid argument: unknown suffix 'WB' EOF virsh -q -c $test_url setmaxmem test 42WB >out 2>err && fail=1 test -s out && fail=1 -- 2.12.2

1 0

[libvirt] question about virtlogd service restart
by Wang King 13 Apr '17

13 Apr '17

Hi all, I found that virtlogd cannot write qemu log and serial log anymore after restart it. It's because of the file descriptor which qemu connected to the virtlogd is broken, and cannot be reconnect after virtlogd restarted. Is this expected behavior or unresolved issue? Thanks Wang King

2 1

[libvirt] [PATCH] qemu: do not crash on USB address with no port and invalid bus
by Ján Tomko 12 Apr '17

12 Apr '17

Properly error out when the user requests a port from a bus that does not have a controller present in the domain XML. https://bugzilla.redhat.com/show_bug.cgi?id=1441589 --- src/conf/domain_addr.c | 3 ++- .../qemuxml2argv-usb-bus-missing.xml | 22 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-bus-missing.xml diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 35bdc34..8b61091 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -2009,7 +2009,8 @@ virDomainUSBAddressAssign(virDomainUSBAddressSetPtr addrs, if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { VIR_DEBUG("A USB port on bus %u was requested", info->addr.usb.bus); - if (!addrs->buses[info->addr.usb.bus]) { + if (info->addr.usb.bus >= addrs->nbuses || + !addrs->buses[info->addr.usb.bus]) { virReportError(VIR_ERR_XML_ERROR, _("USB bus %u requested but no controller " "with that index is present"), info->addr.usb.bus); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-bus-missing.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-bus-missing.xml new file mode 100644 index 0000000..831a4c0 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-bus-missing.xml @@ -0,0 +1,22 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <controller type='usb' index='0'/> + <memballoon model='virtio'/> + <input type='mouse' bus='usb'> + <address type='usb' bus='0'/> + </input> + <hub type='usb'> + <address type='usb' bus='1'/> + </hub> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ed99c21..c1b014b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1341,6 +1341,9 @@ mymain(void) DO_TEST("usb-port-missing", QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); + DO_TEST_PARSE_ERROR("usb-bus-missing", + QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, + QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-ports", QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); -- 2.10.2

2 1

[libvirt] [PATCH 0/5] Enable CI build testing with Travis
by Daniel P. Berrange 12 Apr '17

12 Apr '17

Since we already sync our repo to github, we can easily take advantage of the free Travis CI system to improve our testing coverage. Our current CentOS CI hardware doesn't have scope for running many more VMs than it already does and even if it did, that imposes an administrative burden to manage the OS. So this uses Travis to get us automated testing of Ubuntu Precise & Trusty, with GCC and CLang, and OS-X with CLang. Daniel P. Berrange (5): annotate all mocked functions with noinline Prevent test failures with ebtables/iptables/ip6tables are missing Fix detection of required RBD version Ignore SASL deprecation warnings on OS-X Add travis build configuration .travis.yml | 85 ++++++++++++++++++++++++++++++++++++++++ build-aux/mock-noinline.pl | 72 ++++++++++++++++++++++++++++++++++ cfg.mk | 6 ++- m4/virt-storage-rbd.m4 | 16 +++++++- src/internal.h | 22 +++++++++++ src/qemu/qemu_capspriv.h | 2 +- src/rpc/virnetsaslcontext.c | 12 ++++++ src/rpc/virnetsocket.h | 6 ++- src/util/vircommand.h | 2 +- src/util/vircrypto.h | 2 +- src/util/virfile.h | 2 +- src/util/virhostcpu.h | 4 +- src/util/virmacaddr.h | 2 +- src/util/virnetdev.h | 9 +++-- src/util/virnetdevip.h | 2 +- src/util/virnetdevopenvswitch.h | 2 +- src/util/virnetdevtap.h | 6 +-- src/util/virnuma.h | 16 ++++---- src/util/virrandom.h | 6 +-- src/util/virscsi.h | 2 +- src/util/virscsivhost.h | 2 +- src/util/virtpm.h | 2 +- src/util/virutil.h | 10 ++--- src/util/viruuid.h | 2 +- tests/networkxml2firewalltest.c | 13 ++++++ tests/nwfilterebiptablestest.c | 13 ++++++ tests/nwfilterxml2firewalltest.c | 12 ++++++ tests/virfirewalltest.c | 13 ++++++ 28 files changed, 302 insertions(+), 41 deletions(-) create mode 100644 .travis.yml create mode 100644 build-aux/mock-noinline.pl -- 2.9.3

4 8

[libvirt] [PATCH 0/2] Fixes for CI virt-manager test failures
by John Ferlan 12 Apr '17

12 Apr '17

Test began failing after commit 'd06d1a32' and 'be3c2dfd': https://ci.centos.org/view/libvirt/job/virt-manager-master-check/systems=li… Needed to fix the aclfilter check in both NumOfDevices and GetNames John Ferlan (2): conf: Fix virNodeDeviceObjGetNames nnames increment nodedev: Fix aclfilter check src/conf/virnodedeviceobj.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.9.3

3 4

[libvirt] [PATCH v2 0/2] Simplify perf events handling a little
by Daniel P. Berrange 12 Apr '17

12 Apr '17

This was previously posted & acked here: https://www.redhat.com/archives/libvir-list/2016-December/msg00795.html but then i forgot to push it and also notice a bug in the first place. There were conflicts against current master too, so I'm reposting for new ACK.. Daniel P. Berrange (2): perf: get rid of pointless virPerfGetEventAttr() method perf: get rid of pointless virPerfGetEvent() method src/util/virperf.c | 185 +++++++++++++++++++++-------------------------------- 1 file changed, 73 insertions(+), 112 deletions(-) -- 2.9.3

2 5

[libvirt] RFC: fixing struct name in public header
by Daniel P. Berrange 12 Apr '17

12 Apr '17

Take a look at this def from libvirt-domain.h: typedef struct _virDomainInterfaceIPAddress virDomainIPAddress; typedef virDomainIPAddress *virDomainIPAddressPtr; struct _virDomainInterfaceIPAddress { int type; /* virIPAddrType */ char *addr; /* IP address */ unsigned int prefix; /* IP address prefix */ }; Notice the struct name is different from the typedef names. Technically renaming the struct to remove the 'Interface' word would be an API break. On the flip side though we don't expect any apps to use the struct name, but rather use the typedefs, hence use of '_' in the name. We could do what we did with the typed parameter stuff and rename the struct, but add a #define _virDomainInterfaceIPAddress _virDomainIPAddress Any thoughts ? Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|

4 4

[libvirt] [PATCH 0/2] qemu: conf: Fix memory leaks
by Peter Krempa 12 Apr '17

12 Apr '17

Peter Krempa (2): qemu: conf: Don't leak snapshot image format conf variable qemu: conf: Don't leak 'namespaces' temporary variable while parsing config src/qemu/qemu_conf.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.12.2

2 3

[libvirt] [PATCH] util: fix potential segfault
by Wang King 12 Apr '17

12 Apr '17

virBufferCurrentContent might be get a NULL string, and then without checking it, this can cause a segfault as strlen expects a string != NULL. Use virBufferCheckError to check error before calling strlen. --- src/util/virsystemd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index ceb1c1a..cfc4bdb 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -135,6 +135,8 @@ virSystemdAppendValidMachineName(virBufferPtr buf, bool skip_dot = false; for (; *name; name++) { + if (virBufferCheckError(buf) < 0) + break; if (strlen(virBufferCurrentContent(buf)) >= 64) break; -- 2.8.3

2 1

[libvirt] [PATCH 0/9] virsh: don't overwrite errors in virDomain(Snapshot)Free functions and other refactors
by Peter Krempa 12 Apr '17

12 Apr '17

Avoid the annoying problem that virDomainFree and virDomainSnapshotFree reset libvirt errors and thus errors from helper functions don't get reported. This seriesl also contains other refactors which I noticed along. Peter Krempa (9): virsh: Add new file for utility functions and move a few virsh-util: Move domain lookup helpers into virsh-util virsh-util: Add wrapper for virDomainFree virsh: Add wrapper for virDomainSnapshotFree vsh: Add helper for safe remembering of libvirt errors virsh: add helpers for getting domain XML for XPath purposes virsh-domain-monitor: Use the virsh wrappers for getting XML to simplify code virsh-domain: Use the virsh wrappers for getting XML to simplify code virsh-domain: Refactor cmdTTYConsole cfg.mk | 8 + po/POTFILES.in | 1 + tools/Makefile.am | 1 + tools/virsh-domain-monitor.c | 89 +++-------- tools/virsh-domain.c | 370 ++++++++++++++----------------------------- tools/virsh-domain.h | 12 -- tools/virsh-host.c | 1 - tools/virsh-snapshot.c | 74 ++++----- tools/virsh-util.c | 222 ++++++++++++++++++++++++++ tools/virsh-util.h | 78 +++++++++ tools/virsh-volume.c | 1 + tools/virsh.c | 41 ----- tools/virsh.h | 4 - tools/vsh.c | 15 ++ tools/vsh.h | 1 + 15 files changed, 493 insertions(+), 425 deletions(-) create mode 100644 tools/virsh-util.c create mode 100644 tools/virsh-util.h -- 2.12.2

2 18

[libvirt] [PATCH] qemu: Fix mdev checking for VFIO support
by Erik Skultety 12 Apr '17

12 Apr '17

Commit a4a39d90 added a check that checks for VFIO support with mediated devices. The problem is that the hostdev preparing functions behave like a fallthrough if device of that specific type doesn't exist. However, the check for VFIO support was independent of the existence of a mdev device which caused the guest to fail to start with any device to be directly assigned if VFIO was disabled/unavailable in the kernel. The proposed change first ensures that it makes sense to check for VFIO support in the first place, and only then performs the VFIO support check itself. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1441291 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/qemu/qemu_hostdev.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 685bf5b59..9b5504832 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -330,11 +330,19 @@ qemuHostdevPrepareMediatedDevices(virQEMUDriverPtr driver, int nhostdevs) { virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr; + bool supportsVFIO = qemuHostdevHostSupportsPassthroughVFIO(); + size_t i; - if (!qemuHostdevHostSupportsPassthroughVFIO()) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("host doesn't support VFIO PCI interface")); - return -1; + for (i = 0; i < nhostdevs; i++) { + if (hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV) { + if (!supportsVFIO) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("host doesn't support VFIO PCI interface")); + return -1; + } + break; + } } return virHostdevPrepareMediatedDevices(hostdev_mgr, QEMU_DRIVER_NAME, -- 2.12.2

2 2