.conf file setting(s) for packet filtering backend(s)
by Laine Stump
(this probably will make no sense to anyone who hasn't spent time
looking at daemonConfig*, in which case you can go ahead and hit Delete
now. At any rate I'm just tossing this out into the void to see if
anyone has any ideas/opinions, so in *any* case feel free to hit delete!)
Happy New Year! and time for another bit of confused ramblings trying to
figure out how to do something that ends up being non-confused and
straightforward.
I'm currently working on switching the backend of the network driver
from using iptables to using nftables. Due to some functionality that is
not available with nftables (the rule that fixes up the checksum of DHCP
packets which, btw, is only relevant for *very* old guests, e.g. RHEL5),
this needs to be opt-in via a config file setting. In the meantime, in
order to make this doable in a reasonable amount of time, I am *not*
converting the nwfilter driver right away, and when I do it will need
its own config file setting for opt-in.
I've never before looked at the code for the .conf file settings at all.
I had assumed there would be some sort of "pull" API, where code in the
drivers could call, e.g. virConfGetString("filter_backend") and it would
return the config setting to the caller. But when I look at it, I see
that all daemons use the same daemonConfigLoadFile() called from
remote_daemon.c:main() (which is shared by all the daemons) and the
daemonConfig object that is created to hold the config settings that are
read is only visible within main() - the only way that a config setting
is used is by main() "pushing" it out to a static variable somewhere
else where it is later retrieved by the interested party, e.g. the way
that main() calls daemonSetupNetDevOpenvswitch(config), which then sets
the static virNetDevOpenvswitchTimeout in util/virnetdevopenvswitch.c.
(NB: util/virnetdevopenvswitch.c is linked into every deamon, so even
for the daemons that don't use it, calls to virnetdevopenvswitch.c
functions still compile properly (and calling them is harmless), so
virNetDevOpenvswitchTimeout is set even for daemons that never call
openvswitch APIs).
If I could count on all builds using split daemons (i.e. separate
virtnetworkd and virtnwfilterd) then I could add a similar API in
virfirewall.c that remote_daemon.c:main() could use to set
"filter_backend" into a static in virfirewall.c (which is used by both
drivers) and everything would just happily work:
virtnetworkd.conf:
filter_backend = nftables
virtnwfilterd.conf
filter_backend = iptables
However, I need to also deal with the possibility that the nwfilter and
network drivers are in the same unified libvirtd binary, and in that
case both drivers would have the same virfirewall.c:filter_backend
setting, thus making it impossible to use the iptables backend for the
nwfilter driver and nftables backend for the network driver. For that
case I would need separate settings in the config for each driver, e.g.
libvirtd.conf:
network_filter_backend = nftables
nwfilter_backend = iptables
and then those would need to be stored off somewhere different for each
driver, then they would use it to set the backend for each virFirewall
object as it is created. Organizationally, it would make the most sense
for these settings (and the API to set them) to be located in the
drivers that use them (so, for example, network_filter_backend could
live in network/bridge_driver_linux.c and nwfilter_backend could live in
nwfilter/nwfilter_driver.c). But that would mean that
remote_daemon.c:main() would need to directly call functions in those
files, which is a no-no (because, in the case of split daemons, you
either have one or the other at build time, but never both).
So should I perhaps declare the nftables backend for nwfilter to be a
lost cause until everyone moves to split daemons, add a "filter_backend"
setting that is directly set in virfirewall.c (by
remote_daemon.c:main()), and then provide some sort of override in
virFirewallNew so calls from the nwfilter driver can say "ignore the
filter_backend setting and use iptables"?
Or should we make the virConf APIs beefier, and add facilities to save
off the entire daemonConfig object and make its contents available via
something like virConfGetString("network_filter_backend")?
But if I did that, it would mean two differently-named config entries,
and it would certainly be nice if I didn't have to introduce
daemon-specific names like this that would need to be carried over from
libvirtd.conf into virtnwfilterd.conf and virtnetworkd.conf (where
differing names would no longer be required). I suppose I could go "full
MS" and introduce the concept of sections to the conf file, so
libvirtd.conf could have something like this:
[network]
filter_backend = nftables
[nwfilter]
filter_backend = iptables
but that seems like a lot of work for something that will be obsolete in
a year or so anyway (when the unified daemon is a thing of the past).
Am I thinking about details too much and missing an obvious simple solution?
(I think until/unless I or someone else comes up with a better idea, I'm
going to go with a single filter_backend setting set in virfirewall.c
that is somehow overridden when the virFirewall calls come from the
nwfilter driver. Then if everyone moves to split daemons before I get
around to making the nwfilter driver support nftables, the problem will
end up just solving itself; otherwise I can think of some other piece of
ugliness to make it work).
3 years, 3 months
- 2
- 3
[PATCH] src: Don't check for retval of some glib functions
by Michal Privoznik
There are a few glib functions that abort on OOM and thus there's
no point in checking their retval against NULL. Nevertheless, we
do have those checks in a few places. Remove them.
Generated using the following spatch:
@@
expression x;
identifier n;
expression r;
@@
(
x = g_strdup_printf(...);
| x = g_strdup_vprintf(...);
| x = g_strdup(...);
| x = g_strndup(...);
| x = g_new0(...);
| x = g_realloc(...);
)
... when != x
- if(!x)
(
- return r;
|
- goto n;
)
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/hyperv/hyperv_driver.c | 14 --------------
src/util/virprocess.c | 2 --
2 files changed, 16 deletions(-)
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 3327f0132e..7b684e04ba 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -482,8 +482,6 @@ hypervDomainAddVirtualDiskParent(virDomainPtr domain,
parent__PATH = g_strdup_printf("\\\\%s\\Root\\Virtualization\\V2:"
"Msvm_ResourceAllocationSettingData.InstanceID=\"%s\"",
hostname, parentInstanceIDEscaped);
- if (!parent__PATH)
- return -1;
if (hypervSetEmbeddedProperty(controllerResource, "Parent", parent__PATH) < 0)
return -1;
@@ -529,9 +527,6 @@ hypervDomainAddVirtualHardDisk(virDomainPtr domain,
"Msvm_ResourceAllocationSettingData.InstanceID=\"%s\"",
hostname, vhdInstanceIdEscaped);
- if (!vhd__PATH)
- return -1;
-
if (hypervSetEmbeddedProperty(volumeResource, "Parent", vhd__PATH) < 0)
return -1;
@@ -660,8 +655,6 @@ hypervDomainAttachPhysicalDisk(virDomainPtr domain,
controller__PATH = g_strdup_printf("\\\\%s\\Root\\Virtualization\\V2:"
"Msvm_ResourceAllocationSettingData.InstanceID=\"%s\"",
hostname, controllerInstanceIdEscaped);
- if (!controller__PATH)
- return -1;
if (hypervSetEmbeddedProperty(diskResource, "Parent", controller__PATH) < 0)
return -1;
@@ -711,8 +704,6 @@ hypervDomainAddOpticalDrive(virDomainPtr domain,
parent__PATH = g_strdup_printf("\\\\%s\\Root\\Virtualization\\V2:"
"Msvm_ResourceAllocationSettingData.InstanceID=\"%s\"",
hostname, parentInstanceIDEscaped);
- if (!parent__PATH)
- return -1;
if (hypervSetEmbeddedProperty(driveResource, "Parent", parent__PATH) < 0)
return -1;
@@ -756,8 +747,6 @@ hypervDomainAddOpticalDisk(virDomainPtr domain,
vhd__PATH = g_strdup_printf("\\\\%s\\Root\\Virtualization\\V2:"
"Msvm_ResourceAllocationSettingData.InstanceID=\"%s\"",
hostname, vhdInstanceIdEscaped);
- if (!vhd__PATH)
- return -1;
if (hypervSetEmbeddedProperty(volumeResource, "Parent", vhd__PATH) < 0)
return -1;
@@ -829,9 +818,6 @@ hypervDomainAttachFloppy(virDomainPtr domain,
"Msvm_ResourceAllocationSettingData.InstanceID=\"%s\"",
hostname, vhdInstanceIdEscaped);
- if (!vfd__PATH)
- return -1;
-
if (hypervSetEmbeddedProperty(volumeResource, "Parent", vfd__PATH) < 0)
return -1;
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index c74bd16fe6..66b20b0a33 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -1826,8 +1826,6 @@ virProcessGetSchedInfo(unsigned long long *cpuWait,
proc = g_strdup_printf("/proc/%d/task/%d/sched", (int) pid, (int) tid);
else
proc = g_strdup_printf("/proc/%d/sched", (int) pid);
- if (!proc)
- return -1;
/* The file is not guaranteed to exist (needs CONFIG_SCHED_DEBUG) */
if (access(proc, R_OK) < 0) {
--
2.34.1
3 years, 3 months
- 2
- 1
[PATCH] change return type of virURIParamAppend() to void type
by Ani Sinha
virURIParamAppend() unconditionally returns 0. Simplify and make the return type
as void type.
Signed-off-by: Ani Sinha <ani(a)anisinha.ca>
---
src/util/viruri.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/util/viruri.c b/src/util/viruri.c
index 3c73188a55..88bb0cc1f8 100644
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -34,7 +34,7 @@
VIR_LOG_INIT("util.uri");
-static int
+static void
virURIParamAppend(virURI *uri,
const char *name,
const char *value)
@@ -52,7 +52,7 @@ virURIParamAppend(virURI *uri,
uri->params[uri->paramsCount].ignore = false;
uri->paramsCount++;
- return 0;
+ return;
}
@@ -113,8 +113,7 @@ virURIParseParams(virURI *uri)
}
/* Append to the parameter set. */
- if (virURIParamAppend(uri, name, NULLSTR_EMPTY(value)) < 0)
- return -1;
+ virURIParamAppend(uri, name, NULLSTR_EMPTY(value));
next:
query = end;
--
2.25.1
3 years, 3 months
- 2
- 1
[PATCH] NEWS: Fix indentation
by Andrea Bolognani
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
Pushed as trivial.
NEWS.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/NEWS.rst b/NEWS.rst
index 3c06fdde0f..7ee03fde0e 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -42,12 +42,12 @@ v8.0.0 (unreleased)
as ``VIR_MIGRATE_NON_SHARED_SYNCHRONOUS_WRITES`` exposed via
``virsh migrate --copy-storage-synchronous-writes``.
- * Introduce TCG domain features
+ * Introduce TCG domain features
Libvirt is now able to set the size of translation block cache size
(tb-size) for TCG domains.
- * qemu: Add new API to inject a launch secret in a domain
+ * qemu: Add new API to inject a launch secret in a domain
New API ``virDomainSetLaunchSecurityState()`` and virsh command
``domsetlaunchsecstate`` are added to support injecting a launch secret
--
2.31.1
3 years, 3 months
- 1
- 0
[PATCH 00/21] qemuxml2*test: Improve handling of capabilities
by Peter Krempa
This series originally started as an attempt to remove pointless copying
of capabilitiy objects in the qemuxml2argvtest which actually took ~40%
of the runtime of the test.
Obviously few snags and places for improvements were noticed along the
way.
Peter Krempa (21):
qemuProcessPrepareQEMUCaps: Don't clear
QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE
qemuDomainNeedsFDC: Simplify and improve checking if a machine needs
FDC
qemuxml2argvtest: Remove redundant floppy controller tests
testutilsqemu: Remove unused non-x86 fake machine types
tests: qemuxml2argvdata: Remove use of 'pc-1.0' and 'pc-1.2' machine
types
tests: qemuxml2argvdata: Remove specific q35 machine types from
fake-caps tests
qemuxml2xmltest: Replace 'interface-server' by 'net-server' test case
qemuxml2(argv|xml)test: Enable 'controller-usb-order' for qemuxml2argv
and convert it to latest caps
qemuxml2(argv|xml)test: Unify usage of DO_TEST_CAPS_LATEST
tests: qemuxml2argvdata: Purge versioned i440fx machine types from
fake-caps tests
qemuhotplugtestdomains: Remove unnecessary use of versioned pc machine
types
securityselinuxlabeldata: Purge unneeded versioned machine type
testutilsqemu: Remove unused fake-caps x86 machine types
qemuxml2argvdata: Use proper arch and emulator for x86 real capability
tests
qemuxml2argvdata: Use proper arch and emulator for aarch64 real
capability tests
qemuxml2argvtest: Don't insert capabilities into cache twice
qemuxml2(xml|argv)test: Test real state of things with
'x86-kvm-32-on-64'
qemuxml2argvtest: Enable qemuxml2argv version of 'blkdeviotune' test
qemuxml2argvtest: Convert 'missing-machine' to DO_TEST_CAPS_LATEST
qemuTestCapsCacheInsert: Extract code for popluating fake machine
types
qemuTestCapsCacheInsert: Rewrite caps cache insertion
src/qemu/qemu_domain.c | 17 +-
src/qemu/qemu_process.c | 9 +-
...g-console-compat-2-live+console-virtio.xml | 2 +-
.../qemuhotplug-console-compat-2-live.xml | 2 +-
tests/qemusecuritytest.c | 3 +-
.../audio-alsa-best.x86_64-4.1.0.args | 2 +-
.../audio-alsa-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-alsa-best.xml | 4 +-
.../audio-alsa-full.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-alsa-full.xml | 4 +-
.../audio-alsa-minimal.x86_64-4.1.0.args | 2 +-
.../audio-alsa-minimal.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-alsa-minimal.xml | 4 +-
.../audio-coreaudio-best.x86_64-4.1.0.args | 2 +-
.../audio-coreaudio-best.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/audio-coreaudio-best.xml | 4 +-
.../audio-coreaudio-full.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/audio-coreaudio-full.xml | 4 +-
.../audio-coreaudio-minimal.x86_64-4.1.0.args | 2 +-
...audio-coreaudio-minimal.x86_64-latest.args | 2 +-
.../audio-coreaudio-minimal.xml | 4 +-
...audio-default-nographics.x86_64-4.1.0.args | 2 +-
...udio-default-nographics.x86_64-latest.args | 2 +-
.../audio-default-nographics.xml | 4 +-
tests/qemuxml2argvdata/audio-default-sdl.args | 2 +-
.../audio-default-sdl.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-default-sdl.xml | 4 +-
.../qemuxml2argvdata/audio-default-spice.args | 2 +-
.../audio-default-spice.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/audio-default-spice.xml | 4 +-
tests/qemuxml2argvdata/audio-default-vnc.args | 2 +-
.../audio-default-vnc.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-default-vnc.xml | 4 +-
.../audio-file-best.x86_64-4.1.0.args | 2 +-
.../audio-file-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-file-best.xml | 4 +-
.../audio-file-full.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-file-full.xml | 4 +-
.../audio-file-minimal.x86_64-4.1.0.args | 2 +-
.../audio-file-minimal.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-file-minimal.xml | 4 +-
.../audio-jack-full.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-jack-full.xml | 4 +-
.../audio-jack-minimal.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-jack-minimal.xml | 4 +-
.../audio-many-backends.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/audio-many-backends.xml | 4 +-
.../audio-none-best.x86_64-4.1.0.args | 2 +-
.../audio-none-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-none-best.xml | 4 +-
.../audio-none-full.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-none-full.xml | 4 +-
.../audio-none-minimal.x86_64-4.1.0.args | 2 +-
.../audio-none-minimal.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-none-minimal.xml | 4 +-
.../audio-oss-best.x86_64-4.1.0.args | 2 +-
.../audio-oss-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-oss-best.xml | 4 +-
.../audio-oss-full.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-oss-full.xml | 4 +-
.../audio-oss-minimal.x86_64-4.1.0.args | 2 +-
.../audio-oss-minimal.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-oss-minimal.xml | 4 +-
.../audio-pulseaudio-best.x86_64-4.1.0.args | 2 +-
.../audio-pulseaudio-best.x86_64-latest.args | 2 +-
.../audio-pulseaudio-best.xml | 4 +-
.../audio-pulseaudio-full.x86_64-latest.args | 2 +-
.../audio-pulseaudio-full.xml | 4 +-
...audio-pulseaudio-minimal.x86_64-4.1.0.args | 2 +-
...udio-pulseaudio-minimal.x86_64-latest.args | 2 +-
.../audio-pulseaudio-minimal.xml | 4 +-
.../audio-sdl-best.x86_64-4.1.0.args | 2 +-
.../audio-sdl-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-sdl-best.xml | 4 +-
.../audio-sdl-full.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-sdl-full.xml | 4 +-
.../audio-sdl-minimal.x86_64-4.1.0.args | 2 +-
.../audio-sdl-minimal.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-sdl-minimal.xml | 4 +-
.../audio-spice-best.x86_64-4.1.0.args | 2 +-
.../audio-spice-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-spice-best.xml | 4 +-
.../audio-spice-full.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-spice-full.xml | 4 +-
.../audio-spice-minimal.x86_64-4.1.0.args | 2 +-
.../audio-spice-minimal.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/audio-spice-minimal.xml | 4 +-
tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +-
tests/qemuxml2argvdata/bios-nvram-secure.xml | 2 +-
.../blkdeviotune-group-num.x86_64-4.1.0.args | 2 +-
.../blkdeviotune-group-num.x86_64-latest.args | 2 +-
.../blkdeviotune-group-num.xml | 4 +-
.../blkdeviotune-max-length.x86_64-4.1.0.args | 2 +-
...blkdeviotune-max-length.x86_64-latest.args | 2 +-
.../blkdeviotune-max-length.xml | 4 +-
.../blkdeviotune-max.x86_64-4.1.0.args | 2 +-
.../blkdeviotune-max.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/blkdeviotune-max.xml | 4 +-
.../blkdeviotune.x86_64-latest.args | 40 ++++
tests/qemuxml2argvdata/blkdeviotune.xml | 4 +-
tests/qemuxml2argvdata/boot-floppy-q35.args | 2 +-
tests/qemuxml2argvdata/boot-floppy-q35.xml | 2 +-
.../qemuxml2argvdata/console-compat-auto.args | 2 +-
.../console-compat-auto.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/console-compat-auto.xml | 4 +-
.../console-compat-chardev.args | 2 +-
.../console-compat-chardev.x86_64-latest.args | 2 +-
.../console-compat-chardev.xml | 4 +-
tests/qemuxml2argvdata/console-compat.args | 2 +-
.../console-compat.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/console-compat.xml | 4 +-
.../controller-usb-order.x86_64-latest.args | 38 ++++
.../controller-virtio-scsi.x86_64-latest.args | 2 +-
.../controller-virtio-scsi.xml | 4 +-
.../disk-address-conflict.xml | 4 +-
.../disk-aio.x86_64-2.12.0.args | 2 +-
.../disk-aio.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-aio.xml | 4 +-
.../disk-arm-virtio-sd.aarch64-4.0.0.args | 3 +-
.../disk-arm-virtio-sd.aarch64-latest.args | 3 +-
tests/qemuxml2argvdata/disk-arm-virtio-sd.xml | 5 +-
.../disk-attaching-partition-nosupport.xml | 4 +-
.../disk-backing-chains-index.xml | 4 +-
...-backing-chains-noindex.x86_64-2.12.0.args | 2 +-
...-backing-chains-noindex.x86_64-latest.args | 2 +-
.../disk-backing-chains-noindex.xml | 4 +-
.../disk-blockio.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-blockio.xml | 4 +-
.../disk-boot-cdrom.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-boot-cdrom.xml | 4 +-
.../disk-boot-disk.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-boot-disk.xml | 4 +-
.../disk-cdrom-bus-other.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/disk-cdrom-bus-other.xml | 4 +-
...m-empty-network-invalid.x86_64-latest.args | 2 +-
.../disk-cdrom-empty-network-invalid.xml | 4 +-
.../disk-cdrom.x86_64-2.12.0.args | 2 +-
.../disk-cdrom.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom.xml | 4 +-
.../disk-device-lun-type-invalid.xml | 4 +-
.../disk-error-policy.x86_64-2.12.0.args | 2 +-
.../disk-error-policy.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-error-policy.xml | 4 +-
.../disk-fdc-incompatible-address.xml | 4 +-
.../disk-floppy-q35-2_11.x86_64-latest.args | 42 ----
.../qemuxml2argvdata/disk-floppy-q35-2_11.xml | 38 ----
.../disk-floppy-q35-2_9.x86_64-2.12.0.args | 36 ----
...rgs => disk-floppy-q35.x86_64-2.12.0.args} | 2 +-
...rgs => disk-floppy-q35.x86_64-latest.args} | 2 +-
...floppy-q35-2_9.xml => disk-floppy-q35.xml} | 2 +-
.../disk-floppy-tray.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-floppy-tray.xml | 4 +-
.../disk-floppy.x86_64-2.12.0.args | 2 +-
.../disk-floppy.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-floppy.xml | 4 +-
tests/qemuxml2argvdata/disk-fmt-cow.xml | 4 +-
tests/qemuxml2argvdata/disk-fmt-dir.xml | 4 +-
tests/qemuxml2argvdata/disk-fmt-iso.xml | 4 +-
.../disk-fmt-qcow.x86_64-4.1.0.args | 2 +-
.../disk-fmt-qcow.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-fmt-qcow.xml | 4 +-
.../disk-geometry.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-geometry.xml | 4 +-
.../disk-hostdev-scsi-address-conflict.xml | 4 +-
.../disk-ide-incompatible-address.xml | 4 +-
.../disk-ide-split.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-ide-split.xml | 4 +-
.../disk-ide-wwn.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-ide-wwn.xml | 4 +-
.../disk-metadata-cache.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/disk-metadata-cache.xml | 4 +-
.../disk-missing-target-invalid.xml | 4 +-
.../disk-network-gluster.x86_64-2.12.0.args | 2 +-
.../disk-network-gluster.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/disk-network-gluster.xml | 4 +-
...-network-iscsi-auth-secrettype-invalid.xml | 4 +-
...sk-network-iscsi-auth-wrong-secrettype.xml | 4 +-
.../disk-network-iscsi.x86_64-2.12.0.args | 2 +-
.../disk-network-iscsi.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-network-iscsi.xml | 4 +-
.../disk-network-nbd.x86_64-2.12.0.args | 2 +-
.../disk-network-nbd.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-network-nbd.xml | 4 +-
tests/qemuxml2argvdata/disk-network-nfs.xml | 2 +-
...sk-network-rbd-no-colon.x86_64-latest.args | 2 +-
.../disk-network-rbd-no-colon.xml | 4 +-
.../disk-network-rbd.x86_64-2.12.0.args | 2 +-
.../disk-network-rbd.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-network-rbd.xml | 4 +-
.../disk-network-sheepdog.x86_64-2.12.0.args | 2 +-
.../disk-network-sheepdog.x86_64-6.0.0.args | 2 +-
.../disk-network-sheepdog.xml | 4 +-
.../disk-network-source-auth-both.xml | 4 +-
...isk-network-source-auth.x86_64-2.12.0.args | 2 +-
...isk-network-source-auth.x86_64-latest.args | 2 +-
.../disk-network-source-auth.xml | 4 +-
...isk-network-tlsx509-nbd.x86_64-2.12.0.args | 1 -
.../disk-network-tlsx509-nbd.xml | 2 +-
...sk-network-tlsx509-vxhs.x86_64-2.12.0.args | 1 -
.../disk-network-tlsx509-vxhs.xml | 2 +-
.../disk-no-boot.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-no-boot.xml | 4 +-
.../disk-nvme.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-nvme.xml | 4 +-
.../disk-order.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-order.xml | 4 +-
.../disk-readonly-disk.x86_64-2.12.0.args | 2 +-
.../disk-readonly-disk.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-readonly-disk.xml | 4 +-
.../disk-rotation.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-rotation.xml | 4 +-
tests/qemuxml2argvdata/disk-same-targets.xml | 4 +-
.../disk-sata-device.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-sata-device.xml | 4 +-
.../disk-sata-incompatible-address.xml | 4 +-
.../disk-scsi-device-auto.x86_64-latest.args | 2 +-
.../disk-scsi-device-auto.xml | 4 +-
.../disk-scsi-disk-split.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/disk-scsi-disk-split.xml | 4 +-
.../disk-scsi-disk-vpd-build-error.xml | 4 +-
.../disk-scsi-disk-vpd.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml | 4 +-
.../disk-scsi-disk-wwn.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml | 4 +-
.../disk-scsi-incompatible-address.xml | 4 +-
...sk-scsi-lun-passthrough.x86_64-latest.args | 2 +-
.../disk-scsi-lun-passthrough.xml | 4 +-
.../disk-scsi.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-scsi.xml | 4 +-
.../disk-serial.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-serial.xml | 4 +-
tests/qemuxml2argvdata/disk-shared-qcow.xml | 4 +-
.../disk-shared.x86_64-2.12.0.args | 2 +-
.../disk-shared.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-shared.xml | 4 +-
.../disk-slices.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-slices.xml | 4 +-
.../disk-snapshot.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-snapshot.xml | 4 +-
.../disk-source-pool-mode.x86_64-4.1.0.args | 2 +-
.../disk-source-pool-mode.x86_64-latest.args | 2 +-
.../disk-source-pool-mode.xml | 4 +-
.../disk-source-pool.x86_64-4.1.0.args | 2 +-
.../disk-source-pool.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-source-pool.xml | 4 +-
.../disk-transient.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-transient.xml | 4 +-
...sk-usb-device-removable.x86_64-latest.args | 2 +-
.../disk-usb-device-removable.xml | 4 +-
.../disk-usb-device.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-usb-device.xml | 4 +-
tests/qemuxml2argvdata/disk-usb-pci.xml | 4 +-
tests/qemuxml2argvdata/disk-vhostuser.xml | 2 +-
.../disk-virtio-queues.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-virtio-queues.xml | 4 +-
...irtio-scsi-reservations.x86_64-2.12.0.args | 2 +-
...virtio-scsi-reservations.x86_64-5.2.0.args | 2 +-
...irtio-scsi-reservations.x86_64-latest.args | 2 +-
.../disk-virtio-scsi-reservations.xml | 4 +-
.../disk-virtio.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-virtio.xml | 4 +-
.../encrypted-disk-usage.x86_64-4.1.0.args | 2 +-
.../encrypted-disk-usage.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/encrypted-disk-usage.xml | 4 +-
.../encrypted-disk.x86_64-4.1.0.args | 2 +-
.../encrypted-disk.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/encrypted-disk.xml | 4 +-
.../eoi-disabled.x86_64-4.0.0.args | 4 +-
.../eoi-disabled.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/eoi-disabled.xml | 4 +-
.../eoi-enabled.x86_64-4.0.0.args | 4 +-
.../eoi-enabled.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/eoi-enabled.xml | 4 +-
.../fd-memory-no-numa-topology.args | 2 +-
.../fd-memory-no-numa-topology.xml | 2 +-
.../fd-memory-numa-topology.args | 2 +-
.../fd-memory-numa-topology.xml | 2 +-
.../fd-memory-numa-topology2.args | 2 +-
.../fd-memory-numa-topology2.xml | 2 +-
.../fd-memory-numa-topology3.args | 2 +-
.../fd-memory-numa-topology3.xml | 2 +-
.../fips-enabled.x86_64-5.1.0.args | 2 +-
.../fips-enabled.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/fips-enabled.xml | 4 +-
.../floppy-drive-fat.x86_64-2.12.0.args | 2 +-
.../floppy-drive-fat.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/floppy-drive-fat.xml | 4 +-
.../qemuxml2argvdata/fs9p.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/fs9p.xml | 4 +-
...egl-headless-rendernode.x86_64-latest.args | 2 +-
.../graphics-egl-headless-rendernode.xml | 4 +-
.../graphics-egl-headless.args | 2 +-
.../graphics-egl-headless.x86_64-latest.args | 2 +-
.../graphics-egl-headless.xml | 4 +-
.../graphics-sdl-egl-headless.xml | 4 +-
...s-spice-agent-file-xfer.x86_64-latest.args | 2 +-
.../graphics-spice-agent-file-xfer.xml | 4 +-
...aphics-spice-agentmouse.x86_64-latest.args | 2 +-
.../graphics-spice-agentmouse.xml | 4 +-
...s-spice-auto-socket-cfg.x86_64-latest.args | 2 +-
.../graphics-spice-auto-socket-cfg.xml | 4 +-
...phics-spice-auto-socket.x86_64-latest.args | 2 +-
.../graphics-spice-auto-socket.xml | 4 +-
...phics-spice-compression.x86_64-latest.args | 2 +-
.../graphics-spice-compression.xml | 4 +-
...hics-spice-egl-headless.x86_64-latest.args | 2 +-
.../graphics-spice-egl-headless.xml | 4 +-
...pice-gl-auto-rendernode.x86_64-latest.args | 2 +-
.../graphics-spice-gl-auto-rendernode.xml | 4 +-
.../graphics-spice-invalid-egl-headless.xml | 4 +-
.../graphics-spice-no-args.x86_64-latest.args | 2 +-
.../graphics-spice-no-args.xml | 4 +-
.../graphics-spice-qxl-vga.x86_64-latest.args | 2 +-
.../graphics-spice-qxl-vga.xml | 4 +-
.../graphics-spice-sasl.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/graphics-spice-sasl.xml | 4 +-
.../graphics-spice-socket.x86_64-latest.args | 2 +-
.../graphics-spice-socket.xml | 4 +-
.../graphics-spice-timeout.x86_64-latest.args | 2 +-
.../graphics-spice-timeout.xml | 4 +-
...raphics-spice-usb-redir.x86_64-latest.args | 2 +-
.../graphics-spice-usb-redir.xml | 4 +-
.../graphics-spice.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/graphics-spice.xml | 4 +-
...ics-vnc-auto-socket-cfg.x86_64-2.11.0.args | 2 +-
...ics-vnc-auto-socket-cfg.x86_64-latest.args | 2 +-
.../graphics-vnc-auto-socket-cfg.xml | 4 +-
...raphics-vnc-auto-socket.x86_64-2.11.0.args | 2 +-
...raphics-vnc-auto-socket.x86_64-latest.args | 2 +-
.../graphics-vnc-auto-socket.xml | 4 +-
...aphics-vnc-egl-headless.x86_64-2.11.0.args | 2 +-
...aphics-vnc-egl-headless.x86_64-latest.args | 2 +-
.../graphics-vnc-egl-headless.xml | 4 +-
...hics-vnc-no-listen-attr.x86_64-2.11.0.args | 2 +-
...hics-vnc-no-listen-attr.x86_64-latest.args | 2 +-
.../graphics-vnc-no-listen-attr.xml | 4 +-
.../graphics-vnc-none.x86_64-2.11.0.args | 2 +-
.../graphics-vnc-none.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-none.xml | 4 +-
.../graphics-vnc-policy.x86_64-2.11.0.args | 2 +-
.../graphics-vnc-policy.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/graphics-vnc-policy.xml | 4 +-
.../graphics-vnc-power.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-power.xml | 4 +-
...remove-generated-socket.x86_64-2.11.0.args | 2 +-
...remove-generated-socket.x86_64-latest.args | 2 +-
.../graphics-vnc-remove-generated-socket.xml | 4 +-
.../graphics-vnc-sasl.x86_64-2.11.0.args | 2 +-
.../graphics-vnc-sasl.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-sasl.xml | 4 +-
...-vnc-socket-new-cmdline.x86_64-2.11.0.args | 2 +-
...-vnc-socket-new-cmdline.x86_64-latest.args | 2 +-
.../graphics-vnc-socket-new-cmdline.xml | 4 +-
.../graphics-vnc-socket.x86_64-2.11.0.args | 2 +-
.../graphics-vnc-socket.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/graphics-vnc-socket.xml | 4 +-
.../graphics-vnc-tls-secret.x86_64-5.2.0.args | 2 +-
...graphics-vnc-tls-secret.x86_64-latest.args | 2 +-
.../graphics-vnc-tls-secret.xml | 4 +-
.../graphics-vnc-tls.x86_64-2.11.0.args | 2 +-
.../graphics-vnc-tls.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-tls.xml | 4 +-
.../graphics-vnc-websocket.x86_64-2.11.0.args | 2 +-
.../graphics-vnc-websocket.x86_64-latest.args | 2 +-
.../graphics-vnc-websocket.xml | 4 +-
.../graphics-vnc.x86_64-2.11.0.args | 2 +-
.../graphics-vnc.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc.xml | 4 +-
...tdev-mdev-display-ramfb.x86_64-latest.args | 2 +-
.../hostdev-mdev-display-ramfb.xml | 4 +-
...play-spice-egl-headless.x86_64-latest.args | 2 +-
...ostdev-mdev-display-spice-egl-headless.xml | 4 +-
...ev-display-spice-opengl.x86_64-latest.args | 2 +-
.../hostdev-mdev-display-spice-opengl.xml | 4 +-
...isplay-vnc-egl-headless.x86_64-latest.args | 2 +-
.../hostdev-mdev-display-vnc-egl-headless.xml | 4 +-
...ostdev-mdev-display-vnc.x86_64-latest.args | 2 +-
.../hostdev-mdev-display-vnc.xml | 4 +-
.../hostdev-scsi-lsi.x86_64-4.1.0.args | 2 +-
.../hostdev-scsi-lsi.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-lsi.xml | 4 +-
.../hostdev-scsi-vhost-scsi-pci-boot-fail.xml | 4 +-
.../hostdev-scsi-vhost-scsi-pcie.args | 2 +-
.../hostdev-scsi-vhost-scsi-pcie.xml | 2 +-
...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 2 +-
...ostdev-scsi-virtio-scsi.x86_64-latest.args | 2 +-
.../hostdev-scsi-virtio-scsi.xml | 4 +-
.../hostdevs-drive-address-conflict.xml | 4 +-
.../hugepages-memaccess3.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/hugepages-memaccess3.xml | 2 +-
.../hugepages-numa-default-dimm.args | 2 +-
.../hugepages-numa-default-dimm.xml | 2 +-
.../hugepages-numa-default.args | 2 +-
.../hugepages-numa-default.xml | 2 +-
.../hugepages-nvdimm.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/hugepages-nvdimm.xml | 4 +-
.../hyperv-off.x86_64-4.0.0.args | 2 +-
.../hyperv-off.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/hyperv-off.xml | 4 +-
.../hyperv-panic.x86_64-4.0.0.args | 4 +-
.../hyperv-panic.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/hyperv-panic.xml | 4 +-
.../hyperv-passthrough.x86_64-6.1.0.args | 2 +-
.../hyperv-passthrough.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/hyperv-passthrough.xml | 4 +-
.../hyperv-stimer-direct.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/hyperv-stimer-direct.xml | 4 +-
.../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 4 +-
.../hyperv.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/hyperv.xml | 4 +-
.../input-linux.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/input-linux.xml | 4 +-
tests/qemuxml2argvdata/interface-server.xml | 131 ------------
...othreads-virtio-scsi-pci.x86_64-5.2.0.args | 2 +-
...threads-virtio-scsi-pci.x86_64-latest.args | 2 +-
.../iothreads-virtio-scsi-pci.xml | 4 +-
.../kvmclock+eoi-disabled.x86_64-4.0.0.args | 4 +-
.../kvmclock+eoi-disabled.x86_64-latest.args | 2 +-
.../kvmclock+eoi-disabled.xml | 4 +-
...v-missing-platform-info.x86_64-2.12.0.args | 2 +-
...nch-security-sev-missing-platform-info.xml | 2 +-
.../luks-disks.x86_64-4.1.0.args | 1 +
tests/qemuxml2argvdata/luks-disks.xml | 5 +-
.../memfd-memory-default-hugepage.xml | 5 +-
tests/qemuxml2argvdata/memfd-memory-numa.xml | 5 +-
...y-hotplug-nvdimm-access.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-access.xml | 4 +-
...ory-hotplug-nvdimm-align.x86_64-5.2.0.args | 2 +-
...ry-hotplug-nvdimm-align.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-align.xml | 4 +-
...ory-hotplug-nvdimm-label.x86_64-5.2.0.args | 2 +-
...ry-hotplug-nvdimm-label.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-label.xml | 4 +-
...mory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 2 +-
...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-pmem.xml | 4 +-
...-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 2 +-
...hotplug-nvdimm-readonly.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-readonly.xml | 4 +-
.../memory-hotplug-nvdimm.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm.xml | 4 +-
...mory-hotplug-virtio-mem.x86_64-latest.args | 2 +-
.../memory-hotplug-virtio-mem.xml | 2 +-
...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 2 +-
...ory-hotplug-virtio-pmem.x86_64-latest.args | 2 +-
.../memory-hotplug-virtio-pmem.xml | 2 +-
.../misc-no-reboot.x86_64-5.2.0.args | 2 +-
.../misc-no-reboot.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/misc-no-reboot.xml | 4 +-
tests/qemuxml2argvdata/missing-machine.err | 1 -
.../missing-machine.x86_64-latest.err | 1 +
tests/qemuxml2argvdata/missing-machine.xml | 2 +-
.../mlock-off.x86_64-3.0.0.args | 2 +-
.../mlock-off.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/mlock-off.xml | 4 +-
.../mlock-on.x86_64-3.0.0.args | 2 +-
.../mlock-on.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/mlock-on.xml | 4 +-
.../name-escape.x86_64-2.11.0.args | 2 +-
.../name-escape.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/name-escape.xml | 4 +-
tests/qemuxml2argvdata/net-user.args | 2 +-
.../net-user.x86_64-4.0.0.args | 2 +-
tests/qemuxml2argvdata/net-user.xml | 4 +-
.../net-vdpa.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/net-vdpa.xml | 4 +-
tests/qemuxml2argvdata/net-vhostuser.args | 2 +-
.../net-vhostuser.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/net-vhostuser.xml | 4 +-
.../qemuxml2argvdata/pages-dimm-discard.args | 2 +-
tests/qemuxml2argvdata/pages-dimm-discard.xml | 2 +-
.../panic-double.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/panic-double.xml | 4 +-
.../panic-no-address.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/panic-no-address.xml | 4 +-
.../qemuxml2argvdata/panic.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/panic.xml | 4 +-
.../parallel-parport-chardev.args | 2 +-
...arallel-parport-chardev.x86_64-latest.args | 2 +-
.../parallel-parport-chardev.xml | 4 +-
.../parallel-tcp-chardev.args | 2 +-
.../parallel-tcp-chardev.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/parallel-tcp-chardev.xml | 4 +-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-addr.xml | 2 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-idx.xml | 2 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +-
tests/qemuxml2argvdata/pci-autofill-addr.xml | 2 +-
.../pci-bridge-duplicate-index.xml | 2 +-
.../pci-bridge-many-disks.args | 2 +-
.../pci-bridge-many-disks.xml | 2 +-
.../pci-bridge-negative-index-invalid.xml | 2 +-
tests/qemuxml2argvdata/pci-bridge.args | 2 +-
tests/qemuxml2argvdata/pci-bridge.xml | 2 +-
.../pci-expander-bus-bad-bus.xml | 2 +-
.../pci-expander-bus-bad-node.xml | 2 +-
tests/qemuxml2argvdata/pci-expander-bus.args | 2 +-
tests/qemuxml2argvdata/pci-expander-bus.xml | 2 +-
tests/qemuxml2argvdata/pci-many.args | 2 +-
tests/qemuxml2argvdata/pci-many.xml | 2 +-
tests/qemuxml2argvdata/pci-root-address.xml | 2 +-
.../pci-root-nonzero-index.xml | 2 +-
.../pci-serial-dev-chardev.args | 2 +-
.../pci-serial-dev-chardev.x86_64-latest.args | 2 +-
.../pci-serial-dev-chardev.xml | 4 +-
.../pcie-expander-bus-bad-machine.xml | 2 +-
tests/qemuxml2argvdata/pcihole64-gib.xml | 2 +-
tests/qemuxml2argvdata/pcihole64-none.xml | 2 +-
tests/qemuxml2argvdata/pcihole64.args | 2 +-
tests/qemuxml2argvdata/pcihole64.xml | 2 +-
.../pv-spinlock-disabled.x86_64-4.0.0.args | 4 +-
.../pv-spinlock-disabled.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/pv-spinlock-disabled.xml | 4 +-
.../pv-spinlock-enabled.x86_64-4.0.0.args | 4 +-
.../pv-spinlock-enabled.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/pv-spinlock-enabled.xml | 4 +-
.../q35-pm-disable-fallback.args | 2 +-
.../q35-pm-disable-fallback.xml | 2 +-
tests/qemuxml2argvdata/q35-pm-disable.args | 2 +-
tests/qemuxml2argvdata/q35-pm-disable.xml | 2 +-
.../q35-virt-manager-basic.args | 2 +-
.../q35-virt-manager-basic.xml | 2 +-
.../qemu-ns.x86_64-4.0.0.args | 2 +-
.../qemu-ns.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/qemu-ns.xml | 4 +-
.../seclabel-dynamic-none-relabel.xml | 2 +-
.../serial-dev-chardev-iobase.args | 2 +-
...rial-dev-chardev-iobase.x86_64-latest.args | 2 +-
.../serial-dev-chardev-iobase.xml | 4 +-
.../qemuxml2argvdata/serial-dev-chardev.args | 2 +-
.../serial-dev-chardev.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/serial-dev-chardev.xml | 4 +-
.../qemuxml2argvdata/serial-file-chardev.args | 2 +-
.../serial-file-chardev.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/serial-file-chardev.xml | 4 +-
tests/qemuxml2argvdata/serial-file-log.args | 2 +-
.../serial-file-log.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/serial-file-log.xml | 4 +-
.../qemuxml2argvdata/serial-many-chardev.args | 2 +-
.../serial-many-chardev.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/serial-many-chardev.xml | 4 +-
.../qemuxml2argvdata/serial-pty-chardev.args | 2 +-
.../serial-pty-chardev.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/serial-pty-chardev.xml | 4 +-
.../serial-spiceport-nospice.args | 2 +-
...erial-spiceport-nospice.x86_64-latest.args | 2 +-
.../serial-spiceport-nospice.xml | 4 +-
tests/qemuxml2argvdata/serial-spiceport.args | 2 +-
.../serial-spiceport.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/serial-spiceport.xml | 4 +-
.../qemuxml2argvdata/serial-tcp-chardev.args | 2 +-
.../serial-tcp-chardev.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/serial-tcp-chardev.xml | 4 +-
.../serial-tcp-telnet-chardev.args | 2 +-
...rial-tcp-telnet-chardev.x86_64-latest.args | 2 +-
.../serial-tcp-telnet-chardev.xml | 4 +-
.../serial-tcp-tlsx509-chardev-notls.args | 2 +-
...p-tlsx509-chardev-notls.x86_64-latest.args | 2 +-
.../serial-tcp-tlsx509-chardev-notls.xml | 4 +-
.../serial-tcp-tlsx509-chardev-verify.args | 2 +-
...-tlsx509-chardev-verify.x86_64-latest.args | 2 +-
.../serial-tcp-tlsx509-chardev-verify.xml | 4 +-
.../serial-tcp-tlsx509-chardev.args | 2 +-
...ial-tcp-tlsx509-chardev.x86_64-latest.args | 2 +-
.../serial-tcp-tlsx509-chardev.xml | 4 +-
.../serial-tcp-tlsx509-secret-chardev.args | 2 +-
...-tlsx509-secret-chardev.x86_64-latest.args | 2 +-
.../serial-tcp-tlsx509-secret-chardev.xml | 4 +-
.../qemuxml2argvdata/serial-udp-chardev.args | 2 +-
.../serial-udp-chardev.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/serial-udp-chardev.xml | 4 +-
.../qemuxml2argvdata/serial-unix-chardev.args | 2 +-
.../serial-unix-chardev.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/serial-unix-chardev.xml | 4 +-
tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +-
.../serial-vc-chardev.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/serial-vc-chardev.xml | 4 +-
tests/qemuxml2argvdata/user-aliases-usb.args | 2 +-
tests/qemuxml2argvdata/user-aliases-usb.xml | 2 +-
tests/qemuxml2argvdata/user-aliases.args | 2 +-
tests/qemuxml2argvdata/user-aliases.xml | 2 +-
tests/qemuxml2argvdata/user-aliases2.xml | 2 +-
.../vcpu-placement-static.args | 2 +-
.../vcpu-placement-static.xml | 2 +-
...host-user-gpu-secondary.x86_64-latest.args | 2 +-
.../vhost-user-gpu-secondary.xml | 4 +-
.../vhost-user-vga.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/vhost-user-vga.xml | 4 +-
tests/qemuxml2argvdata/vhost-vsock.xml | 5 +-
...eo-bochs-display-device.x86_64-latest.args | 2 +-
.../video-bochs-display-device.xml | 4 +-
...o-qxl-sec-device-vram64.x86_64-latest.args | 2 +-
.../video-qxl-sec-device-vram64.xml | 4 +-
...video-ramfb-display-device-pci-address.xml | 4 +-
...eo-ramfb-display-device.x86_64-latest.args | 2 +-
.../video-ramfb-display-device.xml | 4 +-
.../watchdog-device.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/watchdog-device.xml | 4 +-
.../watchdog-dump.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/watchdog-dump.xml | 4 +-
.../watchdog-injectnmi.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/watchdog-injectnmi.xml | 4 +-
.../watchdog.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/watchdog.xml | 4 +-
...gs => x86-kvm-32-on-64.x86_64-latest.args} | 14 +-
tests/qemuxml2argvtest.c | 39 ++--
...audio-default-nographics.x86_64-latest.xml | 4 +-
.../audio-default-sdl.x86_64-latest.xml | 4 +-
.../audio-default-spice.x86_64-latest.xml | 4 +-
.../audio-default-vnc.x86_64-latest.xml | 4 +-
.../blkdeviotune.x86_64-latest.xml | 4 +-
.../console-compat-auto.xml | 4 +-
tests/qemuxml2xmloutdata/console-compat.xml | 4 +-
...=> controller-usb-order.x86_64-latest.xml} | 3 +
.../controller-virtio-scsi.xml | 4 +-
tests/qemuxml2xmloutdata/disk-aio.xml | 4 +-
.../disk-arm-virtio-sd.aarch64-latest.xml | 5 +-
.../disk-backing-chains-index-active.xml | 4 +-
.../disk-backing-chains-index-inactive.xml | 4 +-
.../disk-backing-chains-noindex.xml | 4 +-
tests/qemuxml2xmloutdata/disk-boot-cdrom.xml | 4 +-
tests/qemuxml2xmloutdata/disk-boot-disk.xml | 4 +-
.../disk-cdrom-bus-other.xml | 4 +-
...om-empty-network-invalid.x86_64-latest.xml | 4 +-
tests/qemuxml2xmloutdata/disk-cdrom.xml | 4 +-
.../qemuxml2xmloutdata/disk-error-policy.xml | 4 +-
tests/qemuxml2xmloutdata/disk-floppy.xml | 4 +-
tests/qemuxml2xmloutdata/disk-fmt-qcow.xml | 4 +-
.../disk-metadata-cache.x86_64-latest.xml | 4 +-
.../disk-network-gluster.xml | 4 +-
.../qemuxml2xmloutdata/disk-network-iscsi.xml | 4 +-
tests/qemuxml2xmloutdata/disk-network-nbd.xml | 4 +-
...isk-network-nfs-inactive.x86_64-latest.xml | 2 +-
.../disk-network-nfs.x86_64-latest.xml | 2 +-
tests/qemuxml2xmloutdata/disk-network-rbd.xml | 4 +-
.../disk-network-sheepdog.xml | 4 +-
.../disk-network-source-auth.xml | 4 +-
.../disk-network-tlsx509-nbd.xml | 2 +-
.../disk-network-tlsx509-vxhs.xml | 2 +-
.../disk-rotation.x86_64-latest.xml | 4 +-
.../disk-scsi-device-auto.xml | 4 +-
.../qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 4 +-
.../disk-scsi.x86_64-latest.xml | 4 +-
tests/qemuxml2xmloutdata/disk-serial.xml | 4 +-
.../disk-slices.x86_64-latest.xml | 4 +-
.../disk-source-pool-mode.xml | 4 +-
tests/qemuxml2xmloutdata/disk-source-pool.xml | 4 +-
.../disk-transient.x86_64-latest.xml | 4 +-
tests/qemuxml2xmloutdata/disk-usb-device.xml | 4 +-
.../disk-vhostuser.x86_64-latest.xml | 2 +-
tests/qemuxml2xmloutdata/disk-virtio.xml | 4 +-
tests/qemuxml2xmloutdata/encrypted-disk.xml | 4 +-
tests/qemuxml2xmloutdata/eoi-disabled.xml | 4 +-
tests/qemuxml2xmloutdata/eoi-enabled.xml | 4 +-
tests/qemuxml2xmloutdata/floppy-drive-fat.xml | 4 +-
.../graphics-egl-headless-rendernode.xml | 4 +-
...cs-spice-auto-socket-cfg.x86_64-latest.xml | 4 +-
...aphics-spice-auto-socket.x86_64-latest.xml | 4 +-
...aphics-spice-compression.x86_64-latest.xml | 4 +-
...phics-spice-egl-headless.x86_64-latest.xml | 4 +-
.../graphics-spice-qxl-vga.x86_64-latest.xml | 4 +-
.../graphics-spice-socket.x86_64-latest.xml | 4 +-
.../graphics-spice-timeout.x86_64-latest.xml | 4 +-
.../graphics-spice.x86_64-latest.xml | 4 +-
.../graphics-vnc-auto-socket-cfg.xml | 4 +-
.../graphics-vnc-auto-socket.xml | 4 +-
.../graphics-vnc-egl-headless.xml | 4 +-
.../graphics-vnc-no-listen-attr.xml | 4 +-
...ics-vnc-remove-generated-socket-active.xml | 4 +-
...s-vnc-remove-generated-socket-inactive.xml | 4 +-
.../qemuxml2xmloutdata/graphics-vnc-sasl.xml | 4 +-
.../graphics-vnc-socket.xml | 4 +-
tests/qemuxml2xmloutdata/graphics-vnc-tls.xml | 4 +-
.../graphics-vnc-websocket.xml | 4 +-
tests/qemuxml2xmloutdata/graphics-vnc.xml | 4 +-
...stdev-mdev-display-ramfb.x86_64-latest.xml | 4 +-
tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 4 +-
.../hostdev-scsi-vhost-scsi-pcie.xml | 2 +-
.../hostdev-scsi-virtio-scsi.xml | 4 +-
tests/qemuxml2xmloutdata/hyperv-off.xml | 4 +-
tests/qemuxml2xmloutdata/hyperv-panic.xml | 4 +-
.../qemuxml2xmloutdata/hyperv-passthrough.xml | 4 +-
.../hyperv-stimer-direct.xml | 4 +-
tests/qemuxml2xmloutdata/hyperv.xml | 4 +-
tests/qemuxml2xmloutdata/interface-server.xml | 138 ------------
.../iothreads-virtio-scsi-pci.xml | 4 +-
...ml => luks-disks-source.x86_64-latest.xml} | 5 +-
...disks.xml => luks-disks.x86_64-latest.xml} | 0
...memory-default-hugepage.x86_64-latest.xml} | 0
...ml => memfd-memory-numa.x86_64-latest.xml} | 0
tests/qemuxml2xmloutdata/misc-no-reboot.xml | 4 +-
tests/qemuxml2xmloutdata/net-server.xml | 43 ++++
tests/qemuxml2xmloutdata/net-user.xml | 4 +-
tests/qemuxml2xmloutdata/net-vdpa.xml | 4 +-
tests/qemuxml2xmloutdata/net-vhostuser.xml | 4 +-
tests/qemuxml2xmloutdata/panic-double.xml | 4 +-
tests/qemuxml2xmloutdata/panic-no-address.xml | 4 +-
tests/qemuxml2xmloutdata/panic.xml | 4 +-
tests/qemuxml2xmloutdata/pci-autoadd-addr.xml | 2 +-
tests/qemuxml2xmloutdata/pci-autoadd-idx.xml | 2 +-
.../qemuxml2xmloutdata/pci-autofill-addr.xml | 2 +-
.../pci-bridge-many-disks.xml | 2 +-
tests/qemuxml2xmloutdata/pci-bridge.xml | 2 +-
tests/qemuxml2xmloutdata/pci-expander-bus.xml | 2 +-
tests/qemuxml2xmloutdata/pci-many.xml | 2 +-
.../pci-serial-dev-chardev.xml | 4 +-
tests/qemuxml2xmloutdata/pcihole64-gib.xml | 2 +-
tests/qemuxml2xmloutdata/pcihole64-none.xml | 2 +-
tests/qemuxml2xmloutdata/pcihole64.xml | 2 +-
.../pv-spinlock-disabled.xml | 4 +-
.../pv-spinlock-enabled.xml | 4 +-
.../q35-virt-manager-basic.xml | 2 +-
.../qemu-ns.x86_64-latest.xml | 4 +-
...seclabel-dynamic-none-relabel-inactive.xml | 2 +-
.../serial-spiceport-nospice.xml | 4 +-
tests/qemuxml2xmloutdata/serial-spiceport.xml | 4 +-
.../serial-tcp-tlsx509-chardev.xml | 4 +-
...l => tseg-explicit-size.x86_64-latest.xml} | 29 ++-
...xml => vhost-vsock-auto.x86_64-latest.xml} | 5 +-
...sock.xml => vhost-vsock.x86_64-latest.xml} | 0
tests/qemuxml2xmloutdata/watchdog.xml | 4 +-
.../x86-kvm-32-on-64.x86_64-latest.xml | 27 +++
tests/qemuxml2xmltest.c | 39 +---
tests/securityselinuxlabeldata/chardev.xml | 2 +-
tests/securityselinuxlabeldata/disks.xml | 2 +-
tests/securityselinuxlabeldata/kernel.xml | 2 +-
tests/securityselinuxlabeldata/nfs.xml | 2 +-
tests/testutilsqemu.c | 198 +++++++++++-------
tests/vircapstest.c | 6 -
730 files changed, 1362 insertions(+), 1575 deletions(-)
create mode 100644 tests/qemuxml2argvdata/blkdeviotune.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/controller-usb-order.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml
delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
rename tests/qemuxml2argvdata/{disk-floppy-q35-2_11.x86_64-2.12.0.args => disk-floppy-q35.x86_64-2.12.0.args} (96%)
rename tests/qemuxml2argvdata/{disk-floppy-q35-2_9.x86_64-latest.args => disk-floppy-q35.x86_64-latest.args} (96%)
rename tests/qemuxml2argvdata/{disk-floppy-q35-2_9.xml => disk-floppy-q35.xml} (95%)
delete mode 100644 tests/qemuxml2argvdata/interface-server.xml
delete mode 100644 tests/qemuxml2argvdata/missing-machine.err
create mode 100644 tests/qemuxml2argvdata/missing-machine.x86_64-latest.err
rename tests/qemuxml2argvdata/{x86-kvm-32-on-64.args => x86-kvm-32-on-64.x86_64-latest.args} (53%)
rename tests/qemuxml2xmloutdata/{controller-usb-order.xml => controller-usb-order.x86_64-latest.xml} (93%)
delete mode 100644 tests/qemuxml2xmloutdata/interface-server.xml
rename tests/qemuxml2xmloutdata/{luks-disks-source.xml => luks-disks-source.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{luks-disks.xml => luks-disks.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memfd-memory-default-hugepage.xml => memfd-memory-default-hugepage.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memfd-memory-numa.xml => memfd-memory-numa.x86_64-latest.xml} (100%)
create mode 100644 tests/qemuxml2xmloutdata/net-server.xml
rename tests/qemuxml2xmloutdata/{tseg-explicit-size.xml => tseg-explicit-size.x86_64-latest.xml} (61%)
rename tests/qemuxml2xmloutdata/{vhost-vsock-auto.xml => vhost-vsock-auto.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{vhost-vsock.xml => vhost-vsock.x86_64-latest.xml} (100%)
create mode 100644 tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-latest.xml
--
2.31.1
3 years, 3 months
- 2
- 42
[PATCH] Make virConnectOpenInternal() report error in all cases
by Ani Sinha
virConnectOpenInternal() does not report error in all failure scenarios, except
in some specific cases. This inconsistent behavior forces the caller of this
function report a generic error for all failure modes which then hides specific
error scenarios. This change makes virConnectOpenInternal() report failure in
all cases so that it can generate specific errors based on the type of failure
encountered. The reporiting of the errors can be made more fine grained in
subsequent changes.
Signed-off-by: Ani Sinha <ani(a)anisinha.ca>
---
src/libvirt.c | 24 ++++++++++++++++--------
src/libxl/libxl_migration.c | 3 ---
src/qemu/qemu_migration.c | 3 ---
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/libvirt.c b/src/libvirt.c
index 45315f484c..53ceee1359 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -893,8 +893,12 @@ virConnectOpenInternal(const char *name,
bool embed = false;
ret = virGetConnect();
- if (ret == NULL)
+ if (ret == NULL) {
+ virReportError(VIR_ERR_INVALID_CONN,
+ _("Failed to create connection object for URI %s"),
+ NULLSTR(name));
return NULL;
+ }
if (virConfLoadConfig(&conf, "libvirt.conf") < 0)
goto failed;
@@ -974,7 +978,7 @@ virConnectOpenInternal(const char *name,
virReportError(VIR_ERR_NO_CONNECT,
_("URI '%s' does not include a driver name"),
name);
- goto failed;
+ goto failed_no_report;
}
if (virConnectCheckURIMissingSlash(uristr,
@@ -992,7 +996,7 @@ virConnectOpenInternal(const char *name,
virReportError(VIR_ERR_NO_CONNECT,
_("URI scheme '%s' for embedded driver is not valid"),
ret->uri->scheme);
- goto failed;
+ goto failed_no_report;
}
root = virURIGetParam(ret->uri, "root");
@@ -1002,7 +1006,7 @@ virConnectOpenInternal(const char *name,
if (!g_path_is_absolute(root)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("root path must be absolute"));
- goto failed;
+ goto failed_no_report;
}
if (virEventRequireImpl() < 0)
@@ -1062,7 +1066,7 @@ virConnectOpenInternal(const char *name,
__FILE__, __FUNCTION__, __LINE__,
_("libvirt was built without the '%s' driver"),
ret->uri->scheme);
- goto failed;
+ goto failed_no_report;
}
VIR_DEBUG("trying driver %zu (%s) ...",
@@ -1112,13 +1116,13 @@ virConnectOpenInternal(const char *name,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Driver %s cannot be used in embedded mode"),
virConnectDriverTab[i]->hypervisorDriver->name);
- goto failed;
+ goto failed_no_report;
}
/* before starting the new connection, check if the driver only works
* with a server, and so return an error if the server is missing */
if (virConnectDriverTab[i]->remoteOnly && ret->uri && !ret->uri->server) {
virReportError(VIR_ERR_INVALID_ARG, "%s", _("URI is missing the server part"));
- goto failed;
+ goto failed_no_report;
}
ret->driver = virConnectDriverTab[i]->hypervisorDriver;
@@ -1155,7 +1159,7 @@ virConnectOpenInternal(const char *name,
if (!ret->driver) {
/* If we reach here, then all drivers declined the connection. */
virReportError(VIR_ERR_NO_CONNECT, "%s", NULLSTR(name));
- goto failed;
+ goto failed_no_report;
}
VIR_FREE(uristr);
@@ -1163,6 +1167,10 @@ virConnectOpenInternal(const char *name,
return ret;
failed:
+ virReportError(VIR_ERR_OPERATION_FAILED,
+ _("Failed to connect to remote libvirt URI %s"),
+ NULLSTR(uristr));
+ failed_no_report:
VIR_FREE(uristr);
virObjectUnref(ret);
diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c
index 6d0ab4ee28..bc2b5401da 100644
--- a/src/libxl/libxl_migration.c
+++ b/src/libxl/libxl_migration.c
@@ -1134,9 +1134,6 @@ libxlDomainMigrationSrcPerformP2P(libxlDriverPrivate *driver,
virObjectLock(vm);
if (dconn == NULL) {
- virReportError(VIR_ERR_OPERATION_FAILED,
- _("Failed to connect to remote libvirt URI %s: %s"),
- dconnuri, virGetLastErrorMessage());
return ret;
}
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index b9d7d582f5..2635ef1162 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -5145,9 +5145,6 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *driver,
goto cleanup;
if (dconn == NULL) {
- virReportError(VIR_ERR_OPERATION_FAILED,
- _("Failed to connect to remote libvirt URI %s: %s"),
- dconnuri, virGetLastErrorMessage());
return -1;
}
--
2.25.1
3 years, 3 months
- 4
- 4
[PATCH v2 0/2] qemu: Work around qemu not sending DEVICE_DELETED when device is configured via JSON
by Peter Krempa
QEMU fix was posted https://lists.gnu.org/archive/html/qemu-devel/2022-01/msg00542.html
I'll hold off this version until just before the freeze. In case the
qemu commit gets merged we can avoid some of the churn by adding
in-progress qemu caps and updating to it.
Note that I've trimmed patch 1 when sent to the list. See them in full
at:
https://gitlab.com/pipo.sk/libvirt/-/commits/device-add-json-revert-2
v2:
- dropped patch 2, folded important bits from the commit message into
commit message for patch 1
Peter Krempa (2):
qemu: Revert to using non-JSON commandline for -device
NEWS: Mention device hot-unplug regression with qemu-6.2 and
workarounds for it
NEWS.rst | 31 ++++++++++++++
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
.../caps_6.2.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
.../caps_6.2.0.x86_64.xml | 1 -
...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 6 +--
...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 6 +--
.../aarch64-tpm.aarch64-latest.args | 2 +-
.../aarch64-virt-graphics.aarch64-latest.args | 36 ++++++++--------
.../aarch64-virt-headless.aarch64-latest.args | 28 ++++++-------
.../audio-alsa-best.x86_64-latest.args | 4 +-
.../audio-alsa-full.x86_64-latest.args | 4 +-
.../audio-alsa-minimal.x86_64-latest.args | 4 +-
.../audio-coreaudio-best.x86_64-latest.args | 4 +-
.../audio-coreaudio-full.x86_64-latest.args | 4 +-
...audio-coreaudio-minimal.x86_64-latest.args | 4 +-
...udio-default-nographics.x86_64-latest.args | 4 +-
.../audio-default-sdl.x86_64-latest.args | 6 +--
.../audio-default-spice.x86_64-latest.args | 6 +--
.../audio-default-vnc.x86_64-latest.args | 6 +--
.../audio-file-best.x86_64-latest.args | 4 +-
.../audio-file-full.x86_64-latest.args | 4 +-
.../audio-file-minimal.x86_64-latest.args | 4 +-
.../audio-jack-full.x86_64-latest.args | 4 +-
.../audio-jack-minimal.x86_64-latest.args | 4 +-
.../audio-many-backends.x86_64-latest.args | 14 +++----
.../audio-none-best.x86_64-latest.args | 4 +-
.../audio-none-full.x86_64-latest.args | 4 +-
.../audio-none-minimal.x86_64-latest.args | 4 +-
.../audio-oss-best.x86_64-latest.args | 4 +-
.../audio-oss-full.x86_64-latest.args | 4 +-
.../audio-oss-minimal.x86_64-latest.args | 4 +-
.../audio-pulseaudio-best.x86_64-latest.args | 4 +-
.../audio-pulseaudio-full.x86_64-latest.args | 4 +-
...udio-pulseaudio-minimal.x86_64-latest.args | 4 +-
.../audio-sdl-best.x86_64-latest.args | 4 +-
.../audio-sdl-full.x86_64-latest.args | 4 +-
.../audio-sdl-minimal.x86_64-latest.args | 4 +-
.../audio-spice-best.x86_64-latest.args | 4 +-
.../audio-spice-full.x86_64-latest.args | 4 +-
.../audio-spice-minimal.x86_64-latest.args | 4 +-
.../blkdeviotune-group-num.x86_64-latest.args | 8 ++--
...blkdeviotune-max-length.x86_64-latest.args | 8 ++--
.../blkdeviotune-max.x86_64-latest.args | 8 ++--
.../channel-unix-guestfwd.x86_64-latest.args | 4 +-
.../console-compat-auto.x86_64-latest.args | 8 ++--
.../console-compat-chardev.x86_64-latest.args | 8 ++--
.../console-compat.x86_64-latest.args | 6 +--
.../console-virtio-unix.x86_64-latest.args | 10 ++---
.../controller-virtio-scsi.x86_64-latest.args | 24 +++++------
...-Icelake-Server-pconfig.x86_64-latest.args | 4 +-
.../cpu-host-model.x86_64-latest.args | 10 ++---
.../cpu-translation.x86_64-latest.args | 4 +-
.../cputune-cpuset-big-id.x86_64-latest.args | 6 +--
...ult-video-type-aarch64.aarch64-latest.args | 6 +--
...default-video-type-ppc64.ppc64-latest.args | 8 ++--
.../devices-acpi-index.x86_64-latest.args | 16 +++----
.../disk-aio-io_uring.x86_64-latest.args | 6 +--
.../disk-aio.x86_64-latest.args | 8 ++--
.../disk-arm-virtio-sd.aarch64-latest.args | 2 +-
...-backing-chains-noindex.x86_64-latest.args | 16 +++----
.../disk-blockio.x86_64-latest.args | 8 ++--
.../disk-boot-cdrom.x86_64-latest.args | 6 +--
.../disk-boot-disk.x86_64-latest.args | 6 +--
.../disk-cache.x86_64-latest.args | 14 +++----
.../disk-cdrom-bus-other.x86_64-latest.args | 6 +--
...m-empty-network-invalid.x86_64-latest.args | 4 +-
.../disk-cdrom-network.x86_64-latest.args | 10 ++---
.../disk-cdrom-tray.x86_64-latest.args | 10 ++---
.../disk-cdrom.x86_64-latest.args | 10 ++---
.../disk-copy_on_read.x86_64-latest.args | 12 +++---
.../disk-detect-zeroes.x86_64-latest.args | 8 ++--
.../disk-discard.x86_64-latest.args | 8 ++--
.../disk-error-policy.x86_64-latest.args | 8 ++--
.../disk-floppy-q35-2_11.x86_64-latest.args | 12 +++---
.../disk-floppy-q35-2_9.x86_64-latest.args | 12 +++---
.../disk-floppy-tray.x86_64-latest.args | 10 ++---
.../disk-floppy.x86_64-latest.args | 8 ++--
.../disk-fmt-qcow.x86_64-latest.args | 6 +--
.../disk-geometry.x86_64-latest.args | 6 +--
.../disk-ide-split.x86_64-latest.args | 8 ++--
.../disk-ide-wwn.x86_64-latest.args | 6 +--
.../disk-ioeventfd.x86_64-latest.args | 12 +++---
.../disk-metadata-cache.x86_64-latest.args | 8 ++--
.../disk-network-gluster.x86_64-latest.args | 8 ++--
.../disk-network-http.x86_64-latest.args | 10 ++---
.../disk-network-iscsi.x86_64-latest.args | 18 ++++----
.../disk-network-nbd.x86_64-latest.args | 12 +++---
.../disk-network-nfs.x86_64-latest.args | 6 +--
...-network-rbd-encryption.x86_64-latest.args | 12 +++---
...sk-network-rbd-no-colon.x86_64-latest.args | 8 ++--
.../disk-network-rbd.x86_64-latest.args | 14 +++----
...isk-network-source-auth.x86_64-latest.args | 8 ++--
...isk-network-tlsx509-nbd.x86_64-latest.args | 4 +-
.../disk-no-boot.x86_64-latest.args | 8 ++--
.../disk-nvme.x86_64-latest.args | 12 +++---
.../disk-order.x86_64-latest.args | 12 +++---
.../disk-readonly-disk.x86_64-latest.args | 8 ++--
.../disk-rotation.x86_64-latest.args | 12 +++---
.../disk-sata-device.x86_64-latest.args | 8 ++--
.../disk-scsi-device-auto.x86_64-latest.args | 10 ++---
.../disk-scsi-disk-split.x86_64-latest.args | 20 ++++-----
.../disk-scsi-disk-vpd.x86_64-latest.args | 12 +++---
.../disk-scsi-disk-wwn.x86_64-latest.args | 12 +++---
...sk-scsi-lun-passthrough.x86_64-latest.args | 12 +++---
.../disk-scsi.x86_64-latest.args | 26 ++++++------
.../disk-serial.x86_64-latest.args | 8 ++--
.../disk-shared.x86_64-latest.args | 14 +++----
.../disk-slices.x86_64-latest.args | 14 +++----
.../disk-snapshot.x86_64-latest.args | 10 ++---
.../disk-source-pool-mode.x86_64-latest.args | 12 +++---
.../disk-source-pool.x86_64-latest.args | 14 +++----
.../disk-transient.x86_64-latest.args | 6 +--
...sk-usb-device-removable.x86_64-latest.args | 8 ++--
.../disk-usb-device.x86_64-latest.args | 8 ++--
.../disk-vhostuser.x86_64-latest.args | 8 ++--
.../disk-virtio-queues.x86_64-latest.args | 8 ++--
...irtio-scsi-reservations.x86_64-latest.args | 10 ++---
.../disk-virtio.x86_64-latest.args | 10 ++---
.../encrypted-disk-usage.x86_64-latest.args | 6 +--
.../encrypted-disk.x86_64-latest.args | 6 +--
.../eoi-disabled.x86_64-latest.args | 4 +-
.../eoi-enabled.x86_64-latest.args | 4 +-
.../event_idx.x86_64-latest.args | 12 +++---
...d-memory-numa-topology4.x86_64-latest.args | 4 +-
.../fips-enabled.x86_64-latest.args | 6 +--
.../floppy-drive-fat.x86_64-latest.args | 6 +--
.../qemuxml2argvdata/fs9p.x86_64-latest.args | 6 +--
.../genid-auto.x86_64-latest.args | 4 +-
.../qemuxml2argvdata/genid.x86_64-latest.args | 4 +-
...egl-headless-rendernode.x86_64-latest.args | 6 +--
.../graphics-egl-headless.x86_64-latest.args | 6 +--
...s-spice-agent-file-xfer.x86_64-latest.args | 8 ++--
...aphics-spice-agentmouse.x86_64-latest.args | 10 ++---
...s-spice-auto-socket-cfg.x86_64-latest.args | 4 +-
...phics-spice-auto-socket.x86_64-latest.args | 4 +-
...phics-spice-compression.x86_64-latest.args | 8 ++--
...hics-spice-egl-headless.x86_64-latest.args | 6 +--
...pice-gl-auto-rendernode.x86_64-latest.args | 6 +--
.../graphics-spice-no-args.x86_64-latest.args | 6 +--
.../graphics-spice-qxl-vga.x86_64-latest.args | 8 ++--
.../graphics-spice-sasl.x86_64-latest.args | 6 +--
.../graphics-spice-socket.x86_64-latest.args | 4 +-
.../graphics-spice-timeout.x86_64-latest.args | 14 +++----
...raphics-spice-usb-redir.x86_64-latest.args | 16 +++----
.../graphics-spice.x86_64-latest.args | 8 ++--
...ics-vnc-auto-socket-cfg.x86_64-latest.args | 6 +--
...raphics-vnc-auto-socket.x86_64-latest.args | 4 +-
...aphics-vnc-egl-headless.x86_64-latest.args | 6 +--
...hics-vnc-no-listen-attr.x86_64-latest.args | 6 +--
.../graphics-vnc-none.x86_64-latest.args | 4 +-
.../graphics-vnc-policy.x86_64-latest.args | 6 +--
.../graphics-vnc-power.x86_64-latest.args | 6 +--
...remove-generated-socket.x86_64-latest.args | 6 +--
.../graphics-vnc-sasl.x86_64-latest.args | 6 +--
...-vnc-socket-new-cmdline.x86_64-latest.args | 4 +-
.../graphics-vnc-socket.x86_64-latest.args | 4 +-
...graphics-vnc-tls-secret.x86_64-latest.args | 4 +-
.../graphics-vnc-tls.x86_64-latest.args | 4 +-
.../graphics-vnc-websocket.x86_64-latest.args | 4 +-
.../graphics-vnc.x86_64-latest.args | 6 +--
...tdev-mdev-display-ramfb.x86_64-latest.args | 8 ++--
...play-spice-egl-headless.x86_64-latest.args | 6 +--
...ev-display-spice-opengl.x86_64-latest.args | 6 +--
...isplay-vnc-egl-headless.x86_64-latest.args | 6 +--
...ostdev-mdev-display-vnc.x86_64-latest.args | 6 +--
.../hostdev-scsi-lsi.x86_64-latest.args | 20 ++++-----
...ostdev-scsi-virtio-scsi.x86_64-latest.args | 22 +++++-----
.../hugepages-memaccess3.x86_64-latest.args | 2 +-
.../hugepages-nvdimm.x86_64-latest.args | 4 +-
.../hyperv-off.x86_64-latest.args | 4 +-
.../hyperv-panic.x86_64-latest.args | 2 +-
.../hyperv-passthrough.x86_64-latest.args | 2 +-
.../hyperv-stimer-direct.x86_64-latest.args | 2 +-
.../hyperv.x86_64-latest.args | 2 +-
.../input-linux.x86_64-latest.args | 4 +-
.../intel-iommu-aw-bits.x86_64-latest.args | 2 +-
...ntel-iommu-caching-mode.x86_64-latest.args | 2 +-
...ntel-iommu-device-iotlb.x86_64-latest.args | 2 +-
.../intel-iommu-eim.x86_64-latest.args | 2 +-
.../intel-iommu.x86_64-latest.args | 2 +-
...threads-virtio-scsi-pci.x86_64-latest.args | 10 ++---
.../kvmclock+eoi-disabled.x86_64-latest.args | 4 +-
...nch-security-sev-direct.x86_64-latest.args | 4 +-
...luks-disks-source-qcow2.x86_64-latest.args | 16 +++----
.../luks-disks-source.x86_64-latest.args | 14 +++----
.../luks-disks.x86_64-latest.args | 8 ++--
...memory-default-hugepage.x86_64-latest.args | 4 +-
.../memfd-memory-numa.x86_64-latest.args | 6 +--
...y-hotplug-nvdimm-access.x86_64-latest.args | 8 ++--
...ry-hotplug-nvdimm-align.x86_64-latest.args | 8 ++--
...ry-hotplug-nvdimm-label.x86_64-latest.args | 8 ++--
...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 8 ++--
...hotplug-nvdimm-readonly.x86_64-latest.args | 8 ++--
.../memory-hotplug-nvdimm.x86_64-latest.args | 8 ++--
...mory-hotplug-virtio-mem.x86_64-latest.args | 10 ++---
...ory-hotplug-virtio-pmem.x86_64-latest.args | 8 ++--
.../misc-no-reboot.x86_64-latest.args | 4 +-
.../mlock-off.x86_64-latest.args | 2 +-
.../mlock-on.x86_64-latest.args | 2 +-
.../name-escape.x86_64-latest.args | 20 ++++-----
.../net-vdpa.x86_64-latest.args | 4 +-
.../net-vhostuser.x86_64-latest.args | 8 ++--
.../numatune-hmat.x86_64-latest.args | 4 +-
...emnode-restrictive-mode.x86_64-latest.args | 4 +-
.../numatune-memnode.x86_64-latest.args | 4 +-
.../numatune-system-memory.x86_64-latest.args | 2 +-
.../os-firmware-bios.x86_64-latest.args | 16 +++----
...re-efi-no-enrolled-keys.x86_64-latest.args | 6 +--
...os-firmware-efi-secboot.x86_64-latest.args | 16 +++----
.../os-firmware-efi.x86_64-latest.args | 16 +++----
.../panic-double.x86_64-latest.args | 4 +-
.../panic-no-address.x86_64-latest.args | 8 ++--
.../qemuxml2argvdata/panic.x86_64-latest.args | 8 ++--
...arallel-parport-chardev.x86_64-latest.args | 8 ++--
.../parallel-tcp-chardev.x86_64-latest.args | 8 ++--
.../parallel-unix-chardev.x86_64-latest.args | 8 ++--
...pi-root-hotplug-disable.x86_64-latest.args | 4 +-
...cpi-root-hotplug-enable.x86_64-latest.args | 4 +-
.../pci-serial-dev-chardev.x86_64-latest.args | 8 ++--
...e-expander-bus-aarch64.aarch64-latest.args | 2 +-
...cie-root-port-nohotplug.x86_64-latest.args | 18 ++++----
...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 8 ++--
...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 8 ++--
...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 8 ++--
...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 8 ++--
...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 8 ++--
...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 8 ++--
.../ppc64-pseries-graphics.ppc64-latest.args | 22 +++++-----
.../ppc64-pseries-headless.ppc64-latest.args | 16 +++----
.../ppc64-tpmproxy-single.ppc64-latest.args | 6 +--
.../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 8 ++--
.../pv-spinlock-disabled.x86_64-latest.args | 4 +-
.../pv-spinlock-enabled.x86_64-latest.args | 4 +-
.../qemu-ns.x86_64-latest.args | 6 +--
...rial-dev-chardev-iobase.x86_64-latest.args | 8 ++--
.../serial-dev-chardev.x86_64-latest.args | 8 ++--
.../serial-file-chardev.x86_64-latest.args | 8 ++--
.../serial-file-log.x86_64-latest.args | 6 +--
.../serial-many-chardev.x86_64-latest.args | 10 ++---
.../serial-pty-chardev.x86_64-latest.args | 8 ++--
...erial-spiceport-nospice.x86_64-latest.args | 6 +--
.../serial-spiceport.x86_64-latest.args | 12 +++---
.../serial-tcp-chardev.x86_64-latest.args | 8 ++--
...rial-tcp-telnet-chardev.x86_64-latest.args | 8 ++--
...p-tlsx509-chardev-notls.x86_64-latest.args | 10 ++---
...-tlsx509-chardev-verify.x86_64-latest.args | 10 ++---
...ial-tcp-tlsx509-chardev.x86_64-latest.args | 10 ++---
...-tlsx509-secret-chardev.x86_64-latest.args | 10 ++---
.../serial-udp-chardev.x86_64-latest.args | 10 ++---
.../serial-unix-chardev.x86_64-latest.args | 8 ++--
.../serial-vc-chardev.x86_64-latest.args | 8 ++--
...rtcard-passthrough-unix.x86_64-latest.args | 8 ++--
.../tpm-emulator-spapr.ppc64-latest.args | 14 +++----
.../tpm-emulator-tpm2-enc.x86_64-latest.args | 6 +--
...pm-emulator-tpm2-pstate.x86_64-latest.args | 6 +--
.../tpm-emulator-tpm2.x86_64-latest.args | 6 +--
.../tpm-emulator.x86_64-latest.args | 6 +--
.../tpm-passthrough-crb.x86_64-latest.args | 6 +--
.../tpm-passthrough.x86_64-latest.args | 6 +--
.../tseg-explicit-size.x86_64-latest.args | 10 ++---
.../usb-redir-unix.x86_64-latest.args | 14 +++----
...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +-
...vhost-user-fs-hugepages.x86_64-latest.args | 12 +++---
...host-user-gpu-secondary.x86_64-latest.args | 10 ++---
.../vhost-user-vga.x86_64-latest.args | 8 ++--
.../vhost-vsock-auto.x86_64-latest.args | 6 +--
.../vhost-vsock.x86_64-latest.args | 6 +--
...eo-bochs-display-device.x86_64-latest.args | 8 ++--
...video-qxl-device-vram64.x86_64-latest.args | 6 +--
...o-qxl-sec-device-vram64.x86_64-latest.args | 8 ++--
...eo-ramfb-display-device.x86_64-latest.args | 8 ++--
...video-virtio-vga-gpu-gl.x86_64-latest.args | 8 ++--
.../virtio-9p-createmode.x86_64-latest.args | 14 +++----
.../virtio-9p-multidevs.x86_64-latest.args | 12 +++---
.../virtio-lun.x86_64-latest.args | 12 +++---
...virtio-non-transitional.x86_64-latest.args | 42 +++++++++----------
...-options-controller-ats.x86_64-latest.args | 12 +++---
...ptions-controller-iommu.x86_64-latest.args | 12 +++---
...tions-controller-packed.x86_64-latest.args | 12 +++---
...virtio-options-disk-ats.x86_64-latest.args | 8 ++--
...rtio-options-disk-iommu.x86_64-latest.args | 8 ++--
...tio-options-disk-packed.x86_64-latest.args | 8 ++--
.../virtio-options-fs-ats.x86_64-latest.args | 8 ++--
...virtio-options-fs-iommu.x86_64-latest.args | 8 ++--
...irtio-options-fs-packed.x86_64-latest.args | 8 ++--
...irtio-options-input-ats.x86_64-latest.args | 8 ++--
...tio-options-input-iommu.x86_64-latest.args | 8 ++--
...io-options-input-packed.x86_64-latest.args | 8 ++--
...-options-memballoon-ats.x86_64-latest.args | 4 +-
...loon-freepage-reporting.x86_64-latest.args | 4 +-
...ptions-memballoon-iommu.x86_64-latest.args | 4 +-
...tions-memballoon-packed.x86_64-latest.args | 4 +-
.../virtio-options-net-ats.x86_64-latest.args | 8 ++--
...irtio-options-net-iommu.x86_64-latest.args | 8 ++--
...rtio-options-net-packed.x86_64-latest.args | 8 ++--
.../virtio-options-rng-ats.x86_64-latest.args | 8 ++--
...irtio-options-rng-iommu.x86_64-latest.args | 8 ++--
...rtio-options-rng-packed.x86_64-latest.args | 8 ++--
...irtio-options-video-ats.x86_64-latest.args | 8 ++--
...tio-options-video-iommu.x86_64-latest.args | 8 ++--
...io-options-video-packed.x86_64-latest.args | 8 ++--
.../virtio-options.x86_64-latest.args | 28 ++++++-------
.../virtio-rng-builtin.x86_64-latest.args | 6 +--
.../virtio-rng-egd-unix.x86_64-latest.args | 6 +--
.../virtio-transitional.x86_64-latest.args | 26 ++++++------
.../watchdog-device.x86_64-latest.args | 8 ++--
.../watchdog-dump.x86_64-latest.args | 8 ++--
.../watchdog-injectnmi.x86_64-latest.args | 8 ++--
.../watchdog.x86_64-latest.args | 6 +--
...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 6 +--
...default-cpu-kvm-q35-4.2.x86_64-latest.args | 14 +++----
...efault-cpu-tcg-features.x86_64-latest.args | 10 ++---
...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 6 +--
...default-cpu-tcg-q35-4.2.x86_64-latest.args | 14 +++----
.../x86_64-pc-graphics.x86_64-latest.args | 20 ++++-----
.../x86_64-pc-headless.x86_64-latest.args | 16 +++----
.../x86_64-q35-graphics.x86_64-latest.args | 34 +++++++--------
.../x86_64-q35-headless.x86_64-latest.args | 30 ++++++-------
320 files changed, 1332 insertions(+), 1305 deletions(-)
--
2.31.1
3 years, 3 months
- 1
- 2
[libvirt PATCH 0/2] qemu: virtiofs: add killpriv_v2 support (virtiofs epopee)
by Ján Tomko
Ján Tomko (2):
conf: add killpriv v2 attribute for virtiofs
qemu: virtiofs: add (no_)killpriv_v2 support
docs/formatdomain.rst | 4 ++++
docs/schemas/domaincommon.rng | 7 +++++++
src/conf/domain_conf.c | 15 +++++++++++++++
src/conf/domain_conf.h | 1 +
src/qemu/qemu_virtiofs.c | 5 +++++
.../qemuxml2argvdata/vhost-user-fs-fd-memory.xml | 1 +
6 files changed, 33 insertions(+)
--
2.31.1
3 years, 3 months
- 2
- 4
[libvirt PATCH v3 00/13] cgroup and thread management in ch driver.
by Praveen K Paladugu
This patchset adds support for cgroup management of ch threads. This version
correctly manages cgroups for vcpu and emulator threads created by ch. cgroup
management for iothreads is not yet supported.
Along with cgroup management, this patchset also enables support for pinning
vcpu and emulator threads to selected host cpus.
v3:
* addrressed all the formatting comments in v2 patch set
* dropped indentation patches are they do not adhere to libvirt coding style
* fixed build issue in qemu driver that was introduced in v2
Praveen K Paladugu (5):
util: Helper functions to get process info
ch_driver,ch_domain: vcpu info getter callbacks
qemu,hypervisor: refactor some cgroup mgmt methods
ch_process: Setup emulator and iothread settings
ch_driver: emulator threadinfo & pinning callbacks
Vineeth Pillai (8):
ch_domain: add virCHDomainGetMonitor helper method
ch_domain: add methods to manage private vcpu data
ch_driver: domainGetVcpuPinInfo and nodeGetCPUMap
ch_monitor: Get nicindexes in prep for cgroup mgmt
ch: methods for cgroup mgmt in ch driver
ch_driver,ch_domain: vcpupin callback in ch driver
ch_driver: enable typed param string for numatune
ch_driver: add numatune callbacks for CH driver
src/ch/ch_conf.c | 2 +
src/ch/ch_conf.h | 6 +-
src/ch/ch_domain.c | 172 ++++++-
src/ch/ch_domain.h | 32 +-
src/ch/ch_driver.c | 789 +++++++++++++++++++++++++++++++++
src/ch/ch_monitor.c | 341 +++++++++++---
src/ch/ch_monitor.h | 60 ++-
src/ch/ch_process.c | 385 +++++++++++++++-
src/ch/ch_process.h | 3 +
src/ch/meson.build | 1 +
src/hypervisor/domain_cgroup.c | 426 +++++++++++++++++-
src/hypervisor/domain_cgroup.h | 52 +++
src/libvirt_private.syms | 15 +
src/qemu/qemu_cgroup.c | 410 +----------------
src/qemu/qemu_cgroup.h | 11 -
src/qemu/qemu_driver.c | 130 +-----
src/qemu/qemu_hotplug.c | 7 +-
src/qemu/qemu_process.c | 20 +-
src/util/virprocess.c | 108 +++++
src/util/virprocess.h | 5 +
20 files changed, 2357 insertions(+), 618 deletions(-)
--
2.27.0
3 years, 3 months
- 2
- 21
[PATCH] util: Improve log out parsing errors
by Martin Kletzander
Suggested-by: Erik Skultety <eskultet(a)redhat.com>
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/util/virlog.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/util/virlog.c b/src/util/virlog.c
index 139dce8d0220..b44ad0ef6c47 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -1487,21 +1487,21 @@ virLogParseOutput(const char *src)
if (!(tokens = g_strsplit(src, ":", 0)) ||
(count = g_strv_length(tokens)) < 2) {
virReportError(VIR_ERR_INVALID_ARG,
- _("Malformed format for output '%s'"), src);
+ _("Malformed format for log output '%s'"), src);
return NULL;
}
if (virStrToLong_uip(tokens[0], NULL, 10, &prio) < 0 ||
(prio < VIR_LOG_DEBUG) || (prio > VIR_LOG_ERROR)) {
virReportError(VIR_ERR_INVALID_ARG,
- _("Invalid priority '%s' for output '%s'"),
+ _("Invalid log priority '%s' for log output '%s'"),
tokens[0], src);
return NULL;
}
if ((dest = virLogDestinationTypeFromString(tokens[1])) < 0) {
virReportError(VIR_ERR_INVALID_ARG,
- _("Invalid destination '%s' for output '%s'"),
+ _("Invalid log destination '%s' for log output '%s'"),
tokens[1], src);
return NULL;
}
@@ -1511,7 +1511,7 @@ virLogParseOutput(const char *src)
((dest == VIR_LOG_TO_FILE ||
dest == VIR_LOG_TO_SYSLOG) && count != 3)) {
virReportError(VIR_ERR_INVALID_ARG,
- _("Output '%s' does not meet the format requirements "
+ _("Log output '%s' does not meet the format requirements "
"for destination type '%s'"), src, tokens[1]);
return NULL;
}
--
2.34.1
3 years, 3 months
- 2
- 2