[libvirt PATCH 00/20] ci: Move GitLab build recipes to a standalone script
by Erik Skultety
This is a follow up to:
https://listman.redhat.com/archives/libvir-list/2023-January/237201.html
The effort here is to unify the way builds/tests are executed in GitLab CI vs
local container executions and make another step forward in terms of
reproducibility of (specifically) GitLab environments.
Even though code to run all but one (coverity) jobs from GitLab via the
build.sh script is added with this series, local behavior remains the same as
before this series. The reason for that is that that will require more patches
ridding of the Makefile which is currently used and instead integrate usage of
lcitool with the ci/helper Python script which is currently the entry point for
local container executions.
Pipeline: https://gitlab.com/eskultety/libvirt/-/pipelines/768645158
Ubuntu is having some repo connection issues today, so the one failed ^job
can be ignored
Erik Skultety (20):
gitlab-ci.yml: Replace all explicit calls to ninja with meson commands
gitlab-ci.yml: potfile: Consolidate the meson compile calls
gitlab-ci.yml: Use $HOME for rpmbuild's topdir instead of PWD
ci: build.sh: Drop the commentary about CI_BUILD_SCRIPT
ci: build.sh: Use 'meson setup' explicitly
ci: build.sh: Always assume -Dsystem=true
ci: build.sh: Drop the CI prefix from the CI_{MESON,NINJA}_ARGS vars
ci: build.sh: Move off of ninja command to directly calling meson
ci: build.sh: Join MESON_ARGS and MESON_OPTS
ci: build.sh: Break the script functionality into helper functions
ci: build.sh: Move the necessary env variables to build.sh
ci: build.sh: Add support for individual GitLab jobs
ci: build.sh: Wire up the individual job functions to the CLI
ci: build.sh: Document CI_CONT_SRCDIR
ci: build.sh: Make the build script fail ASAP with 'set -e'
ci: build.sh: Update git index in local container environments on
'dist'
ci: build.sh: Make the script executable
gitlab-ci.yml: Add 'after_script' stage to prep for artifact
collection
gitlab-ci.yml: Adopt job execution via a Bash script
gitlab-ci.yml: Drop the usage of script variables reference
.gitlab-ci.yml | 56 ++++++++++-------------
ci/Makefile | 16 ++++---
ci/build.sh | 121 +++++++++++++++++++++++++++++++++++++++++++------
ci/helper | 21 ++++++---
4 files changed, 155 insertions(+), 59 deletions(-)
mode change 100644 => 100755 ci/build.sh
--
2.39.1
1 year, 6 months
[PATCH 0/5] qemuxml2xmltest: Finish modernization of few last forgotten cases
by Peter Krempa
Peter Krempa (5):
qemuxml2xmltest: Rework file name generation in 'testInfoSetPaths'
qemuxml2xmltest: Use DO_TEST_CAPS_ARCH_LATEST_FULL for arm GIC tests
qemuxml2argvtest: Pass expected state via struct testQemuInfo's
'flags' member
qemuxml2xmltest: Modernize rest of 'seclabel-*' tests
qemuxml2xmltest: Merge DO_TEST macro into DO_TEST_CAPS_INTERNAL
...amic-baselabel-inactive.x86_64-latest.xml} | 5 +-
...amic-labelskip-inactive.x86_64-latest.xml} | 5 +-
...c-none-relabel-inactive.x86_64-latest.xml} | 5 +-
...namic-override-inactive.x86_64-latest.xml} | 5 +-
...ynamic-relabel-inactive.x86_64-latest.xml} | 5 +-
tests/qemuxml2xmltest.c | 149 ++++++------------
tests/testutilsqemu.h | 1 +
7 files changed, 73 insertions(+), 102 deletions(-)
rename tests/qemuxml2xmloutdata/{seclabel-dynamic-baselabel-inactive.xml => seclabel-dynamic-baselabel-inactive.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{seclabel-dynamic-labelskip-inactive.xml => seclabel-dynamic-labelskip-inactive.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{seclabel-dynamic-none-relabel-inactive.xml => seclabel-dynamic-none-relabel-inactive.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{seclabel-dynamic-override-inactive.xml => seclabel-dynamic-override-inactive.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{seclabel-dynamic-relabel-inactive.xml => seclabel-dynamic-relabel-inactive.x86_64-latest.xml} (89%)
--
2.41.0
1 year, 6 months
[PATCH 0/2] virschematest: Fix schema coverage of 'ch' driver's tests
by Peter Krempa
Peter Krempa (2):
tests: chxml2xmlin: Fix path format for fake paths
virschematest: Validate files in 'chxml2xmlin' and 'chxml2xmlout'
directories
tests/chxml2xmlin/basic.xml | 4 ++--
tests/virschematest.c | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
--
2.41.0
1 year, 6 months
[PATCH 0/6] Fix one corner case when parsing 'mdevctl' output
by Michal Privoznik
See 2/6 for explanation.
Michal Prívozník (6):
nodedevmdevctltest: Rename mdevctl-list-empty test case
nodeDeviceParseMdevctlJSON: Accept empty string
nodedevmdevctltest: Introduce a test case for empty mdevctl output
node_device_driver: Deduplicate mediated devices listing
virMdevctlList: Don't check for !output
virjsontest: Introduce a test case for an empty array
src/node_device/node_device_driver.c | 40 ++++++-------------
.../mdevctl-list-empty-array.json | 1 +
.../mdevctl-list-empty-array.out.xml | 0
.../mdevctl-list-empty.json | 1 -
tests/nodedevmdevctltest.c | 1 +
tests/virjsontest.c | 1 +
6 files changed, 16 insertions(+), 28 deletions(-)
create mode 100644 tests/nodedevmdevctldata/mdevctl-list-empty-array.json
create mode 100644 tests/nodedevmdevctldata/mdevctl-list-empty-array.out.xml
--
2.41.0
1 year, 6 months
[PATCH] conf: add virDomainDiskBlockIoCheckABIStability()
by Kristina Hanicova
Add missing ABI stability check for blockio properties for disk
devices.
Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com>
---
src/conf/domain_conf.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2e60927799..71bd49bf95 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -19775,6 +19775,28 @@ virDomainVirtioOptionsCheckABIStability(virDomainVirtioOptions *src,
}
+static bool
+virDomainDiskBlockIoCheckABIStability(virDomainDiskDef *src,
+ virDomainDiskDef *dst)
+{
+ if (src->blockio.logical_block_size != dst->blockio.logical_block_size) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target disk logical_block_size %1$u does not match source %2$u"),
+ dst->blockio.logical_block_size, src->blockio.logical_block_size);
+ return false;
+ }
+
+ if (src->blockio.physical_block_size != dst->blockio.physical_block_size) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target disk physical_block_size %1$u does not match source %2$u"),
+ dst->blockio.physical_block_size, src->blockio.physical_block_size);
+ return false;
+ }
+ return true;
+}
+
+
+
static bool
virDomainDiskDefCheckABIStability(virDomainDiskDef *src,
virDomainDiskDef *dst)
@@ -19858,6 +19880,9 @@ virDomainDiskDefCheckABIStability(virDomainDiskDef *src,
if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info))
return false;
+ if (!virDomainDiskBlockIoCheckABIStability(src, dst))
+ return false;
+
return true;
}
--
2.41.0
1 year, 6 months
[PATCH v2 0/5] Improve closing of FDs for child processes
by Michal Privoznik
This is a v2 of:
https://listman.redhat.com/archives/libvir-list/2023-June/240351.html
Hopefully, I've implemented all Dan's suggestions.
Michal Prívozník (5):
virfile: Introduce virCloseRange()
virfile: Introduce virCloseFrom()
vircommand: Unify mass FD closing
vircommand: Introduce virCommandMassCloseRange()
src: Detect close_range syscall during virGlobalInit()
src/libvirt.c | 4 +
src/libvirt_private.syms | 4 +
src/util/vircommand.c | 160 ++++++++++++++++++++++++---------------
src/util/virfile.c | 110 +++++++++++++++++++++++++++
src/util/virfile.h | 5 ++
tests/commandtest.c | 2 +
6 files changed, 222 insertions(+), 63 deletions(-)
--
2.41.0
1 year, 6 months
[libvirt PATCH v3 0/8] Support for VFIO variant drivers, Part 1
by Laine Stump
A "VFIO variant" driver is a kernel driver for a device that supports
all the APIs of the basic vfio-pci driver (which enables assigning a
host PCI device to a QEMU guest) plus "some extra stuff" (e.g. to
enable things like saving/restoring device state in order to support
live migration.)
Way back last year I posted a couple attempts to support VFIO variant
drivers; here is V2 (along with a later followup discussion from a
couple months ago):
https://listman.redhat.com/archives/libvir-list/2022-August/233661.html
https://listman.redhat.com/archives/libvir-list/2023-May/240108.html
The mlx5-vfio-pci driver has now been upstream for quite awhile (and
even in the downstream Fedora 38 kernel, for example), as are the
sysfs bits that allow us to determine whether or not a driver is a
VFIO variant, and I've updated the patch(es) to use this.
I've also been working on auto-binding to the "best-match" VFIO
variant driver based on comparing the device's modalias file in sysfs
to the contents of the kernel's modules.alias file, but that isn't
quite ready (partly code that isn't yet working, but also partly
indecision about exactly where in the XML to put the driver name when
it is specified; I won't take up more space here with that though).
In the meantime, there are people who want to use the mlx5-vfio-pci
driver (and Cedric Le Goater also has written vfio-pci-igbvf and
vfio-pci-e1000e drivers (which area very useful for testing), although
I don't think he has posted them anywhere yet), so I would like to get
the basic patches here merged in upstream now while I continue working
on "Part 2".
These patches provide two improvements that make testing/using VFIO
drivers much more convenient:
1) The specific driver can be given in the virsh nodedev-detach
command (or the virNodeDeviceDetachFlags() API call), e.g.:
virsh nodedev-detach pci_0000_04_11_5 --driver vfio-pci-igbvf
2) If the <hostdev> (or "<interface> ... <type='hostdev'/>" has
"managed='no'", then libvirt will recognize any VFIO variant driver
(rather than the current behavior of rejecting anything that isn't
exactly "vfio-pci")
With these two capabilities, it's simple and straightforward to bind a
device to a VFIO variant driver, and then start a guest that uses that
device.
Change in V2:
* complete remake, more refactoring
* use existence of "vfio-dev" subdirectory of device directory in
sysfs to determine whether the currently-bound driver is a vfio
variant.
* support binding to a user-specified driver during nodedev-detach,
rather than only supporting vfio-pci.
Laine Stump (8):
util: use "stubDriverType" instead of just "stubDriver"
util: add stub driver name to virPCIDevice object
util: rename virPCIDeviceGetDriverPathAndName
util: permit existing binding to VFIO variant driver
util: probe stub driver from within function that binds to stub driver
util: honor stubDriverName when probing/binding stub driver for a
device
node_device: support binding other drivers with
virNodeDeviceDetachFlags()
qemu: turn two multiline log messages into single line
src/hypervisor/domain_driver.c | 9 +-
src/hypervisor/domain_driver.h | 2 +
src/hypervisor/virhostdev.c | 35 +++-----
src/libvirt_private.syms | 9 +-
src/libxl/libxl_driver.c | 3 +-
src/qemu/qemu_driver.c | 37 ++++----
src/util/virnvme.c | 2 +-
src/util/virpci.c | 156 +++++++++++++++++++++++++--------
src/util/virpci.h | 18 ++--
tests/virhostdevtest.c | 2 +-
tests/virpcitest.c | 10 +--
11 files changed, 185 insertions(+), 98 deletions(-)
--
2.41.0
1 year, 6 months
[libvirt PATCH v6 00/36] Use nbdkit for http/ftp/ssh network drives in libvirt
by Jonathon Jongsma
This is the sixth version of this patch series. See
https://bugzilla.redhat.com/show_bug.cgi?id=2016527 for more information about
the goal, but the summary is that RHEL does not want to ship the qemu storage
plugins for curl and ssh. Handling them outside of the qemu process provides
several advantages such as reduced attack surface and stability.
Pretty much all of the patches have already been reviewed by Peter but I have
been waiting for selinux policy changes before pushing it upstream. The selinux
changes are not fully done, but there is a new policy in development that has
allowed me to run with selinux in enforcing mode for the common cases.
See https://bugzilla.redhat.com/show_bug.cgi?id=2182505 for more information.
For me, the following scenarios work now with selinux enabled using the selinux
policy from that bug:
- http/https disks
- ssh disks with password authentication
- ssh disks with passwordless keyfile
The one major thing that doesn't work and is difficult to get working with
selinux enabled is the ssh-agent. This is because there doesn't seem to be any
selinux policy for ssh-agent, so by default the ssh-agent socket is labeled
unconfined_t. We cannot allow access from the libvirt/qemu to unconfined_t
because that would open up access to just about anything on the host. So
additional work will likely be necessary for ssh-agent/libvirt interaction in
the future. Fortunately ssh-agent is something that never was really supported
with the old qemu block driver either, so I think we could potentially merge
this patchset either without the ssh-agent patches or with a note that
ssh-agent won't work with selinux enabled.
Note also that gitlab CI will not work for this series without changes to the
ci definitions due to the addition of libnbd dependency. It also will require
changes to selinux policy to enable nbdkit to execute in the proper context.
Changes in v6:
- rebased to latest master
- slightly improved error reporting
- removed polling fallback if pidfd_open is unavailable
- split ssh-agent feature into separate patches
- other smaller changes suggested by Peter in v5
Jonathon Jongsma (36):
schema: allow 'ssh' as a protocol for network disks
qemu: Add functions for determining nbdkit availability
qemu: expand nbdkit capabilities
util: Allow virFileCache data to be any GObject
qemu: implement basic virFileCache for nbdkit caps
qemu: implement persistent file cache for nbdkit caps
qemu: use file cache for nbdkit caps
qemu: Add qemuNbdkitProcess
qemu: query nbdkit module dir from binary
qemu: add functions to start and stop nbdkit
qemu: remove unused 'mode' param from qemuDomainLogContextNew()
Generalize qemuDomainLogContextNew()
qemu: Extract qemuDomainLogContext into a new file
qemu: move qemuProcessReadLog() to qemuLogContext
qemu: log error output from nbdkit
tests: add ability to test various nbdkit capabilities
qemu: split qemuDomainSecretStorageSourcePrepare
qemu: include nbdkit state in private xml
util: secure erase virCommand send buffers
qemu: pass sensitive data to nbdkit via pipe
qemu: use nbdkit to serve network disks if available
util: make virCommandSetSendBuffer testable
tests: add tests for nbdkit invocation
qemu: add test for authenticating a https network disk
qemu: Monitor nbdkit process for exit
qemu: try to connect to nbdkit early to detect errors
schema: add password configuration for ssh disk
qemu: implement password auth for ssh disks with nbdkit
schema: add configuration for host verification of ssh disks
qemu: implement knownHosts for ssh disks with nbdkit
schema: add keyfile configuration for ssh disks
qemu: implement keyfile auth for ssh disks with nbdkit
schema: add ssh-agent configuration for ssh disks
qemu: implement ssh-agent auth for ssh disks with nbdkit
run: add ability to set selinux context
rpm: update spec file for for nbdkit support
build-aux/syntax-check.mk | 2 +-
docs/formatdomain.rst | 45 +-
libvirt.spec.in | 8 +
meson.build | 14 +
meson_options.txt | 1 +
po/POTFILES | 2 +
run.in | 100 +-
src/conf/domain_conf.c | 33 +
src/conf/schemas/domaincommon.rng | 55 +
src/conf/storage_source_conf.c | 3 +
src/conf/storage_source_conf.h | 6 +-
src/libvirt_private.syms | 1 +
src/qemu/meson.build | 3 +
src/qemu/qemu_block.c | 162 ++-
src/qemu/qemu_conf.c | 22 +
src/qemu/qemu_conf.h | 6 +
src/qemu/qemu_domain.c | 439 +++---
src/qemu/qemu_domain.h | 37 +-
src/qemu/qemu_driver.c | 3 +
src/qemu/qemu_extdevice.c | 62 +
src/qemu/qemu_hotplug.c | 7 +
src/qemu/qemu_logcontext.c | 329 +++++
src/qemu/qemu_logcontext.h | 41 +
src/qemu/qemu_nbdkit.c | 1280 +++++++++++++++++
src/qemu/qemu_nbdkit.h | 115 ++
src/qemu/qemu_nbdkitpriv.h | 31 +
src/qemu/qemu_process.c | 114 +-
src/util/vircommand.c | 19 +-
src/util/vircommand.h | 8 +
src/util/vircommandpriv.h | 4 +
src/util/virfilecache.c | 14 +-
src/util/virfilecache.h | 2 +-
tests/meson.build | 1 +
tests/qemublocktest.c | 2 +-
...w2-invalid.json => network-ssh-qcow2.json} | 0
...cow2-invalid.xml => network-ssh-qcow2.xml} | 0
.../disk-cdrom-network.args.disk0 | 6 +
.../disk-cdrom-network.args.disk1 | 8 +
.../disk-cdrom-network.args.disk1.pipe.778 | 1 +
.../disk-cdrom-network.args.disk2 | 8 +
.../disk-cdrom-network.args.disk2.pipe.780 | 1 +
.../disk-network-http.args.disk0 | 6 +
.../disk-network-http.args.disk1 | 5 +
.../disk-network-http.args.disk2 | 6 +
.../disk-network-http.args.disk2.pipe.778 | 1 +
.../disk-network-http.args.disk3 | 7 +
.../disk-network-http.args.disk3.pipe.780 | 1 +
...work-source-curl-nbdkit-backing.args.disk0 | 7 +
...ce-curl-nbdkit-backing.args.disk0.pipe.778 | 1 +
.../disk-network-source-curl.args.disk0 | 7 +
...sk-network-source-curl.args.disk0.pipe.778 | 1 +
.../disk-network-source-curl.args.disk1 | 9 +
...sk-network-source-curl.args.disk1.pipe.780 | 1 +
...sk-network-source-curl.args.disk1.pipe.782 | 1 +
.../disk-network-source-curl.args.disk2 | 7 +
...sk-network-source-curl.args.disk2.pipe.782 | 1 +
...sk-network-source-curl.args.disk2.pipe.784 | 1 +
.../disk-network-source-curl.args.disk3 | 6 +
.../disk-network-source-curl.args.disk4 | 6 +
.../disk-network-ssh-key.args.disk0 | 9 +
.../disk-network-ssh-key.args.disk1 | 9 +
.../disk-network-ssh-password.args.disk0 | 9 +
...k-network-ssh-password.args.disk0.pipe.778 | 1 +
.../disk-network-ssh.args.disk0 | 7 +
.../disk-network-ssh.args.disk1 | 8 +
.../disk-network-ssh.args.disk1.pipe.778 | 1 +
.../disk-network-ssh.args.disk2 | 9 +
tests/qemunbdkittest.c | 310 ++++
tests/qemustatusxml2xmldata/modern-in.xml | 4 +
...sk-cdrom-network-nbdkit.x86_64-latest.args | 42 +
.../disk-cdrom-network-nbdkit.xml | 1 +
...isk-network-http-nbdkit.x86_64-latest.args | 44 +
.../disk-network-http-nbdkit.xml | 1 +
...rce-curl-nbdkit-backing.x86_64-latest.args | 37 +
...isk-network-source-curl-nbdkit-backing.xml | 45 +
...work-source-curl-nbdkit.x86_64-latest.args | 49 +
.../disk-network-source-curl-nbdkit.xml | 1 +
...isk-network-source-curl.x86_64-latest.args | 53 +
.../disk-network-source-curl.xml | 74 +
.../qemuxml2argvdata/disk-network-ssh-key.xml | 44 +
...disk-network-ssh-nbdkit.x86_64-latest.args | 35 +
.../disk-network-ssh-nbdkit.xml | 1 +
...sk-network-ssh-password.x86_64-latest.args | 35 +
.../disk-network-ssh-password.xml | 35 +
.../disk-network-ssh.x86_64-latest.args | 35 +
tests/qemuxml2argvdata/disk-network-ssh.xml | 32 +
tests/qemuxml2argvtest.c | 19 +
tests/testutilsqemu.c | 26 +
tests/testutilsqemu.h | 4 +
89 files changed, 3545 insertions(+), 504 deletions(-)
create mode 100644 src/qemu/qemu_logcontext.c
create mode 100644 src/qemu/qemu_logcontext.h
create mode 100644 src/qemu/qemu_nbdkit.c
create mode 100644 src/qemu/qemu_nbdkit.h
create mode 100644 src/qemu/qemu_nbdkitpriv.h
rename tests/qemublocktestdata/imagecreate/{network-ssh-qcow2-invalid.json => network-ssh-qcow2.json} (100%)
rename tests/qemublocktestdata/imagecreate/{network-ssh-qcow2-invalid.xml => network-ssh-qcow2.xml} (100%)
create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk0
create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk1
create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk1.pipe.778
create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk2
create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk2.pipe.780
create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk0
create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk1
create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk2
create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk2.pipe.778
create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk3
create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk3.pipe.780
create mode 100644 tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0
create mode 100644 tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0.pipe.778
create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk0
create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk0.pipe.778
create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1
create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.780
create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.782
create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2
create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.782
create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.784
create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk3
create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk4
create mode 100644 tests/qemunbdkitdata/disk-network-ssh-key.args.disk0
create mode 100644 tests/qemunbdkitdata/disk-network-ssh-key.args.disk1
create mode 100644 tests/qemunbdkitdata/disk-network-ssh-password.args.disk0
create mode 100644 tests/qemunbdkitdata/disk-network-ssh-password.args.disk0.pipe.778
create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk0
create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk1
create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk1.pipe.778
create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk2
create mode 100644 tests/qemunbdkittest.c
create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.x86_64-latest.args
create mode 120000 tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.xml
create mode 100644 tests/qemuxml2argvdata/disk-network-http-nbdkit.x86_64-latest.args
create mode 120000 tests/qemuxml2argvdata/disk-network-http-nbdkit.xml
create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.xml
create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.x86_64-latest.args
create mode 120000 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.xml
create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl.xml
create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-key.xml
create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-nbdkit.x86_64-latest.args
create mode 120000 tests/qemuxml2argvdata/disk-network-ssh-nbdkit.xml
create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-password.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-password.xml
create mode 100644 tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/disk-network-ssh.xml
--
2.41.0
1 year, 6 months
[PATCH] qemuValidateDomainVCpuTopology: Remove misconfiguration warning
by Peter Krempa
Since commit baca59a5384 the NUMA definition is automatically fixed if
the vCPU count mismatches the NUMA cpu count so that this warning will
never be triggered.
Additionally VIR_WARN of a misconfiguration of a VM would not really
be seen in most cases as it's only simply logged.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
This was originally in my series reworking qemuxml2xmltest. I've removed
it but later figured out that it's dead code. This posting has an
updated commit message.
src/qemu/qemu_validate.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 28e4a4cc99..9e638894a9 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -761,7 +761,6 @@ qemuValidateDomainVCpuTopology(const virDomainDef *def, virQEMUCaps *qemuCaps)
def->os.machine);
unsigned int topologycpus;
unsigned int granularity;
- unsigned int numacpus;
if (virDomainDefGetVcpus(def) == 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -785,13 +784,6 @@ qemuValidateDomainVCpuTopology(const virDomainDef *def, virQEMUCaps *qemuCaps)
}
}
- numacpus = virDomainNumaGetCPUCountTotal(def->numa);
- if ((numacpus != 0) && (topologycpus != numacpus)) {
- VIR_WARN("CPU topology doesn't match numa CPU count; "
- "partial NUMA mapping is obsoleted and will "
- "be removed in future");
- }
-
/* vCPU hotplug granularity must be respected */
granularity = qemuValidateDefGetVcpuHotplugGranularity(def);
if ((virDomainDefGetVcpus(def) % granularity) != 0) {
--
2.41.0
1 year, 6 months
[libvirt PATCH v3 00/25] introduce external snapshot revert support
by Pavel Hrdina
This implements virDomainRevertToSnapshot to work with external
snapshots. In addition it modifies virDomainSnapshotDelete to work
correctly when we revert to non-leaf snapshot or when there is
non-linear snapshot tree with multiple branches.
Gitlab repo with the patches:
https://gitlab.com/hrdina/libvirt/-/tree/snapshot-revert-external
changes in v3:
- `revertdisks` is properly freed in virDomainSnapshotDefDispose()
- qemuSnapshotCreateQcow2Files() no longer takes `reuse` as argument
and was changed to take `virDomainDef *` instead of `virDomainObj *`
- proper commit message for `qemu_snapshot: use VIR_ASYNC_JOB_SNAPSHOT
when reverting snapshot`
- fixed incorrect usage of `ssize_t i`
- dropped the weird logic from qemuSnapshotRevertExternalInactive() as
we only need offline VM definition and preserve correct error message
if creating qcow files fails
- qemuSnapshotClearRevertdisks() correctly frees `revertdisks`
- added new patches 'qemuDomainGetImageIds: pass domain definition directly`
as we need to modify the function to take `virDomainDef *` directly
- qemuSnapshotDiskHasBackingDisk() now uses qemuDomainGetImageIds() to get
correct UID and GID for virStorageSourceGetMetadata() and also for
virCommandRun() as well by storing it in
`struct _qemuSnapshotDisksWithBackingStoreData`
Pavel Hrdina (25):
libvirt_private: list virDomainMomentDefPostParse
snapshot_conf: export virDomainSnapshotDiskDefClear
snapshot_conf: use alternate domain definition in
virDomainSnapshotDefAssignExternalNames
snapshot_conf: introduce <revertDisks> metadata element
virDomainSnapshotAlignDisks: Allow overriding user-configured snapshot
default
qemu_snapshot: introduce qemuSnapshotDomainDefUpdateDisk
qemu_snapshot: use virDomainDiskByName while updating domain def
qemu_snapshot: introduce qemuSnapshotCreateQcow2Files
qemuSnapshotCreateQcow2Files: use domain definition directly
qemu_snapshot: move external disk prepare to single function
qemu_snapshot: use VIR_ASYNC_JOB_SNAPSHOT when reverting snapshot
qemu_snapshot: introduce external snapshot revert support
qemu_snapshot: rename qemuSnapshotDeleteExternalPrepare
qemu_snapshot: extract external snapshot delete prepare to function
qemu_snapshot: add merge to external snapshot delete prepare data
qemu_snapshot: prepare data for non-active leaf external snapshot
deletion
qemu_snapshot: add support to delete external snapshot without block
commit
qemu_snapshot: delete: properly update parent snapshot with revert
data
qemu_snapshot: remove revertdisks when creating new snapshot
virdomainmomentobjlist: introduce virDomainMomentIsAncestor
qemuDomainGetImageIds: pass domain definition directly
qemu_snapshot: update backing store after deleting external snapshot
qemu_snapshot: check only once if snapshot is external
qemu_snapshot: add checks for external snapshot deletion
qemu_snapshot: allow snapshot revert for external snapshots
src/conf/schemas/domainsnapshot.rng | 7 +
src/conf/snapshot_conf.c | 55 +-
src/conf/snapshot_conf.h | 11 +-
src/conf/virdomainmomentobjlist.c | 17 +
src/conf/virdomainmomentobjlist.h | 4 +
src/libvirt_private.syms | 6 +
src/qemu/qemu_backup.c | 2 +-
src/qemu/qemu_blockjob.c | 2 +-
src/qemu/qemu_domain.c | 8 +-
src/qemu/qemu_domain.h | 2 +-
src/qemu/qemu_snapshot.c | 973 ++++++++++++++++++++++------
src/test/test_driver.c | 2 +-
12 files changed, 886 insertions(+), 203 deletions(-)
--
2.41.0
1 year, 6 months
