[PATCH] virsh: Fix typo of metadata
by Han Han
Signed-off-by: Han Han <hhan(a)redhat.com>
---
tools/virsh-domain.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 5222949566..b7dea5e8f7 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -13559,7 +13559,7 @@ virshEventMetadataChangePrint(virConnectPtr conn G_GNUC_UNUSED,
{
virBuffer buf = VIR_BUFFER_INITIALIZER;
- virBufferAsprintf(&buf, _("event 'metdata-change' for domain %s: %s %s\n"),
+ virBufferAsprintf(&buf, _("event 'metadata-change' for domain %s: %s %s\n"),
virDomainGetName(dom),
UNKNOWNSTR(virshEventMetadataChangeTypeTypeToString(type)),
NULLSTR(nsuri));
--
2.24.0.rc1
4 years, 5 months
[PATCH v5 0/4] introduction of migration_version attribute for VFIO live migration
by Yan Zhao
This patchset introduces a migration_version attribute under sysfs of VFIO
Mediated devices.
This migration_version attribute is used to check migration compatibility
between two mdev devices.
Currently, it has two locations:
(1) under mdev_type node,
which can be used even before device creation, but only for mdev
devices of the same mdev type.
(2) under mdev device node,
which can only be used after the mdev devices are created, but the src
and target mdev devices are not necessarily be of the same mdev type
(The second location is newly added in v5, in order to keep consistent
with the migration_version node for migratable pass-though devices)
Patch 1 defines migration_version attribute for the first location in
Documentation/vfio-mediated-device.txt
Patch 2 uses GVT as an example for patch 1 to show how to expose
migration_version attribute and check migration compatibility in vendor
driver.
Patch 3 defines migration_version attribute for the second location in
Documentation/vfio-mediated-device.txt
Patch 4 uses GVT as an example for patch 3 to show how to expose
migration_version attribute and check migration compatibility in vendor
driver.
(The previous "Reviewed-by" and "Acked-by" for patch 1 and patch 2 are
kept in v5, as there are only small changes to commit messages of the two
patches.)
v5:
added patch 2 and 4 for mdev device part of migration_version attribute.
v4:
1. fixed indentation/spell errors, reworded several error messages
2. added a missing memory free for error handling in patch 2
v3:
1. renamed version to migration_version
2. let errno to be freely defined by vendor driver
3. let checking mdev_type be prerequisite of migration compatibility check
4. reworded most part of patch 1
5. print detailed error log in patch 2 and generate migration_version
string at init time
v2:
1. renamed patched 1
2. made definition of device version string completely private to vendor
driver
3. reverted changes to sample mdev drivers
4. described intent and usage of version attribute more clearly.
Yan Zhao (4):
vfio/mdev: add migration_version attribute for mdev (under mdev_type
node)
drm/i915/gvt: export migration_version to mdev sysfs (under mdev_type
node)
vfio/mdev: add migration_version attribute for mdev (under mdev device
node)
drm/i915/gvt: export migration_version to mdev sysfs (under mdev
device node)
.../driver-api/vfio-mediated-device.rst | 183 ++++++++++++++++++
drivers/gpu/drm/i915/gvt/Makefile | 2 +-
drivers/gpu/drm/i915/gvt/gvt.c | 39 ++++
drivers/gpu/drm/i915/gvt/gvt.h | 7 +
drivers/gpu/drm/i915/gvt/kvmgt.c | 55 ++++++
drivers/gpu/drm/i915/gvt/migration_version.c | 170 ++++++++++++++++
drivers/gpu/drm/i915/gvt/vgpu.c | 13 +-
7 files changed, 466 insertions(+), 3 deletions(-)
create mode 100644 drivers/gpu/drm/i915/gvt/migration_version.c
--
2.17.1
4 years, 5 months
[PATCH 0/1] configure: prefer python's sphinx module
by John Snow
Hi, this is a followup to my patch which attempted to prefer
'sphinx-build' to 'sphinx-build-3' which intended to prefer a VENV
installation of sphinx over Fedora's system installation.
That got confusing, though, so here's something that's simpler and
better: use python to invoke sphinx so we don't have to worry about
python/sphinx version mismatches.
This should essentially always DTRT. In cases where a specific sphinx is
preferred, you would use a virtual environment with sphinx installed and
configure QEMU with e.g. --python /path/to/my/venv/python35
John Snow (1):
configure: prefer python's sphinx module
docs/system/deprecated.rst | 19 +++++++++++++++++++
configure | 20 +++++++++-----------
2 files changed, 28 insertions(+), 11 deletions(-)
--
2.21.3
4 years, 5 months
[libvirt-sandbox PATCH] gitlab: introduce CI jobs testing git master & distro libvirt
by Daniel P. Berrangé
The sandbox build needs to validate one axis
- A variety of libvirt versions
We test a variety of libvirt versions by running a build against the
distro provided libvirt packages. All that is then missing is a build
against the latest libvirt git master, which only needs to be run on
a single distro, for which Ubuntu 20.04 is picked as a stable long life
base.
For mingw, we only test against libvirt git master, using Fedora
rawhide. It is expected that any issues against older libvirt will
have already been caught by the native builds.
Several distros are not included because they don't provide the package
pre-requisites.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
.gitlab-ci.yml | 163 ++++++++++++++++++
ci/containers/README.rst | 14 ++
ci/containers/libvirt-debian-10.Dockerfile | 64 +++++++
ci/containers/libvirt-debian-9.Dockerfile | 67 +++++++
ci/containers/libvirt-debian-sid.Dockerfile | 64 +++++++
ci/containers/libvirt-fedora-31.Dockerfile | 64 +++++++
ci/containers/libvirt-fedora-32.Dockerfile | 64 +++++++
.../libvirt-fedora-rawhide.Dockerfile | 65 +++++++
ci/containers/libvirt-ubuntu-1804.Dockerfile | 67 +++++++
ci/containers/libvirt-ubuntu-2004.Dockerfile | 69 ++++++++
ci/containers/refresh | 27 +++
11 files changed, 728 insertions(+)
create mode 100644 ci/containers/README.rst
create mode 100644 ci/containers/libvirt-debian-10.Dockerfile
create mode 100644 ci/containers/libvirt-debian-9.Dockerfile
create mode 100644 ci/containers/libvirt-debian-sid.Dockerfile
create mode 100644 ci/containers/libvirt-fedora-31.Dockerfile
create mode 100644 ci/containers/libvirt-fedora-32.Dockerfile
create mode 100644 ci/containers/libvirt-fedora-rawhide.Dockerfile
create mode 100644 ci/containers/libvirt-ubuntu-1804.Dockerfile
create mode 100644 ci/containers/libvirt-ubuntu-2004.Dockerfile
create mode 100755 ci/containers/refresh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50dae92..c12a262 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,87 @@
stages:
- prebuild
+ - containers
+ - builds
+
+.container_job_template: &container_job_definition
+ image: docker:stable
+ stage: containers
+ services:
+ - docker:dind
+ before_script:
+ - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest"
+ - export COMMON_TAG="$CI_REGISTRY/libvirt/libvirt-sandbox/ci-$NAME:latest"
+ - docker info
+ - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
+ script:
+ - docker pull "$TAG" || docker pull "$COMMON_TAG" || true
+ - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/libvirt-$NAME.Dockerfile" ci
+ - docker push "$TAG"
+ after_script:
+ - docker logout
+
+.script_variables: &script_variables |
+ export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
+ export SCRATCH_DIR="/tmp/scratch"
+ export VROOT="$SCRATCH_DIR/vroot"
+ export CCACHE_DIR="$PWD/ccache"
+ export CCACHE_MAXSIZE="500M"
+ export PATH="$CCACHE_WRAPPERSDIR:$VROOT/bin:$PATH"
+ export PKG_CONFIG_PATH="$VROOT/lib/pkgconfig"
+ export XDG_DATA_DIRS="$VROOT/share:/usr/share"
+ export GI_TYPELIB_PATH="$VROOT/lib/girepository-1.0"
+
+.git_native_build_job_template: &git_native_build_job_definition
+ image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
+ stage: builds
+ cache:
+ paths:
+ - ccache/
+ key: "$CI_JOB_NAME"
+ before_script:
+ - *script_variables
+ - export LD_LIBRARY_PATH="$VROOT/lib"
+ script:
+ - pushd "$PWD"
+ - mkdir -p "$SCRATCH_DIR"
+ - cd "$SCRATCH_DIR"
+ - git clone --depth 1 https://gitlab.com/libvirt/libvirt.git
+ - git clone --depth 1 https://gitlab.com/libvirt/libvirt-glib.git
+ - mkdir libvirt/build
+ - cd libvirt/build
+ - ../autogen.sh --prefix="$VROOT" --without-libvirtd
+ - $MAKE install
+ - cd ../..
+ - mkdir libvirt-glib/build
+ - cd libvirt-glib/build
+ - ../autogen.sh --prefix="$VROOT" --without-libvirtd
+ - $MAKE install
+ - popd
+ - mkdir build
+ - cd build
+ - ../autogen.sh --prefix="$VROOT" --enable-gtk-doc
+ - $MAKE install
+ - $MAKE dist
+ - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; then rpmbuild --nodeps -ta libvirt-sandbox*.tar.gz ; fi
+
+.dist_native_build_job_template: &dist_native_build_job_definition
+ image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
+ stage: builds
+ cache:
+ paths:
+ - ccache/
+ key: "$CI_JOB_NAME"
+ before_script:
+ - *script_variables
+ script:
+ - mkdir build
+ - cd build
+ - ../autogen.sh --prefix="$VROOT" --enable-gtk-doc
+ - $MAKE install
+ - $MAKE dist
+ - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; then rpmbuild -ta libvirt-sandbox*.tar.gz ; fi
+
# Check that all commits are signed-off for the DCO.
# Skip on "libvirt" namespace, since we only need to run
@@ -14,3 +95,85 @@ check-dco:
except:
variables:
- $CI_PROJECT_NAMESPACE == 'libvirt'
+
+x64-debian-9-container:
+ <<: *container_job_definition
+ variables:
+ NAME: debian-9
+
+x64-debian-10-container:
+ <<: *container_job_definition
+ variables:
+ NAME: debian-10
+
+x64-debian-sid-container:
+ <<: *container_job_definition
+ variables:
+ NAME: debian-sid
+
+x64-fedora-31-container:
+ <<: *container_job_definition
+ variables:
+ NAME: fedora-31
+
+x64-fedora-32-container:
+ <<: *container_job_definition
+ variables:
+ NAME: fedora-32
+
+x64-fedora-rawhide-container:
+ <<: *container_job_definition
+ variables:
+ NAME: fedora-rawhide
+
+x64-ubuntu-1804-container:
+ <<: *container_job_definition
+ variables:
+ NAME: ubuntu-1804
+
+x64-ubuntu-2004-container:
+ <<: *container_job_definition
+ variables:
+ NAME: ubuntu-2004
+
+
+
+x64-debian-9-dist-build:
+ <<: *dist_native_build_job_definition
+ variables:
+ NAME: debian-9
+
+x64-debian-10-dist-build:
+ <<: *dist_native_build_job_definition
+ variables:
+ NAME: debian-10
+
+x64-debian-sid-dist-build:
+ <<: *dist_native_build_job_definition
+ variables:
+ NAME: debian-sid
+
+x64-fedora-31-dist-build:
+ <<: *dist_native_build_job_definition
+ variables:
+ NAME: fedora-31
+
+x64-fedora-32-dist-build:
+ <<: *dist_native_build_job_definition
+ variables:
+ NAME: fedora-32
+
+x64-fedora-rawhide-dist-build:
+ <<: *dist_native_build_job_definition
+ variables:
+ NAME: fedora-rawhide
+
+x64-ubuntu-1804-dist-build:
+ <<: *dist_native_build_job_definition
+ variables:
+ NAME: ubuntu-1804
+
+x64-ubuntu-2004-git-build:
+ <<: *git_native_build_job_definition
+ variables:
+ NAME: ubuntu-2004
diff --git a/ci/containers/README.rst b/ci/containers/README.rst
new file mode 100644
index 0000000..530897e
--- /dev/null
+++ b/ci/containers/README.rst
@@ -0,0 +1,14 @@
+CI job assets
+=============
+
+This directory contains assets used in the automated CI jobs, most
+notably the Dockerfiles used to build container images in which the
+CI jobs then run.
+
+The ``refresh`` script is used to re-create the Dockerfiles using the
+``lcitool`` command that is provided by repo
+https://gitlab.com/libvirt/libvirt-ci
+
+The containers are built during the CI process and cached in the GitLab
+container registry of the project doing the build. The cached containers
+can be deleted at any time and will be correctly rebuilt.
diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/libvirt-debian-10.Dockerfile
new file mode 100644
index 0000000..51f79e2
--- /dev/null
+++ b/ci/containers/libvirt-debian-10.Dockerfile
@@ -0,0 +1,64 @@
+FROM debian:10
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get dist-upgrade -y && \
+ apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ autopoint \
+ bash \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ chrony \
+ gcc \
+ gdb \
+ gettext \
+ git \
+ gtk-doc-tools \
+ libc-dev-bin \
+ libc6-dev \
+ libcap-ng-dev \
+ libgirepository1.0-dev \
+ libglib2.0-dev \
+ liblzma-dev \
+ libselinux1-dev \
+ libtirpc-dev \
+ libtool \
+ libtool-bin \
+ libvirt-dev \
+ libvirt-glib-1.0-dev \
+ libxml2-dev \
+ locales \
+ lsof \
+ make \
+ meson \
+ net-tools \
+ ninja-build \
+ patch \
+ perl \
+ pkgconf \
+ python3 \
+ python3-setuptools \
+ python3-wheel \
+ screen \
+ strace \
+ sudo \
+ vim \
+ zlib1g-dev && \
+ apt-get autoremove -y && \
+ apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
+
+ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/libvirt-debian-9.Dockerfile b/ci/containers/libvirt-debian-9.Dockerfile
new file mode 100644
index 0000000..cf94a67
--- /dev/null
+++ b/ci/containers/libvirt-debian-9.Dockerfile
@@ -0,0 +1,67 @@
+FROM debian:9
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get dist-upgrade -y && \
+ apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ autopoint \
+ bash \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ chrony \
+ gcc \
+ gdb \
+ gettext \
+ git \
+ gtk-doc-tools \
+ libc-dev-bin \
+ libc6-dev \
+ libcap-ng-dev \
+ libgirepository1.0-dev \
+ libglib2.0-dev \
+ liblzma-dev \
+ libselinux1-dev \
+ libtirpc-dev \
+ libtool \
+ libtool-bin \
+ libvirt-dev \
+ libvirt-glib-1.0-dev \
+ libxml2-dev \
+ locales \
+ lsof \
+ make \
+ net-tools \
+ ninja-build \
+ patch \
+ perl \
+ pkgconf \
+ python3 \
+ python3-pip \
+ python3-setuptools \
+ python3-wheel \
+ screen \
+ strace \
+ sudo \
+ vim \
+ zlib1g-dev && \
+ apt-get autoremove -y && \
+ apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
+
+RUN pip3 install \
+ meson==0.49.0
+
+ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/libvirt-debian-sid.Dockerfile
new file mode 100644
index 0000000..6a34306
--- /dev/null
+++ b/ci/containers/libvirt-debian-sid.Dockerfile
@@ -0,0 +1,64 @@
+FROM debian:sid
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get dist-upgrade -y && \
+ apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ autopoint \
+ bash \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ chrony \
+ gcc \
+ gdb \
+ gettext \
+ git \
+ gtk-doc-tools \
+ libc-dev-bin \
+ libc6-dev \
+ libcap-ng-dev \
+ libgirepository1.0-dev \
+ libglib2.0-dev \
+ liblzma-dev \
+ libselinux1-dev \
+ libtirpc-dev \
+ libtool \
+ libtool-bin \
+ libvirt-dev \
+ libvirt-glib-1.0-dev \
+ libxml2-dev \
+ locales \
+ lsof \
+ make \
+ meson \
+ net-tools \
+ ninja-build \
+ patch \
+ perl \
+ pkgconf \
+ python3 \
+ python3-setuptools \
+ python3-wheel \
+ screen \
+ strace \
+ sudo \
+ vim \
+ zlib1g-dev && \
+ apt-get autoremove -y && \
+ apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
+
+ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/libvirt-fedora-31.Dockerfile b/ci/containers/libvirt-fedora-31.Dockerfile
new file mode 100644
index 0000000..6e0da18
--- /dev/null
+++ b/ci/containers/libvirt-fedora-31.Dockerfile
@@ -0,0 +1,64 @@
+FROM fedora:31
+
+RUN dnf update -y && \
+ dnf install -y \
+ autoconf \
+ automake \
+ bash \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ chrony \
+ cppi \
+ gcc \
+ gdb \
+ gettext \
+ gettext-devel \
+ git \
+ glib2-devel \
+ glibc-devel \
+ glibc-langpack-en \
+ glibc-static \
+ gobject-introspection-devel \
+ gtk-doc \
+ libcap-ng-devel \
+ libselinux-devel \
+ libtirpc-devel \
+ libtool \
+ libvirt-devel \
+ libvirt-gobject-devel \
+ libxml2-devel \
+ lsof \
+ make \
+ meson \
+ net-tools \
+ ninja-build \
+ patch \
+ perl \
+ pkgconfig \
+ python3 \
+ python3-setuptools \
+ python3-wheel \
+ rpcgen \
+ rpm-build \
+ screen \
+ strace \
+ sudo \
+ vim \
+ xz-devel \
+ xz-static \
+ zlib-devel \
+ zlib-static && \
+ dnf autoremove -y && \
+ dnf clean all -y && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
+
+ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/libvirt-fedora-32.Dockerfile
new file mode 100644
index 0000000..5d86af2
--- /dev/null
+++ b/ci/containers/libvirt-fedora-32.Dockerfile
@@ -0,0 +1,64 @@
+FROM fedora:32
+
+RUN dnf update -y && \
+ dnf install -y \
+ autoconf \
+ automake \
+ bash \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ chrony \
+ cppi \
+ gcc \
+ gdb \
+ gettext \
+ gettext-devel \
+ git \
+ glib2-devel \
+ glibc-devel \
+ glibc-langpack-en \
+ glibc-static \
+ gobject-introspection-devel \
+ gtk-doc \
+ libcap-ng-devel \
+ libselinux-devel \
+ libtirpc-devel \
+ libtool \
+ libvirt-devel \
+ libvirt-gobject-devel \
+ libxml2-devel \
+ lsof \
+ make \
+ meson \
+ net-tools \
+ ninja-build \
+ patch \
+ perl \
+ pkgconfig \
+ python3 \
+ python3-setuptools \
+ python3-wheel \
+ rpcgen \
+ rpm-build \
+ screen \
+ strace \
+ sudo \
+ vim \
+ xz-devel \
+ xz-static \
+ zlib-devel \
+ zlib-static && \
+ dnf autoremove -y && \
+ dnf clean all -y && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
+
+ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/libvirt-fedora-rawhide.Dockerfile
new file mode 100644
index 0000000..8a299fd
--- /dev/null
+++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile
@@ -0,0 +1,65 @@
+FROM fedora:rawhide
+
+RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
+ dnf update -y && \
+ dnf install -y \
+ autoconf \
+ automake \
+ bash \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ chrony \
+ cppi \
+ gcc \
+ gdb \
+ gettext \
+ gettext-devel \
+ git \
+ glib2-devel \
+ glibc-devel \
+ glibc-langpack-en \
+ glibc-static \
+ gobject-introspection-devel \
+ gtk-doc \
+ libcap-ng-devel \
+ libselinux-devel \
+ libtirpc-devel \
+ libtool \
+ libvirt-devel \
+ libvirt-gobject-devel \
+ libxml2-devel \
+ lsof \
+ make \
+ meson \
+ net-tools \
+ ninja-build \
+ patch \
+ perl \
+ pkgconfig \
+ python3 \
+ python3-setuptools \
+ python3-wheel \
+ rpcgen \
+ rpm-build \
+ screen \
+ strace \
+ sudo \
+ vim \
+ xz-devel \
+ xz-static \
+ zlib-devel \
+ zlib-static && \
+ dnf autoremove -y && \
+ dnf clean all -y && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
+
+ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/libvirt-ubuntu-1804.Dockerfile
new file mode 100644
index 0000000..bea1fb4
--- /dev/null
+++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile
@@ -0,0 +1,67 @@
+FROM ubuntu:18.04
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get dist-upgrade -y && \
+ apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ autopoint \
+ bash \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ chrony \
+ gcc \
+ gdb \
+ gettext \
+ git \
+ gtk-doc-tools \
+ libc-dev-bin \
+ libc6-dev \
+ libcap-ng-dev \
+ libgirepository1.0-dev \
+ libglib2.0-dev \
+ liblzma-dev \
+ libselinux1-dev \
+ libtirpc-dev \
+ libtool \
+ libtool-bin \
+ libvirt-dev \
+ libvirt-glib-1.0-dev \
+ libxml2-dev \
+ locales \
+ lsof \
+ make \
+ net-tools \
+ ninja-build \
+ patch \
+ perl \
+ pkgconf \
+ python3 \
+ python3-pip \
+ python3-setuptools \
+ python3-wheel \
+ screen \
+ strace \
+ sudo \
+ vim \
+ zlib1g-dev && \
+ apt-get autoremove -y && \
+ apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
+
+RUN pip3 install \
+ meson==0.49.0
+
+ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/libvirt-ubuntu-2004.Dockerfile
new file mode 100644
index 0000000..0c2c4d6
--- /dev/null
+++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile
@@ -0,0 +1,69 @@
+FROM ubuntu:20.04
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get dist-upgrade -y && \
+ apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ autopoint \
+ bash \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ chrony \
+ gcc \
+ gdb \
+ gettext \
+ git \
+ gtk-doc-tools \
+ libc-dev-bin \
+ libc6-dev \
+ libcap-ng-dev \
+ libgirepository1.0-dev \
+ libglib2.0-dev \
+ libgnutls28-dev \
+ liblzma-dev \
+ libnl-3-dev \
+ libnl-route-3-dev \
+ libselinux1-dev \
+ libtirpc-dev \
+ libtool \
+ libtool-bin \
+ libxml2-dev \
+ libxml2-utils \
+ locales \
+ lsof \
+ make \
+ meson \
+ net-tools \
+ ninja-build \
+ patch \
+ perl \
+ pkgconf \
+ python3 \
+ python3-docutils \
+ python3-setuptools \
+ python3-wheel \
+ screen \
+ strace \
+ sudo \
+ valac \
+ vim \
+ xsltproc \
+ zlib1g-dev && \
+ apt-get autoremove -y && \
+ apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
+
+ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/refresh b/ci/containers/refresh
new file mode 100755
index 0000000..ce65700
--- /dev/null
+++ b/ci/containers/refresh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+if test -z "$1"
+then
+ echo "syntax: $0 PATH-TO-LCITOOL"
+ exit 1
+fi
+
+LCITOOL=$1
+
+if ! test -x "$LCITOOL"
+then
+ echo "$LCITOOL is not executable"
+ exit 1
+fi
+
+HOSTS=$($LCITOOL hosts | grep -v -E '(freebsd|centos|opensuse)')
+
+for host in $HOSTS
+do
+ if test "$host" = "libvirt-ubuntu-2004"
+ then
+ $LCITOOL dockerfile $host libvirt+minimal,libvirt-glib,libvirt-sandbox > $host.Dockerfile
+ else
+ $LCITOOL dockerfile $host libvirt+dist,libvirt-glib+dist,libvirt-sandbox > $host.Dockerfile
+ fi
+done
--
2.26.2
4 years, 5 months
[libvirt PATCH v4 00/12] Add ability to create mediated devices in libvirt
by Jonathon Jongsma
This is the first portion of an effort to support persistent mediated devices
with libvirt. This first series simply enables creating and destroying
non-persistent mediated devices via the virNodeDeviceCreateXML() and
virNodeDeviceDestroy() functions. The 'mdevctl' utility[1] provides the backend
implementation.
Hopefully these are the last changes and version can simply be pushed upstream.
Changes in v4:
- coding style / spacing fixes
- remove 'persist' arg from start command
- fixed distcheck failure by including test data dir in EXTRA_DIST
- Add an item to NEWS.rst
[1] https://github.com/mdevctl/mdevctl
Jonathon Jongsma (12):
nodedev: make iommuGroup optional for mdevs
nodedev: factor out nodeDeviceHasCapability()
nodedev: add support for mdev attributes
nodedev: refactor nodeDeviceFindNewDevice()
nodedev: store mdev UUID in mdev caps
nodedev: add mdev support to virNodeDeviceCreateXML()
nodedev: Build a non-loadable driver lib
nodedev: Add testing for 'mdevctl start'
nodedev: add mdev support to virNodeDeviceDestroy()
nodedev: Add testing for 'mdevctl stop'
docs: note node device fields that are read-only
news: mediated devices can be created
NEWS.rst | 7 +
build-aux/syntax-check.mk | 2 +-
docs/formatnode.html.in | 21 +-
docs/schemas/nodedev.rng | 18 +-
libvirt.spec.in | 2 +
m4/virt-external-programs.m4 | 3 +
src/conf/node_device_conf.c | 68 +++-
src/conf/node_device_conf.h | 3 +
src/conf/virnodedeviceobj.c | 34 ++
src/conf/virnodedeviceobj.h | 3 +
src/libvirt_private.syms | 3 +
src/node_device/Makefile.inc.am | 23 +-
src/node_device/node_device_driver.c | 360 ++++++++++++++++--
src/node_device/node_device_driver.h | 7 +
src/node_device/node_device_udev.c | 5 +-
src/util/virmdev.c | 12 +
src/util/virmdev.h | 11 +
tests/Makefile.am | 15 +
...019_36ea_4111_8f0a_8c9a70e21366-start.argv | 1 +
...019_36ea_4111_8f0a_8c9a70e21366-start.json | 1 +
...d39_495e_4243_ad9f_beb3f14c23d9-start.argv | 1 +
...d39_495e_4243_ad9f_beb3f14c23d9-start.json | 1 +
...916_1ca8_49ac_b176_871d16c13076-start.argv | 1 +
...916_1ca8_49ac_b176_871d16c13076-start.json | 1 +
tests/nodedevmdevctldata/mdevctl-stop.argv | 1 +
tests/nodedevmdevctltest.c | 303 +++++++++++++++
...v_d069d019_36ea_4111_8f0a_8c9a70e21366.xml | 7 +
...v_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml | 9 +
...v_fedc4916_1ca8_49ac_b176_871d16c13076.xml | 8 +
29 files changed, 863 insertions(+), 68 deletions(-)
create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366-start.argv
create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366-start.json
create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9-start.argv
create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9-start.json
create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871d16c13076-start.argv
create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871d16c13076-start.json
create mode 100644 tests/nodedevmdevctldata/mdevctl-stop.argv
create mode 100644 tests/nodedevmdevctltest.c
create mode 100644 tests/nodedevschemadata/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml
create mode 100644 tests/nodedevschemadata/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml
create mode 100644 tests/nodedevschemadata/mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml
--
2.21.3
4 years, 5 months
[libvirt PATCH] nodedev: Makefile: Use AM_LDFLAGS_MOD_NOUNDEF with the installed library
by Erik Skultety
Rather than using the AM_LDFLAGS_MOD_NOUNDEF options with the noinstall
library that will come out of libtool from
libvirt_driver_nodedev_impl_la, use it with the installed version
libvirt_driver_nodedev_la.
Broken-by-commit: c44bffb9
Fixes: https://ci.centos.org/job/libvirt-rpm/systems=libvirt-fedora-32/1155/
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
Technically a build fix, but I'd like one more pair of eyes to look at this,
especially if they understand libtool.
src/node_device/Makefile.inc.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index 5993165b56..abe26b23bf 100644
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -37,6 +37,7 @@ if WITH_NODE_DEVICES
noinst_LTLIBRARIES += libvirt_driver_nodedev_impl.la
libvirt_driver_nodedev_la_SOURCES =
libvirt_driver_nodedev_la_LIBADD = libvirt_driver_nodedev_impl.la
+libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
mod_LTLIBRARIES += libvirt_driver_nodedev.la
libvirt_driver_nodedev_impl_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES)
--
2.26.2
4 years, 5 months
[PATCH] qemu: auto-assign hostdev interface devices to PCIe
by Laine Stump
Until recently, an <interface type='network'> would automatically be
assigned model "rtl8139" (the default on x86 machinetypes), which in
turn would lead to the device being assigned a PCI address on a
conventional PCI controller (i.e. a pcie-to-pci-bridge). If the
network was a typical Linux host bridge-based network that used an
emulated device, this would be appropriate, since the guest actually
would get an emulated rtl8139 NIC, and that device is a conventional
PCI device.
However, if the network being used was a pool of hostdev devices, the
guest would get an actual PCIe network device assigned from the host
via VFIO; while the interface model in that case is irrelevant for the
QEMU commandline to assign the device, the PCI address would have
already been assigned prior to runtime, so the address assignment
would be done based on the model='rtl8139' - a conventional PCI
device. VFIO assignment of a PCIe device to a conventional PCI slot
works, but we would rather have these devices in a PCIe slot.
Since commit bdb8f2e4186, if <interface type='network'> points to a
etwork that is a pool of hostdev devices, the interface model will be
_unset_ by default. This patch uses that information when deciding
what type of slot to assign to the device: since all hostdev network
interfaces are SR-IOV VFs, and *all* SR-IOV network cards are PCIe, it
is safe to assume that the VFs are PCIe and we should assign then to a
PCIe slot in the guest.
Signed-off-by: Laine Stump <laine(a)redhat.com>
---
(NB: all talk of PCIe vs. conventional PCI is irrelevant for
machinetypes that don't support PCIe - any requirement for PCIe is
"squashed" down to just "PCI" in those cases)
(Note to Paulo - I realize this doesn't describe exactly what happens
on s390, since the default interface model in that case is "virtio"
rather than "rtl8139", and this patch should actually cause no
behavior change on S390. I'm Cc'ing you since you're the author of the
other patch I mention in the commit message, and also so you can try
running your same tests with this patch added, and verify that it
really doesn't break anything for S390.)
src/qemu/qemu_domain_address.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 07431343ed..05cf251cd5 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -734,6 +734,14 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
if (net->model == VIR_DOMAIN_NET_MODEL_E1000E)
return pcieFlags;
+ /* the only time model can be "unknown" is for type='hostdev'
+ * or for type='network' where the network is a pool of
+ * hostdev devices. These will always be pcie on the host, and
+ * should be pcie in the guest if it supports pcie.
+ */
+ if (net->model == VIR_DOMAIN_NET_MODEL_UNKNOWN)
+ return pcieFlags;
+
return pciFlags;
}
--
2.25.4
4 years, 5 months
[libvirt PATCH 0/4] cpu_map: Add some missing x86 features
by Jiri Denemark
The features were added to QEMU long ago.
Jiri Denemark (4):
cpu_map: Request test files update when adding x86 features
cpu_map: Add missing x86 features in 0x7 CPUID leaf
cpu_map: Add missing x86 features in 0x80000008 CPUID leaf
cpu_map: Add missing AMD SVM features
src/cpu_map/x86_features.xml | 57 +++++++++++++++++++
.../x86_64-cpuid-A10-5800K-disabled.xml | 1 +
.../x86_64-cpuid-A10-5800K-enabled.xml | 1 +
.../x86_64-cpuid-A10-5800K-guest.xml | 10 ++++
.../x86_64-cpuid-A10-5800K-host.xml | 10 ++++
.../x86_64-cpuid-A10-5800K-json.xml | 2 +
.../x86_64-cpuid-Cooperlake-enabled.xml | 2 +-
.../x86_64-cpuid-Cooperlake-json.xml | 1 +
.../x86_64-cpuid-Core-i5-6600-disabled.xml | 1 +
...6_64-cpuid-Core-i7-5600U-arat-disabled.xml | 1 +
.../x86_64-cpuid-Core-i7-5600U-disabled.xml | 1 +
...6_64-cpuid-Core-i7-5600U-ibrs-disabled.xml | 2 +-
.../x86_64-cpuid-Core-i7-7700-disabled.xml | 1 +
...86_64-cpuid-EPYC-7601-32-Core-disabled.xml | 2 +
...x86_64-cpuid-EPYC-7601-32-Core-enabled.xml | 1 +
.../x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 11 ++++
.../x86_64-cpuid-EPYC-7601-32-Core-host.xml | 11 ++++
...-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml | 2 +
...4-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml | 1 +
..._64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml | 11 ++++
...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 11 ++++
...6_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml | 2 +
.../x86_64-cpuid-EPYC-7601-32-Core-json.xml | 2 +
.../x86_64-cpuid-FX-8150-guest.xml | 10 ++++
.../cputestdata/x86_64-cpuid-FX-8150-host.xml | 10 ++++
...-cpuid-Hygon-C86-7185-32-core-disabled.xml | 2 +
...4-cpuid-Hygon-C86-7185-32-core-enabled.xml | 1 +
..._64-cpuid-Hygon-C86-7185-32-core-guest.xml | 11 ++++
...6_64-cpuid-Hygon-C86-7185-32-core-host.xml | 11 ++++
...6_64-cpuid-Hygon-C86-7185-32-core-json.xml | 2 +
.../x86_64-cpuid-Ice-Lake-Server-disabled.xml | 2 +-
.../x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 +
.../x86_64-cpuid-Ice-Lake-Server-host.xml | 1 +
.../x86_64-cpuid-Opteron-1352-guest.xml | 3 +
.../x86_64-cpuid-Opteron-1352-host.xml | 3 +
.../x86_64-cpuid-Opteron-2350-disabled.xml | 1 +
.../x86_64-cpuid-Opteron-2350-enabled.xml | 1 +
.../x86_64-cpuid-Opteron-2350-guest.xml | 3 +
.../x86_64-cpuid-Opteron-2350-host.xml | 3 +
.../x86_64-cpuid-Opteron-2350-json.xml | 1 +
.../x86_64-cpuid-Opteron-6234-disabled.xml | 1 +
.../x86_64-cpuid-Opteron-6234-enabled.xml | 1 +
.../x86_64-cpuid-Opteron-6234-guest.xml | 10 ++++
.../x86_64-cpuid-Opteron-6234-host.xml | 10 ++++
.../x86_64-cpuid-Opteron-6234-json.xml | 2 +
.../x86_64-cpuid-Opteron-6282-guest.xml | 10 ++++
.../x86_64-cpuid-Opteron-6282-host.xml | 10 ++++
.../x86_64-cpuid-Phenom-B95-disabled.xml | 1 +
.../x86_64-cpuid-Phenom-B95-enabled.xml | 1 +
.../x86_64-cpuid-Phenom-B95-guest.xml | 4 ++
.../x86_64-cpuid-Phenom-B95-host.xml | 4 ++
.../x86_64-cpuid-Phenom-B95-json.xml | 2 +
...puid-Ryzen-7-1800X-Eight-Core-disabled.xml | 2 +
...cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml | 1 +
...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 11 ++++
...64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 11 ++++
...64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml | 2 +
...4-cpuid-Ryzen-9-3900X-12-Core-disabled.xml | 2 +
...64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml | 5 +-
...6_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml | 13 +++++
...86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 13 +++++
...86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml | 4 ++
.../x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-5115-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6148-disabled.xml | 2 +-
...6_64-cpuid-Xeon-Platinum-8268-disabled.xml | 3 +-
.../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 +
.../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 +
.../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 2 +
.../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 2 +
.../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 2 +
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 2 +
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 5 ++
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 5 ++
.../cpu-host-model-cmt.x86_64-4.0.0.args | 6 +-
78 files changed, 357 insertions(+), 13 deletions(-)
--
2.27.0
4 years, 5 months
[libvirt PATCH] Fix allocation of virDomainFSDef
by Ján Tomko
Some less commonly used drivers were omitted when we switched
the allocator from a plain VIR_ALLOC to virDomainFSDefNew.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
Fixes: da665fbd4858890fbb3bbf5da2a7b6ca37bb3220
https://bugzilla.redhat.com/show_bug.cgi?id=1846450
---
src/openvz/openvz_conf.c | 2 +-
src/vbox/vbox_common.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 190c57b622..db3df5ed5a 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -357,7 +357,7 @@ openvzReadFSConf(virDomainDefPtr def,
goto error;
}
- if (VIR_ALLOC(fs) < 0)
+ if (!(fs = virDomainFSDefNew(NULL)))
goto error;
veid_str = g_strdup_printf("%d", veid);
diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 85935ba731..15f8eb074a 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -3626,7 +3626,7 @@ vboxDumpSharedFolders(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine
char *hostPath = NULL;
PRBool writable = PR_FALSE;
- if (VIR_ALLOC(def->fss[i]) < 0)
+ if (!(def->fss[i] = virDomainFSDefNew(data->xmlopt)))
goto cleanup;
def->fss[i]->type = VIR_DOMAIN_FS_TYPE_MOUNT;
--
2.25.4
4 years, 5 months
[libvirt PATCH] util: remove outdated comment from virLogFormatString
by Ján Tomko
Introduced by commit 72ab0b6dc8129a388aff260a6e444d48495b0e93 which
added some code depending on libvirt's log format string into
qemuProcessReadLogOutput. This function was deleted by commit
932534e85f34a479c7eac174e997bfd9c85bd22d later.
Drop the comment.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
Closes: https://gitlab.com/libvirt/libvirt/-/issues/35
---
Pushed as trivial.
src/util/virlog.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/util/virlog.c b/src/util/virlog.c
index e4944d1258..2c18eeed03 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -421,13 +421,6 @@ virLogFormatString(char **msg,
virLogPriority priority,
const char *str)
{
- /*
- * Be careful when changing the following log message formatting, we rely
- * on it when stripping libvirt debug messages from qemu log files. So when
- * changing this, you might also need to change the code there.
- * virLogFormatString() function name is mentioned there so it's sufficient
- * to just grep for it to find the right place.
- */
if ((funcname != NULL)) {
*msg = g_strdup_printf("%llu: %s : %s:%d : %s\n",
virThreadSelfID(), virLogPriorityString(priority),
--
2.25.4
4 years, 5 months
