- Devel - libvirt List Archives

[libvirt] [PATCH 0/5] Couple of virDomainInterfaceAddresses fixes
by Michal Privoznik 17 Mar '15

17 Mar '15

While testing the new API I've noticed some leaks and other errors. The very first patch changes the RPC protocol, but hey - on an unreleased procedure yet! Michal Privoznik (5): RPC: Allow HW address in remote_domain_interface struct to be NULL virsh: Adapt to new HW address scenario qemuAgentGetInterfaces: Don't error out on missing HW address cmdDomIfAddr: Free @ip_addr_str qemuGetDHCPInterfaces: Don't leak @network daemon/remote.c | 5 ++++- include/libvirt/libvirt-domain.h | 2 +- src/libvirt-domain.c | 3 ++- src/qemu/qemu_agent.c | 7 ------- src/qemu/qemu_driver.c | 6 +++++- src/remote/remote_driver.c | 3 ++- src/remote/remote_protocol.x | 2 +- src/remote_protocol-structs | 2 +- tools/virsh-domain-monitor.c | 11 +++++++---- 9 files changed, 23 insertions(+), 18 deletions(-) -- 2.0.5

2 14

[libvirt] [PATCH] Add support for Midonet virtual ports
by Antoni Segura Puimedon 17 Mar '15

17 Mar '15

Up until now, to plug VMs into the Midonet virtual networks it was necessary to use the 'last resort' 'ethernet' type. That implied having the domain tainted and having to deal witht the tap lifecycle outside of libvirt/VM lifecycle. With the patch I submit, a new virtualport type will be accepted by libvirt that will always require an interfaceid (as it is essential for binding a tap device to a virtual port that the virtual port itself exists and has a UUID). With that interfaceid, libvirt will delegate the binding on the Midonet userspace tools. Antoni Segura Puimedon (1): Add support for the midonet virtualport type configure.ac | 4 ++ docs/schemas/networkcommon.rng | 12 +++++ src/Makefile.am | 1 + src/conf/domain_conf.h | 1 + src/conf/netdev_vport_profile_conf.c | 3 +- src/libvirt_private.syms | 5 ++ src/qemu/qemu_hotplug.c | 25 +++++++--- src/qemu/qemu_process.c | 13 +++-- src/util/virnetdevmidonet.c | 97 ++++++++++++++++++++++++++++++++++++ src/util/virnetdevmidonet.h | 37 ++++++++++++++ src/util/virnetdevtap.c | 11 ++-- src/util/virnetdevvportprofile.c | 1 + src/util/virnetdevvportprofile.h | 5 +- 13 files changed, 197 insertions(+), 18 deletions(-) create mode 100644 src/util/virnetdevmidonet.c create mode 100644 src/util/virnetdevmidonet.h -- 2.3.0

5 32

[libvirt] [PATCH 0/7] Fix ejecting of network backed cdroms via virsh
by Peter Krempa 17 Mar '15

17 Mar '15

It turned out that not only virsh was broken ... Peter Krempa (7): virsh: domain: Don't use vshPrepareDiskXML for creating XML to detach disk virsh: domain: Add --print-xml flag for command change-media virsh: domain: Fix the change-media command qemu: hotplug: Use checker function to check if disk is empty qemu: driver: Fix cold-update of removable storage devices util: storage: Fix check for empty storage device conf: disk: Simplify checking if source definition was parsed src/conf/domain_conf.c | 12 ++-- src/qemu/qemu_driver.c | 16 ++--- src/qemu/qemu_hotplug.c | 2 +- src/util/virstoragefile.c | 4 ++ tools/virsh-domain.c | 171 ++++++++++++++++++++++++---------------------- tools/virsh.pod | 7 +- 6 files changed, 112 insertions(+), 100 deletions(-) -- 2.2.2

2 11

[libvirt] [PATCH v2] parallels: minor cleanup
by Maxim Nestratov 17 Mar '15

17 Mar '15

v2 change: rebased to the current master indentation is fixed, unnecessary error message removed, unnecessary job freeing removed Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com> --- src/parallels/parallels_sdk.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index ee71bd6..a0b62cd 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -701,7 +701,7 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) goto cleanup; pret = PrlVmDevNet_GetHostInterfaceName(netAdapter, net->ifname, &buflen); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetGoto(pret, cleanup); if (isCt && netAdapterIndex == (PRL_UINT32) -1) { /* venet devices don't have mac address and @@ -1350,7 +1350,6 @@ prlsdkLoadDomains(parallelsConnPtr privconn) error: PrlHandle_Free(result); - PrlHandle_Free(job); return -1; } @@ -1730,8 +1729,6 @@ prlsdkDomainChangeState(virDomainPtr domain, pdom = dom->privateData; pret = chstate(privconn, pdom->sdkdom); - virReportError(VIR_ERR_OPERATION_FAILED, - _("Can't change domain state: %d"), pret); if (PRL_FAILED(pret)) { virResetLastError(); -- 1.7.1

2 2

[libvirt] [PULL 13/13] migration: Expose 'cancelling' status to user
by Juan Quintela 17 Mar '15

17 Mar '15

From: zhanghailiang <zhang.zhanghailiang(a)huawei.com> 'cancelling' status was introduced by commit 51cf4c1a, mainly to avoid a possible start of a new migration process while the previous one still exists. But we didn't expose this status to user, instead we returned the 'active' state. Here, we expose it to the user (such as libvirt), 'cancelling' status only occurs for a short window before the migration aborts, so for users, if they cancel a migration process, it will observe 'cancelling' status occasionally. Testing revealed that with older libvirt (anything 1.2.13 or less) will print an odd error message if the state is seen, but that the migration is still properly cancelled. Newer libvirt will be patched to recognize the new state without the odd error message. Signed-off-by: zhanghailiang <zhang.zhanghailiang(a)huawei.com> Reviewed-by: Eric Blake <eblake(a)redhat.com> Cc: libvir-list(a)redhat.com Signed-off-by: Juan Quintela <quintela(a)redhat.com> --- migration/migration.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index d7a1e7d..bc42490 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -195,13 +195,11 @@ MigrationInfo *qmp_query_migrate(Error **errp) break; case MIGRATION_STATUS_SETUP: info->has_status = true; - info->status = MIGRATION_STATUS_SETUP; info->has_total_time = false; break; case MIGRATION_STATUS_ACTIVE: case MIGRATION_STATUS_CANCELLING: info->has_status = true; - info->status = MIGRATION_STATUS_ACTIVE; info->has_total_time = true; info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - s->total_time; @@ -237,7 +235,6 @@ MigrationInfo *qmp_query_migrate(Error **errp) get_xbzrle_cache_stats(info); info->has_status = true; - info->status = MIGRATION_STATUS_COMPLETED; info->has_total_time = true; info->total_time = s->total_time; info->has_downtime = true; @@ -259,13 +256,12 @@ MigrationInfo *qmp_query_migrate(Error **errp) break; case MIGRATION_STATUS_FAILED: info->has_status = true; - info->status = MIGRATION_STATUS_FAILED; break; case MIGRATION_STATUS_CANCELLED: info->has_status = true; - info->status = MIGRATION_STATUS_CANCELLED; break; } + info->status = s->state; return info; } -- 2.1.0

1 0

[libvirt] [PATCH v2 0/4] parallels: fixes and cleanups
by Maxim Nestratov 17 Mar '15

17 Mar '15

From: Maxim Nestratov <mnestratov(a)parallels.com> v2 change: - rebased Maxim Nestratov (3): parallels: don't forget to unlock domain if unregister fails parallels: fix home directory for VMs parallels: minor cleanup Mikhail Feoktistov (1): parallels: set cpu mode when applying xml configuration

2 10

[libvirt] [PATCH 0/6] parallels: implement managed save
by Dmitry Guryanov 17 Mar '15

17 Mar '15

This patch is intended to implement all needed code, so that suspend/resume in openstack nova will work. It implements .domainHasManagedSaveImage, .domainManagedSave and .domainManagedSaveRemove functions. Also it adds workaround to parallelsDomainDefineXMLFlags to skip applying configuration, if VM is in managed save state and config hasn't been changed, because it's not possible to change VM config in suspended state in PCS. Dmitry Guryanov (6): parallels: fix headers in parallels_sdk.h parallels: split prlsdkDomainChangeState function parallels: implement virDomainManagedSave parallels: report, that cdroms are readonly parallels: add controllers in prlsdkLoadDomain parallels: fix virDomainDefineXML for domain in saved state src/parallels/parallels_driver.c | 101 +++++++++++++++++++++++++++++++++++++-- src/parallels/parallels_sdk.c | 65 ++++++++++++++++++------- src/parallels/parallels_sdk.h | 17 +++++-- 3 files changed, 157 insertions(+), 26 deletions(-) -- 2.1.0

1 6

[libvirt] [PATCH v2 0/4] Fix errors with memory balloon stats period
by Martin Kletzander 17 Mar '15

17 Mar '15

Nothing big, just some cleanup and then the fix in last patch. More info in particular commit messages. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1140958 v1 is here: https://www.redhat.com/archives/libvir-list/2015-March/msg00665.html Martin Kletzander (4): util: Make sure the comment about virBufferAddBuffer is true conf: Reorder elements inside memballoon qemu: Don't duplicate errors when settings stats period conf: Use correct type for balloon stats period docs/formatdomain.html.in | 2 ++ docs/schemas/domaincommon.rng | 28 ++++++++-------- src/conf/domain_conf.c | 37 ++++++++++++---------- src/conf/domain_conf.h | 2 +- src/qemu/qemu_monitor.c | 31 ++++++++++++------ src/qemu/qemu_process.c | 2 +- src/util/virbuffer.c | 14 +++++--- .../qemuxml2xmlout-balloon-device-period.xml | 30 ++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 9 files changed, 101 insertions(+), 46 deletions(-) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-period.xml -- 2.3.2

2 11

[libvirt] [PATCH] wireshark: fix VPATH build
by Pavel Hrdina 17 Mar '15

17 Mar '15

Add $(top_builddir) paths to INCLUDES to fix VPATH build. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. tools/wireshark/src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wireshark/src/Makefile.am b/tools/wireshark/src/Makefile.am index d4edc65..a7d775f 100644 --- a/tools/wireshark/src/Makefile.am +++ b/tools/wireshark/src/Makefile.am @@ -20,9 +20,9 @@ INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/gnulib/lib + -I$(top_srcdir)/src -I$(top_builddir)/src \ + -I$(top_srcdir)/include -I$(top_builddir)/include \ + -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib ws_plugin_LTLIBRARIES = libvirt.la libvirt_la_SOURCES = packet-libvirt.h packet-libvirt.c plugin.c -- 2.0.5

1 0

[libvirt] [PATCH v2] rpm-build: use pkg-config to detect wireshark presence
by Pavel Hrdina 17 Mar '15

17 Mar '15

Wireshark supports pkg-config since 1.11.3. Right now we build wireshark-dissectior tool as default trough rpm build only on fedora >= 21 and there is new wireshark that supports pkg-config. If someone wants to build libvirt with wireshark-dissector against old wireshark, they should specify the location by hand. This patch is mainly to fix wrong dependency on wireshark binary as it doesn't make sense to require that binary file to just get version info of that package in makefile. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- configure.ac | 66 ++--------------------------------------- m4/virt-wireshark.m4 | 44 +++++++++++++++++++++++++++ tools/wireshark/src/Makefile.am | 2 +- 3 files changed, 47 insertions(+), 65 deletions(-) create mode 100644 m4/virt-wireshark.m4 diff --git a/configure.ac b/configure.ac index 2fedd1a..b5a05bb 100644 --- a/configure.ac +++ b/configure.ac @@ -247,6 +247,7 @@ LIBVIRT_CHECK_SELINUX LIBVIRT_CHECK_SSH2 LIBVIRT_CHECK_SYSTEMD_DAEMON LIBVIRT_CHECK_UDEV +LIBVIRT_CHECK_WIRESHARK LIBVIRT_CHECK_YAJL AC_MSG_CHECKING([for CPUID instruction]) @@ -2642,70 +2643,6 @@ AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) AC_SUBST([LIBNL_CFLAGS]) AC_SUBST([LIBNL_LIBS]) -dnl wireshark dissector - -AC_ARG_WITH([wireshark-dissector], - [AS_HELP_STRING([--with-wireshark-dissector], - [enable wireshark dissector plugin support @<:@default=check@:>@])], - [ with_wireshark_dissector=$withval ], - [ with_wireshark_dissector=check ]) - -AC_DEFUN([LIBVIRT_WS_HANDLE_ERROR], [ - if test "$with_wireshark_dissector" = "yes"; then - AC_MSG_ERROR([$1]) - else - with_wireshark_dissector=no - fi -]) -if test "$with_wireshark_dissector" != "no"; then - dnl Check for XDR headers existence - AC_CHECK_HEADERS([rpc/types.h]) - - dnl Check for glib-2.0 existence - PKG_CHECK_MODULES([GLIB], [glib-2.0], [ - WS_DISSECTOR_CPPFLAGS="$WS_DISSECTOR_CPPFLAGS `$PKG_CONFIG --cflags glib-2.0`" - ], [ - LIBVIRT_WS_HANDLE_ERROR([pkg-config 'glib-2.0' is required for wireshark-dissector support]) - ]) - - dnl Search for wireshark(or tshark) command - AC_PATH_PROG([WIRESHARK], [wireshark]) - AC_PATH_PROG([WIRESHARK], [tshark]) - if test -z "$WIRESHARK"; then - LIBVIRT_WS_HANDLE_ERROR([command not found wireshark or tshark]) - else - dnl Check for wireshark headers - save_CPPFLAGS="$CPPFLAGS" - WS_DISSECTOR_CPPFLAGS="$WS_DISSECTOR_CPPFLAGS -I`dirname $WIRESHARK`/../include/wireshark" - CPPFLAGS="$CPPFLAGS $WS_DISSECTOR_CPPFLAGS" - AC_CHECK_HEADERS([wireshark/config.h],, [ - LIBVIRT_WS_HANDLE_ERROR([wireshark/config.h is required for wireshark-dissector support]) - ]) - AC_CHECK_HEADERS([wireshark/epan/packet.h wireshark/epan/dissectors/packet-tcp.h],, [ - LIBVIRT_WS_HANDLE_ERROR([wireshark/epan/{packet,packet-tcp}.h are required for wireshark-dissector support]) - ], [ - #include <wireshark/config.h> - ]) - CPPFLAGS="$save_CPPFLAGS" - fi - if test "$with_wireshark_dissector" != "no"; then - with_wireshark_dissector=yes - fi -fi -AC_SUBST([WS_DISSECTOR_CPPFLAGS]) -AM_CONDITIONAL([WITH_WIRESHARK_DISSECTOR], [test "$with_wireshark_dissector" = "yes"]) - -AC_ARG_WITH([ws-plugindir], - [AS_HELP_STRING([--with-ws-plugindir], - [wireshark plugins directory for use when installing wireshark plugin])], - [ws_plugindir=$withval]) - -if test "$with_wireshark_dissector" != "no" && test -z "$ws_plugindir"; then - ws_version=`$WIRESHARK -v | head -1 | cut -f 2 -d' '` - ws_plugindir="$libdir/wireshark/plugins/$ws_version" -fi -AC_SUBST([ws_plugindir]) - # Check for Linux vs. BSD ifreq members AC_CHECK_MEMBERS([struct ifreq.ifr_newname, struct ifreq.ifr_ifindex, @@ -2937,6 +2874,7 @@ LIBVIRT_RESULT_SELINUX LIBVIRT_RESULT_SSH2 LIBVIRT_RESULT_SYSTEMD_DAEMON LIBVIRT_RESULT_UDEV +LIBVIRT_RESULT_WIRESHARK LIBVIRT_RESULT_YAJL AC_MSG_NOTICE([ libxml: $LIBXML_CFLAGS $LIBXML_LIBS]) AC_MSG_NOTICE([ dlopen: $DLOPEN_LIBS]) diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 new file mode 100644 index 0000000..47204ed --- /dev/null +++ b/m4/virt-wireshark.m4 @@ -0,0 +1,44 @@ +dnl The libvirt.so wireshark plugin +dnl +dnl Copyright (C) 2015 Red Hat, Inc. +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl <http://www.gnu.org/licenses/>. +dnl + +AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[ + LIBVIRT_CHECK_PKG([WIRESHARK_DISSECTOR], [wireshark], [1.11.3]) + + AC_ARG_WITH([ws-plugindir], + [AS_HELP_STRING([--with-ws-plugindir], + [wireshark plugins directory for use when installing wireshark plugin])], + [], [with_ws_plugindir=check]) + + dnl Check for system location of wireshark plugins + if test "x$with_wireshark_dissector" != "xno" ; then + if test "x$with_ws_plugindir" = "xcheck" ; then + ws_plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)" + elif test "x$with_ws_plugindir" = "xno" || test "x$with_ws_plugindir" = "xyes"; then + AC_MSG_ERROR([ws-plugindir must be used only with valid path]) + else + ws_plugindir=$with_ws_plugindir + fi + fi + + AC_SUBST([ws_plugindir]) +]) + +AC_DEFUN([LIBVIRT_RESULT_WIRESHARK],[ + LIBVIRT_RESULT_LIB([WIRESHARK_DISSECTOR]) +]) diff --git a/tools/wireshark/src/Makefile.am b/tools/wireshark/src/Makefile.am index 61ddb38..d4edc65 100644 --- a/tools/wireshark/src/Makefile.am +++ b/tools/wireshark/src/Makefile.am @@ -26,7 +26,7 @@ INCLUDES = \ ws_plugin_LTLIBRARIES = libvirt.la libvirt_la_SOURCES = packet-libvirt.h packet-libvirt.c plugin.c -libvirt_la_CPPFLAGS = $(WS_DISSECTOR_CPPFLAGS) +libvirt_la_CPPFLAGS = $(WIRESHARK_DISSECTOR_CFLAGS) libvirt_la_LDFLAGS = -avoid-version -module packet-libvirt.c: packet-libvirt.h libvirt/protocol.h -- 2.0.5

2 2