[PATCH pushed] virDomainDriverAutoShutdown: Fix printf conversion specifier for 'waitShutdownSecs'
by Peter Krempa
From: Peter Krempa <pkrempa(a)redhat.com>
The variable is declared as unsigned int but two places used '%d'.
Reported-in: https://issues.redhat.com/browse/RHEL-95721
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
Trivial.
src/hypervisor/domain_driver.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c
index 35966a5a8d..62bbe176ae 100644
--- a/src/hypervisor/domain_driver.c
+++ b/src/hypervisor/domain_driver.c
@@ -880,9 +880,9 @@ virDomainDriverAutoShutdown(virDomainDriverAutoShutdownConfig *cfg)
}
timer = g_timer_new();
- virSystemdNotifyStatus("Waiting %d secs for VM shutdown completion",
+ virSystemdNotifyStatus("Waiting %u secs for VM shutdown completion",
cfg->waitShutdownSecs);
- VIR_INFO("Waiting %d secs for VM shutdown completion", cfg->waitShutdownSecs);
+ VIR_INFO("Waiting %u secs for VM shutdown completion", cfg->waitShutdownSecs);
while (1) {
bool anyRunning = false;
for (i = 0; i < numDomains; i++) {
--
2.49.0
1 month, 1 week
[PATCH v4 0/2] Fix virtio console port assignment issue
by Aaron M. Brown
Changelog:
---
v4:
- Update commit messages
---
v3:
- Added Reviewed-By
- Included CI Results Link
---
v2:
- Split patch into two commits
- Added fixes tag
---
This libvirt patch does the following:
1. fixes an issue with virtio console device port assignment on vioserial buses
2. updates console port reservation comment and changes the allowZero variable to allowPortZero for clarity
Currently in libvirt, a virtio console device cannot be assigned a port number greater than zero on a vioserial bus. This leads to port collision errors when adding more than 1 virtio console device on a single vioserial bus.
After applying this patch, one can add multiple console ports under a single vioserial bus.
Here is a link to CI results for this series: https://gitlab.com/aaronbmalik/libvirt/-/pipelines/1832324065
Aaron M. Brown (2):
virDomainVirtioSerialAddrAssign: Fix virtio console port assignment on
vioserial bus
domain_addr.c: Update console port reservation comment and allowZero
variable for clarity
src/conf/domain_addr.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
--
2.39.5 (Apple Git-154)
1 month, 1 week
[PATCH 0/3] docs: Small tweaks to downloads page
by Andrea Bolognani
*** CLICK HERE TO BLURB ***
Andrea Bolognani (3):
docs: Unify clone instructions
docs: Drop mention of read-only git mirrors
docs: Add prompt to clone commands
docs/downloads.rst | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
--
2.49.0
1 month, 1 week
[PATCH 0/2] docs: Fix docs for VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES_ZEROES
by Peter Krempa
Remove note about needing a pre-cleared image and document need to
enable discards to obtain a sparse image.
Peter Krempa (2):
Revert "docs: Add warning about using a cleared image with
VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES_ZEROES"
docs: Note that zero detection on migration sparsifies image only when
discard='unmap' is set
docs/manpages/virsh.rst | 7 +++----
include/libvirt/libvirt-domain.h | 12 +++++-------
2 files changed, 8 insertions(+), 11 deletions(-)
--
2.49.0
1 month, 1 week
[PATCH 0/7] virsh: Fix cleanup in 'event' command and introduce 'await' command
by Peter Krempa
'virsh await' is a helper/syntax-sugar command which allows you to wait
until a domain reaches a certain state. Currently this series implements
conditions named 'domain-inactive' and 'guest-agent-available'.
Peter Krempa (7):
virthread: Register auto cleanup function for virMutex
virthread: Add infrastructure for static virCond definitions
virsh: cmdEvent: Ensure that event callbacks are unregistered before
returning
vshCommandRun: Convert to directly return the exit code
vsh: Add support for commands with more return values
virsh: Introduce 'await' command for waiting until target domain state
is reached
virsh: await: Introduce 'guest-agent-available' condition
docs/manpages/virsh.rst | 30 ++++
src/util/virthread.h | 7 +
tools/virsh-domain-event.c | 321 ++++++++++++++++++++++++++++++++++++-
tools/virsh.c | 4 +-
tools/virt-admin.c | 4 +-
tools/vsh.c | 46 ++++--
tools/vsh.h | 3 +-
7 files changed, 398 insertions(+), 17 deletions(-)
--
2.49.0
1 month, 1 week
[PATCH] libxl_capabilities: Make some functions return void
by Michal Privoznik
From: Michal Privoznik <mprivozn(a)redhat.com>
Inside of libxlMakeDomainCapabilities() there are some functions
called and basically all of them never return anything but zero
(indicating success). Yet, they are called in a fashion that
suggests otherwise. Turn those functions into void and drop
checks for their retvals.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/libxl/libxl_capabilities.c | 43 +++++++++++++---------------------
1 file changed, 16 insertions(+), 27 deletions(-)
diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
index 6aca4075e7..48f7619cc4 100644
--- a/src/libxl/libxl_capabilities.c
+++ b/src/libxl/libxl_capabilities.c
@@ -512,7 +512,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps)
return 0;
}
-static int
+static void
libxlMakeDomainOSCaps(const char *machine,
virDomainCapsOS *os,
virFirmware **firmwares,
@@ -527,7 +527,7 @@ libxlMakeDomainOSCaps(const char *machine,
capsLoader->readonly.report = true;
if (STREQ(machine, "xenpv") || STREQ(machine, "xenpvh"))
- return 0;
+ return;
capsLoader->supported = VIR_TRISTATE_BOOL_YES;
capsLoader->values.values = g_new0(char *, nfirmwares);
@@ -542,11 +542,9 @@ libxlMakeDomainOSCaps(const char *machine,
VIR_DOMAIN_LOADER_TYPE_PFLASH);
VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->readonly,
VIR_TRISTATE_BOOL_YES);
-
- return 0;
}
-static int
+static void
libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev)
{
dev->supported = VIR_TRISTATE_BOOL_YES;
@@ -562,11 +560,9 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev)
VIR_DOMAIN_DISK_BUS_IDE,
VIR_DOMAIN_DISK_BUS_SCSI,
VIR_DOMAIN_DISK_BUS_XEN);
-
- return 0;
}
-static int
+static void
libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev)
{
dev->supported = VIR_TRISTATE_BOOL_YES;
@@ -576,11 +572,9 @@ libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev)
VIR_DOMAIN_GRAPHICS_TYPE_SDL,
VIR_DOMAIN_GRAPHICS_TYPE_VNC,
VIR_DOMAIN_GRAPHICS_TYPE_SPICE);
-
- return 0;
}
-static int
+static void
libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVideo *dev)
{
dev->supported = VIR_TRISTATE_BOOL_YES;
@@ -590,11 +584,9 @@ libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVideo *dev)
VIR_DOMAIN_VIDEO_TYPE_VGA,
VIR_DOMAIN_VIDEO_TYPE_CIRRUS,
VIR_DOMAIN_VIDEO_TYPE_XEN);
-
- return 0;
}
-static int
+static void
libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdev *dev)
{
dev->supported = VIR_TRISTATE_BOOL_YES;
@@ -625,10 +617,9 @@ libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdev *dev)
virDomainCapsEnumClear(&dev->pciBackend);
VIR_DOMAIN_CAPS_ENUM_SET(dev->pciBackend, VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN);
- return 0;
}
-static int
+static void
libxlMakeDomainDeviceConsoleCaps(virDomainCapsDeviceConsole *console)
{
console->supported = VIR_TRISTATE_BOOL_YES;
@@ -643,8 +634,6 @@ libxlMakeDomainDeviceConsoleCaps(virDomainCapsDeviceConsole *console)
VIR_DOMAIN_CHR_TYPE_UDP,
VIR_DOMAIN_CHR_TYPE_UNIX,
VIR_DOMAIN_CHR_TYPE_VC);
-
- return 0;
}
virCaps *
@@ -698,15 +687,15 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps,
else
domCaps->maxvcpus = PV_MAX_VCPUS;
- if (libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares) < 0 ||
- libxlMakeDomainDeviceDiskCaps(disk) < 0 ||
- libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 ||
- libxlMakeDomainDeviceVideoCaps(video) < 0 ||
- libxlMakeDomainDeviceConsoleCaps(console))
- return -1;
- if (STRNEQ(domCaps->machine, "xenpvh") &&
- libxlMakeDomainDeviceHostdevCaps(hostdev) < 0)
- return -1;
+ libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares);
+ libxlMakeDomainDeviceDiskCaps(disk);
+ libxlMakeDomainDeviceGraphicsCaps(graphics);
+ libxlMakeDomainDeviceVideoCaps(video);
+ libxlMakeDomainDeviceConsoleCaps(console);
+
+ if (STRNEQ(domCaps->machine, "xenpvh")) {
+ libxlMakeDomainDeviceHostdevCaps(hostdev);
+ }
domCaps->features[VIR_DOMAIN_CAPS_FEATURE_IOTHREADS] = VIR_TRISTATE_BOOL_NO;
domCaps->features[VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO] = VIR_TRISTATE_BOOL_NO;
--
2.49.0
1 month, 1 week
[PATCH v2 0/4] conf: graphics def and parse refactor
by Kirill Shchetiniuk
This series refactors the existing parse logic by using the proper utility
functions, it also contains some parameters type changes to void
unnecessary type convertions.
1. 'VNC' graphics pasing were refactored to use the vitXMLProp* utility functions.
'autoport' and 'websocketGenerated' remain their bool type, as this structure
members can be also modified later and not only determined by the initial XML
definition.
2. 'RDP' graphics refactored same as VNC graphics, except that 'multiUser' and
'replaceUser' types changed from bool to tristateBool, as parameters are
determined only by the initial XML.
3. 'SDL' graphics fullscreen option type changed from bool to tristateBool,
to avoid unnecessary type convertions.
4. 'desktop' graphics fullscreen option is removed as it was never used.
Kirill Shchetiniuk (4):
conf: VNC graphics parse refactor
conf: SDL fullscreen option refactor
conf: RDP graphics parse refactor
conf: desktop graphics remove unused option
docs/formatdomain.rst | 5 +-
src/conf/domain_conf.c | 125 ++++++++++++++----------------
src/conf/domain_conf.h | 7 +-
src/conf/schemas/domaincommon.rng | 5 --
src/qemu/qemu_command.c | 2 +-
src/qemu/qemu_process.c | 4 +-
src/qemu/qemu_validate.c | 4 +-
src/vbox/vbox_common.c | 8 +-
8 files changed, 71 insertions(+), 89 deletions(-)
--
2.49.0
1 month, 1 week
[PATCH 0/4] conf: graphics def and parse refactor
by Kirill Shchetiniuk
This series is supposed to refactor the existing parse logic by
using the proper utility function and some parameters type change.
1. VNC graphics pasing were refactored to use the vitXMLProp* utility functions.
'autoport' and 'websocketGenerated' remain their bool type, as this structure
members can be also modified later and not only determined by the initial XML
definition.
2. RDP graphics refactored same as VNC graphics, exept that 'multiUser' and
'replaceUser' types changed from bool to tristate, as parameters determined
only by the initial XML.
3. SDL graphics fullscreen option type changed from bool to tristate, to avoid
unnecessary type convertions.
4. desktop fullscreen option is removed as it was never used.
Kirill Shchetiniuk (4):
conf: VNC graphics parse refactor
conf: SDL fullscreen option refactor
conf: RDP graphics parse refactor
conf: desktop graphics remove unused option
docs/formatdomain.rst | 5 +-
src/conf/domain_conf.c | 125 ++++++++++++++----------------
src/conf/domain_conf.h | 7 +-
src/conf/schemas/domaincommon.rng | 5 --
src/qemu/qemu_command.c | 2 +-
src/qemu/qemu_process.c | 4 +-
src/qemu/qemu_validate.c | 4 +-
src/vbox/vbox_common.c | 8 +-
8 files changed, 71 insertions(+), 89 deletions(-)
--
2.49.0
1 month, 1 week
[PATCH] qemu: command: Don't attempt to set backend MTU for networks which don't use host backend directly
by Peter Krempa
From: Peter Krempa <pkrempa(a)redhat.com>
Attempting to set MTU for network types which don't actually use the
network device on the host results in a failure. The 'mtu' property is
also used e.g. for the 'host_mtu' property of e.g. 'virtio-net-pci'
which is applied even in vhost-user mode.
Use the existing switch which selects devices without a network device
backend on the host side and skip setting the MTU.
Tested by running 'passt' in vhost-user mode manually:
passt -f --vhost-user -s /tmp/vh.sock
and the following XML:
<interface type="vhostuser">
<mac address="52:54:00:3d:91:97"/>
<source type="unix" path="/tmp/vh.sock" mode="client"/>
<model type="virtio"/>
<mtu size="9999"/>
<address type="pci" domain="0x0000" bus="0x00" slot="0x02" function="0x0"/>
</interface>
The OS in the guest reports MTU 9999.
Closes: https://gitlab.com/libvirt/libvirt/-/issues/717
Closes: https://gitlab.com/libvirt/libvirt/-/issues/192
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index fec48edfc1..edafe1588c 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8713,6 +8713,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
bool requireNicdev = false;
g_autoptr(virJSONValue) hostnetprops = NULL;
qemuDomainNetworkPrivate *netpriv = QEMU_DOMAIN_NETWORK_PRIVATE(net);
+ bool setBackendMTU = true;
GSList *n;
if (qemuDomainValidateActualNetDef(net, qemuCaps) < 0)
@@ -8802,6 +8803,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
case VIR_DOMAIN_NET_TYPE_NULL:
case VIR_DOMAIN_NET_TYPE_VDS:
case VIR_DOMAIN_NET_TYPE_LAST:
+ setBackendMTU = false;
/* These types don't use a network device on the host, but
* instead use some other type of connection to the emulated
* device in the qemu process.
@@ -8842,7 +8844,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
}
}
- if (net->mtu && net->managed_tap != VIR_TRISTATE_BOOL_NO &&
+ if (net->mtu && setBackendMTU && net->managed_tap != VIR_TRISTATE_BOOL_NO &&
virNetDevSetMTU(net->ifname, net->mtu) < 0)
goto cleanup;
--
2.49.0
1 month, 2 weeks
[PATCH 0/2] Fix build on non-Linux
by Jiri Denemark
Jiri Denemark (2):
util: Avoid statfs in virFileGetExistingParent
util: Move virFileGetExistingParent out of ifdef __linux__
src/util/virfile.c | 56 ++++++++++++++++++++++-----------------------
tests/virfilemock.c | 28 +++++++++++++++++++++++
2 files changed, 56 insertions(+), 28 deletions(-)
--
2.49.0
1 month, 2 weeks
