- Devel - libvirt List Archives

[PATCH 0/4] Xen: Add support for qemu commandline passthrough
by Jim Fehlig 05 Aug '20

05 Aug '20

This patch series introduces support for qemu commandline passthrough to the xen driver. ATM it uses the same schema extension as the qemu driver, but it could be changed to something like xmlns:xen='http://libvirt.org/schemas/domain/xen/1.0' if desired. I didn't see an immediate benefit to that, other than following the pattern used by qemu, bhyve, and lxc. Using the same namespace and schema could be a bit confusing to users, but on the other hand it is just qemu under the covers. Since Xen does not support passing environment vars or adjusting qemu's capabilities, the parser will flag attempts at setting those as errors. The patch to NEWS.rst is just a reminder for me to create a news entry and will need rebased once 6.6.0 is out. Thanks in advance for your comments! Regards, Jim Jim Fehlig (4): Expose virStringListCopy in libvirt_private.syms Xen: Add support for qemu command-line passthrough Xen: Add support for qemu commandline passthrough to config converter news: Mention support for qemu commandline passthrough in Xen NEWS.rst | 6 ++ docs/drvxen.html.in | 35 +++++++ src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 11 ++- src/libxl/libxl_conf.h | 8 ++ src/libxl/libxl_domain.c | 99 ++++++++++++++++++++ src/libxl/libxl_domain.h | 1 + src/libxl/xen_xl.c | 88 +++++++++++++++++ tests/xlconfigdata/test-qemu-passthrough.cfg | 26 +++++ tests/xlconfigdata/test-qemu-passthrough.xml | 53 +++++++++++ tests/xlconfigtest.c | 4 + 11 files changed, 331 insertions(+), 1 deletion(-) create mode 100644 tests/xlconfigdata/test-qemu-passthrough.cfg create mode 100644 tests/xlconfigdata/test-qemu-passthrough.xml -- 2.26.2

2 8

[libvirt PATCH] docs: formatdomain: fyx a tipo
by Ján Tomko 04 Aug '20

04 Aug '20

s/hystorical/historical/ Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. Sorry if this was an easter egg. It was too painful to look at. docs/formatdomain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 3275d1b39e..218f0c1718 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -6070,7 +6070,7 @@ below <#elementCharSerialAndConsole>`__. Relationship between serial ports and consoles '''''''''''''''''''''''''''''''''''''''''''''' -Due to hystorical reasons, the ``serial`` and ``console`` elements have +Due to historical reasons, the ``serial`` and ``console`` elements have partially overlapping scopes. In general, both elements are used to configure one or more serial consoles to -- 2.26.2

1 0

[libvirt PATCH] src: add G_GNUC_NO_INLINE annotations for mocked symbols
by Daniel P. Berrangé 04 Aug '20

04 Aug '20

We should prevent inlining of symbols from the driver .so files that are mocked, as well as those in the main libvirt.so This isn't fixing any currently known problem, just trying to prevent future issues. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- scripts/mock-noinline.py | 2 +- src/libxl/libxl_capabilities.h | 2 +- src/qemu/qemu_command.h | 4 ++-- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_interface.h | 2 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_process.h | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/mock-noinline.py b/scripts/mock-noinline.py index a8b7680c11..69cf0b4b99 100644 --- a/scripts/mock-noinline.py +++ b/scripts/mock-noinline.py @@ -59,7 +59,7 @@ def scan_overrides(filename): m = re.search(r'''^\w+\s*(?:\*\s*)?(\w+)\(''', line) if m is not None: name = m.group(1) - if name.startswith("vir"): + if name.startswith("vir") or name.startswith("qemu") or name.startswith("libxl"): mocked[name] = "%s:%d" % (filename, lineno) diff --git a/src/libxl/libxl_capabilities.h b/src/libxl/libxl_capabilities.h index 9efb836429..4e8e2bb59b 100644 --- a/src/libxl/libxl_capabilities.h +++ b/src/libxl/libxl_capabilities.h @@ -39,7 +39,7 @@ * by libvirt for Xen, and cannot be used for a persistent network name. */ #define LIBXL_GENERATED_PREFIX_XEN "vif" -bool libxlCapsHasPVUSB(void); +bool libxlCapsHasPVUSB(void) G_GNUC_NO_INLINE; virCapsPtr libxlMakeCapabilities(libxl_ctx *ctx); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index b579817b44..89d99b111f 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -82,7 +82,7 @@ int qemuBuildTLSx509BackendProps(const char *tlspath, /* Open a UNIX socket for chardev FD passing */ int -qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev); +qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev) G_GNUC_NO_INLINE; /* Generate '-device' string for chardev device */ int @@ -254,4 +254,4 @@ qemuBuildTPMOpenBackendFDs(const char *tpmdev, int *tpmfd, int *cancelfd) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(4) G_GNUC_NO_INLINE; diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 4a49e04a15..6287c5b5e8 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -151,7 +151,7 @@ int qemuDomainSetVcpuInternal(virQEMUDriverPtr driver, virBitmapPtr vcpus, bool state); -unsigned long long qemuDomainGetUnplugTimeout(virDomainObjPtr vm); +unsigned long long qemuDomainGetUnplugTimeout(virDomainObjPtr vm) G_GNUC_NO_INLINE; int qemuHotplugAttachDBusVMState(virQEMUDriverPtr driver, virDomainObjPtr vm, diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h index 0464b903d7..3dcefc6a12 100644 --- a/src/qemu/qemu_interface.h +++ b/src/qemu/qemu_interface.h @@ -54,7 +54,7 @@ int qemuInterfaceBridgeConnect(virDomainDefPtr def, int qemuInterfaceOpenVhostNet(virDomainDefPtr def, virDomainNetDefPtr net, int *vhostfd, - size_t *vhostfdSize); + size_t *vhostfdSize) G_GNUC_NO_INLINE; qemuSlirpPtr qemuInterfacePrepareSlirp(virQEMUDriverPtr driver, virDomainNetDefPtr net); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 1c1b0c9b89..d20a15c202 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -408,7 +408,7 @@ int qemuMonitorSetLink(qemuMonitorPtr mon, /* These APIs are for use by the internal Text/JSON monitor impl code only */ char *qemuMonitorNextCommandID(qemuMonitorPtr mon); int qemuMonitorSend(qemuMonitorPtr mon, - qemuMonitorMessagePtr msg); + qemuMonitorMessagePtr msg) G_GNUC_NO_INLINE; virJSONValuePtr qemuMonitorGetOptions(qemuMonitorPtr mon) ATTRIBUTE_NONNULL(1); void qemuMonitorSetOptions(qemuMonitorPtr mon, virJSONValuePtr options) diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 84fea25983..098ab857be 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -30,7 +30,7 @@ int qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, const char *line, - qemuMonitorMessagePtr msg); + qemuMonitorMessagePtr msg) G_GNUC_NO_INLINE; int qemuMonitorJSONIOProcess(qemuMonitorPtr mon, const char *data, diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 125508f9fe..dbd989c321 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -203,9 +203,9 @@ int qemuProcessRefreshDisks(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob asyncJob); -int qemuProcessStartManagedPRDaemon(virDomainObjPtr vm); +int qemuProcessStartManagedPRDaemon(virDomainObjPtr vm) G_GNUC_NO_INLINE; -void qemuProcessKillManagedPRDaemon(virDomainObjPtr vm); +void qemuProcessKillManagedPRDaemon(virDomainObjPtr vm) G_GNUC_NO_INLINE; typedef struct _qemuProcessQMP qemuProcessQMP; typedef qemuProcessQMP *qemuProcessQMPPtr; -- 2.26.2

2 1

[PATCH] tests: qemublocktest: fix crashing with SIGBUS
by Roman Bogorodskiy 04 Aug '20

04 Aug '20

Commit bcbb026993 converted qemublocktest to use g_autoptr for virQEMUCaps. To prevent it from crashing, don't explicitly call virObjectUnref() on this object. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- tests/qemublocktest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index fb5319d7bd..0685b703a1 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -1394,7 +1394,6 @@ mymain(void) cleanup: qemuTestDriverFree(&driver); VIR_FREE(capslatest_x86_64); - virObjectUnref(caps_x86_64); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.27.0

3 2

[libvirt PATCH] docs: fix libvirt go-import metadata in pages
by Daniel P. Berrangé 04 Aug '20

04 Aug '20

The meson conversion lost the <meta> tags providing the go-import, because the "$pagename" variable lost the .html suffix. Rather than fix that, just change to using "$pagesrc" instead, as it is a better fit. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/newapi.xsl | 2 -- docs/page.xsl | 7 +++---- docs/site.xsl | 3 +-- docs/subsite.xsl | 1 - scripts/meson-html-gen.py | 4 ---- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 0dc4f7ae52..7ac8caa35d 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -835,7 +835,6 @@ indent="yes" encoding="UTF-8"> <xsl:apply-templates select="exsl:node-set($mainpage)" mode="page"> - <xsl:with-param name="pagename" select="concat($htmldir, '', $indexfile)"/> <xsl:with-param name="timestamp" select="$timestamp"/> </xsl:apply-templates> </xsl:document> @@ -851,7 +850,6 @@ indent="yes" encoding="UTF-8"> <xsl:apply-templates select="exsl:node-set($subpage)" mode="page"> - <xsl:with-param name="pagename" select="concat($htmldir, '/libvirt-', @name, '.html')"/> <xsl:with-param name="timestamp" select="$timestamp"/> </xsl:apply-templates> </xsl:document> diff --git a/docs/page.xsl b/docs/page.xsl index bdd57ba2e0..9ab8d3dd69 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -76,14 +76,13 @@  <xsl:template match="/" mode="page"> - <xsl:param name="pagename"/> <xsl:param name="pagesrc"/> <xsl:param name="timestamp"/> <xsl:text disable-output-escaping="yes"><!DOCTYPE html> </xsl:text> <html> <xsl:comment> - This file is autogenerated from <xsl:value-of select="$pagename"/>.in + This file is autogenerated from <xsl:value-of select="$pagesrc"/> Do not edit this file. Changes will be lost. </xsl:comment> <xsl:comment> @@ -100,10 +99,10 @@ <meta name="theme-color" content="#ffffff"/> <title>libvirt: <xsl:value-of select="html:html/html:body//html:h1"/></title> <meta name="description" content="libvirt, virtualization, virtualization API"/> - <xsl:if test="$pagename = 'libvirt-go.html'"> + <xsl:if test="$pagesrc = 'docs/libvirt-go.rst'"> <meta name="go-import" content="libvirt.org/libvirt-go git https://libvirt.org/git/libvirt-go.git"/> </xsl:if> - <xsl:if test="$pagename = 'libvirt-go-xml.html'"> + <xsl:if test="$pagesrc = 'docs/libvirt-go-xml.rst'"> <meta name="go-import" content="libvirt.org/libvirt-go-xml git https://libvirt.org/git/libvirt-go-xml.git"/> </xsl:if> <xsl:apply-templates select="/html:html/html:head/html:script" mode="content"/> diff --git a/docs/site.xsl b/docs/site.xsl index 73ddd8ca6b..931e26272f 100644 --- a/docs/site.xsl +++ b/docs/site.xsl @@ -15,7 +15,7 @@ <xsl:variable name="href_base"> <xsl:choose> - <xsl:when test="$pagename = '404.html'"> + <xsl:when test="$pagesrc = 'docs/404.html.in'"> <xsl:value-of select="'/'"/> </xsl:when> <xsl:otherwise> @@ -26,7 +26,6 @@ <xsl:template match="/"> <xsl:apply-templates select="." mode="page"> - <xsl:with-param name="pagename" select="$pagename"/> <xsl:with-param name="pagesrc" select="$pagesrc"/> <xsl:with-param name="timestamp" select="$timestamp"/> </xsl:apply-templates> diff --git a/docs/subsite.xsl b/docs/subsite.xsl index bfd34eebd2..2bdfcbb9b1 100644 --- a/docs/subsite.xsl +++ b/docs/subsite.xsl @@ -16,7 +16,6 @@ <xsl:template match="/"> <xsl:apply-templates select="." mode="page"> - <xsl:with-param name="pagename" select="$pagename"/> <xsl:with-param name="pagesrc" select="$pagesrc"/> <xsl:with-param name="timestamp" select="$timestamp"/> </xsl:apply-templates> diff --git a/scripts/meson-html-gen.py b/scripts/meson-html-gen.py index dbf238de54..2731d734a7 100755 --- a/scripts/meson-html-gen.py +++ b/scripts/meson-html-gen.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import argparse -import os import subprocess parser = argparse.ArgumentParser() @@ -15,12 +14,9 @@ parser.add_argument("htmlfile", type=str, help="path to generated HTML file") parser.add_argument("pagesrc", type=str, default="", nargs='?', help="(optional) path to source file used for edit this page") args = parser.parse_args() -name = os.path.basename(args.htmlfile).replace('.html', '') - html_tmp = subprocess.run( [ args.xsltproc, - '--stringparam', 'pagename', name, '--stringparam', 'pagesrc', args.pagesrc, '--stringparam', 'builddir', args.builddir, '--stringparam', 'timestamp', args.timestamp, -- 2.26.2

2 1

[PATCH-for-5.1] .travis.yml: Deprecate it in favor of GitLab CI
by Philippe Mathieu-Daudé 04 Aug '20

04 Aug '20

As of QEMU 5.2 we prefer to focus our CI development on GitLab. Mark Travis-CI as deprecated (adding a big warning). Signed-off-by: Philippe Mathieu-Daudé <philmd(a)redhat.com> --- docs/system/deprecated.rst | 11 +++++++++++ .travis.yml | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 851dbdeb8a..c17a5b0896 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -17,6 +17,17 @@ they were first deprecated in the 2.10.0 release. What follows is a list of all features currently marked as deprecated. +Build and test automation +------------------------- + +``Travis-CI`` (Since 5.2) +''''''''''''''''''''''''' + +``Travis-CI`` is deprecated in favor of GitLab-CI. + +The '.travis.yml' configuration should only be modified to remove jobs +when equivalent exist on GitLab-CI. Adding new jobs is not allowed. + System emulator command line arguments -------------------------------------- diff --git a/.travis.yml b/.travis.yml index 6695c0620f..4ad243f511 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,10 @@ +# WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +# +# As of QEMU 5.2, this file is now deprecated in favor of GitLab CI. +# Do not modify, except to remove jobs ported to GitLab CI. +# +# WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING + # The current Travis default is a VM based 16.04 Xenial on GCE # Additional builds with specific requirements for a full VM need to # be added as additional matrix: entries later on -- 2.21.3

4 3

[libvirt PATCH] build-aux: remove some syntax-check cruft
by Daniel P. Berrangé 04 Aug '20

04 Aug '20

sc_proper_name_utf8_requires_ICONV looks for Makefile.am files, so is not going to work correctly with meson. The 'today' variable is not referenced anywhere. The 'writable-files' target is not used anywhere sc_prohibit_reversed_compare_failure only checks 'init.sh' which does not exist in libvirt. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- build-aux/syntax-check.mk | 54 --------------------------------------- 1 file changed, 54 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 9256532ab3..6eb59cf90e 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -72,10 +72,6 @@ VC_LIST_EXCEPT = \ | $(GREP) -Ev -e '($(VC_LIST_ALWAYS_EXCLUDE_REGEX)|$(_sc_excl))' \ $(_prepend_srcdir_prefix) -# Override this in syntax-check.mk if you are using a different format in your -# NEWS file. -today = $(shell date +%Y-%m-%d) - # Prevent programs like 'sort' from considering distinct strings to be equal. # Doing it here saves us from having to set LC_ALL elsewhere in this file. export LC_ALL = C @@ -1744,29 +1740,6 @@ sc_prohibit_test_double_equal: halt='use "test x = x", not "test x =''= x"' \ $(_sc_search_regexp) -# Each program that uses proper_name_utf8 must link with one of the -# ICONV libraries. Otherwise, some ICONV library must appear in LDADD. -# The perl -0777 invocation below extracts the possibly-multi-line -# definition of LDADD from the appropriate Makefile.am and exits 0 -# when it contains "ICONV". -sc_proper_name_utf8_requires_ICONV: - @progs=$$($(VC_LIST_EXCEPT) \ - | xargs $(GREP) -l 'proper_name_utf8 ''("'); \ - if test "x$$progs" != x; then \ - fail=0; \ - for p in $$progs; do \ - dir=$$(dirname "$$p"); \ - perl -0777 \ - -ne 'exit !(/^LDADD =(.+?[^\\]\n)/ms && $$1 =~ /ICONV/)' \ - $$dir/Makefile.am && continue; \ - base=$$(basename "$$p" .c); \ - $(GREP) "$${base}_LDADD.*ICONV)" $$dir/Makefile.am > /dev/null \ - || { fail=1; echo 1>&2 "$(ME): $$p uses proper_name_utf8"; }; \ - done; \ - test $$fail = 1 && \ - { echo 1>&2 '$(ME): the above do not link with any ICONV library'; \ - exit 1; } || :; \ - fi # Warn about "c0nst struct Foo const foo[]", # but not about "char const *const foo" or "#define const const". @@ -1828,33 +1801,6 @@ sc_po_check: rm -f $@-1 $@-2; \ fi -# Check that 'make alpha' will not fail at the end of the process, -# i.e., when pkg-M.N.tar.xz already exists (either in "." or in ../release) -# and is read-only. -writable-files: - $(AM_V_GEN)if test -d $(release_archive_dir); then \ - for file in $(DIST_ARCHIVES); do \ - for p in ./ $(release_archive_dir)/; do \ - test -e $$p$$file || continue; \ - test -w $$p$$file \ - || { echo ERROR: $$p$$file is not writable; fail=1; }; \ - done; \ - done; \ - test "$$fail" && exit 1 || : ; \ - else :; \ - fi - - -# BRE regex of file contents to identify a test script. -_test_script_regex ?= \<init\.sh\> - -# In tests, use "compare expected actual", not the reverse. -sc_prohibit_reversed_compare_failure: - @prohibit='\<compare [^ ]+ ([^ ]*exp|/dev/null)' \ - containing='$(_test_script_regex)' \ - halt='reversed compare arguments' \ - $(_sc_search_regexp) - # #if HAVE_... will evaluate to false for any non numeric string. # That would be flagged by using -Wundef, however gnulib currently # tests many undefined macros, and so we can't enable that option. -- 2.26.2

2 1

[libvirt PATCH] network: Use single quotes in default network configuration
by Andrea Bolognani 04 Aug '20

04 Aug '20

Whenever libvirt is upgraded on a Debian system, the user will be prompted along the lines of Configuration file '/etc/libvirt/qemu/networks/default.xml' ==> Modified (by you or by a script) since installation. ==> Package distributor has shipped an updated version. What would you like to do about it ? Your options are: Y or I : install the package maintainer's version N or O : keep your currently-installed version D : show the differences between the versions Z : start a shell to examine the situation The default action is to keep your current version. *** default.xml (Y/I/N/O/D/Z) [default=N] ? d --- /etc/libvirt/qemu/networks/default.xml 2020-08-04 12:57:25.450911143 +0200 +++ /etc/libvirt/qemu/networks/default.xml.dpkg-new 2020-08-03 22:47:15.000000000 +0200 @@ -1,19 +1,11 @@ - - <network> <name>default</name> - <uuid>612a2cab-72fb-416d-92bc-4d9e597bfb63</uuid> - <forward mode='nat'/> - <bridge name='virbr0' stp='on' delay='0'/> - <mac address='52:54:00:1f:03:79'/> - <ip address='192.168.122.1' netmask='255.255.255.0'> + <uuid>d020b839-4379-492c-aa74-eab7365076e6</uuid> + <bridge name="virbr0"/> + <forward/> + <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> - <range start='192.168.122.2' end='192.168.122.254'/> + <range start="192.168.122.2" end="192.168.122.254"/> </dhcp> </ip> </network> The UUID situation should probably be handled the same way it is in the spec file by stripping it, and in general we could behave much better towards users, but one part of the diff that immediately stands out is that some lines are highlighted not because they are semantically different, but simply because they use different types of quotes around attributes. Since the canonical version of all libvirt XML documents (as returned by the various vir*GetXMLDesc() APIs) as well as the on-disk representations use single quotes, let's use the same for configuration files we install as well. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/network/default.xml.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/network/default.xml.in b/src/network/default.xml.in index d7241d0c16..08a3632eb6 100644 --- a/src/network/default.xml.in +++ b/src/network/default.xml.in @@ -1,10 +1,10 @@ <network> <name>default</name> - <bridge name="virbr0"/> + <bridge name='virbr0'/> <forward/> - <ip address="192.168.122.1" netmask="255.255.255.0"> + <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> - <range start="192.168.122.2" end="192.168.122.254"/> + <range start='192.168.122.2' end='192.168.122.254'/> </dhcp> </ip> </network> -- 2.25.4

2 1

[PATCH] mdev: fix daemon crash on reattach mdevs
by Binfeng Wu 04 Aug '20

04 Aug '20

Causing a crash when virMediatedDeviceListFindIndex because of some pointers in mgr->activeMediatedHostdevs become dangling pointers if goto cleanup label in virMediatedDeviceListMarkDevices. Reproduction scenario: 1. start vm1 with mdev1 2. start vm2 with mdev2, mdev1 (the order cannot be changed) Backtrace: #0 0x0000ffffb8c36250 in strcmp #1 0x0000ffffb9b80754 in virMediatedDeviceListFindIndex #2 0x0000ffffb9b80870 in virMediatedDeviceListFind #3 0x0000ffffb9c9e168 in virHostdevReAttachMediatedDevices #4 0x0000ffff9949f724 in qemuHostdevReAttachMediatedDevices #5 0x0000ffff9949f7f8 in qemuHostdevReAttachDomainDevices #6 0x0000ffff994bcd70 in qemuProcessStop #7 0x0000ffff994bf4e0 in qemuProcessStart ..... Signed-off-by: Binfeng Wu <wubinfeng(a)huawei.com> --- src/util/virmdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index b8023dd991..26cb8300ff 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -439,7 +439,7 @@ virMediatedDeviceListMarkDevices(virMediatedDeviceListPtr dst, if (virMediatedDeviceIsUsed(mdev, dst) || virMediatedDeviceSetUsedBy(mdev, drvname, domname) < 0) - goto cleanup; + goto rollback; /* Copy mdev references to the driver list: * - caller is responsible for NOT freeing devices in @src on success -- 2.26.2.windows.1

2 1

[libvirt PATCH 0/2] header fixes
by Pavel Hrdina 04 Aug '20

04 Aug '20

Pavel Hrdina (2): remote: remove duplicated header src/logging: no need to include log_protocol.h in log_manager.h src/logging/log_manager.h | 2 -- src/qemu/qemu_command.c | 1 + src/remote/remote_daemon_dispatch.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) -- 2.26.2

2 3