- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] storage: drop support for qcow-create, kvm-img
by Cole Robinson 20 Apr '16

20 Apr '16

I don't think we need to try and support qcow-create or kvm-img binaries anymore; everywhere we care about should have a /usr/bin/qemu-img. See patches for more details Cole Robinson (3): storage: remove support for /usr/bin/qcow-create storage: remove support for /usr/bin/kvm-img storage: drop the plumbing needed for kvm-img/qcow-create src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 4 +- src/storage/storage_backend.c | 131 ++------------------------------------- src/storage/storage_backend.h | 9 ++- src/storage/storage_backend_fs.c | 21 ++----- src/util/virfile.c | 2 +- tests/virstoragetest.c | 4 +- 7 files changed, 18 insertions(+), 155 deletions(-) -- 2.7.3

3 10

[libvirt] [PATCH] tests: Fix enumeration value
by Andrea Bolognani 20 Apr '16

20 Apr '16

Commit 3a773c43c801 introduced the testCompareNetXML2XMLResult enumeration; however, in one instance the result variable was assigned a value from the very similar testCompareDocXML2XMLResult enumeration, leading to a build error. networkxml2xmltest.c:33:42: error: implicit conversion from enumeration type 'testCompareDomXML2XMLResult' to different enumeration type 'testCompareNetXML2XMLResult' [-Werror,-Wenum-conversion] testCompareNetXML2XMLResult result = TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS; ~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Use the proper value (TEST_COMPARE_NET_XML2XML_RESULT_SUCCESS) instead. --- Pushed as build breaker. tests/networkxml2xmltest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index a52b350..c069f3d 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -30,7 +30,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, { char *actual = NULL; int ret; - testCompareNetXML2XMLResult result = TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS; + testCompareNetXML2XMLResult result = TEST_COMPARE_NET_XML2XML_RESULT_SUCCESS; virNetworkDefPtr dev = NULL; if (!(dev = virNetworkDefParseFile(inxml))) { -- 2.5.5

1 0

[libvirt] [PATCH 0/7] Probe and expose GIC capabilities
by Andrea Bolognani 20 Apr '16

20 Apr '16

Changes from [RFC]: * Fix issues pointed out during review (see patches 1 and 2 for details) * Add documentation The only thing missing AFAIK is some test cases... I'm not sure whether it's possible to include QMP replies for QEMU 2.6 even though it hasn't been released yet, and I wouldn't know how to generate a .replies file anyway. Any pointers? Cheers. [RFC] https://www.redhat.com/archives/libvir-list/2016-March/msg00956.html Andrea Bolognani (7): conf: Get rid of virDomainCapsDevice qemu: Probe GIC capabilities schema: Validate GIC capabilities conf: Expose GIC capabilities qemu: Fill in GIC capabilities qemu: Cache GIC capabilities docs: Document the new XML elements docs/formatdomain.html.in | 3 +- docs/formatdomaincaps.html.in | 43 ++++- docs/schemas/domaincaps.rng | 18 ++ src/conf/domain_capabilities.c | 42 ++++- src/conf/domain_capabilities.h | 24 +-- src/qemu/qemu_capabilities.c | 194 ++++++++++++++++++++- src/qemu/qemu_monitor.c | 17 ++ src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 115 ++++++++++++ src/qemu/qemu_monitor_json.h | 4 + src/util/virgic.h | 13 ++ tests/domaincapsschemadata/domaincaps-basic.xml | 3 + tests/domaincapsschemadata/domaincaps-full.xml | 3 + .../domaincaps-qemu_1.6.50-1.xml | 3 + tests/domaincapstest.c | 8 +- 15 files changed, 470 insertions(+), 24 deletions(-) -- 2.5.5

2 16

[libvirt] [PATCH] network: Don't use ERR_NO_SUPPORT for invalid net-update requests
by Cole Robinson 20 Apr '16

20 Apr '16

VIR_ERR_NO_SUPPORT maps to the error string this function is not supported by the connection driver and is largely only used for when a driver doesn't have any implementation for a public API. So its usage with invalid net-update requests is a bit out of place. Instead use VIR_ERR_OPERATION_UNSUPPORTED which maps to: Operation not supported And is what qemu's hotplug routines use in similar scenarios --- src/conf/network_conf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 4fb2e2a..eabaccd 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3376,14 +3376,14 @@ void virNetworkSetBridgeMacAddr(virNetworkDefPtr def) static void virNetworkDefUpdateNoSupport(virNetworkDefPtr def, const char *section) { - virReportError(VIR_ERR_NO_SUPPORT, + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("can't update '%s' section of network '%s'"), section, def->name); } static void virNetworkDefUpdateUnknownCommand(unsigned int command) { - virReportError(VIR_ERR_NO_SUPPORT, + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("unrecognized network update command code %d"), command); } @@ -3666,7 +3666,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, /* parse the xml into a virSocketAddrRange */ if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("dhcp ranges cannot be modified, " "only added or deleted")); goto cleanup; @@ -3772,7 +3772,7 @@ virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, goto cleanup; if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("forward interface entries cannot be modified, " "only added or deleted")); goto cleanup; @@ -3973,7 +3973,7 @@ virNetworkDefUpdateDNSHost(virNetworkDefPtr def, memset(&host, 0, sizeof(host)); if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("DNS HOST records cannot be modified, " "only added or deleted")); goto cleanup; @@ -4067,7 +4067,7 @@ virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, memset(&srv, 0, sizeof(srv)); if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("DNS SRV records cannot be modified, " "only added or deleted")); goto cleanup; @@ -4151,7 +4151,7 @@ virNetworkDefUpdateDNSTxt(virNetworkDefPtr def, memset(&txt, 0, sizeof(txt)); if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("DNS TXT records cannot be modified, " "only added or deleted")); goto cleanup; @@ -4268,7 +4268,7 @@ virNetworkDefUpdateSection(virNetworkDefPtr def, ret = virNetworkDefUpdateDNSSrv(def, command, parentIndex, ctxt, flags); break; default: - virReportError(VIR_ERR_NO_SUPPORT, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("can't update unrecognized section of network")); break; } -- 2.7.3

2 1

[libvirt] [PATCH v2 1/2] Explicitly error on uri=qemu://system
by Cole Robinson 20 Apr '16

20 Apr '16

It's a fairly common error that a user tries to connect to a URI like qemu://system or qemu://session (missing a slash). This errors like: $ virsh --connect qemu://session error: failed to connect to the hypervisor error: Unable to resolve address 'session' service '16514': No address associated with hostname If you already know that the standard qemu URI has 3 slashes, that error will make it obvious enough. But new user's may not get it. There's even a RHEL support page explicitly mentioning it!: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/ht… Catch this error early in libvirt.c virConnectOpen for qemu (and vbox which has similar rules https://bugzilla.redhat.com/show_bug.cgi?id=1038304 --- v2: Use conventional function naming Improve a comment Handle 'vz' driver src/libvirt.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index a21d00e..919c9cb 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -928,6 +928,35 @@ virConnectGetDefaultURI(virConfPtr conf, } +/* + * Check to see if an invalid URI like qemu://system (missing /) was passed, + * offer the suggested fix. + */ +static int +virConnectCheckURIMissingSlash(const char *uristr, virURIPtr uri) +{ + /* To avoid false positives, only check drivers that mandate + a path component in the URI, like /system or /session */ + if (STRNEQ(uri->scheme, "qemu") && + STRNEQ(uri->scheme, "vbox") && + STRNEQ(uri->scheme, "vz")) + return 0; + + if (uri->path != NULL) + return 0; + + if (STREQ(uri->server, "session") || + STREQ(uri->server, "system")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid URI %s (maybe you want %s:///%s)"), + uristr, uri->scheme, uri->server); + return -1; + } + + return 0; +} + + static virConnectPtr do_open(const char *name, virConnectAuthPtr auth, @@ -995,6 +1024,12 @@ do_open(const char *name, NULLSTR(ret->uri->user), ret->uri->port, NULLSTR(ret->uri->path)); + if (virConnectCheckURIMissingSlash(alias ? alias : name, + ret->uri) < 0) { + VIR_FREE(alias); + goto failed; + } + VIR_FREE(alias); } else { VIR_DEBUG("no name, allowing driver auto-select"); -- 2.7.3

3 4

[libvirt] [PATCH] Revert "daemon: use socket activation with systemd"
by Cole Robinson 20 Apr '16

20 Apr '16

This reverts commit 1e9808d3a1e00a7121bae8b163d9c42d441d2ca8. We shouldn't advertise libvirtd.socket activation, since currently it means VM/network/... autostart won't work as expected. We tried to find a middle ground by installing the config file without an [Install] section, since systemd won't allow .socket to be enabled without one... or at least it did do that; presently on f24 it allows activating the socket quite happily. This also caused user confusion[1] Just remove the socket file. I've filed a new RFE to track coming up with a solution to the autostart problem[2], we can point users at that if there's more confusion: [1]: https://bugzilla.redhat.com/show_bug.cgi?id=1279348 [2]: https://bugzilla.redhat.com/show_bug.cgi?id=1326136 --- .gitignore | 1 - daemon/Makefile.am | 14 ++------------ daemon/libvirtd.conf | 5 ----- daemon/libvirtd.service.in | 5 +++++ daemon/libvirtd.socket.in | 11 ----------- libvirt.spec.in | 7 ++----- 6 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 daemon/libvirtd.socket.in diff --git a/.gitignore b/.gitignore index 0d12c5c..381db69 100644 --- a/.gitignore +++ b/.gitignore @@ -63,7 +63,6 @@ /daemon/libvirtd.pod /daemon/libvirtd.policy /daemon/libvirtd.service -/daemon/libvirtd.socket /daemon/test_libvirtd.aug /docs/aclperms.htmlinc /docs/apibuild.py.stamp diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 2dbe81b..fc6fd95 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -59,7 +59,6 @@ EXTRA_DIST = \ libvirt.rules \ libvirtd.sasl \ libvirtd.service.in \ - libvirtd.socket.in \ libvirtd.sysconf \ libvirtd.sysctl \ libvirtd.aug \ @@ -446,18 +445,15 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART if LIBVIRT_INIT_SCRIPT_SYSTEMD SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system -BUILT_SOURCES += libvirtd.service libvirtd.socket +BUILT_SOURCES += libvirtd.service -install-init-systemd: install-sysconfig libvirtd.service libvirtd.socket +install-init-systemd: install-sysconfig libvirtd.service $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) $(INSTALL_DATA) libvirtd.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service - $(INSTALL_DATA) libvirtd.socket \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.socket uninstall-init-systemd: uninstall-sysconfig rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.socket rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : else ! LIBVIRT_INIT_SCRIPT_SYSTEMD install-init-systemd: @@ -481,12 +477,6 @@ libvirtd.service: libvirtd.service.in $(top_builddir)/config.status < $< > $@-t && \ mv $@-t $@ -libvirtd.socket: libvirtd.socket.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - check-local: check-augeas diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 5485f98..d2c439c 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -77,11 +77,6 @@ # UNIX socket access controls # -# Beware that if you are changing *any* of these options, and you use -# socket activation with systemd, you need to adjust the settings in -# the libvirtd.socket file as well since it could impose a security -# risk if you rely on file permission checking only. - # Set the UNIX domain socket group ownership. This can be used to # allow a 'trusted' set of users access to management capabilities # without becoming root. diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index 608221c..1616e7a 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -1,3 +1,8 @@ +# NB we don't use socket activation. When libvirtd starts it will +# spawn any virtual machines registered for autostart. We want this +# to occur on every boot, regardless of whether any client connects +# to a socket. Thus socket activation doesn't have any benefit + [Unit] Description=Virtualization daemon Before=libvirt-guests.service diff --git a/daemon/libvirtd.socket.in b/daemon/libvirtd.socket.in deleted file mode 100644 index 0915bb3..0000000 --- a/daemon/libvirtd.socket.in +++ /dev/null @@ -1,11 +0,0 @@ -[Socket] -ListenStream=@runstatedir@/libvirt/libvirt-sock -ListenStream=@runstatedir@/libvirt/libvirt-sock-ro - -; The following settings must match libvirtd.conf file in order to -; work as expected because libvirtd can't change them later. -; SocketMode=0777 is safe only if authentication on the socket is set -; up. For further information, please see the libvirtd.conf file. -SocketMode=0777 -SocketUser=root -SocketGroup=root diff --git a/libvirt.spec.in b/libvirt.spec.in index 8036fa3..c3bfea3 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1710,7 +1710,7 @@ exit 0 %if %{with_systemd} %if %{with_systemd_macros} - %systemd_post virtlockd.socket virtlogd.socket libvirtd.service libvirtd.socket + %systemd_post virtlockd.socket virtlogd.socket libvirtd.service %else if [ $1 -eq 1 ] ; then # Initial installation @@ -1739,19 +1739,17 @@ fi %preun daemon %if %{with_systemd} %if %{with_systemd_macros} - %systemd_preun libvirtd.socket libvirtd.service virtlogd.socket virtlogd.service virtlockd.socket virtlockd.service + %systemd_preun libvirtd.service virtlogd.socket virtlogd.service virtlockd.socket virtlockd.service %else if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable \ - libvirtd.socket \ libvirtd.service \ virtlogd.socket \ virtlogd.service \ virtlockd.socket \ virtlockd.service > /dev/null 2>&1 || : /bin/systemctl stop \ - libvirtd.socket \ libvirtd.service \ virtlogd.socket \ virtlogd.service \ @@ -1966,7 +1964,6 @@ exit 0 %if %{with_systemd} %{_unitdir}/libvirtd.service -%{_unitdir}/libvirtd.socket %{_unitdir}/virtlogd.service %{_unitdir}/virtlogd.socket %{_unitdir}/virtlockd.service -- 2.7.3

2 2

[libvirt] [PATCH v2] vz: handle sourceless cdroms
by Nikolay Shirokovskiy 19 Apr '16

19 Apr '16

From: Mikhail Feoktistov <mfeoktistov(a)virtuozzo.com> libvirt handles empty source as NULL, while vz sdk as "" thus we need a bit of conversion. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/vz/vz_sdk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) changes from v1: ================ 1. simplify empty string check in prlsdkGetDiskInfo 2. call setting "" explicitly in prlsdkAddDisk. point 2 is the actual reason for releasing new version. I need this semantics on my future work of updating disks. diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 2e9544b..9b783af 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -565,7 +565,7 @@ prlsdkGetDiskInfo(vzDriverPtr driver, if (!(buf = prlsdkGetStringParamVar(PrlVmDev_GetFriendlyName, prldisk))) goto cleanup; - if (virDomainDiskSetSource(disk, buf) < 0) + if (*buf != '\0' && virDomainDiskSetSource(disk, buf) < 0) goto cleanup; if (prlsdkGetDiskId(prldisk, isCt, &disk->bus, &disk->dst) < 0) @@ -3183,6 +3183,7 @@ static int prlsdkAddDisk(vzDriverPtr driver, PRL_DEVICE_TYPE devType; PRL_CLUSTERED_DEVICE_SUBTYPE scsiModel; char *dst = NULL; + const char *path = disk->src->path ? : ""; if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) devType = PDE_HARD_DISK; @@ -3206,10 +3207,10 @@ static int prlsdkAddDisk(vzDriverPtr driver, pret = PrlVmDev_SetEmulatedType(sdkdisk, emutype); prlsdkCheckRetGoto(pret, cleanup); - pret = PrlVmDev_SetSysName(sdkdisk, disk->src->path); + pret = PrlVmDev_SetSysName(sdkdisk, path); prlsdkCheckRetGoto(pret, cleanup); - pret = PrlVmDev_SetFriendlyName(sdkdisk, disk->src->path); + pret = PrlVmDev_SetFriendlyName(sdkdisk, path); prlsdkCheckRetGoto(pret, cleanup); drive = &disk->info.addr.drive; -- 1.8.3.1

2 1

[libvirt] [PATCH REBASE 0/4] vz: use disk bus and target name as disk id
by Nikolay Shirokovskiy 19 Apr '16

19 Apr '16

This series is a preparation to implement device update functionality. In case of disk updates disk bus and disk target name pair is considered disk id. We already have places in vz driver code where we use disk source as id. These places are either not critical (see boot patch) or correct (see detach patch) so we need not to fix them immediately to use more rubust id. But as this id will be introduced anyway for disk updates let's move to new id in existing code. This way we have single id for disks. Nikolay Shirokovskiy (4): vz: introduce vzsdk disk id function vz: fix detach disk to use new disk id vz: fix boot check to use new disk id vz: cleanup: remove trivial function src/vz/vz_sdk.c | 251 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 126 insertions(+), 125 deletions(-) -- 1.8.3.1

2 9

[libvirt] [PATCH 00/10] Convert secret driver to use hashed object
by John Ferlan 19 Apr '16

19 Apr '16

This series replaces the usage of linked list in secret driver with a hashed object list as was suggested in the review in the last patch of the previous secret driver changes series: http://www.redhat.com/archives/libvir-list/2016-February/msg01274.html Patch 1 - starts the ball rolling Patch 2 - is yet another code optimization (as found in bridge_driver) Patches 3-8 - Add the new API's "slowly" (for review purposes) Patch 9 - replaces the usage of linked lists with the hashed object Patch 10 - moves the secretLoadAllConfigs to secret_conf The changes are loosely modeled after both virdomainobj and network_conf functionality. The real meat and potato(e)s is found in patches 5 and 9. Other functions should be relatively straightforward. I've done testing of various virsh secret-* commands (both valid and invalid options) as well as performing driver start, stop, and reload testing. Each patch was built using 'check' and 'syntax-check'. The end result is much more code in secret_conf and much less in secret_driver. John Ferlan (10): secret: Move virSecretObj to secret_conf.h Add secretObjFromSecret secret: Add hashed virSecretObj and virSecretObjList secret: Introduce virSecretObjListFindBy{UUID|Usage} support secret: Introduce virSecretObjListAdd* and virSecretObjListRemove secret: Introduce virSecretObjListNumOfSecrets secret: Introduce virSecretObjListExport secret: Introduce virSecretObjListGetUUIDs secret: Use the hashed virSecretObjList secret: Move and rename secretLoadAllConfigs src/conf/secret_conf.c | 819 ++++++++++++++++++++++++++++++++++++++++++++- src/conf/secret_conf.h | 76 ++++- src/libvirt_private.syms | 11 + src/secret/secret_driver.c | 647 +++-------------------------------- 4 files changed, 957 insertions(+), 596 deletions(-) -- 2.5.0

4 40

[libvirt] [PATCH 0/3] qemu: cleanup duplicate calls to DomainObjIsActive
by Cole Robinson 19 Apr '16

19 Apr '16

Some API entry points have duplicate calls to DomainObjIsActive. Remove the redundant ones, and document the valid ones that confused me :) Cole Robinson (3): qemu: Remove redundant DomainObjIsActive calls qemu: Clarify usage of DomainObjIsActive for PMSuspended qemu: Clarify usage of DomainObjIsActive for SetTime src/qemu/qemu_driver.c | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) -- 2.7.3

2 7

[libvirt] [PATCH] Explicitly error on uri=qemu://system
by Cole Robinson 19 Apr '16

19 Apr '16

It's a fairly common error that a user tries to connect to a URI like qemu://system or qemu://session (missing a slash). This errors like: $ virsh --connect qemu://session error: failed to connect to the hypervisor error: Unable to resolve address 'session' service '16514': No address associated with hostname If you already know that the standard qemu URI has 3 slashes, that error will make it obvious enough. But new user's may not get it. There's even a RHEL support page explicitly mentioning it!: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/ht… Catch this error early in libvirt.c virConnectOpen for qemu (and vbox which has similar rules https://bugzilla.redhat.com/show_bug.cgi?id=1038304 --- src/libvirt.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index a21d00e..7607ae3 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -928,6 +928,33 @@ virConnectGetDefaultURI(virConfPtr conf, } +/* + * Check to see if an invalid URI like qemu://system (missing /) was passed, + * offer the suggested fix. + */ +static int +check_uri_missing_slash(const char *uristr, virURIPtr uri) +{ + /* These drivers _only_ accepts URIs with a 'path' element */ + if (STRNEQ(uri->scheme, "qemu") && + STRNEQ(uri->scheme, "vbox")) + return 0; + + if (uri->path != NULL) + return 0; + + if (STREQ(uri->server, "session") || + STREQ(uri->server, "system")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid URI %s (maybe you want %s:///%s)"), + uristr, uri->scheme, uri->server); + return -1; + } + + return 0; +} + + static virConnectPtr do_open(const char *name, virConnectAuthPtr auth, @@ -995,6 +1022,11 @@ do_open(const char *name, NULLSTR(ret->uri->user), ret->uri->port, NULLSTR(ret->uri->path)); + if (check_uri_missing_slash(alias ? alias : name, ret->uri) < 0) { + VIR_FREE(alias); + goto failed; + } + VIR_FREE(alias); } else { VIR_DEBUG("no name, allowing driver auto-select"); -- 2.7.3

3 4

[libvirt] [libvirt-php][PATCH 0/3] Couple of small fixes
by Michal Privoznik 19 Apr '16

19 Apr '16

While playing with our php bindings I've noticed couple of memory leaks mostly. And one bug in our examples. Michal Privoznik (3): examples: Check properly if connected Fix some leaks related to get_string_from_xpath Revisit some VIRT_RETURN_STRING examples/index.php | 4 +- src/libvirt-php.c | 121 ++++++++++++++++++++++++++++++----------------------- 2 files changed, 72 insertions(+), 53 deletions(-) -- 2.7.3

4 13

[libvirt] RFC: Drop unmaintained hv drivers? (phyp, xenapi, hyperv)
by Cole Robinson 19 Apr '16

19 Apr '16

Hi all, There's a few old hypervisor drivers in the tree that haven't been actively maintained for a long time. I'm curious if anyone knows of these drivers being actively used. If not I think we should consider dropping them src/phyp/ : for power VM hypervisor. Added in July 2009. The last commit that looks like it wasn't either internal API conversion, or caught by code analysis, is: commit 41461ff7f7d6ee6679aae2a8004e305c5830c9e8 Author: Eduardo Otubo <otubo(a)linux.vnet.ibm.com> Date: Tue Apr 19 12:34:08 2011 -0300 PHYP: Adding reboot domain function Adding reboot <domain> function for pHyp driver. Nearly 5 years ago. Eduardo is the primary driver author too (CCd at his email from github). Searching the upstream bug tracker for all bugs with 'phyp', the only one that's actually about the phyp driver is a report from 2 years ago that it crashes trying to open a connection: https://bugzilla.redhat.com/show_bug.cgi?id=1093094 src/xenapi/: Connecting to a xen api server. Added in March 2010. Largely appears to be a code drop, the original author/committer has never had another commit. The last xenapi specific commit seems to be: commit 484460ec4678a264c5e7355495c2f0da72cb42bd Author: Matthias Bolte <matthias.bolte(a)googlemail.com> Date: Thu Jul 21 15:16:11 2011 +0200 xenapi: Improve error reporting in xenapiOpen once again Nearly 5 years ago. The only upstream bug that was filed about xenapi is: https://bugzilla.redhat.com/show_bug.cgi?id=711372 Which was about a connection failure that was eventually fixed upstream, and dovetailed into the above referenced commit. Current xen guys, you know of anyone using this? src/hyperv/: Added in July 2011. This was largely a code drop as well; committed and patched a few times by Matthias but it was a university project by someone else. Last hyperv targeted patch was: commit 9e9ea3ead9825bd1dc2c17cea4abc8c4165591d0 Author: Matthias Bolte <matthias.bolte(a)googlemail.com> Date: Sun Sep 9 17:39:40 2012 +0200 hyperv: Fix and improve hypervListAllDomains The driver is fairly minimal as well: it can only list existing VMs and perform lifecycle operations. It can't create new VMs, and doesn't list VM device config AFAICT. Also, in general, I've never heard about anyone _actually_ using any of those drivers in the wild. There's reports here and there but it mostly sounds like people trying them out. Just an anecdote so take it with a grain of salt - Cole

4 7

[libvirt] [PATCH] network: Add support for dhcp-range lease time in the network XML configuration format and dnsmasq
by Alberto Ruiz 19 Apr '16

19 Apr '16

Hello, I've been asked to send this patch to the list for review which I originally posted at rhbz#913446 [0]. My main motivation is to be able to set a saner default for dhcp leases in Boxes for development machines where the instant volatility of the dhcp lease makes it impossible to reliably work with services after the machines have to be rebooted. One has to discover the ip again... setup ssh keys... This patch is a first attempt so feel free to let me know if I'm aiming at the right direction. Thanks! [0]https://bugzilla.redhat.com/show_bug.cgi?id=913446 -- Alberto Ruiz Associate Engineering Manager - Desktop Management Tools Red Hat

3 4

[libvirt] how does the qemu command line executed by libvirt?
by zhukaijie 19 Apr '16

19 Apr '16

As you know, libvirt takes advantage of xml and generate corresponding qemu command line. But how does this command line executed? Does it executed in bash shell? Or any other api is used to create the qemu process? Thank you.

2 1

[libvirt] [PATCH] qemu: command: drop redundant min_guarantee check
by Cole Robinson 19 Apr '16

19 Apr '16

We already reject a VM with min_guarantee early in the VM startup in qemuProcessStartValidate --- src/qemu/qemu_command.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 26c19ff..2fb967a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9143,7 +9143,6 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr driver, if (virMemoryLimitIsSet(def->mem.hard_limit) || virMemoryLimitIsSet(def->mem.soft_limit) || - def->mem.min_guarantee || virMemoryLimitIsSet(def->mem.swap_hard_limit)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory tuning is not available in session mode")); -- 2.7.3

2 1

[libvirt] [libvirt-php PATCH 00/29] Add PHP7 support and unit tests V2
by Neal Gompa 19 Apr '16

19 Apr '16

This patch set is a revision of the first version, taking into account some of the feedback from Michal Privoznik. I've done some patch surgery to rebase the patch set on the current git HEAD, so it should cleanly apply as-is. Additionally, I've squashed a few commits (mainly some of Remi's patches that were squashable that should be squashed). This means that Vasiliy's patches are no longer unnecessarily part of this patch set. I've updated my patches for the instructions on the php extension build system method to correct a typo on how to run the tests (`make test` instead of `make tests`) and removed the "-dev" suffix that Remi attached to the version string in libvirt-php.h, as I expect that there will likely be a libvirt-php release after this patch set is merged. I would greatly appreciate a quick review and merge of this patch set. Chuck Roydhouse (1): add arginfo for libvirt_domain_block_commit and libvirt_domain_block_job_info Frederic Mora (1): Add more tests Neal Gompa (2): Commit short instructions to using the php extension build method Bump version to 0.5.2 Remi Collet (25): add config.m4 to allow standard PHP extension build system include config.h earlier add missing arginfo adapt RETURN_STRING work on zpp register + fetch resources + hash adapt add_assoc_string_ex clean ALLOC_INIT_ZVAL zend_hash_update add_next_index_string buildable with PHP 7 bump version 0.5.2-dev fix missed (hidden) zpp calls fix PHP 5 compat fix libvirt_version + add test port test-connect.phpt to real phpt Switch all add_assoc_string_ex to add_assoc_string to avoid nul char management Fix max_connections management add test-conn-limit.phpt (as real phpt) add test-connect-get-emulator.phpt fix parse_array + build warnings convert test-install.phpt to real phpt convert test-domain-create-and-coredump.phpt to real phpt convert test-domain-create-and-get-xpath.phpt to real phpt fix PHP 5 compat again (nested macro issue) INSTALL.PHPEXT | 14 + configure.ac | 2 +- src/config.m4 | 52 + src/libvirt-php.c | 1796 ++++++++++++++++------- src/libvirt-php.h | 48 +- src/tests/example-no-disk-and-media.xml | 41 + src/tests/qemu-no-disk-and-media.xml | 41 + src/tests/skipif.inc | 3 + src/tests/test-conn-limit.phpt | 49 + src/tests/test-connect-get-capabilities.phpt | 27 + src/tests/test-connect-get-emulator.phpt | 15 + src/tests/test-connect-get-info.phpt | 110 ++ src/tests/test-connect-get-machine-types.phpt | 30 + src/tests/test-connect.phpt | 15 + src/tests/test-domain-create-and-coredump.phpt | 49 + src/tests/test-domain-create-and-get-xpath.phpt | 56 + src/tests/test-domain-create-and-shutdown.phpt | 38 + src/tests/test-domain-define.phpt | 38 + src/tests/test-domain-disk.phpt | 71 + src/tests/test-domain-get.phpt | 91 ++ src/tests/test-domain-lookup-by-name.phpt | 35 + src/tests/test-domain-nic.phpt | 52 + src/tests/test-install.phpt | 136 ++ src/tests/test-libvirt-php.img | 0 src/tests/test-logfile.phpt | 43 + src/tests/test-version-get.phpt | 27 + 26 files changed, 2330 insertions(+), 549 deletions(-) create mode 100644 INSTALL.PHPEXT create mode 100644 src/config.m4 create mode 100644 src/tests/example-no-disk-and-media.xml create mode 100644 src/tests/qemu-no-disk-and-media.xml create mode 100644 src/tests/skipif.inc create mode 100644 src/tests/test-conn-limit.phpt create mode 100644 src/tests/test-connect-get-capabilities.phpt create mode 100644 src/tests/test-connect-get-emulator.phpt create mode 100644 src/tests/test-connect-get-info.phpt create mode 100644 src/tests/test-connect-get-machine-types.phpt create mode 100644 src/tests/test-connect.phpt create mode 100644 src/tests/test-domain-create-and-coredump.phpt create mode 100644 src/tests/test-domain-create-and-get-xpath.phpt create mode 100644 src/tests/test-domain-create-and-shutdown.phpt create mode 100644 src/tests/test-domain-define.phpt create mode 100644 src/tests/test-domain-disk.phpt create mode 100644 src/tests/test-domain-get.phpt create mode 100644 src/tests/test-domain-lookup-by-name.phpt create mode 100644 src/tests/test-domain-nic.phpt create mode 100644 src/tests/test-install.phpt create mode 100644 src/tests/test-libvirt-php.img create mode 100644 src/tests/test-logfile.phpt create mode 100644 src/tests/test-version-get.phpt -- 2.5.5

4 41

[libvirt] [python PATCH] fix crash in getAllDomainStats
by Pavel Hrdina 19 Apr '16

19 Apr '16

Commits 1d39dbaf and 827ed9b4 broke the libvirt-python API by removing virDomainRef() and virDomainFree(). virDomainStatsRecordListFree() will free that domain pointer and later when virDomain (python object) call its destructor and tries to free that same pointer again. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1326839 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- libvirt-override.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index 4640ed5..2de95ce 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8381,6 +8381,7 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, PyObject *py_retval; PyObject *py_record; PyObject *py_record_stats = NULL; + virDomainPtr dom = NULL; size_t i; if (!(py_retval = PyList_New(nrecords))) @@ -8392,9 +8393,12 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, VIR_PY_LIST_SET_GOTO(py_retval, i, py_record, error); + dom = records[i]->dom; + virDomainRef(dom); VIR_PY_TUPLE_SET_GOTO(py_record, 0, - libvirt_virDomainPtrWrap(records[i]->dom), + libvirt_virDomainPtrWrap(dom), error); + dom = NULL; if (!(py_record_stats = getPyVirTypedParameter(records[i]->params, records[i]->nparams))) @@ -8406,6 +8410,8 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, return py_retval; error: + if (dom) + virDomainFree(dom); Py_XDECREF(py_retval); return NULL; } -- 2.8.1

2 1

[libvirt] [PATCH 0/2] prevent duplicate entries in network device pools
by Laine Stump 19 Apr '16

19 Apr '16

This is a simple bugfix, but proper testing required the ability to test for parse failures in networkxml2xmltest, which wasn't yet an option, so I added a separate prerequisite patch to do that (in case someone wants to backport the new testing option without the bugfix). Laine Stump (2): test: enable testing for expected parse errors in network XML network: prevent duplicate entries in network device pools src/conf/network_conf.c | 33 ++++++++-- tests/networkxml2xmlin/hostdev-duplicate.xml | 11 ++++ tests/networkxml2xmlin/passthrough-duplicate.xml | 10 +++ tests/networkxml2xmltest.c | 77 ++++++++++++++++++------ 4 files changed, 108 insertions(+), 23 deletions(-) create mode 100644 tests/networkxml2xmlin/hostdev-duplicate.xml create mode 100644 tests/networkxml2xmlin/passthrough-duplicate.xml -- 2.5.5

2 3

[libvirt] [PATCH v2] Include sysmacros.h where needed
by Martin Kletzander 18 Apr '16

18 Apr '16

So in glibc-2.23 sys/sysmacros.h is no longer included from sys/types.h and we don't build because of the usage of major/minor/makedev macros. Autoconf already has AC_HEADER_MAJOR macro that check where exactly these functions/macros are defined, so let's use that. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v2: - Don't include the file unconditionally, but rather use AC_HEADER_MAJOR that exists for exactly this purpose. v1: - https://www.redhat.com/archives/libvir-list/2016-April/msg00851.html configure.ac | 2 ++ src/conf/domain_audit.c | 6 ++++++ src/lxc/lxc_controller.c | 7 +++++++ src/lxc/lxc_driver.c | 7 +++++++ src/util/vircgroup.c | 7 +++++++ src/util/virutil.c | 7 +++++++ tests/vircgroupmock.c | 7 +++++++ 7 files changed, 43 insertions(+) diff --git a/configure.ac b/configure.ac index b1500f60bc5d..f266484575ff 100644 --- a/configure.ac +++ b/configure.ac @@ -144,6 +144,8 @@ AC_TYPE_UID_T dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL) AC_LIBTOOL_WIN32_DLL +AC_HEADER_MAJOR + m4_ifndef([LT_INIT], [ AM_PROG_LIBTOOL ], [ diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index bd2eeb6a792d..36a3cf6ba0b4 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -26,6 +26,12 @@ #include <sys/stat.h> #include <sys/types.h> +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif MAJOR_IN_SYSMACROS +# include <sys/sysmacros.h> +#endif + #include "domain_audit.h" #include "viraudit.h" #include "viruuid.h" diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 73e57e30ad48..de59775256b5 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -28,6 +28,13 @@ #include <sys/wait.h> #include <sys/socket.h> #include <sys/types.h> + +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif MAJOR_IN_SYSMACROS +# include <sys/sysmacros.h> +#endif + #include <sys/un.h> #include <sys/personality.h> #include <unistd.h> diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ef488123db12..1dfbde333073 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -29,6 +29,13 @@ #include <sys/utsname.h> #include <string.h> #include <sys/types.h> + +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif MAJOR_IN_SYSMACROS +# include <sys/sysmacros.h> +#endif + #include <sys/socket.h> #include <sys/stat.h> #include <sys/un.h> diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index bffd88f90a44..da5ccff35f8a 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -35,6 +35,13 @@ #include <stdlib.h> #include <sys/stat.h> #include <sys/types.h> + +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif MAJOR_IN_SYSMACROS +# include <sys/sysmacros.h> +#endif + #include <signal.h> #include <dirent.h> #include <unistd.h> diff --git a/src/util/virutil.c b/src/util/virutil.c index 82051505d258..d80d994327cd 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -36,6 +36,13 @@ #include <poll.h> #include <sys/stat.h> #include <sys/types.h> + +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif MAJOR_IN_SYSMACROS +# include <sys/sysmacros.h> +#endif + #include <sys/ioctl.h> #include <string.h> #include <termios.h> diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 756ac51679b4..cfc51e8f6373 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -29,6 +29,13 @@ # include <unistd.h> # include <fcntl.h> # include <sys/stat.h> + +# ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +# elif MAJOR_IN_SYSMACROS +# include <sys/sysmacros.h> +# endif + # include <stdarg.h> # include "testutilslxc.h" # include "virstring.h" -- 2.8.1

2 3

[libvirt] [PATCH] qemu: Label master key file
by Martin Kletzander 18 Apr '16

18 Apr '16

When creating the master key, we used mode 0600 (which we should) but because we were creating it as root, the file is not readable by any qemu running as non-root. Fortunately, it's just a matter of labelling the file. We are generating the file path few times already, so let's label it in the same function that has access to the path already. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_domain.c | 15 ++++++++++++--- src/qemu/qemu_domain.h | 3 ++- src/qemu/qemu_process.c | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5d54fffcfb98..83e765ef6868 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -504,11 +504,13 @@ qemuDomainGetMasterKeyFilePath(const char *libDir) * Returns 0 on success, -1 on failure with error message indicating failure */ static int -qemuDomainWriteMasterKeyFile(qemuDomainObjPrivatePtr priv) +qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver, + virDomainObjPtr vm) { char *path; int fd = -1; int ret = -1; + qemuDomainObjPrivatePtr priv = vm->privateData; if (!(path = qemuDomainGetMasterKeyFilePath(priv->libDir))) return -1; @@ -525,6 +527,10 @@ qemuDomainWriteMasterKeyFile(qemuDomainObjPrivatePtr priv) goto cleanup; } + if (virSecurityManagerDomainSetDirLabel(driver->securityManager, + vm->def, path) < 0) + goto cleanup; + ret = 0; cleanup: @@ -697,8 +703,11 @@ qemuDomainMasterKeyRemove(qemuDomainObjPrivatePtr priv) * Returns: 0 on success, -1 w/ error message on failure */ int -qemuDomainMasterKeyCreate(qemuDomainObjPrivatePtr priv) +qemuDomainMasterKeyCreate(virQEMUDriverPtr driver, + virDomainObjPtr vm) { + qemuDomainObjPrivatePtr priv = vm->privateData; + /* If we don't have the capability, then do nothing. */ if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET)) return 0; @@ -709,7 +718,7 @@ qemuDomainMasterKeyCreate(qemuDomainObjPrivatePtr priv) priv->masterKeyLen = QEMU_DOMAIN_MASTER_KEY_LEN; - if (qemuDomainWriteMasterKeyFile(priv) < 0) + if (qemuDomainWriteMasterKeyFile(driver, vm) < 0) goto error; return 0; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index d8d57d32df5d..7d2c4fd92ae4 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -584,7 +584,8 @@ char *qemuDomainGetMasterKeyFilePath(const char *libDir); int qemuDomainMasterKeyReadFile(qemuDomainObjPrivatePtr priv); -int qemuDomainMasterKeyCreate(qemuDomainObjPrivatePtr priv); +int qemuDomainMasterKeyCreate(virQEMUDriverPtr driver, + virDomainObjPtr vm); void qemuDomainMasterKeyRemove(qemuDomainObjPrivatePtr priv); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b1e270ff235e..787d78670dae 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5218,7 +5218,7 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, goto cleanup; VIR_DEBUG("Create domain masterKey"); - if (qemuDomainMasterKeyCreate(priv) < 0) + if (qemuDomainMasterKeyCreate(driver, vm) < 0) goto cleanup; ret = 0; -- 2.8.1

3 8

[libvirt] [RFC 0/6] Probe and expose GIC capabilities
by Andrea Bolognani 18 Apr '16

18 Apr '16

This series implements support for asking QEMU what GIC versions can be used for guests, eg: <features> <gic version='2'/> </features> and exposing such information to users via domain capabilities. QEMU patches that implement the query-gic-capabilities QMP command: https://lists.gnu.org/archive/html/qemu-devel/2016-03/msg04465.html Cheers. Andrea Bolognani (6): conf: Get rid of virDomainCapsDevice qemu: Probe GIC capabilities schema: Validate GIC capabilities conf: Expose GIC capabilities qemu: Fill in GIC capabilities qemu: Cache GIC capabilities docs/schemas/domaincaps.rng | 18 +++ src/conf/domain_capabilities.c | 26 +++- src/conf/domain_capabilities.h | 24 ++-- src/qemu/qemu_capabilities.c | 157 ++++++++++++++++++++- src/qemu/qemu_monitor.c | 10 ++ src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 90 ++++++++++++ src/qemu/qemu_monitor_json.h | 4 + src/util/virgic.h | 13 ++ tests/domaincapsschemadata/domaincaps-basic.xml | 3 + tests/domaincapsschemadata/domaincaps-full.xml | 3 + .../domaincaps-qemu_1.6.50-1.xml | 3 + tests/domaincapstest.c | 8 +- 13 files changed, 341 insertions(+), 22 deletions(-) -- 2.5.5

4 26

[libvirt] [PATCH] virDomain{Get, Set}PerfEvents: Tweak documentation
by Michal Privoznik 18 Apr '16

18 Apr '16

These API already support VIR_DOMAIN_AFFECT_* flags. But the documentation does not mention it. Eww. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-domain.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 3e144b6..4f473c9 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -9695,11 +9695,13 @@ virDomainOpenChannel(virDomainPtr dom, * @domain: a domain object * @params: where to store perf events setting * @nparams: number of items in @params - * @flags: extra flags; not used yet, so callers should always pass 0 + * @flags: bitwise-OR of virDomainModificationImpact * - * Get all perf events setting. Possible fields returned in @params are - * defined by VIR_DOMAIN_PERF_* macros and new fields will likely be - * introduced in the future. + * Get all Linux perf events setting. Possible fields returned in + * @params are defined by VIR_PERF_EVENT_* macros and new fields + * will likely be introduced in the future. + * + * Linux perf events are performance analyzing tool in Linux. * * Returns -1 in case of failure, 0 in case of success. */ @@ -9743,9 +9745,13 @@ int virDomainGetPerfEvents(virDomainPtr domain, * @params: pointer to perf events parameter object * @nparams: number of perf event parameters (this value can be the same * less than the number of parameters supported) - * @flags: extra flags; not used yet, so callers should always pass 0 + * @flags: bitwise-OR of virDomainModificationImpact * - * Enable or disable the particular list of perf events you care about. + * Enable or disable the particular list of Linux perf events you + * care about. The @params argument should contain any subset of + * VIR_PERF_EVENT_ macros. + * + * Linux perf events are performance analyzing tool in Linux. * * Returns -1 in case of error, 0 in case of success. */ -- 2.7.3

2 1

[libvirt] [PATCH v4 00/11] Introduce worker tuning APIs
by Erik Skultety 18 Apr '16

18 Apr '16

since v3: - fixed some indentation problem in 10/11 - for some reason daemon-side APIs did not follow our function signature conventions, e.g. if the function name starts with virAdmServer (adminServer for server-side version), it means that first argument is going to be virAdmServerPtr (virNetServerPtr for server side), etc., but for some reason, I named the server-side version adminDaemon, while passing virNetServerPtr as the first argument - fixed a bug when setting parameters would return error stating that minWorkers cannot be larger than maxWorkers for configuration: maxWorkers = 14 and minWorkers = 13 - replaced srv-workertune command with two commands srv-threadpool-info and srv-threadpool-set, since it's much easier to extend the set of options for each command separately than to do some black magic to determine which options make the command behave as a getter and which ones make it behave as a setter since v2: - all getters are now protected by threadpool mutex to prevent torn reads in concurrent execution - some checks in adminDispatchServerGetThreadpoolParameters were redundant, thus were optimizes out - fixed memory leak in adminDispatchServerGetThreadpoolParameters when allocating a newlist although typed params serialization already does that - fixed some cosmetic issues like exporting a function prototype one patch earlier than it should actually be introduced - a mistake that got there by interactive rebase Erik Skultety (11): po: Fix record ordering in POTFILES.in libvirt-host: Move virTypedParam* to libvirt-common admin: Enable usage of typed parameters util: Refactor thread creation by introducing virThreadPoolExpand util: Report system error when virThreadCreateFull fails util: Use a mutex when retrieving threadpool data util: Add more getters to threadpool parameters admin: Prepare admin protocol for future worker related procedures admin: Introduce virAdmServerGethreadPoolParameters admin: Introduce virAdmServerSetThreadPoolParameters virt-admin: Introduce srv-threadpool-info and srv-threadpool-set commands cfg.mk | 2 +- daemon/admin.c | 88 +++++++++++++ daemon/admin_server.c | 110 ++++++++++++++++ daemon/admin_server.h | 11 ++ include/libvirt/libvirt-admin.h | 71 +++++++++++ include/libvirt/libvirt-common.h.in | 185 +++++++++++++++++++++++++++ include/libvirt/libvirt-host.h | 186 ---------------------------- po/POTFILES.in | 4 +- src/admin/admin_protocol.x | 54 +++++++- src/admin/admin_remote.c | 77 ++++++++++++ src/admin_protocol-structs | 45 +++++++ src/libvirt-admin.c | 83 +++++++++++++ src/libvirt_admin_private.syms | 3 + src/libvirt_admin_public.syms | 2 + src/libvirt_private.syms | 4 + src/rpc/virnetserver.c | 37 ++++++ src/rpc/virnetserver.h | 13 ++ src/util/virthreadpool.c | 241 ++++++++++++++++++++++++++---------- src/util/virthreadpool.h | 8 ++ tools/virt-admin.c | 185 +++++++++++++++++++++++++++ 20 files changed, 1152 insertions(+), 257 deletions(-) -- 2.4.11

2 15

[libvirt] [PATCH] Libvirt: virTypedParamsValidate: Fix detection of multiple parameters
by Jason J. Herne 18 Apr '16

18 Apr '16

virTypedParamsValidate currently uses an index based check to find duplicate parameters. This check does not work. Consider the following simple example: We have only 2 keys A (multiples allowed) B (multiples NOT allowed) We are given the following list of parameters to check: A A B If you work through the validation loop you will see that our last iteration through the loop has i=2 and j=1. In this case, i > j and keys[j].value.i will indicate that multiples are not allowed. Both conditionals are satisfied so an incorrect error will be given: "parameter '%s' occurs multiple times" This patch replaces the index based check with code that remembers the name of the last parameter seen and only triggers the error case if the current parameter name equals the last one. This works because the list is sorted and duplicate parameters will be grouped together. In reality, we hit this bug while using selective block migration to migrate a guest with 5 disks. 5 was apparently just the right number to push i > j and hit this bug. virsh migrate --live guestname --copy-storage-all --migrate-disks vdb,vdc,vdd,vde,vdf qemu+ssh://dsthost/system Signed-off-by: Jason J. Herne <jjherne(a)linux.vnet.ibm.com> Reviewed-by: Eric Farman <farman(a)linux.vnet.ibm.com> --- src/util/virtypedparam.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index 138fc64..23109e1 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -66,7 +66,7 @@ virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) va_list ap; int ret = -1; size_t i, j; - const char *name; + const char *name, *last_name = NULL; int type; size_t nkeys = 0, nkeysalloc = 0; virTypedParameterPtr sorted = NULL, keys = NULL; @@ -106,7 +106,8 @@ virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) if (STRNEQ(sorted[i].field, keys[j].field)) { j++; } else { - if (i > j && !(keys[j].value.i & VIR_TYPED_PARAM_MULTIPLE)) { + if (STREQ_NULLABLE(last_name, sorted[i].field) && + !(keys[j].value.i & VIR_TYPED_PARAM_MULTIPLE)) { virReportError(VIR_ERR_INVALID_ARG, _("parameter '%s' occurs multiple times"), sorted[i].field); @@ -125,6 +126,7 @@ virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) virTypedParameterTypeToString(keys[j].type)); goto cleanup; } + last_name = sorted[i].field; i++; } } -- 1.9.1

2 1