- Devel - libvirt List Archives

[RESEND][PATCH] migration: fix xml file residual during vm crash with migration
by zhengchuan 02 Sep '20

02 Sep '20

>From 935ec812b822ca978631e72bb9b9a5d00df24a42 Mon Sep 17 00:00:00 2001 From: Zheng Chuan <zhengchuan(a)huawei.com> Date: Mon, 27 Jul 2020 14:39:05 +0800 Subject: [PATCH] migration: fix xml file residual during vm crash with migration when migration is cancelled (such as kill -9 vmpid in Src, etc), it could do virDomainSaveStatus() to save xml file after qemuProcessStop(), which results in xml residulal. Fix it by that do not do virDomainSaveStatus() if vm is not active. Signed-off-by: Zheng Chuan <zhengchuan(a)huawei.com> --- src/qemu/qemu_migration.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2c7bf34..d2804ab 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3073,6 +3073,9 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, jobPriv->migParams, priv->job.apiFlags); + if (!virDomainObjIsActive(vm)) + goto done; + if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); } -- 1.8.3.1

3 2

[PATCH] fix vm schizencephaly when heartbeat stoped
by Yilu Lin 02 Sep '20

02 Sep '20

>From e28cb2a03a670e4c0e7641f68f9d9f3accb00ae0 Mon Sep 17 00:00:00 2001 From: Yilu Lin <linyilu(a)huawei.com> Date: Tue, 4 Aug 2020 02:42:00 -0400 Subject: [PATCH] fix vm schizencephaly when heartbeat stoped Signed-off-by: Yilu Lin <linyilu(a)huawei.com> If keepalive messages lost in finish step, vm maybe schizencephaly. Shutdown src vm for protection. --- src/qemu/qemu_migration.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2c7bf34..b8296ba 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4136,6 +4136,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, int cookieoutlen = 0; int ret = -1; virErrorPtr orig_err = NULL; + virErrorPtr finish_err = NULL; + bool living = true; bool cancelled = true; virStreamPtr st = NULL; unsigned long destflags; @@ -4394,7 +4396,16 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, * The lock manager plugins should take care of * safety in this scenario. */ - cancelled = ddomain == NULL; + if (!cancelled && !ddomain) + finish_err = virSaveLastError(); + + if (finish_err && finish_err->message && + strstr(finish_err->message, "received hangup / error event on socket")) { + living = false; + VIR_ERROR(_("keepalive messages lost in finish step, shutdown src vm for protection")); + } else { + cancelled = ddomain == NULL; + } /* If finish3 set an error, and we don't have an earlier * one we need to preserve it in case confirm3 overwrites @@ -4427,10 +4438,17 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, virObjectUnref(ddomain); ret = 0; } else { - ret = -1; + if (!living) + ret = 0; + else + ret = -1; } virObjectUnref(st); + if (finish_err) { + virSetError(finish_err); + virFreeError(finish_err); + } virErrorRestore(&orig_err); VIR_FREE(uri_out); -- 2.19.1

2 1

[PATCH 0/5] Prefer WITH_* prefix for #if conditionals
by Michal Privoznik 02 Sep '20

02 Sep '20

2 8

[PATCH v2 0/9] qemu: Allow migration over UNIX sockets
by Martin Kletzander 02 Sep '20

02 Sep '20

v2: - Allow TLS and parallel migration as well - Use simpler unix socket URIs KubeVirt would like to use this feature. For more information see individual commits and changes in manpages and documentation. Resolves: https://bugzilla.redhat.com/1638889 Martin Kletzander (9): qemu: Use g_autofree in qemuMigrationSrcConnect qemu: Rework qemuMigrationSrcConnect virsh: Reuse existing variable when parsing migrate --disks-port qemu: Rework starting NBD server for migration tests: Add simple test for virDomainMigrateCheckNotLocal qemu: Allow NBD migration over UNIX socket peer2peer migration: allow connecting to local sockets qemu: Allow migration over UNIX socket news: qemu: Allow migration over UNIX sockets NEWS.rst | 6 + docs/manpages/virsh.rst | 33 ++- docs/migration.html.in | 33 +++ include/libvirt/libvirt-domain.h | 13 ++ scripts/apibuild.py | 1 + src/libvirt-domain.c | 11 +- src/libvirt_internal.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 33 ++- src/qemu/qemu_migration.c | 354 +++++++++++++++++++++++-------- src/qemu/qemu_migration.h | 3 + src/qemu/qemu_migration_cookie.c | 3 +- src/qemu/qemu_migration_params.c | 9 + src/qemu/qemu_migration_params.h | 3 + src/qemu/qemu_monitor.c | 15 ++ src/qemu/qemu_monitor.h | 4 + src/remote/remote_driver.c | 8 +- src/util/viruri.c | 30 +++ src/util/viruri.h | 2 + tests/meson.build | 1 + tests/virmigtest.c | 91 ++++++++ tools/virsh-domain.c | 19 +- 22 files changed, 570 insertions(+), 105 deletions(-) create mode 100644 tests/virmigtest.c -- 2.28.0

4 24

[libvirt PATCH 0/3] AUTHORS: Convert to reStructuredText
by Andrea Bolognani 02 Sep '20

02 Sep '20

Plus some other adjustments. Andrea Bolognani (3): AUTHORS: Convert to reStructuredText AUTHORS: Some small tweaks AUTHORS: Remove Emacs file variables AUTHORS.in | 103 ----------------------------------- AUTHORS.rst.in | 99 +++++++++++++++++++++++++++++++++ libvirt.spec.in | 2 +- meson.build | 4 +- scripts/meson-gen-authors.py | 2 +- 5 files changed, 103 insertions(+), 107 deletions(-) delete mode 100644 AUTHORS.in create mode 100644 AUTHORS.rst.in -- 2.26.2

2 7

[PATCH] build-aux: use GNU sed for syntax-check on FreeBSD
by Roman Bogorodskiy 02 Sep '20

02 Sep '20

BSD sed(1) and GNU sed(1) syntax are not compatible, and as syntax-check.mk uses the GNU flavor, set SED variable to 'gsed' by default. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- build-aux/syntax-check.mk | 8 ++++++++ 1 file changed, 8 insertions(+) I'm not sure if this requires a more comprehensive solution. I have mixed feeling about this. If we try to just use gsed like in this patch, it'll fail because we don't require gsed to be installed. OTOH, an alternative solution like checking for gsed in meson.build, and probably even generation of some files with variables to be sourced by .mk files feels like too much of a hassle, esp. in this context. diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 6eb59cf90e..bbfcb63152 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -28,7 +28,15 @@ ME := build-aux/syntax-check.mk # ignoring the module description. AWK ?= awk GREP ?= grep +# FreeBSD (and probably some other OSes too) ships own version of sed(1), not +# compatible with the GNU sed. GNU sed is available as gsed(1), so use this +# instead +UNAME := $(shell uname) +ifeq ($(UNAME),FreeBSD) +SED ?= gsed +else SED ?= sed +endif # Helper variables. _empty = -- 2.27.0

2 3

[libvirt PATCH] meson: add -Wall and -Wextra explicitly for buildtype=plain
by Pavel Hrdina 02 Sep '20

02 Sep '20

If someone runs `meson setup --buildtype plain` meson ignores warning_level=2 that is in our meson.build file. The implication is that Meson will not automatically add -Wall which enables -Wformat. This breaks building libvirt from git with the buildtype set to plain. There is an issue reported [1] to not ignore warning_level silently and the change to ignore it was done by upstream commit [2]. [1] <https://github.com/mesonbuild/meson/issues/7399> [2] <https://github.com/mesonbuild/meson/commit/8ee1c9a07a3a35e3ed262fbc358fd86c…> Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- meson.build | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index e193166a9b..f38785eeae 100644 --- a/meson.build +++ b/meson.build @@ -503,10 +503,6 @@ cc_flags_disabled = [ # In meson this is specified using 'c_std=gnu99' in project() function. '-std=gnu99', - # In meson this is specified using 'warning_level=2' in project() function. - '-Wall', - '-Wextra', - # don't care about C++ compiler compat '-Wc++-compat', '-Wabi', @@ -573,6 +569,21 @@ cc_flags_disabled = [ '-Wsuggest-attribute=malloc', ] +# In meson this is specified using 'warning_level=2' in project() function. +# However, meson silently ignores 'warning_level' option with 'buildtype=plain' +# so we have to enable them explicitly. +if get_option('buildtype') == 'plain' + cc_flags += [ + '-Wall', + '-Wextra', + ] +else + cc_flags_disabled += [ + '-Wall', + '-Wextra', + ] +endif + foreach flag : cc_flags_disabled if cc_flags.contains(flag) error('@0@ is disabled but listed in cc_flags'.format(flag)) -- 2.26.2

3 3

[libvirt PATCH] util: virnetdevtap: stats: fix txdrop on FreeBSD
by Ján Tomko 02 Sep '20

02 Sep '20

For older FreeBSD, we needed an ifdef guard to use if_data.ifi_oqdrops, which was introduced by: commit 61bbdbb94ce3e2f5e969c9bddb443427db07bf61 Implement interface stats for BSD But when we dropped the check because we deprecated building on FreeBSD-10 in: commit 83131d9714db7ee77ab220186b6b0d8b6c22b09e configure: drop check for unsupported FreeBSD We started building the wrong side of the ifdef. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Fixes: 83131d9714db7ee77ab220186b6b0d8b6c22b09e --- src/util/virnetdevtap.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 9f5e535180..cab5ef0ced 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -974,20 +974,12 @@ virNetDevTapInterfaceStats(const char *ifname, stats->rx_bytes = ifd->ifi_obytes; stats->rx_packets = ifd->ifi_opackets; stats->rx_errs = ifd->ifi_oerrors; -# ifdef HAVE_STRUCT_IF_DATA_IFI_OQDROPS stats->rx_drop = ifd->ifi_oqdrops; -# else - stats->rx_drop = 0; -# endif } else { stats->tx_bytes = ifd->ifi_obytes; stats->tx_packets = ifd->ifi_opackets; stats->tx_errs = ifd->ifi_oerrors; -# ifdef HAVE_STRUCT_IF_DATA_IFI_OQDROPS stats->tx_drop = ifd->ifi_oqdrops; -# else - stats->tx_drop = 0; -# endif stats->rx_bytes = ifd->ifi_ibytes; stats->rx_packets = ifd->ifi_ipackets; stats->rx_errs = ifd->ifi_ierrors; -- 2.26.2

2 1

GSoC 2020 Salt Virt Advanced Performance Tuning Support
by Guoqing Li 02 Sep '20

02 Sep '20

Hello Libvirt community This is my first time working on a GSoC project with Libvirt. SaltStack is an open-source project that facilitates configuration management for IT infrastructures and Virt is a module of SaltStack. The following 9 PRs summerizes the work I have done during this summer. The goal is to make existing Libvirt API domain properties configurable in Salt Virt in order to support advanced performance tuning. 5 PRs have been merged so far and another 4 are under reviewing. Although all basic unit tests have passed, I believe more rigorous tests are needed before using these features in production. I will spend more time later on adding more tests. Acknowledgements =============== Sincere thanks to my mentors Cedric Bosdonnat (cbosdo), Pedro Algarvio (s0undt3ch) and Tyler Jones (Akm0d) for their patient support and advice. Thank Wayne Werner (waynew), Daniel Wozniak (dwoz) Megan Wilhite (ch3ll) from SaltStack community for being very responsive on my questions and code reviews. and Libvirt organisation for providing this opportunity for me to learn and grow. PRs =============== CPU tuning and io threads allocation (reviewing) https://github.com/saltstack/salt/pull/58196 Memory backing (reviewing) https://github.com/saltstack/salt/pull/58167 CPU model, topology and NUMA node tuning (reviewing) https://github.com/saltstack/salt/pull/57879 Memory tuning (reviewing) https://github.com/saltstack/salt/pull/57636 Polish parameter doc (merged) https://github.com/saltstack/salt/pull/57086 Map null to None in sls file (merged) https://github.com/saltstack/salt/pull/57451 Firmware auto select (merged) https://github.com/saltstack/salt/pull/57396 Boot VMs with UEFI (merged) https://github.com/saltstack/salt/pull/56613 Boot parameter update fix (merged) https://github.com/saltstack/salt/pull/56562 Kind regards, Guoqing LI

1 0

[libvirt PATCH v2] Adds e1000e/vmxnet3 Vnet_hdr suuport
by Patrick Magauran 02 Sep '20

02 Sep '20

Changes from Original: Moved Comparison to qemuInterfaceIsVnetCompatModel in qemu_interface.c per the recommendation of Daniel Berrangé ----- Libvirt bases its decision about whether to apply the vnet_hdr flag to the tap interface on whether or not the selected model is VirtIO. Originally, VirtIO was the only model to support the vnet_hdr in QEMU; however, the e1000e & vmxnet3 adapters also support it(seemingly from introduction based on commits). This passes the whole packet to the host, reducing emulation overhead and improving performance. Signed-off-by: Patrick Magauran <patmagauran.j(a)gmail.com> --- src/qemu/qemu_interface.c | 15 +++++++++++---- src/qemu/qemu_interface.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index ffec992596..229bb299aa 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -230,6 +230,13 @@ qemuInterfaceStopDevices(virDomainDefPtr def) return 0; } +bool qemuInterfaceIsVnetCompatModel(const virDomainNetDef *net) +{ + return (virDomainNetIsVirtioModel(net) || + net->model == VIR_DOMAIN_NET_MODEL_E1000E || + net->model == VIR_DOMAIN_NET_MODEL_VMXNET3); +} + /** * qemuInterfaceDirectConnect: @@ -255,7 +262,7 @@ qemuInterfaceDirectConnect(virDomainDefPtr def, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); unsigned int macvlan_create_flags = VIR_NETDEV_MACVLAN_CREATE_WITH_TAP; - if (virDomainNetIsVirtioModel(net)) + if (qemuInterfaceIsVnetCompatModel(net)) macvlan_create_flags |= VIR_NETDEV_MACVLAN_VNET_HDR; if (virNetDevMacVLanCreateWithVPortProfile(net->ifname, @@ -417,7 +424,7 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def, } } - if (virDomainNetIsVirtioModel(net)) + if (qemuInterfaceIsVnetCompatModel(net)) tap_create_flags |= VIR_NETDEV_TAP_CREATE_VNET_HDR; if (net->managed_tap == VIR_TRISTATE_BOOL_NO) { @@ -436,7 +443,7 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def, if (virNetDevMacVLanTapOpen(net->ifname, tapfd, tapfdSize) < 0) goto cleanup; if (virNetDevMacVLanTapSetup(tapfd, tapfdSize, - virDomainNetIsVirtioModel(net)) < 0) { + qemuInterfaceIsVnetCompatModel(net)) < 0) { goto cleanup; } } else { @@ -559,7 +566,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, template_ifname = true; } - if (virDomainNetIsVirtioModel(net)) + if (qemuInterfaceIsVnetCompatModel(net)) tap_create_flags |= VIR_NETDEV_TAP_CREATE_VNET_HDR; if (driver->privileged) { diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h index 0464b903d7..9e3f61e8e0 100644 --- a/src/qemu/qemu_interface.h +++ b/src/qemu/qemu_interface.h @@ -58,3 +58,4 @@ int qemuInterfaceOpenVhostNet(virDomainDefPtr def, qemuSlirpPtr qemuInterfacePrepareSlirp(virQEMUDriverPtr driver, virDomainNetDefPtr net); +bool qemuInterfaceIsVnetCompatModel(const virDomainNetDef *net); -- 2.26.2

3 2