December 2023 - Devel - libvirt List Archives

[Libvir] Hang with virt-install graphic=no on FC 6 6.93/F7 RC2
by libvirtuser 23 Dec '25

23 Dec '25

I had this problem and another user confirmed the same behavior on his machine: http://pastie.caboo.se/65417 Haven't tried it with *2925.10* yet. Also, is there a way to get more verbose info about what calls are causing the "configuration file syntax error" errors? Thanks. virt-install How large would you like the disk () to be (in gigabytes)? 4 ERROR: Must provide a file, not a directory for the disk What would you like to use as the disk (path)? /xen/images/x6.img Would you like to enable graphics support? (yes or no) no What is the install location? http://mirror.anl.gov/pub/fedora-linux-core/test/6.93/Fedora/i386/os/ Starting install... libvir: Xen Daemon error : GET operation failed: libvir: error : configuration file syntax error: expecting a name libvir: error : configuration file syntax error: expecting a name libvir: error : configuration file syntax error: expecting a name Retrieving Fedora... 276 kB 00:01 Retrieving vmlinuz... 100% |=========================| 2.1 MB 00:16 Retrieving initrd.img... 100% |=========================| 5.4 MB 00:28 libvir: Xen Daemon error : GET operation failed: libvir: error : configuration file syntax error: expecting a name libvir: error : configuration file syntax error: expecting a name libvir: error : configuration file syntax error: expecting a name Creating domain... 0 B 00:06 Linux version 2.6.20-2925.5.fc7xen (brewbuilder(a)ls20-bc1-14.build.redhat.com) (gcc version 4.1.2 20070317 (Red Hat 4.1.2-5)) #1 SMP Thu Mar 22 13:51:38 EDT 2007 BIOS-provided physical RAM map: sanitize start sanitize bail 0 copy_e820_map() start: 0000000000000000 size: 0000000020800000 end: 0000000020800000 type: 1 Xen: 0000000000000000 - 0000000020800000 (usable) 0MB HIGHMEM available. 520MB LOWMEM available. Using x86 segment limits to approximate NX protection Zone PFN ranges: DMA 0 -> 133120 Normal 133120 -> 133120 HighMem 133120 -> 133120 early_node_map[1] active PFN ranges 0: 0 -> 133120 ACPI in unprivileged domain disabled Built 1 zonelists. Total pages: 132080 Kernel command line: method=http://mirror.anl.gov/pub/fedora-linux-core/test/6.93/Fedora/i386/os/ Enabling fast FPU save and restore... done. Enabling unmasked SIMD FPU exception support... done. Initializing CPU#0 CPU 0 irqstacks, hard=c135f000 soft=c133f000 PID hash table entries: 4096 (order: 12, 16384 bytes) Xen reported: 1694.994 MHz processor. Console: colour dummy device 80x25 Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar ... MAX_LOCKDEP_SUBCLASSES: 8 ... MAX_LOCK_DEPTH: 30 ... MAX_LOCKDEP_KEYS: 2048 ... CLASSHASH_SIZE: 1024 ... MAX_LOCKDEP_ENTRIES: 8192 ... MAX_LOCKDEP_CHAINS: 16384 ... CHAINHASH_SIZE: 8192 memory used by lock dependency info: 1064 kB per task-struct memory footprint: 1200 bytes Dentry cache hash table entries: 131072 (order: 7, 524288 bytes) Inode-cache hash table entries: 65536 (order: 6, 262144 bytes) Software IO TLB disabled vmalloc area: e1000000-f4ffe000, maxmem 2d7fe000 Memory: 503936k/532480k available (2030k kernel code, 19948k reserved, 1079k data, 180k init, 0k highmem) virtual kernel memory layout: fixmap : 0xf5315000 - 0xf57fe000 (5028 kB) pkmap : 0xf5000000 - 0xf5200000 (2048 kB) vmalloc : 0xe1000000 - 0xf4ffe000 ( 319 MB) lowmem : 0xc0000000 - 0xe0800000 ( 520 MB) .init : 0xc130e000 - 0xc133b000 ( 180 kB) .data : 0xc11fb9d9 - 0xc1309714 (1079 kB) .text : 0xc1000000 - 0xc11fb9d9 (2030 kB) Checking if this processor honours the WP bit even in supervisor mode... Ok. Calibrating delay using timer specific routine.. 4262.67 BogoMIPS (lpj=8525343) Security Framework v1.0.0 initialized SELinux: Initializing. SELinux: Starting in permissive mode selinux_register_security: Registering secondary module capability Capability LSM initialized as secondary Mount-cache hash table entries: 512 CPU: Trace cache: 12K uops, L1 D cache: 8K CPU: L2 cache: 256K Checking 'hlt' instruction... OK. SMP alternatives: switching to UP code Freeing SMP alternatives: 11k freed Brought up 1 CPUs Grant table initialized NET: Registered protocol family 16 Brought up 1 CPUs PCI: Fatal: No config space access function found PCI: setting up Xen PCI frontend stub Setting up standard PCI resources ACPI: Interpreter disabled. Linux Plug and Play Support v0.97 (c) Adam Belay pnp: PnP ACPI: disabled xen_mem: Initialising balloon driver. usbcore: registered new interface driver usbfs usbcore: registered new interface driver hub usbcore: registered new device driver usb PCI: System does not support PCI PCI: System does not support PCI NetLabel: Initializing NetLabel: domain hash size = 128 NetLabel: protocols = UNLABELED CIPSOv4 NetLabel: unlabeled traffic allowed by default NET: Registered protocol family 2 IP route cache hash table entries: 32768 (order: 5, 131072 bytes) TCP established hash table entries: 131072 (order: 10, 4194304 bytes) TCP bind hash table entries: 65536 (order: 9, 2097152 bytes) TCP: Hash tables configured (established 131072 bind 65536) TCP reno registered checking if image is initramfs... it is Freeing initrd memory: 7256k freed IA-32 Microcode Update Driver: v1.14-xen <tigran(a)veritas.com> audit: initializing netlink socket (disabled) audit(1180379657.981:1): initialized VFS: Disk quotas dquot_6.5.1 Dquot-cache hash table entries: 1024 (order 0, 4096 bytes) SELinux: Registering netfilter hooks io scheduler noop registered io scheduler anticipatory registered io scheduler deadline registered io scheduler cfq registered (default) pci_hotplug: PCI Hot Plug PCI Core version: 0.5 BUG: at kernel/fork.c:994 copy_process() [<c1005d9a>] show_trace_log_lvl+0x1a/0x2f [<c1006343>] show_trace+0x12/0x14 [<c10063be>] dump_stack+0x16/0x18 [<c101d044>] copy_process+0x195/0x1245 [<c101e144>] do_fork+0x50/0x117 [<c1003351>] kernel_thread+0x8e/0x96 [<c102c701>] __call_usermodehelper+0x2d/0x46 [<c102cd4f>] run_workqueue+0x89/0x145 [<c102d711>] worker_thread+0xd5/0x102 [<c102ff27>] kthread+0xb3/0xdc [<c10058db>] kernel_thread_helper+0x7/0x10 ======================= rtc: IRQ 8 is not free. Non-volatile memory driver v1.2 Linux agpgart interface v0.101 (c) Dave Jones RAMDISK driver initialized: 16 RAM disks of 16384K size 4096 blocksize input: Macintosh mouse button emulation as /class/input/input0 Xen virtual console successfully installed as xvc0 Event-channel device installed. usbcore: registered new interface driver libusual usbcore: registered new interface driver hiddev usbcore: registered new interface driver usbhid drivers/usb/input/hid-core.c: v2.6:USB HID core driver PNP: No PS/2 controller found. Probing ports directly. i8042.c: No controller found. mice: PS/2 mouse device common for all mice TCP bic registered Initializing XFRM netlink socket NET: Registered protocol family 1 NET: Registered protocol family 17 Using IPI No-Shortcut mode XENBUS: Device with no driver: device/vbd/51712 XENBUS: Device with no driver: device/vif/0 Freeing unused kernel memory: 180k freed Write protecting the kernel read-only data: 762k ^[Domain installation still in progress. You can reconnect

2 1

[libvirt] [PATCH] Fix python error reporting for some storage operations
by Cole Robinson 07 Mar '25

07 Mar '25

In the python bindings, all vir* classes expect to be passed a virConnect object when instantiated. Before the storage stuff, these classes were only instantiated in virConnect methods, so the generator is hardcoded to pass 'self' as the connection instance to these classes. Problem is there are some methods that return pool or vol instances which aren't called from virConnect: you can lookup a storage volume's associated pool, and can lookup volumes from a pool. In these cases passing 'self' doesn't give the vir* instance a connection, so when it comes time to raise an exception crap hits the fan. Rather than rework the generator to accomodate this edge case, I just fixed the init functions for virStorage* to pull the associated connection out of the passed value if it's not a virConnect instance. Thanks, Cole diff --git a/python/generator.py b/python/generator.py index 01a17da..c706b19 100755 --- a/python/generator.py +++ b/python/generator.py @@ -962,8 +962,12 @@ def buildWrappers(): list = reference_keepers[classname] for ref in list: classes.write(" self.%s = None\n" % ref[1]) - if classname in [ "virDomain", "virNetwork", "virStoragePool", "virStorageVol" ]: + if classname in [ "virDomain", "virNetwork" ]: classes.write(" self._conn = conn\n") + elif classname in [ "virStorageVol", "virStoragePool" ]: + classes.write(" self._conn = conn\n" + \ + " if not isinstance(conn, virConnect):\n" + \ + " self._conn = conn._conn\n") classes.write(" if _obj != None:self._o = _obj;return\n") classes.write(" self._o = None\n\n"); destruct=None

4 3

[libvirt PATCH 00/28] native support for nftables in virtual network driver
by Laine Stump 12 Jun '24

12 Jun '24

This patch series enables libvirt to use nftables rules rather than iptables *when setting up virtual networks* (it does *not* add nftables support to the nwfilter driver). It accomplishes this by abstracting several iptables functions (from viriptables.[ch] called by the virtual network driver into a rudimentary "virNetfilter API" (in virnetfilter.[ch], having the virtual network driver call the virNetFilter API rather than calling the existing iptables functions directly, and then finally adding an equivalent virNftables backend that can be used instead of iptables (selected manually via a network.conf setting, or automatically if iptables isn't found on the host). A first look at the result may have you thinking that it's filled with a lot of bad decisions. While I would agree with that in many cases, I think that overall they are the "least bad" decisions, or at least "bad within acceptable limits / no worse than something else", and point out that it's been done in a way that minimizes (actually eliminates) the need for immediate changes to nwfilter (the other consumer of iptables, which *also* needs to be updated to use native nftables), and makes it much easier to change our mind about the details in the future. When I first started on this (long, protracted, repeatedly interrupted for extended periods - many of these patches are > a year old) task, I considered doing an all-at-once complete replacement of iptables with nftables, since all the Linux distros we support have had nftables for several years, and I'm pretty sure nobody has it disabled (not even sure if it's possible to disable nftables while still enabling iptables, since they both use xtables in the kernel). But due to libvirt's use of "-t mangle -j CHECKSUM --checksum-fill" (see commit fd5b15ff all the way back in July 2010 for details) which has no equivalent in nftables rules (and we don't *want* it to!!), and the desire to be able to easily switch back to iptables in case of an unforeseen regression, we decided that both iptables and nftables need to be supported (for now), with the default (for now) remaining as iptables. Just allowing for dual backends complicated matters, since it means that we have to have a config file, a setting, detection of which backends are available, and of course some sort of concept of an abstracted frontend that can use either backend based on the config setting (and/or auto-detection). Combining that with the fact that it would just be "too big" of a project to switch over nwfilter's iptables usage at the same time means that we have to keep around a lot of existing code for compatibility's sake rather than just wiping it all away and starting over. So, what I've ended up with is: 1) a network.conf file (didn't exist before) with a single setting "firewall_backend". If unset, the network driver tries to use iptables on the backend, and if that's missing, then tries to use nftables. 2) a new (internal-only, so transient!) virNetFilterXXX API that is used by the network driver in place of the iptablesXXX API, and calls either iptablesXXX or: 3) a virNftablesXXX API that exactly replicates the filtering rules of the existing iptablesXXX API (except in the custom "libvirt" base table rather than the system "filter" and "nat" tables). This means that: 4) when the nftables backend is used, the rules added are *exactly the same* (functionally speaking) as we currently add for iptables (except they are in the "libvirt" table). We had spent some time in IRC discussing different ways of using new functionality available in nftables to make a more efficient/performant implemention of the desired filtering, and there are some really great possibilities that need to be explored, but in the end there were too many details up in the air, and I decided that it would be more "accomplishable" (coined a new word there!) to first replicate existing behavior with nftables, but do it inside a framework that makes it easy to modify the details in the future (in particular making it painless to switch back and forth between builds with differing filter models at runtime) - this way we'll be able to separate the infrastructure work from the details of the rules (which we can then more easily work on and experiment with). (This implies that the main objective right now is "get rid of iptables dependencies", not "make the filtering faster and more efficient"). Notable features of this patchset: * allows switching between iptables/nftables backends without rebooting or restarting networks/guests. Because the commands required to remove a network's filter rules are now saved in the network status XML, each time libvirtd (or virtnetworkd) is restarted, it will execute exactly the commands needed to remove the filter rules that had been added by the previous libvirtd/virtnetworkd (rather than just making a guess, as we've always done up until now), and then add new rules using the current backend+binary's set of rules (while also saving the info needed for future removal of these new rules back into the network's status XML). * firewall_backend can be explicitly set in (new) /etc/libvirt/network.conf, but if it's not explicitly set, libvirt will default to the iptables backend if the iptables binary is found, and otherwise fall back to nftables as long as the nft binary is found; otherwise the first attempt to start a network will fail with an appropriate error. Things that seem ugly / that I would like to clean up / that I think are just fine as they are: * virFirewall does *not* provide a backend-agnostic interface [this is fine] * We need to maintain a backward-compatible API for virFirewall so that we don't have to touch nwfilter code. Trying to make its API backend-agnostic would require individually considering/changing every nwfilter use of virFirewall. * instead virFirewall objects are just a way to build a collection of commands to execute to build a firewall, then execute them while collecting info for and building a collection of commands that will tear down that firewall in the future. Do I want to "fix" this in the future by making virFirewall a higher level interface that accepts tokens describing the type of rule to add (rather than backend-specific arguments to a backend-specific command)? No. I think I like the way virFirewall works (as described in that previous bullet-point), instead I'm thinking that it is just slightly mis-named - I've lately been thinking of it as a "virNetFilterCmdList". Similarly, the virFirewallRules that it has a list of aren't really "rules", they are better described as commands or actions, so maybe they should be renamed to virNetfilterCmd or virNetfilterAction. But that is just cosmetic, so I didn't want to get into it in these patches (especially in case someone disagrees, or has a better idea for naming). * Speaking of renaming - I should probably rename all the "iptablesXXX" functions to "virIptablesXXX" to be consistent with so much of our other code. I lost the ambition to deal with it right now though, so I'm leaving that for later cleanup (or I could do it now if it really makes someone's day :-). * I could have chosen a higher place in the callchain to make the virNetfilter abstraction, e.g. at the level of "networkAddXXXFirewallRules()" rather than at the lower level of iptablesXXX(). That is actually probably what will happen in the future (since it will be necessary in order for an nftables-based firewall to be significantly different in structure from an iptables-based firewall). But that's the beauty of an API being private - we can freely add/remove things as needed. the important thing is that we now have the basic structure there. For now, the split is just above the existing iptablesXXX API (util/viriptables.[ch], which seems like a "narrow" enough place. Most iptablesXXX functions are written in terms of just 10 *other* iptablesXXX functions that add iptables-specific commands - I've just moved those functions into virnetfilter.[ch] (appropriately renamed), and changed them to call the 10 virNetfilterXXX functions that will in-turn call those 10 iptablesXXX (or equivalent virNftablesXXX) functions. * Some people may dislike that the 10 virNetfilterXXX functions are each written with a switch statement that has cases to directly call each backend, rather than each backend driver having a table of pointers to API functions, with the virNetfilter API function calling backends[fwBackend]->XXX() (ie the pattern for so many drivers in libvirt). But for just 2 backends, that really seemed like overkill and unnecessary obfuscation. * As implemented here, I am storing a "<fwRemoval>" element in the network status XML - it contains a serialized virFirewall object that directly contains the commands necessary to remove the firewall. I could instead just store "<firewall>", which would include all the commands that were used to *create* the firewall in addition to the commands needed to remove the firewall. The way it's done currently takes up less space; switching to storing the full firewall *might* be more informative to somebody, but on the other hand would make the network status XML *very* long. If anybody has an opinion about this, now is the time to bring it up - do you think it's worth having a separate list of all the commands that were used to create a network's firewall (keeping in mind that there is no public API to access it)? Or is it enough to just store what's needed to remove the firewall? * Several months ago Eric Garver posted patches for a pure firewalld backend, and I requested that they not be pushed because I wanted that to be integrated with my nftables backend support. Due to the fact that the firewalld backend is almost entirely implemented by putting the bridge into a new firewalld "zone", with no individual rules added, that won't happen as just another backend driver file in parallel to iptables and nftables; it will instead work by checking firewall_backend at a higher level in the network driver, thus avoiding the calls to virNetfilterXXX() entirely. I have locally merged Eric's patches over the top of these patches, and there are surprisingly few conflicts, but since his patches didn't account for a user-settable config (but instead just always used the firewalld backend if firewalld was active), some of the patches are going to require a bit of rework, which I'll take care of after getting these patches in. Laine Stump (28): util: add -w/--concurrent when applying the rule rather than when building it util: new virFirewallRuleGet*() APIs util: determine ignoreErrors value when creating rule, not when applying util: rename iptables helpers that will become the frontend for ip&nftables util: move backend-agnostic virNetfilter*() functions to their own file util: make netfilter action a proper typedefed (virFirewall) enum util: #define the names used for private packet filter chains util: move/rename virFirewallApplyRuleDirect to virIptablesApplyFirewallRule util/network: reintroduce virFirewallBackend, but different network: add (empty) network.conf file to distribution files network: allow setting firewallBackend from network.conf network: do not add DHCP checksum mangle rule unless using iptables network: call backend agnostic function to init private filter chains util: setup functions in virnetfilter which will call appropriate backend build: add nft to the list of binaries we attempt to locate util: add nftables backend to virnetfilter API used by network driver tests: test cases for nftables backend util: new functions to support adding individual rollback rules util: check for 0 args when applying iptables rule util: implement rollback rule autosave for iptables backend util: implement rollback rule autosave for nftables backend network: turn on auto-rollback for the rules added for virtual networks util: new function virFirewallNewFromRollback() util: new functions virFirewallParseXML() and virFirewallFormat() conf: add a virFirewall object to virNetworkObj network: use previously saved list of firewall rules when removing network: save network status when firewall rules are reloaded network: improve log message when reloading virtual network firewall rules libvirt.spec.in | 5 + meson.build | 1 + po/POTFILES | 2 + src/conf/virnetworkobj.c | 40 + src/conf/virnetworkobj.h | 11 + src/libvirt_private.syms | 68 +- src/network/bridge_driver.c | 40 +- src/network/bridge_driver_conf.c | 44 + src/network/bridge_driver_conf.h | 3 + src/network/bridge_driver_linux.c | 241 +++-- src/network/bridge_driver_nop.c | 6 +- src/network/bridge_driver_platform.h | 6 +- src/network/libvirtd_network.aug | 39 + src/network/meson.build | 11 + src/network/network.conf | 24 + src/network/test_libvirtd_network.aug.in | 5 + src/nwfilter/nwfilter_ebiptables_driver.c | 16 +- src/util/meson.build | 2 + src/util/virebtables.c | 4 +- src/util/virfirewall.c | 490 ++++++++-- src/util/virfirewall.h | 51 +- src/util/viriptables.c | 762 ++++----------- src/util/viriptables.h | 222 ++--- src/util/virnetfilter.c | 892 ++++++++++++++++++ src/util/virnetfilter.h | 159 ++++ src/util/virnftables.c | 698 ++++++++++++++ src/util/virnftables.h | 118 +++ .../{base.args => base.iptables} | 0 tests/networkxml2firewalldata/base.nftables | 256 +++++ ...-linux.args => nat-default-linux.iptables} | 0 .../nat-default-linux.nftables | 248 +++++ ...pv6-linux.args => nat-ipv6-linux.iptables} | 0 .../nat-ipv6-linux.nftables | 384 ++++++++ ...rgs => nat-ipv6-masquerade-linux.iptables} | 0 .../nat-ipv6-masquerade-linux.nftables | 456 +++++++++ ...linux.args => nat-many-ips-linux.iptables} | 0 .../nat-many-ips-linux.nftables | 472 +++++++++ ...-linux.args => nat-no-dhcp-linux.iptables} | 0 .../nat-no-dhcp-linux.nftables | 384 ++++++++ ...ftp-linux.args => nat-tftp-linux.iptables} | 0 .../nat-tftp-linux.nftables | 274 ++++++ ...inux.args => route-default-linux.iptables} | 0 .../route-default-linux.nftables | 162 ++++ tests/networkxml2firewalltest.c | 56 +- tests/virfirewalltest.c | 20 +- 45 files changed, 5718 insertions(+), 954 deletions(-) create mode 100644 src/network/libvirtd_network.aug create mode 100644 src/network/network.conf create mode 100644 src/network/test_libvirtd_network.aug.in create mode 100644 src/util/virnetfilter.c create mode 100644 src/util/virnetfilter.h create mode 100644 src/util/virnftables.c create mode 100644 src/util/virnftables.h rename tests/networkxml2firewalldata/{base.args => base.iptables} (100%) create mode 100644 tests/networkxml2firewalldata/base.nftables rename tests/networkxml2firewalldata/{nat-default-linux.args => nat-default-linux.iptables} (100%) create mode 100644 tests/networkxml2firewalldata/nat-default-linux.nftables rename tests/networkxml2firewalldata/{nat-ipv6-linux.args => nat-ipv6-linux.iptables} (100%) create mode 100644 tests/networkxml2firewalldata/nat-ipv6-linux.nftables rename tests/networkxml2firewalldata/{nat-ipv6-masquerade-linux.args => nat-ipv6-masquerade-linux.iptables} (100%) create mode 100644 tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables rename tests/networkxml2firewalldata/{nat-many-ips-linux.args => nat-many-ips-linux.iptables} (100%) create mode 100644 tests/networkxml2firewalldata/nat-many-ips-linux.nftables rename tests/networkxml2firewalldata/{nat-no-dhcp-linux.args => nat-no-dhcp-linux.iptables} (100%) create mode 100644 tests/networkxml2firewalldata/nat-no-dhcp-linux.nftables rename tests/networkxml2firewalldata/{nat-tftp-linux.args => nat-tftp-linux.iptables} (100%) create mode 100644 tests/networkxml2firewalldata/nat-tftp-linux.nftables rename tests/networkxml2firewalldata/{route-default-linux.args => route-default-linux.iptables} (100%) create mode 100644 tests/networkxml2firewalldata/route-default-linux.nftables -- 2.39.2

7 78

[PATCH] Extend libvirt-guests to shutdown only persistent VMs
by Benjamin Taubmann 04 Apr '24

04 Apr '24

At the moment, there is no configuration option for the libvirt-guests service that allows users to define that only persistent virtual machines should be shutdown on host shutdown. Currently, the service config allows to choose between two ON_SHUTDOWN actions that are executed on running virtual machines when the host goes down: shutdown, suspend. The ON_SHUTDOWN action should be orthogonal to the type of the virtual machine. However, the existing implementation, does not suspend transient virtual machines. This is the matrix of actions that is executed on virtual machines based on the configured ON_SHUTDOWN action and the type of a virtual machine. | persistent | transient shutdown | shutdown | shutdown (what we want to change) suspend | suspend | nothing Add config option PERSISTENT_ONLY to libvirt-guests config that allows users to define if the ON_SHUTDOWN action should be applied only on persistent virtual machines. PERSISTENT_ONLY can be set to true, false, default. The default option will implement the already existing logic. Case 1: PERSISTENT_ONLY=default | persistent | transient shutdown | shutdown | shutdown suspend | suspend | nothing Case 2: PERSISTENT_ONLY=true | persistent | transient shutdown | shutdown | nothing suspend | suspend | nothing Case 3: PERSISTENT_ONLY=false | persistent | transient shutdown | shutdown | shutdown suspend | suspend | suspend Change-Id: Ib03013d00b3ec60716287dad4743a038cf000763 --- tools/libvirt-guests.sh.in | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 344b54390a..c3c5954e17 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -38,6 +38,7 @@ PARALLEL_SHUTDOWN=0 START_DELAY=0 BYPASS_CACHE=0 SYNC_TIME=0 +PERSISTENT_ONLY="default" test -f "$initconfdir"/libvirt-guests && . "$initconfdir"/libvirt-guests @@ -438,14 +439,16 @@ shutdown_guests_parallel() # stop # Shutdown or save guests on the configured uris stop() { - local suspending="true" local uri= + local action="suspend" + local persistent_only="default" + # last stop was not followed by start [ -f "$LISTFILE" ] && return 0 if [ "x$ON_SHUTDOWN" = xshutdown ]; then - suspending="false" + action="shutdown" if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" echo @@ -454,6 +457,22 @@ stop() { fi fi + case "x$PERSISTENT_ONLY" in + xtrue) + persistent_only="true" + ;; + xfalse) + persistent_only="false" + ;; + *) + if [ "x$action" = xshutdown ]; then + persistent_only="false" + elif [ "x$action" = xsuspend ]; then + persistent_only="true" + fi + ;; + esac + : >"$LISTFILE" set -f for uri in $URIS; do @@ -478,7 +497,7 @@ stop() { echo fi - if "$suspending"; then + if "$persistent_only"; then local transient="$(list_guests "$uri" "--transient")" if [ $? -eq 0 ]; then local empty="true" @@ -486,7 +505,11 @@ stop() { for uuid in $transient; do if "$empty"; then - eval_gettext "Not suspending transient guests on URI: \$uri: " + if [ "x$action" = xsuspend ]; then + eval_gettext "Not suspending transient guests on URI: \$uri: " + else + eval_gettext "Not shutting down transient guests on URI: \$uri: " + fi empty="false" else printf ", " @@ -520,19 +543,19 @@ stop() { if [ -s "$LISTFILE" ]; then while read uri list; do - if "$suspending"; then + if [ "x$action" = xsuspend ]; then eval_gettext "Suspending guests on \$uri URI..."; echo else eval_gettext "Shutting down guests on \$uri URI..."; echo fi if [ "$PARALLEL_SHUTDOWN" -gt 1 ] && - ! "$suspending"; then + [ "x$action" = xshutdown ]; then shutdown_guests_parallel "$uri" "$list" else local guest= for guest in $list; do - if "$suspending"; then + if [ "x$action" = xsuspend ]; then suspend_guest "$uri" "$guest" else shutdown_guest "$uri" "$guest" -- 2.39.2

4 5

[PATCH v3 00/12] Improve versioned CPU support in libvirt
by Jonathon Jongsma 22 Mar '24

22 Mar '24

For SEV-SNP support we will need to be able to specify versioned CPU models that are not yet available in libvirt. Rather than just adding a versioned CPU or two that would satisfy that immediate need, I decided to try to add versioned CPUs in a more standard way. This series generates CPU definitions for all cpu versions that are defined in upstream qemu (at least for recent Intel and AMD CPUs). libvirt already provides a select subset of these versions as configurable CPU models. But we only include the ones that have defined aliases in qemu, such as EPYC-IBPB. After this patchset, all verisioned cpu models supported by qemu will be available in libvirt. In addition to adding these new versioned models, based on feedback from Daniel Berrange, I've also translated all CPU model aliases to a specific version when specifying a CPU model to qemu. This means that we will no longer specify e.g. '-cpu EPYC' to qemu, but will rather specify '-cpu EPYC-v1' Changes in v3: - handle unversioned aliases Changes in v2: - don't make any changes to existing CPU models - drop concept of aliases from libvirt and only provide new versioned models that aren't already available via their qemu alias. Jonathon Jongsma (12): cpu_map: update script to handle versioned CPUs cpu_map: add canonical names to existing CPU models cpu: parse the canonical name from the cpu model qemu: use canonical name for CPU models cpu_map: Add versioned EPYC CPUs cpu_map: Add versioned Intel Skylake CPUs cpu_map: Add versioned Intel Cascadelake CPUs cpu_map: Add versioned Intel Icelake CPUs cpu_map: Add versioned Intel Cooperlake CPUs cpu_map: Add versioned Intel Snowridge CPUs cpu_map: Add versioned Intel SapphireRapids CPUs cpu_map: Add versioned Dhyana CPUs src/conf/cpu_conf.c | 3 + src/conf/cpu_conf.h | 1 + src/cpu/cpu_x86.c | 24 ++++ src/cpu_map/index.xml | 22 +++ src/cpu_map/meson.build | 22 +++ src/cpu_map/sync_qemu_models_i386.py | 42 ++++-- src/cpu_map/x86_Broadwell-IBRS.xml | 1 + src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 1 + src/cpu_map/x86_Broadwell-noTSX.xml | 1 + src/cpu_map/x86_Broadwell.xml | 1 + src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 1 + src/cpu_map/x86_Cascadelake-Server-v2.xml | 93 +++++++++++++ src/cpu_map/x86_Cascadelake-Server-v4.xml | 91 +++++++++++++ src/cpu_map/x86_Cascadelake-Server-v5.xml | 92 +++++++++++++ src/cpu_map/x86_Cascadelake-Server.xml | 1 + src/cpu_map/x86_Cooperlake-v2.xml | 98 ++++++++++++++ src/cpu_map/x86_Cooperlake.xml | 1 + src/cpu_map/x86_Dhyana-v2.xml | 81 ++++++++++++ src/cpu_map/x86_Dhyana.xml | 1 + src/cpu_map/x86_EPYC-IBPB.xml | 1 + src/cpu_map/x86_EPYC-Milan-v2.xml | 108 +++++++++++++++ src/cpu_map/x86_EPYC-Milan.xml | 1 + src/cpu_map/x86_EPYC-Rome-v2.xml | 93 +++++++++++++ src/cpu_map/x86_EPYC-Rome-v3.xml | 95 +++++++++++++ src/cpu_map/x86_EPYC-Rome-v4.xml | 94 +++++++++++++ src/cpu_map/x86_EPYC-Rome.xml | 1 + src/cpu_map/x86_EPYC-v3.xml | 87 ++++++++++++ src/cpu_map/x86_EPYC-v4.xml | 88 ++++++++++++ src/cpu_map/x86_EPYC.xml | 1 + src/cpu_map/x86_Haswell-IBRS.xml | 1 + src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 1 + src/cpu_map/x86_Haswell-noTSX.xml | 1 + src/cpu_map/x86_Haswell.xml | 1 + src/cpu_map/x86_Icelake-Server-noTSX.xml | 1 + src/cpu_map/x86_Icelake-Server-v3.xml | 103 +++++++++++++++ src/cpu_map/x86_Icelake-Server-v4.xml | 108 +++++++++++++++ src/cpu_map/x86_Icelake-Server-v5.xml | 109 +++++++++++++++ src/cpu_map/x86_Icelake-Server-v6.xml | 109 +++++++++++++++ src/cpu_map/x86_Icelake-Server.xml | 1 + src/cpu_map/x86_IvyBridge-IBRS.xml | 1 + src/cpu_map/x86_IvyBridge.xml | 1 + src/cpu_map/x86_Nehalem-IBRS.xml | 1 + src/cpu_map/x86_Nehalem.xml | 1 + src/cpu_map/x86_SandyBridge-IBRS.xml | 1 + src/cpu_map/x86_SandyBridge.xml | 1 + src/cpu_map/x86_SapphireRapids-v2.xml | 125 ++++++++++++++++++ src/cpu_map/x86_SapphireRapids.xml | 1 + src/cpu_map/x86_Skylake-Client-IBRS.xml | 1 + src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 1 + src/cpu_map/x86_Skylake-Client-v4.xml | 77 +++++++++++ src/cpu_map/x86_Skylake-Client.xml | 1 + src/cpu_map/x86_Skylake-Server-IBRS.xml | 1 + src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 1 + src/cpu_map/x86_Skylake-Server-v4.xml | 83 ++++++++++++ src/cpu_map/x86_Skylake-Server-v5.xml | 85 ++++++++++++ src/cpu_map/x86_Skylake-Server.xml | 1 + src/cpu_map/x86_Snowridge-v2.xml | 78 +++++++++++ src/cpu_map/x86_Snowridge-v3.xml | 80 +++++++++++ src/cpu_map/x86_Snowridge-v4.xml | 78 +++++++++++ src/cpu_map/x86_Snowridge.xml | 1 + src/cpu_map/x86_Westmere-IBRS.xml | 1 + src/cpu_map/x86_Westmere.xml | 1 + src/qemu/qemu_command.c | 5 +- .../x86_64-cpuid-Atom-P5362-guest.xml | 3 +- .../x86_64-cpuid-Atom-P5362-json.xml | 3 +- .../x86_64-cpuid-Cooperlake-host.xml | 3 +- .../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 5 +- .../x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 9 +- ...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 8 +- ..._64-cpuid-Hygon-C86-7185-32-core-guest.xml | 5 +- ...6_64-cpuid-Hygon-C86-7185-32-core-host.xml | 5 +- ...6_64-cpuid-Hygon-C86-7185-32-core-json.xml | 6 +- ...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 9 +- ..._64-cpuid-baseline-Cascadelake+Icelake.xml | 9 +- ...-cpuid-baseline-Cooperlake+Cascadelake.xml | 9 +- ...6_64-cpuid-baseline-Cooperlake+Icelake.xml | 9 +- .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 2 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 2 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 2 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 4 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 4 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 4 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 7 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 7 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 7 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 7 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 7 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 7 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 8 ++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 8 ++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 8 ++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 15 +++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 15 +++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 15 +++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 16 +++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 16 +++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 16 +++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 17 +++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 17 +++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 17 +++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 17 +++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 17 +++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 17 +++ .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 17 +++ .../qemu_7.2.0-tcg.x86_64+hvf.xml | 17 +++ .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 17 +++ tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 17 +++ .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 17 +++ .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 17 +++ tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 17 +++ .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 27 +++- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 22 +++ tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 27 +++- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 27 +++- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 22 +++ tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 27 +++- .../cpu-Haswell-noTSX.x86_64-latest.args | 2 +- .../cpu-Haswell.x86_64-latest.args | 2 +- .../cpu-Haswell2.x86_64-latest.args | 2 +- .../cpu-Haswell3.x86_64-latest.args | 2 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 2 +- .../cpu-cache-disable3.x86_64-latest.args | 2 +- ...u-check-default-partial.x86_64-latest.args | 2 +- .../cpu-fallback.x86_64-5.2.0.args | 2 +- .../cpu-fallback.x86_64-8.0.0.args | 2 +- .../cpu-host-model-cmt.x86_64-latest.args | 2 +- ...-host-model-fallback-kvm.x86_64-4.2.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-5.0.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-5.1.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-5.2.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-6.0.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-6.1.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-6.2.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-7.0.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-7.1.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-7.2.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-8.0.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-8.1.0.args | 2 +- ...host-model-fallback-kvm.x86_64-latest.args | 2 +- ...-host-model-fallback-tcg.x86_64-7.2.0.args | 2 +- ...-host-model-fallback-tcg.x86_64-8.0.0.args | 2 +- ...-host-model-fallback-tcg.x86_64-8.1.0.args | 2 +- ...host-model-fallback-tcg.x86_64-latest.args | 2 +- .../cpu-host-model-kvm.x86_64-4.2.0.args | 2 +- .../cpu-host-model-kvm.x86_64-5.0.0.args | 2 +- .../cpu-host-model-kvm.x86_64-5.1.0.args | 2 +- .../cpu-host-model-kvm.x86_64-5.2.0.args | 2 +- .../cpu-host-model-kvm.x86_64-6.0.0.args | 2 +- .../cpu-host-model-kvm.x86_64-6.1.0.args | 2 +- .../cpu-host-model-kvm.x86_64-6.2.0.args | 2 +- .../cpu-host-model-kvm.x86_64-7.0.0.args | 2 +- .../cpu-host-model-kvm.x86_64-7.1.0.args | 2 +- .../cpu-host-model-kvm.x86_64-7.2.0.args | 2 +- .../cpu-host-model-kvm.x86_64-8.0.0.args | 2 +- .../cpu-host-model-kvm.x86_64-8.1.0.args | 2 +- .../cpu-host-model-kvm.x86_64-latest.args | 2 +- ...ost-model-nofallback-kvm.x86_64-4.2.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-5.0.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-5.1.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-5.2.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-6.0.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-6.1.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-6.2.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-7.0.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-7.1.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-7.2.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-8.0.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-8.1.0.args | 2 +- ...st-model-nofallback-kvm.x86_64-latest.args | 2 +- ...ost-model-nofallback-tcg.x86_64-7.2.0.args | 2 +- ...ost-model-nofallback-tcg.x86_64-8.0.0.args | 2 +- ...ost-model-nofallback-tcg.x86_64-8.1.0.args | 2 +- ...st-model-nofallback-tcg.x86_64-latest.args | 2 +- .../cpu-host-model-tcg.x86_64-7.2.0.args | 2 +- .../cpu-host-model-tcg.x86_64-8.0.0.args | 2 +- .../cpu-host-model-tcg.x86_64-8.1.0.args | 2 +- .../cpu-host-model-tcg.x86_64-latest.args | 2 +- .../cpu-host-model-vendor.x86_64-latest.args | 2 +- .../cpu-minimum1.x86_64-latest.args | 2 +- .../cpu-minimum2.x86_64-latest.args | 2 +- .../cpu-nofallback.x86_64-8.0.0.args | 2 +- .../cpu-phys-bits-emulate2.x86_64-latest.args | 2 +- .../cpu-strict1.x86_64-latest.args | 2 +- .../cpu-translation.x86_64-latest.args | 2 +- .../cpu-tsc-frequency.x86_64-latest.args | 2 +- 190 files changed, 2837 insertions(+), 187 deletions(-) create mode 100644 src/cpu_map/x86_Cascadelake-Server-v2.xml create mode 100644 src/cpu_map/x86_Cascadelake-Server-v4.xml create mode 100644 src/cpu_map/x86_Cascadelake-Server-v5.xml create mode 100644 src/cpu_map/x86_Cooperlake-v2.xml create mode 100644 src/cpu_map/x86_Dhyana-v2.xml create mode 100644 src/cpu_map/x86_EPYC-Milan-v2.xml create mode 100644 src/cpu_map/x86_EPYC-Rome-v2.xml create mode 100644 src/cpu_map/x86_EPYC-Rome-v3.xml create mode 100644 src/cpu_map/x86_EPYC-Rome-v4.xml create mode 100644 src/cpu_map/x86_EPYC-v3.xml create mode 100644 src/cpu_map/x86_EPYC-v4.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v3.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v4.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v5.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v6.xml create mode 100644 src/cpu_map/x86_SapphireRapids-v2.xml create mode 100644 src/cpu_map/x86_Skylake-Client-v4.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v4.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v5.xml create mode 100644 src/cpu_map/x86_Snowridge-v2.xml create mode 100644 src/cpu_map/x86_Snowridge-v3.xml create mode 100644 src/cpu_map/x86_Snowridge-v4.xml -- 2.41.0

3 35

[libvirt PATCH 00/12] Add vmx-* features from qemu
by Tim Wiederhake 15 Mar '24

15 Mar '24

For rationale, see patch 3 (cpu_map: No longer ignore vmx- features in sync_qemu_features_i386.py). Adding features in bunches (one patch per msr index), as this series is adding ~100 features. This also adds cpu features "gds-no" and "amx-complex" and brings libvirt in sync with qemu commit ad6ef0a42e. Tim Wiederhake (12): cpu_map: Add missing feature "gds-no" cpu_map: Add missing feature "amx-complex" cpu_map: No longer ignore vmx- features in sync_qemu_features_i386.py cpu_map: Add missing vmx features from MSR 0x480 cpu_map: Add missing vmx features from MSR 0x485 cpu_map: Add missing vmx features from MSR 0x48B cpu_map: Add missing vmx features from MSR 0x48C cpu_map: Add missing vmx features from MSR 0x48D cpu_map: Add missing vmx features from MSR 0x48E cpu_map: Add missing vmx features from MSR 0x48F cpu_map: Add missing vmx features from MSR 0x490 cpu_map: Add missing vmx features from MSR 0x491 src/cpu_map/sync_qemu_features_i386.py | 2 +- src/cpu_map/x86_features.xml | 295 ++++++++++++++++++ .../x86_64-cpuid-Atom-P5362-enabled.xml | 9 + .../x86_64-cpuid-Atom-P5362-json.xml | 70 +++++ .../x86_64-cpuid-Cooperlake-enabled.xml | 9 + .../x86_64-cpuid-Cooperlake-json.xml | 71 +++++ .../x86_64-cpuid-Core-i7-8550U-enabled.xml | 9 + .../x86_64-cpuid-Core-i7-8550U-json.xml | 68 ++++ ...86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 9 + .../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 71 +++++ ...-cpuid-baseline-Cooperlake+Cascadelake.xml | 71 +++++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 68 ++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 68 ++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 68 ++++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 68 ++++ .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 1 + .../cpu-host-model.x86_64-4.2.0.args | 2 +- .../cpu-host-model.x86_64-5.0.0.args | 2 +- .../cpu-host-model.x86_64-latest.args | 2 +- 20 files changed, 960 insertions(+), 4 deletions(-) -- 2.39.2

3 19

[PATCH 00/10] Subject: [PATCH 00/10] Code cleanup
by Artem Chernyshev 29 Feb '24

29 Feb '24

Several functions was modified to become invariant. Change their type to void and remove unnecessary checks of their return values. Found by Linux Verification Center (linuxtesting.org) with SVACE. Artem Chernyshev (10): conf: domain_conf: virDomainHostdevInsert/virDomainNetInsert to void libxl: libxlMakeDomainCapabilities to void virtime: virTimeMillisNowRaw to void conf: virDomainGraphicsListenAppendAddress() to void conf: virDomainDefMaybeAddInput() to void virbitmap: virBitmapToData() to void tools: cmdDomblkinfoGet() to void vireventglib: virEventRunDefaultImpl() to void vsh: vshCompleterFilter() to void vsh: vshInitDebug() to void examples/c/misc/event-test.c | 5 +- include/libvirt/libvirt-event.h | 2 +- src/ch/ch_monitor.c | 5 +- src/conf/domain_conf.c | 35 +++------- src/conf/domain_conf.h | 8 +-- src/conf/virdomainjob.c | 7 +- src/hypervisor/domain_driver.c | 5 +- src/libxl/libxl_capabilities.c | 40 ++++-------- src/libxl/libxl_capabilities.h | 2 +- src/libxl/libxl_domain.c | 16 ++--- src/libxl/libxl_domain.h | 2 +- src/libxl/libxl_driver.c | 17 ++--- src/libxl/xen_common.c | 25 +++---- src/libxl/xen_common.h | 2 +- src/libxl/xen_xl.c | 3 +- src/lxc/lxc_driver.c | 6 +- src/nwfilter/nwfilter_dhcpsnoop.c | 18 ++--- src/qemu/qemu_agent.c | 6 +- src/qemu/qemu_backup.c | 3 +- src/qemu/qemu_dbus.c | 3 +- src/qemu/qemu_domain.c | 35 ++++------ src/qemu/qemu_domainjob.c | 22 +++---- src/qemu/qemu_domainjob.h | 4 +- src/qemu/qemu_driver.c | 19 +++--- src/qemu/qemu_hotplug.c | 6 +- src/qemu/qemu_migration.c | 4 +- src/qemu/qemu_nbdkit.c | 3 +- src/qemu/qemu_process.c | 12 ++-- src/qemu/qemu_tpm.c | 3 +- src/rpc/virnetdaemon.c | 6 +- src/storage/storage_backend_iscsi_direct.c | 4 +- src/util/virbitmap.c | 6 +- src/util/virbitmap.h | 2 +- src/util/virevent.c | 7 +- src/util/vireventglib.c | 4 +- src/util/vireventglib.h | 2 +- src/util/virfdstream.c | 3 +- src/util/virhostcpu.c | 4 +- src/util/virhostuptime.c | 3 +- src/util/virtime.c | 48 ++++---------- src/util/virtime.h | 14 ++-- src/vbox/vbox_common.c | 4 +- src/vmx/vmx.c | 3 +- src/vz/vz_driver.c | 38 +++++------ src/vz/vz_sdk.c | 14 ++-- src/vz/vz_utils.c | 16 ++--- src/vz/vz_utils.h | 2 +- tests/domaincapstest.c | 3 +- tests/objecteventtest.c | 76 ++++++++++------------ tests/qemucapsprobe.c | 5 +- tests/qemumonitortestutils.c | 8 +-- tests/virbitmaptest.c | 3 +- tests/virnetsockettest.c | 3 +- tools/virsh-completer-domain.c | 6 +- tools/virsh-domain-monitor.c | 10 +-- tools/virsh-domain.c | 15 ++--- tools/vsh.c | 24 +++---- 57 files changed, 231 insertions(+), 420 deletions(-) -- 2.43.0

2 12

[PATCH 0/4] vmx: A couple of disk related fixes
by Michal Privoznik 25 Jan '24

25 Jan '24

The first patch fixes an issue. The last one - I am not sure if it's not going to break something and thus it's optional. Michal Prívozník (4): vmx: Accept empty fileName for cdrom-image vmx2xmltest: Add another test case vmx: Separate disk target name generation into a function vmx: Ensure unique disk targets when parsing src/vmx/vmx.c | 199 +++++++++++++++-------- tests/vmx2xmldata/esx-in-the-wild-12.vmx | 86 ++++++++++ tests/vmx2xmldata/esx-in-the-wild-12.xml | 39 +++++ tests/vmx2xmldata/esx-in-the-wild-8.xml | 4 +- tests/vmx2xmltest.c | 1 + 5 files changed, 261 insertions(+), 68 deletions(-) create mode 100644 tests/vmx2xmldata/esx-in-the-wild-12.vmx create mode 100644 tests/vmx2xmldata/esx-in-the-wild-12.xml -- 2.41.0

3 9

[PATCH 0/3] Allow reserving more memory for PCI controllers
by Michal Privoznik 24 Jan '24

24 Jan '24

*** BLURB HERE *** Michal Prívozník (3): conf: Introduce @memReserve to <controller/> qemu_validate: Restrict setting @memReserve only to some controllers qemu_command: Generate mem-reserve for controllers docs/formatdomain.rst | 6 +++++ src/conf/domain_conf.c | 9 +++++++ src/conf/domain_conf.h | 3 +++ src/conf/schemas/domaincommon.rng | 5 ++++ src/qemu/qemu_command.c | 3 +++ src/qemu/qemu_validate.c | 25 +++++++++++++++++++ .../q35-usb2.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/q35-usb2.xml | 2 +- .../q35-usb2.x86_64-latest.xml | 2 +- 9 files changed, 54 insertions(+), 3 deletions(-) -- 2.41.0

3 5

[v3 0/4] Support for dirty-limit live migration
by Hyman Huang 15 Jan '24

15 Jan '24

v3: - adjust the parameter check location for suggested by Michal - mark the VIR_MIGRATE_DIRTY_LIMIT flag since 10.0.0 - rebase on master Thanks Michal for the comments. Please review, Yong. v1: The dirty-limit functionality for live migration was introduced since qemu>=8.1. In the live migration scenario, it implements the force convergence using the dirty-limit approach, which results in better reliable read performance. A straightforward dirty-limit capability for live migration is added by this patchset. Users might not care about other dirty-limit arguments like "x-vcpu-dirty-limit-period" or "vcpu-dirty-limit," thus do not expose them to Libvirt and Keep the default configurations and values in place. For more details about dirty-limit, please see the following reference: https://lore.kernel.org/qemu- devel/169024923116.19090.10825599068950039132-0(a)git.sr.ht/ Hyman Huang (4): Add VIR_MIGRATE_DIRTY_LIMIT flag qemu_migration: Implement VIR_MIGRATE_DIRTY_LIMIT flag virsh: Add support for VIR_MIGRATE_DIRTY_LIMIT flag NEWS: document support for dirty-limit live migration NEWS.rst | 8 ++++++++ docs/manpages/virsh.rst | 10 +++++++++- include/libvirt/libvirt-domain.h | 5 +++++ src/libvirt-domain.c | 8 ++++++++ src/qemu/qemu_migration.c | 8 ++++++++ src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_params.c | 6 ++++++ src/qemu/qemu_migration_params.h | 1 + tools/virsh-domain.c | 6 ++++++ 9 files changed, 52 insertions(+), 1 deletion(-) -- 2.39.1

2 5

[PATCH rfcv3 00/11] LIBVIRT: X86: TDX support
by Zhenzhong Duan 12 Jan '24

12 Jan '24

Hi, This series brings libvirt the x86 TDX support. * What's TDX? TDX stands for Trust Domain Extensions which isolates VMs from the virtual-machine manager (VMM)/hypervisor and any other software on the platform. To support TDX, multiple software components, not only KVM but also QEMU, guest Linux and virtual bios, need to be updated. For more details, please check link[1], there are TDX spec links and public repository link at github for each software component. This patchset is another software component to extend libvirt to support TDX, with which one can start a VM from high level rather than running qemu directly. * Misc As QEMU use a software emulated way to reset guest which isn't supported by TDX guest for security reason. We add a new way to emulate the reset for TDX guest, called "hard reboot". We achieve this by killing old qemu and start a new one. Complete code can be found at [1], matching qemu code can be found at [2]. There are some new properties for tdx-guest object, i.e. `mrconfigid`, `mrowner`, `mrownerconfig` and `debug` which aren't in matching qemu[2] yet. I keep them intentionally as they will be implemented in qemu as extention series of [2]. * Test start/stop/reboot with virsh stop/reboot trigger in guest stop with on_poweroff=destroy/restart reboot with on_reboot=destroy/restart * Patch organization - patch 1-3: Support query of TDX capabilities. - patch 4-6: Add TDX type to launchsecurity framework. - patch 7-11: Add hard reboot support to TDX guest [1] https://github.com/intel/libvirt-tdx/commits/tdx_for_upstream_rfcv3 [2] https://github.com/intel/qemu-tdx/tree/tdx-qemu-upstream-v3 Thanks Zhenzhong Changelog: rfcv3: - Change to generate qemu cmdline with -bios - drop firmware auto match as -bios is used - add a hard reboot method to reboot TDX guest rfcv2: - give up using qmp cmd and check TDX directly on host for TDX capabilities. - use launchsecurity framework to support TDX - use <os>.<loader> for general loader - add auto firmware match feature for TDX A example TDVF fimware description file 70-edk2-x86_64-tdx.json: { "description": "UEFI firmware for x86_64, supporting Intel TDX", "interface-types": [ "uefi" ], "mapping": { "device": "generic", "filename": "/usr/share/OVMF/OVMF_CODE-tdx.fd" }, "targets": [ { "architecture": "x86_64", "machines": [ "pc-q35-*" ] } ], "features": [ "intel-tdx", "verbose-dynamic" ], "tags": [ ] } rfcv2: https://www.mail-archive.com/libvir-list@redhat.com/msg219378.html Chenyi Qiang (3): qemu: add hard reboot in QEMU driver qemu: make hard reboot as the TDX default reboot mode virsh: add new option "timekeep" to keep virsh console alive Zhenzhong Duan (8): qemu: Check if INTEL Trust Domain Extention support is enabled qemu: Add TDX capability conf: expose TDX feature in domain capabilities conf: add tdx as launch security type qemu: Add command line and validation for TDX type qemu: force special parameters enabled for TDX guest qemu: Extend hard reboot in Qemu driver conf: Add support to keep same domid for hard reboot docs/formatdomaincaps.rst | 1 + include/libvirt/libvirt-domain.h | 2 + src/conf/domain_capabilities.c | 1 + src/conf/domain_capabilities.h | 1 + src/conf/domain_conf.c | 50 ++++++++++++++++ src/conf/domain_conf.h | 11 ++++ src/conf/schemas/domaincaps.rng | 9 +++ src/conf/schemas/domaincommon.rng | 34 +++++++++++ src/conf/virconftypes.h | 2 + src/qemu/qemu_capabilities.c | 38 +++++++++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 29 +++++++++ src/qemu/qemu_domain.c | 18 ++++++ src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_driver.c | 85 ++++++++++++++++++++------ src/qemu/qemu_firmware.c | 1 + src/qemu/qemu_monitor.c | 19 +++++- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 6 +- src/qemu/qemu_namespace.c | 1 + src/qemu/qemu_process.c | 99 ++++++++++++++++++++++++++++++- src/qemu/qemu_validate.c | 18 ++++++ tools/virsh-console.c | 3 + tools/virsh-domain.c | 64 +++++++++++++++----- tools/virsh.h | 1 + 25 files changed, 463 insertions(+), 37 deletions(-) -- 2.34.1

5 40

[PATCH v2 00/14] Unreacheble code cleanup
by Dmitry Frolov 10 Jan '24

10 Jan '24

A lot of unreacheble code was caused by int functions, which return nothing except zero. Unreacheble code was removed. Corresponding functions type was changed to void. Dmitry Frolov (14): cpu: turn virCPUx86DataAddItem() to void cpu: turn virCPUx86DataAdd() to void libxl: turn libxlCapsAddCPUID() to void libxl: turn virCapabilitiesAddHostFeature() to void libxl: turn libxl_get_physinfo() to void conf: turn virCapabilitiesSetNetPrefix() to void libxl: turn libxlMakeDomainOSCaps() to void libxl: turn libxlMakeDomainDeviceDiskCaps() to void libxl: turn libxlMakeDomainDeviceGraphicsCaps() to void libxl: turn libxlMakeDomainDeviceVideoCaps() to void conf: turn virDomainGraphicsListenAppendAddress() to void vbox: turn vboxDumpDisplay() to void libxl: turn xenParseXLNamespaceData() to void rpc: turn virNetClientAddProgram() to void src/admin/admin_remote.c | 3 +- src/conf/capabilities.c | 8 +-- src/conf/capabilities.h | 4 +- src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 2 +- src/cpu/cpu_x86.c | 91 ++++++++++++--------------------- src/cpu/cpu_x86.h | 2 +- src/libxl/libxl_capabilities.c | 54 +++++++------------ src/libxl/libxl_conf.c | 20 ++------ src/libxl/libxl_driver.c | 6 +-- src/libxl/xen_common.c | 7 +-- src/libxl/xen_xl.c | 8 ++- src/locking/lock_driver_lockd.c | 3 +- src/logging/log_manager.c | 3 +- src/lxc/lxc_monitor.c | 4 +- src/remote/remote_driver.c | 7 ++- src/rpc/virnetclient.c | 3 +- src/rpc/virnetclient.h | 2 +- src/test/test_driver.c | 6 +-- src/vbox/vbox_common.c | 13 ++--- src/vmx/vmx.c | 3 +- tests/libxlmock.c | 5 +- 22 files changed, 86 insertions(+), 172 deletions(-) -- 2.34.1

4 55

[PATCH 0/2] ci: Update to Fedora 39
by Michal Privoznik 09 Jan '24

09 Jan '24

Green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/1106643445 Michal Prívozník (2): ci: integration: Switch upstream integration tests to Fedora 39 ci: Update Alpine and Fedora and regenerate ci/buildenv/{alpine-317.sh => alpine-319.sh} | 0 ci/buildenv/{fedora-37.sh => fedora-39.sh} | 0 ...e-317.Dockerfile => alpine-319.Dockerfile} | 2 +- ...ora-37.Dockerfile => fedora-39.Dockerfile} | 2 +- ci/gitlab/builds.yml | 64 +++++++-------- ci/gitlab/containers.yml | 18 ++--- ci/integration.yml | 80 +++++++++---------- ci/manifest.yml | 18 ++--- 8 files changed, 92 insertions(+), 92 deletions(-) rename ci/buildenv/{alpine-317.sh => alpine-319.sh} (100%) rename ci/buildenv/{fedora-37.sh => fedora-39.sh} (100%) rename ci/containers/{alpine-317.Dockerfile => alpine-319.Dockerfile} (98%) rename ci/containers/{fedora-37.Dockerfile => fedora-39.Dockerfile} (98%) -- 2.41.0

6 15

[libvirt PATCH v2 00/15] Support for VFIO variant drivers, Part 2
by Laine Stump 05 Jan '24

05 Jan '24

(Thisis "V2 of Part 2". "V1 of Part 2" is here: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/5GF4… ) Part 1 (which simply made it possible to use virsh nodedev-detach to bind a device to a manually-specified variant driver, and at guest runtime allowed libvirt to ignore the fact that the driver found to the device was something other than exactly "vfio-pci") was here: https://listman.redhat.com/archives/libvir-list/2023-August/241338.html and pushed upstream as of commit v9.6.0-153-g24beaffec3 Part 2 adds two new pieces of functionality: 1) It is possible to manually specify a VFIO variant driver (or force the generic vfio-pci driver) for a device in the domain XML with, e.g.: <driver name='mlx5_vfio_pci'/> (for the former) or: <driver name='vfio-pci'/> (for the latter). 2) By default libvirt will now find the "best match" VFIO or VFIO variant driver by comparing the device's modalias file contents (in sysfs) with vfio drivers found in the running kernel's modules.alias file. This means that "virsh nodedev-detach" of a host device will bind it to its appropriate VFIO variant driver (if one is available), and also if a <hostdev> decice in a domain config has "managed='yes'", libvirt will bind it to a variant driver if possible (in order to force binding to the basic vfio-pci driver instead, you just need to add the <driver> element mentioned above). The first 12 patches are all just getting (1) going (a lot of it is refactoring code to use common code for the four places that use the hostdev <driver> element), and the final 3 patches implement (2). More details are spread along the way. Differences from V1: I squashed together a couple of the patches, and fixed some things that caused CI jobs to fail (I'd forgotten to push the branch to gitlab and trigger CI). Laine Stump (15): util: properly deal with module vs. driver when binding device to driver schema: consolidate RNG for all hostdev <driver> elements conf: move/rename hostdev PCI driver type enum to device_conf.h conf: normalize hostdev <driver> parsing to simplify adding new attr conf: put hostdev PCI backend into a struct conf: use virDeviceHostdevPCIDriverInfo in network and networkport objects conf: split out hostdev <driver> parse/format to their own functions conf: use new common parser/formatter for hostdev driver in network XML tests: remove explicit <driver name='vfio'/> from hostdev test cases xen: explicitly set hostdev driver.type at runtime, not in postparse conf: replace virHostdevIsVFIODevice with virHostdevIsPCIDevice conf: support manually specifying VFIO variant driver in <hostdev> XML util: new function virStringSkipToSpace() tests: mock virPCIDevice(BindTo|UnbindFrom)Stub with nop functions qemu: automatically bind to a vfio variant driver, if available docs/formatdomain.rst | 55 ++- src/conf/device_conf.c | 75 +++ src/conf/device_conf.h | 27 ++ src/conf/domain_capabilities.c | 2 +- src/conf/domain_capabilities.h | 2 +- src/conf/domain_conf.c | 98 +--- src/conf/domain_conf.h | 18 +- src/conf/network_conf.c | 43 +- src/conf/network_conf.h | 17 +- src/conf/schemas/basictypes.rng | 20 + src/conf/schemas/domaincommon.rng | 173 ++++--- src/conf/schemas/network.rng | 10 +- src/conf/schemas/networkport.rng | 10 +- src/conf/virconftypes.h | 2 + src/conf/virnetworkportdef.c | 22 +- src/conf/virnetworkportdef.h | 4 +- src/hypervisor/virhostdev.c | 16 +- src/hypervisor/virhostdev.h | 2 - src/libvirt_private.syms | 10 +- src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_domain.c | 65 ++- src/libxl/libxl_driver.c | 25 +- src/network/bridge_driver.c | 2 +- src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_command.c | 14 +- src/qemu/qemu_domain.c | 29 +- src/qemu/qemu_hostdev.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_validate.c | 6 +- src/security/security_apparmor.c | 2 +- src/security/security_dac.c | 4 +- src/security/security_selinux.c | 4 +- src/security/virt-aa-helper.c | 8 +- src/util/virpci.c | 438 ++++++++++++++++-- src/util/virpci.h | 3 + src/util/virstring.c | 17 + src/util/virstring.h | 1 + tests/domaincapstest.c | 4 +- tests/libxlxml2domconfigdata/moredevs-hvm.xml | 1 - tests/networkxml2xmlin/hostdev-pf-old.xml | 8 + tests/networkxml2xmlin/hostdev-pf.xml | 2 +- tests/networkxml2xmlout/hostdev-pf-old.xml | 8 + tests/networkxml2xmlout/hostdev-pf.xml | 2 +- tests/networkxml2xmltest.c | 6 + tests/qemuhotplugmock.c | 15 + .../qemuhotplug-hostdev-pci.xml | 1 - .../qemuhotplug-base-live+hostdev-pci.xml | 2 +- ...uhotplug-pseries-base-live+hostdev-pci.xml | 2 +- tests/qemustatusxml2xmldata/modern-in.xml | 2 +- .../hostdev-pci-address-unassigned.xml | 4 - .../hostdev-pci-multifunction.xml | 7 - .../hostdev-vfio-multidomain.xml | 1 - .../hostdev-vfio-zpci-autogenerate-fids.xml | 2 - .../hostdev-vfio-zpci-autogenerate-uids.xml | 2 - .../hostdev-vfio-zpci-autogenerate.xml | 1 - .../hostdev-vfio-zpci-boundaries.xml | 2 - .../hostdev-vfio-zpci-ccw-memballoon.xml | 1 - .../hostdev-vfio-zpci-duplicate.xml | 2 - ...ostdev-vfio-zpci-invalid-uid-valid-fid.xml | 1 - .../hostdev-vfio-zpci-multidomain-many.xml | 8 - .../hostdev-vfio-zpci-set-zero.xml | 1 - .../hostdev-vfio-zpci-uid-set-zero.xml | 1 - .../hostdev-vfio-zpci-wrong-arch.xml | 1 - tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 1 - .../hostdev-vfio.x86_64-latest.args | 5 +- tests/qemuxml2argvdata/hostdev-vfio.xml | 19 +- .../net-hostdev-vfio-multidomain.xml | 1 - tests/qemuxml2argvdata/net-hostdev-vfio.xml | 1 - tests/qemuxml2argvdata/pseries-hostdevs-1.xml | 3 - tests/qemuxml2argvdata/pseries-hostdevs-2.xml | 2 - tests/qemuxml2argvdata/pseries-hostdevs-3.xml | 2 - ...v-pci-address-unassigned.x86_64-latest.xml | 4 - ...ostdev-pci-multifunction.x86_64-latest.xml | 7 - ...io-zpci-autogenerate-fids.s390x-latest.xml | 2 - ...io-zpci-autogenerate-uids.s390x-latest.xml | 2 - ...ev-vfio-zpci-autogenerate.s390x-latest.xml | 1 - ...tdev-vfio-zpci-boundaries.s390x-latest.xml | 2 - ...-vfio-zpci-ccw-memballoon.s390x-latest.xml | 1 - ...fio-zpci-multidomain-many.s390x-latest.xml | 8 - .../hostdev-vfio-zpci.s390x-latest.xml | 1 - .../hostdev-vfio.x86_64-latest.xml | 24 +- .../net-hostdev-vfio.x86_64-latest.xml | 1 - .../pseries-hostdevs-1.ppc64-latest.xml | 3 - .../pseries-hostdevs-2.ppc64-latest.xml | 2 - .../pseries-hostdevs-3.ppc64-latest.xml | 2 - tests/virhostdevtest.c | 2 +- .../plug-hostdev-pci-unmanaged.xml | 2 +- .../plug-hostdev-pci.xml | 2 +- tests/xlconfigdata/test-fullvirt-pci.xml | 2 - tests/xmconfigdata/test-pci-dev-syntax.xml | 2 - tests/xmconfigdata/test-pci-devs.xml | 2 - tools/virsh-completer-nodedev.c | 4 +- 92 files changed, 933 insertions(+), 498 deletions(-) create mode 100644 tests/networkxml2xmlin/hostdev-pf-old.xml create mode 100644 tests/networkxml2xmlout/hostdev-pf-old.xml -- 2.41.0

3 44

[libvirt PATCH 0/5] Initial network support in ch driver.
by Praveen K Paladugu 04 Jan '24

04 Jan '24

This series introduces network support for ch guests. ETHERNET network mode is the only mode supported. More modes will be add once this series is merged. For security reasons, cloud-hypervisor requries FDs for guests to be sent using SCM_RIGHTS. This patch series introduces 2 methods that support sending FDs to ch in Patch 3. Network support in ch driver is introduced by Patch 5. I previously sent "hypervisor: Move interface mgmt methods to hypervisor" patch by itself. I merged this patch also into Patch 2 in this series. Praveen K Paladugu (5): conf: Drop unused parameter hypervisor: Move domain interface mgmt methods util: Add util methods required by ch networking ch: Introduce version based cap for network support ch: Enable ETHERNET Network mode support po/POTFILES | 3 + src/ch/ch_capabilities.c | 9 + src/ch/ch_capabilities.h | 1 + src/ch/ch_conf.h | 4 + src/ch/ch_domain.c | 41 +++ src/ch/ch_domain.h | 3 + src/ch/ch_interface.c | 104 +++++++ src/ch/ch_interface.h | 35 +++ src/ch/ch_monitor.c | 205 +++++--------- src/ch/ch_monitor.h | 7 +- src/ch/ch_process.c | 160 ++++++++++- src/ch/meson.build | 2 + src/conf/domain_conf.c | 1 - src/conf/domain_conf.h | 3 +- src/hypervisor/domain_interface.c | 457 ++++++++++++++++++++++++++++++ src/hypervisor/domain_interface.h | 45 +++ src/hypervisor/meson.build | 1 + src/libvirt_private.syms | 11 + src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_process.c | 4 +- src/qemu/qemu_command.c | 6 +- src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_interface.c | 339 +--------------------- src/qemu/qemu_interface.h | 11 - src/qemu/qemu_process.c | 73 +---- src/util/virsocket.c | 109 +++++++ src/util/virsocket.h | 3 + 29 files changed, 1093 insertions(+), 567 deletions(-) create mode 100644 src/ch/ch_interface.c create mode 100644 src/ch/ch_interface.h create mode 100644 src/hypervisor/domain_interface.c create mode 100644 src/hypervisor/domain_interface.h -- 2.41.0

3 9

[PATCH 00/19] qemu XML testing improvements, part 1 - forgotten test files and network driver
by Peter Krempa 04 Jan '24

04 Jan '24

This patch saga aims to improve and simplify testing of qemu XML configs. Part 1 deals with input test files which are not used in qemuxml2argvtest, introduces a mock network driver and adds a checker that all input files are in fact used. Peter Krempa (19): qemuxml2argvtest: Reinstate 'console-compat-chardev' and 'pci-serial-dev-chardev' qemuxml2argvtest: Fix and use 'disk-network-ssh-key' case qemuxml2argvtest: Reinstate 'pseries-vio-address-clash' case qemuxml2argvdata: Move 'smbios-multiple-type2' case to genericxml2xmltest qemuxml2argvtest: Remove duplicated invocations of tests qemuxml2argvtest: Check for duplicate invocation of tests qemuxml2argvmock: Mock qemuInterfaceBridgeConnect qemuxml2argvtest: Add test cases covered only by qemuxml2xmltest - part 1 qemuxml2xmltest: Move 'graphics-listen-network2' case go genericxml2xmltest qemuxml2*test: Add specific test case for interface link state qemuxml*test: Improve 'vhost_queues' test case qemuxml2xmltest: Delete 'interface-driver' case qemu: process: Separate setup of network device objects qemuxml2argvmock: Mock virNetDevSetMTU qemuxml2xmltest: Introduce fake network driver qemuxml2argvtest: Enable 'graphics-listen-network' case virnetworkportxml2xmltest: Add simple versions of bridge/network tests qemuxml2argvtest: Add test cases covered only by qemuxml2xmltest - part 2 qemuxml2argvtest: Add checker that all input files are used src/qemu/qemu_interface.h | 2 +- src/qemu/qemu_process.c | 45 ++-- src/util/virnetdev.h | 2 +- .../graphics-listen-network2.xml | 0 .../smbios-multiple-type2.xml | 0 .../graphics-listen-network2.xml | 35 +++ tests/genericxml2xmltest.c | 3 + tests/qemustatusxml2xmltest.c | 2 +- ...nu-disable-with-timeout.x86_64-latest.args | 36 +++ ...hannel-unix-source-path.x86_64-latest.args | 45 ++++ .../chardev-label.x86_64-latest.args | 41 +++ .../console-compat2.x86_64-latest.args | 40 +++ .../cpu-empty.x86_64-latest.args | 33 +++ ...cpu-host-model-features.x86_64-latest.args | 33 +++ .../cpu-numa-disordered.x86_64-latest.args | 38 +++ .../disk-active-commit.x86_64-latest.args | 38 +++ .../disk-mirror-old.x86_64-latest.args | 45 ++++ .../disk-mirror.x86_64-latest.args | 48 ++++ .../disk-network-ssh-key.x86_64-latest.args | 38 +++ .../qemuxml2argvdata/disk-network-ssh-key.xml | 2 +- .../disk-network-vxhs.x86_64-5.0.0.args | 35 +++ .../downscript.x86_64-latest.args | 43 +++ ...graphics-listen-network.x86_64-latest.args | 37 +++ .../graphics-listen-network.xml | 2 +- .../hostdev-mdev-display.x86_64-latest.args | 34 +++ ...ev-scsi-autogen-address.x86_64-latest.args | 60 +++++ ...hostdev-scsi-large-unit.x86_64-latest.args | 39 +++ .../hostdev-scsi-shareable.x86_64-latest.args | 39 +++ tests/qemuxml2argvdata/interface-driver.xml | 54 ---- .../qemuxml2argvdata/lease.x86_64-latest.args | 39 +++ .../memorybacking-set.x86_64-latest.args | 33 +++ .../memorybacking-unset.x86_64-latest.args | 33 +++ .../metadata-duplicate.x86_64-latest.args | 36 +++ .../metadata.x86_64-latest.args | 36 +++ .../net-bandwidth.x86_64-latest.args | 47 ++++ tests/qemuxml2argvdata/net-bandwidth.xml | 2 +- .../net-bandwidth2.x86_64-latest.args | 44 +++ tests/qemuxml2argvdata/net-bandwidth2.xml | 2 +- .../net-coalesce.x86_64-latest.args | 48 ++++ tests/qemuxml2argvdata/net-coalesce.xml | 6 +- .../net-isolated-port.x86_64-latest.args | 43 +++ tests/qemuxml2argvdata/net-isolated-port.xml | 2 +- .../net-linkstate.x86_64-latest.args | 36 +++ tests/qemuxml2argvdata/net-linkstate.xml | 34 +++ .../net-midonet.x86_64-latest.args | 38 +++ .../net-mtu.x86_64-latest.args | 46 ++++ tests/qemuxml2argvdata/net-mtu.xml | 4 +- .../net-openvswitch.x86_64-latest.args | 38 +++ tests/qemuxml2argvdata/net-openvswitch.xml | 2 +- ...irtio-network-portgroup.x86_64-latest.args | 42 +++ .../net-virtio-network-portgroup.xml | 6 +- ...-virtio-teaming-network.x86_64-latest.args | 39 +++ .../net-virtio-teaming-network.xml | 4 +- .../net-virtio-vhost.x86_64-latest.args | 42 +++ ...{vhost_queues.xml => net-virtio-vhost.xml} | 25 +- ...d-auto-vcpu-no-numatune.x86_64-latest.args | 36 +++ ...static-vcpu-no-numatune.x86_64-latest.args | 36 +++ ...vcpus-topology-mismatch.x86_64-latest.args | 34 +++ .../panic-pseries.ppc64-latest.args | 34 +++ .../pcihole64-gib.x86_64-latest.args | 34 +++ ...pseries-vio-address-clash.ppc64-latest.err | 1 + .../s390-defaultconsole.s390x-latest.args | 33 +++ .../s390-panic.s390x-latest.args | 35 +++ ...eclabel-device-multiple.x86_64-latest.args | 36 +++ ...el-dynamic-none-relabel.x86_64-latest.args | 37 +++ .../seclabel-dynamic-none.x86_64-latest.args | 36 +++ ...serial-target-port-auto.x86_64-latest.args | 42 +++ .../tap-vhost-incorrect.x86_64-latest.args | 40 +++ .../qemuxml2argvdata/tap-vhost-incorrect.xml | 4 +- .../tap-vhost.x86_64-latest.args | 44 +++ tests/qemuxml2argvdata/tap-vhost.xml | 2 +- .../vhost-user-fs-sock.x86_64-latest.args | 34 +++ ...ideo-virtio-gpu-ccw-auto.s390x-latest.args | 36 +++ tests/qemuxml2argvmock.c | 25 ++ tests/qemuxml2argvtest.c | 255 +++++++++++++++++- .../graphics-listen-network.x86_64-latest.xml | 2 +- .../interface-driver.x86_64-latest.xml | 67 ----- .../net-bandwidth.x86_64-latest.xml | 2 +- .../net-bandwidth2.x86_64-latest.xml | 2 +- .../net-coalesce.x86_64-latest.xml | 6 +- .../net-isolated-port.x86_64-latest.xml | 2 +- ...st.xml => net-linkstate.x86_64-latest.xml} | 34 ++- .../net-openvswitch.x86_64-latest.xml | 2 +- ...virtio-network-portgroup.x86_64-latest.xml | 6 +- ...t-virtio-teaming-network.x86_64-latest.xml | 4 +- ...xml => net-virtio-vhost.x86_64-latest.xml} | 29 +- .../tap-vhost-incorrect.x86_64-latest.xml | 4 +- .../tap-vhost.x86_64-latest.xml | 2 +- tests/qemuxml2xmltest.c | 6 +- tests/testutils.c | 14 + tests/testutils.h | 2 + tests/testutilsqemu.h | 3 + .../plug-bridge-basic.xml | 11 + .../plug-network-basic.xml | 10 + tests/virnetworkportxml2xmltest.c | 2 + 95 files changed, 2407 insertions(+), 233 deletions(-) rename tests/{qemuxml2argvdata => genericxml2xmlindata}/graphics-listen-network2.xml (100%) rename tests/{qemuxml2argvdata => genericxml2xmlindata}/smbios-multiple-type2.xml (100%) create mode 100644 tests/genericxml2xmloutdata/graphics-listen-network2.xml create mode 100644 tests/qemuxml2argvdata/boot-menu-disable-with-timeout.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/channel-unix-source-path.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/chardev-label.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/console-compat2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-empty.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-features.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-active-commit.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-mirror-old.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-mirror.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-key.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-vxhs.x86_64-5.0.0.args create mode 100644 tests/qemuxml2argvdata/downscript.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/graphics-listen-network.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-autogen-address.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-large-unit.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-shareable.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/interface-driver.xml create mode 100644 tests/qemuxml2argvdata/lease.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memorybacking-set.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memorybacking-unset.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/metadata-duplicate.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/metadata.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-bandwidth.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-bandwidth2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-coalesce.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-isolated-port.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-linkstate.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-linkstate.xml create mode 100644 tests/qemuxml2argvdata/net-midonet.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-mtu.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-openvswitch.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-virtio-network-portgroup.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming-network.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-virtio-vhost.x86_64-latest.args rename tests/qemuxml2argvdata/{vhost_queues.xml => net-virtio-vhost.xml} (67%) create mode 100644 tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numavcpus-topology-mismatch.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/panic-pseries.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/pcihole64-gib.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/pseries-vio-address-clash.ppc64-latest.err create mode 100644 tests/qemuxml2argvdata/s390-defaultconsole.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-panic.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/seclabel-device-multiple.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-none.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-target-port-auto.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tap-vhost-incorrect.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tap-vhost.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-sock.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw-auto.s390x-latest.args delete mode 100644 tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml rename tests/qemuxml2xmloutdata/{graphics-listen-network2.x86_64-latest.xml => net-linkstate.x86_64-latest.xml} (63%) rename tests/qemuxml2xmloutdata/{vhost_queues.x86_64-latest.xml => net-virtio-vhost.x86_64-latest.xml} (78%) create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge-basic.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-network-basic.xml -- 2.43.0

2 28

[libvirt PATCH v3] qemu: add runtime config option for nbdkit
by Jonathon Jongsma 04 Jan '24

04 Jan '24

Currently when we build with nbdkit support, libvirt will always try to use nbdkit to access remote disk sources when it is available. But without an up-to-date selinux policy allowing this, it will fail. because the required selinux policies are not yet widely available, we have disabled nbdkit support on rpm builds for all distributions before Fedora 40. Unfortunately, this makes it more difficult to test nbdkit support. After someone updates to the necessary selinux policies, they would also need to rebuild libvirt to enable nbdkit support. By introducing a configure option (nbdkit_config_default), we can build packages with nbdkit support but have it disabled by default. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> Suggested-by: Andrea Bolognani <abologna(a)redhat.com> --- Sorry for the delay in getting out a new version. Thanksgiving break in the USA, etc. Changes in v3: - nbdkit_config_default changed from a meson 'boolean' to a meson 'feature' configure option - print error message for senseless configurations where nbdkit is disabled but nbdkit_config_default is enabled - added a comment to example config file about possibility of the default value changing in the future - don't include the storage_use_nbdkit in the config file if nbdkit support is not compiled in. I used the same strategy that is used in the remote driver where certain config options are disabled based on whether WITH_IP is defined or not. When WITH_NBDKIT is not defined, the value is not included in the config file and we don't attempt to parse it from the config file either. libvirt.spec.in | 18 +++++++-- meson.build | 10 +++++ meson_options.txt | 3 +- ...libvirtd_qemu.aug => libvirtd_qemu.aug.in} | 7 ++++ src/qemu/meson.build | 37 ++++++++++++++++++- src/qemu/qemu.conf.in | 13 +++++++ src/qemu/qemu_conf.c | 19 ++++++++++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 3 ++ tests/qemuxml2argvtest.c | 15 +++++--- 10 files changed, 114 insertions(+), 13 deletions(-) rename src/qemu/{libvirtd_qemu.aug => libvirtd_qemu.aug.in} (98%) diff --git a/libvirt.spec.in b/libvirt.spec.in index f3fdedfde4..7aa497a565 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -96,6 +96,7 @@ %define with_sanlock 0 %define with_numad 0 %define with_nbdkit 0 +%define with_nbdkit_config_default 0 %define with_firewalld_zone 0 %define with_netcf 0 %define with_libssh2 0 @@ -174,15 +175,17 @@ %endif %endif -# We should only enable nbdkit support if the OS ships a SELinux policy that -# allows libvirt to launch it. Right now that's not the case anywhere, but -# things should be fine by the time Fedora 40 is released. +# We want to build with nbdkit support, but should only enable nbdkit by +# default if the OS ships a SELinux policy that allows libvirt to launch it. +# Right now that's not the case anywhere, but things should be fine by the time +# Fedora 40 is released. # # TODO: add RHEL 9 once a minor release that contains the necessary SELinux # bits exists (we only support the most recent minor release) %if %{with_qemu} + %define with_nbdkit 0%{!?_without_nbdkit:1} %if 0%{?fedora} >= 40 - %define with_nbdkit 0%{!?_without_nbdkit:1} + %define with_nbdkit_config_default 0%{!?_without_nbdkit_config_default:1} %endif %endif @@ -1214,6 +1217,12 @@ exit 1 %define arg_nbdkit -Dnbdkit=disabled %endif +%if %{with_nbdkit_config_default} + %define arg_nbdkit_config_default -Dnbdkit_config_default=enabled +%else + %define arg_nbdkit_config_default -Dnbdkit_config_default=disabled +%endif + %if %{with_fuse} %define arg_fuse -Dfuse=enabled %else @@ -1329,6 +1338,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) %{?arg_sanlock} \ -Dlibpcap=enabled \ %{?arg_nbdkit} \ + %{?arg_nbdkit_config_default} \ -Dlibnl=enabled \ -Daudit=enabled \ -Ddtrace=enabled \ diff --git a/meson.build b/meson.build index 62481a008d..e63b807f21 100644 --- a/meson.build +++ b/meson.build @@ -1012,6 +1012,16 @@ if not conf.has('WITH_NBDKIT') libnbd_dep = dependency('', required: false) endif +# default value for storage_use_nbdkit config option. +# For now 'auto' just maps to disabled, but in the future it may depend on +# which security drivers are enabled +use_nbdkit_default = get_option('nbdkit_config_default').enabled() + +if use_nbdkit_default and not conf.has('WITH_NBDKIT') + error('nbdkit_config_default requires nbdkit to be enabled') +endif +conf.set10('USE_NBDKIT_DEFAULT', use_nbdkit_default) + libnl_version = '3.0' if not get_option('libnl').disabled() and host_machine.system() == 'linux' libnl_dep = dependency('libnl-3.0', version: '>=' + libnl_version, required: get_option('libnl')) diff --git a/meson_options.txt b/meson_options.txt index a0928102bf..05fd63dd41 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -104,7 +104,8 @@ option('loader_nvram', type: 'string', value: '', description: 'Pass list of pai option('login_shell', type: 'feature', value: 'auto', description: 'build virt-login-shell') option('nss', type: 'feature', value: 'auto', description: 'enable Name Service Switch plugin for resolving guest IP addresses') option('numad', type: 'feature', value: 'auto', description: 'use numad to manage CPU placement dynamically') -option('nbdkit', type: 'feature', value: 'auto', description: 'use nbdkit to access network disks') +option('nbdkit', type: 'feature', value: 'auto', description: 'Build nbdkit storage backend') +option('nbdkit_config_default', type: 'feature', value: 'disabled', description: 'Whether to use nbdkit storage backend for network disks by default (configurable)') option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-utils for power management') option('sysctl_config', type: 'feature', value: 'auto', description: 'Whether to install sysctl configs') option('tls_priority', type: 'string', value: 'NORMAL', description: 'set the default TLS session priority string') diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug.in similarity index 98% rename from src/qemu/libvirtd_qemu.aug rename to src/qemu/libvirtd_qemu.aug.in index ed097ea3d9..bcc0aa8938 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug.in @@ -147,6 +147,10 @@ module Libvirtd_qemu = let capability_filters_entry = str_array_entry "capability_filters" +@CUT_WITH_NBDKIT@ + let storage_entry = bool_entry "storage_use_nbdkit" + +@END@ (* Each entry in the config is one of the following ... *) let entry = default_tls_entry | vnc_entry @@ -170,6 +174,9 @@ module Libvirtd_qemu = | nbd_entry | swtpm_entry | capability_filters_entry +@CUT_WITH_NBDKIT@ + | storage_entry +@END@ | obsolete_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 2279fef2ca..43519e2834 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -137,9 +137,41 @@ if conf.has('WITH_QEMU') qemu_user_group_conf = configuration_data({ 'QEMU_USER': qemu_user, 'QEMU_GROUP': qemu_group, + 'USE_NBDKIT_DEFAULT': use_nbdkit_default.to_int(), }) + + # preprocess config files to remove items related to features that are not + # compiled in + preprocess_config_files = [ + { + 'inpath': 'qemu.conf.in', + 'outpath': 'qemu.conf.tmp', + 'outvar': 'qemu_conf_tmp', + }, + { + 'inpath': 'libvirtd_qemu.aug.in', + 'outpath': 'libvirtd_qemu.aug', + 'outvar': 'libvirtd_qemu_aug', + } + ] + foreach item : preprocess_config_files + if conf.has('WITH_NBDKIT') + preprocess_cmd = [ 'sed', '-e', '/[@]CUT_WITH_NBDKIT[@]/d', '-e', '/[@]END[@]/d', '@INPUT@' ] + else + preprocess_cmd = [ 'sed', '-e', '/[@]CUT_WITH_NBDKIT[@]/,/[@]END[@]/d', '@INPUT@' ] + endif + + tmp = configure_file( + input: item['inpath'], + output: item['outpath'], + command: preprocess_cmd, + capture: true, + ) + set_variable(item['outvar'], tmp) + endforeach + qemu_conf = configure_file( - input: 'qemu.conf.in', + input: qemu_conf_tmp, output: 'qemu.conf', configuration: qemu_user_group_conf, ) @@ -147,6 +179,7 @@ if conf.has('WITH_QEMU') qemu_user_group_hack_conf = configuration_data({ 'QEMU_USER': qemu_user, 'QEMU_GROUP': qemu_group, + 'USE_NBDKIT_DEFAULT': use_nbdkit_default.to_int(), # This hack is necessary because the output file is going to be # used as input for another configure_file() call later, which # will take care of substituting @CONFIG@ with useful data @@ -159,7 +192,7 @@ if conf.has('WITH_QEMU') ) virt_conf_files += qemu_conf - virt_aug_files += files('libvirtd_qemu.aug') + virt_aug_files += libvirtd_qemu_aug virt_test_aug_files += { 'name': 'test_libvirtd_qemu.aug', 'aug': test_libvirtd_qemu_aug_tmp, diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in index 6897e0f760..76633c6a2f 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -974,3 +974,16 @@ # "full" - both QEMU and its helper processes are placed into separate # scheduling group #sched_core = "none" + +@CUT_WITH_NBDKIT@ +# Using nbdkit to access remote disk sources +# +# If this is set then libvirt will use nbdkit to access remote disk sources +# when available. nbdkit will export an NBD share to QEMU rather than having +# QEMU attempt to access the remote server directly. +# +# Possible values are 0 or 1. Default value is @USE_NBDKIT_DEFAULT@. Please +# note that the default might change in future releases. +# +# storage_use_nbdkit = @USE_NBDKIT_DEFAULT@ +@END@ diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 513b5ebb1e..e1a1bc3655 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -285,6 +285,7 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privileged, return NULL; cfg->deprecationBehavior = g_strdup("none"); + cfg->storageUseNbdkit = USE_NBDKIT_DEFAULT; return g_steal_pointer(&cfg); } @@ -1065,6 +1066,19 @@ virQEMUDriverConfigLoadCapsFiltersEntry(virQEMUDriverConfig *cfg, } +#if WITH_NBDKIT +static int +virQEMUDriverConfigLoadStorageEntry(virQEMUDriverConfig *cfg, + virConf *conf) +{ + if (virConfGetValueBool(conf, "storage_use_nbdkit", &cfg->storageUseNbdkit) < 0) + return -1; + + return 0; +} +#endif /* WITH_NBDKIT */ + + int virQEMUDriverConfigLoadFile(virQEMUDriverConfig *cfg, const char *filename, bool privileged) @@ -1136,6 +1150,11 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfig *cfg, if (virQEMUDriverConfigLoadCapsFiltersEntry(cfg, conf) < 0) return -1; +#if WITH_NBDKIT + if (virQEMUDriverConfigLoadStorageEntry(cfg, conf) < 0) + return -1; +#endif /* WITH_NBDKIT */ + return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 1a3ba3a0fb..36049b4bfa 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -230,6 +230,8 @@ struct _virQEMUDriverConfig { char *deprecationBehavior; + bool storageUseNbdkit; + virQEMUSchedCore schedCore; }; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 953808fcfe..0891ddabe9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10296,6 +10296,9 @@ qemuDomainPrepareStorageSourceNbdkit(virStorageSource *src, { g_autoptr(qemuNbdkitCaps) nbdkit = NULL; + if (!cfg->storageUseNbdkit) + return false; + if (virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_NETWORK) return false; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b2ea2191dc..74d20b9132 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1125,7 +1125,6 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid"); DO_TEST_CAPS_LATEST("disk-cdrom-bus-other"); DO_TEST_CAPS_LATEST("disk-cdrom-network"); - DO_TEST_CAPS_LATEST_NBDKIT("disk-cdrom-network-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); DO_TEST_CAPS_LATEST("disk-cdrom-tray"); DO_TEST_CAPS_LATEST("disk-floppy"); DO_TEST_CAPS_LATEST("disk-floppy-q35"); @@ -1171,8 +1170,6 @@ mymain(void) DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0"); DO_TEST_CAPS_LATEST("disk-network-source-auth"); DO_TEST_CAPS_LATEST("disk-network-source-curl"); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-source-curl-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-source-curl-nbdkit-backing", QEMU_NBDKIT_CAPS_PLUGIN_CURL); DO_TEST_CAPS_LATEST("disk-network-nfs"); driver.config->vxhsTLS = 1; driver.config->nbdTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); @@ -1183,13 +1180,10 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0"); DO_TEST_CAPS_LATEST("disk-network-http"); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-http-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); VIR_FREE(driver.config->nbdTLSx509secretUUID); VIR_FREE(driver.config->vxhsTLSx509secretUUID); driver.config->vxhsTLS = 0; DO_TEST_CAPS_LATEST("disk-network-ssh"); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-ssh-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_SSH); - DO_TEST_CAPS_LATEST_NBDKIT("disk-network-ssh-password", QEMU_NBDKIT_CAPS_PLUGIN_SSH); DO_TEST_CAPS_LATEST("disk-no-boot"); DO_TEST_CAPS_LATEST("disk-nvme"); DO_TEST_CAPS_VER("disk-vhostuser-numa", "4.2.0"); @@ -1259,6 +1253,15 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-geometry"); DO_TEST_CAPS_LATEST("disk-blockio"); + driver.config->storageUseNbdkit = 1; + DO_TEST_CAPS_LATEST_NBDKIT("disk-cdrom-network-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-source-curl-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-source-curl-nbdkit-backing", QEMU_NBDKIT_CAPS_PLUGIN_CURL); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-http-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_CURL); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-ssh-nbdkit", QEMU_NBDKIT_CAPS_PLUGIN_SSH); + DO_TEST_CAPS_LATEST_NBDKIT("disk-network-ssh-password", QEMU_NBDKIT_CAPS_PLUGIN_SSH); + driver.config->storageUseNbdkit = 0; + DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); -- 2.41.0

2 3

[libvirt PATCH 0/5] add loongarch support for libvirt
by xianglai li 04 Jan '24

04 Jan '24

From: lixianglai <lixianglai(a)loongson.cn> Hello, Everyone: This patch series adds libvirt support for loongarch.Although the bios path and name has not been officially integrated into qemu and we think there are still many shortcomings, we try to push a version of patch to the community according to the opinions of the community, hoping to listen to everyone's opinions. Anyway we have a version of libvirt that supports loongarch. You can also get libvirt's patch from the link below: https://gitlab.com/lixianglai/libvirt branch: loongarch Since the patch associated with loongarch has not yet been submitted to the virt-manager community, we are providing a temporary patch with loongarch for the time being patch's virt-manager, the open source work of virt-manager adding loongarch will be followed up later or synchronized with the open source libvirt. You can get the virt-manager code with loongarch patch from the link below: https://github.com/loongson/virt-manager branch: loongarch loongarch's virtual machine bios is not yet available in qemu, so you can get it from the following link https://github.com/loongson/Firmware/tree/main/LoongArchVirtMachine (Note: You should clone the repository using git instead of downloading the file via wget or you'll get xml) We named the bios edk2-loongarch64-code.fd, edk2-loongarch64-vars.fd is used to store pflash images of non-volatile variables.After installing qemu-system-loongarch64, you need to manually copy these two files to the /user/share/qemu directory. Since there is no fedora operating system that supports the loongarch architecture, you can find an iso that supports loongarch at the link below for testing purposes: https://github.com/fedora-remix-loongarch/releases-info Well, if you have completed the above steps I think you can now install loongarch virtual machine, you can install it through the virt-manager graphical interface, or install it through vrit-install, here is an example of installing it using virt-install: virt-install \ --virt-type=qemu \ --name loongarch-test \ --memory 4096 \ --vcpus=4 \ --arch=loongarch64 \ --boot cdrom \ --disk device=cdrom,bus=scsi,path=/root/livecd-fedora-mate-4.loongarch64.iso \ --disk path=/var/lib/libvirt/images/debian12-loongarch64.qcow2,size=10,format=qcow2,bus=scsi \ --network network=default \ --osinfo archlinux \ --feature acpi=true \ --video=virtio \ --graphics=vnc,listen=0.0.0.0 lixianglai (5): Add loongarch cpu support Add loongarch cpu model and vendor info Config some capabilities for loongarch virt machine Implement the method of getting host info for loongarch Add bios path for loongarch po/POTFILES | 1 + src/conf/schemas/basictypes.rng | 1 + src/cpu/cpu.c | 2 + src/cpu/cpu.h | 2 + src/cpu/cpu_loongarch.c | 742 +++++++++++++++++++++++++++++ src/cpu/cpu_loongarch.h | 25 + src/cpu/cpu_loongarch_data.h | 37 ++ src/cpu/meson.build | 1 + src/cpu_map/index.xml | 5 + src/cpu_map/loongarch_la464.xml | 6 + src/cpu_map/loongarch_vendors.xml | 3 + src/cpu_map/meson.build | 2 + src/qemu/qemu.conf.in | 3 +- src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 32 ++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 55 +++ src/qemu/qemu_validate.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virarch.c | 4 + src/util/virarch.h | 4 + src/util/virhostcpu.c | 4 +- src/util/virsysinfo.c | 5 +- 24 files changed, 940 insertions(+), 7 deletions(-) create mode 100644 src/cpu/cpu_loongarch.c create mode 100644 src/cpu/cpu_loongarch.h create mode 100644 src/cpu/cpu_loongarch_data.h create mode 100644 src/cpu_map/loongarch_la464.xml create mode 100644 src/cpu_map/loongarch_vendors.xml -- 2.27.0

3 23

[PATCH 00/10] qemu: Improve disk resizing on block devices and support resizing of disk with slice
by Peter Krempa 03 Jan '24

03 Jan '24

This series implements two features: - automatic size discovery when resizing a raw disk on a block device - resizing of raw disks when a 'storage slice' is in use Peter Krempa (10): qemu: block: Introduce helpers for properly testing for 'raw' and 'luks' images qemu: Use qemuBlockStorageSourceIsQEMULuks/qemuBlockStorageSourceIsRaw qemuDomainBlockResize: Agregate all checks at the beginning vsh: Introduce simple version of VSH_ALTERNATIVE_OPTIONS_EXPR virDomainBlockResize: Introduce VIR_DOMAIN_BLOCK_RESIZE_CAPACITY qemuDomainBlockResize: Implement VIR_DOMAIN_BLOCK_RESIZE_CAPACITY qemu: block: Make 'slice' layer effective for 'raw' storage source qemu: block: Format storage slice properties optionally virStorageSourceSliceFree: Export function qemuDomainBlockResize: Properly resize disks with storage slice docs/manpages/virsh.rst | 6 +- include/libvirt/libvirt-domain.h | 1 + src/conf/storage_source_conf.c | 2 +- src/conf/storage_source_conf.h | 2 + src/libvirt-domain.c | 5 + src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 193 +++++++++++++----- src/qemu/qemu_block.h | 9 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 99 ++++++++- .../disk-slices.x86_64-latest.args | 14 +- tools/virsh-domain.c | 10 +- tools/vsh.h | 4 + 13 files changed, 276 insertions(+), 72 deletions(-) -- 2.43.0

3 17

[PATCH v2] qemu_driver: Don't handle the EOF event if vm get restarted
by tugy＠chinatelecom.cn 03 Jan '24

03 Jan '24

From: Guoyi Tu <tugy(a)chinatelecom.cn> Currently, libvirt creates a thread pool with only on thread to handle all qemu monitor events for virtual machines, In the cases that if the thread gets stuck while handling a monitor EOF event, such as unable to kill the virtual machine process or release resources, the events of other virtual machine will be also blocked, which will lead to the abnormal behavior of other virtual machines. For instance, when another virtual machine completes a shutdown operation and the monitor EOF event has been queued but remains unprocessed, we immediately destroy and start the virtual machine again, at a later time when EOF event get processed, the processMonitorEOFEvent() will kill the virtual machine that just started. To address this issue, in the processMonitorEOFEvent(), we check whether the current virtual machine's id is equal to the the one at the time the event was generated. If they do not match, we immediately return. Signed-off-by: Guoyi Tu <tugy(a)chinatelecom.cn> Signed-off-by: dengpengcheng <dengpc12(a)chinatelecom.cn> --- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 11 +++++++++-- src/qemu/qemu_process.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 953808fcfe..435ee621df 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11470,7 +11470,6 @@ qemuProcessEventFree(struct qemuProcessEvent *event) case QEMU_PROCESS_EVENT_NETDEV_STREAM_DISCONNECTED: case QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED: case QEMU_PROCESS_EVENT_SERIAL_CHANGED: - case QEMU_PROCESS_EVENT_MONITOR_EOF: case QEMU_PROCESS_EVENT_GUEST_CRASHLOADED: g_free(event->data); break; @@ -11484,6 +11483,7 @@ qemuProcessEventFree(struct qemuProcessEvent *event) case QEMU_PROCESS_EVENT_UNATTENDED_MIGRATION: case QEMU_PROCESS_EVENT_RESET: case QEMU_PROCESS_EVENT_NBDKIT_EXITED: + case QEMU_PROCESS_EVENT_MONITOR_EOF: case QEMU_PROCESS_EVENT_LAST: break; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 64afae6450..cfc5b79657 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3854,7 +3854,8 @@ processJobStatusChangeEvent(virDomainObj *vm, static void processMonitorEOFEvent(virQEMUDriver *driver, - virDomainObj *vm) + virDomainObj *vm, + int domid) { qemuDomainObjPrivate *priv = vm->privateData; int eventReason = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; @@ -3863,6 +3864,12 @@ processMonitorEOFEvent(virQEMUDriver *driver, unsigned int stopFlags = 0; virObjectEvent *event = NULL; + if (vm->def->id != domid) { + VIR_ERROR("Domain %s was restarted, ignoring EOF", + vm->def->name); + return; + } + if (qemuProcessBeginStopJob(vm, VIR_JOB_DESTROY, true) < 0) return; @@ -4082,7 +4089,7 @@ static void qemuProcessEventHandler(void *data, void *opaque) processJobStatusChangeEvent(vm, processEvent->data); break; case QEMU_PROCESS_EVENT_MONITOR_EOF: - processMonitorEOFEvent(driver, vm); + processMonitorEOFEvent(driver, vm, GPOINTER_TO_INT(processEvent->data)); break; case QEMU_PROCESS_EVENT_PR_DISCONNECT: processPRDisconnectEvent(vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index fc05b4b24f..696d526a5d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -316,7 +316,7 @@ qemuProcessHandleMonitorEOF(qemuMonitor *mon, } qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_MONITOR_EOF, - 0, 0, NULL); + 0, 0, GINT_TO_POINTER(vm->def->id)); /* We don't want this EOF handler to be called over and over while the * thread is waiting for a job. -- 2.17.1

3 2

[PATCH] storage_util: Fix the false condition in virStorageBackendDeviceIsEmpty
by Han Han 02 Jan '24

02 Jan '24

In virStorageBackendDeviceIsEmpty, the return value for virStorageBackendPARTEDValidLabel is -1 or 0. That makes the later condition 'ret == -2' make always false. Remove the always false condition. Found by Linux Verification Center (portal.linuxtesting.ru) with SVACE. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/576 Signed-off-by: Han Han <hhan(a)redhat.com> --- src/storage/storage_util.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7bf815d978..82bcfa5838 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -3352,15 +3352,9 @@ virStorageBackendDeviceIsEmpty(const char *devpath, writelabel)) == -2) ret = virStorageBackendPARTEDValidLabel(devpath, format, writelabel); - if (ret == -2 && !writelabel) + if (!writelabel) ret = 0; - if (ret == -2) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("Unable to probe '%1$s' for existing data, forced overwrite is necessary"), - devpath); - } - return ret == 0; } -- 2.43.0

2 1

[PATCH v2] Improve error message in remoteGetUNIXSocket
by Martin Kletzander 02 Jan '24

02 Jan '24

By adding a link to an explanation in the kbase. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v2: - Do not print first socket path - Add a kbase article explaining the details and solutions - Add a link to said article v1: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/WGEV… .../kbase/failed_connection_after_install.rst | 58 +++++++++++++++++++ docs/kbase/index.rst | 3 + docs/kbase/meson.build | 1 + src/remote/remote_sockets.c | 2 +- 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 docs/kbase/failed_connection_after_install.rst diff --git a/docs/kbase/failed_connection_after_install.rst b/docs/kbase/failed_connection_after_install.rst new file mode 100644 index 000000000000..cea57c460e10 --- /dev/null +++ b/docs/kbase/failed_connection_after_install.rst @@ -0,0 +1,58 @@ +======================================== +Libvirt does not work after installation +======================================== + +.. contents:: + +TL;DR +===== + +Most probably you want to start a virtqemud socket: + +:: + + # systemctl start virtqemud.socket + +If you are unsure whether to do this, please read the rest of this document. + +Symptom +======= + +After installing libvirt or a virt tool that uses libvirt, commands do +not work when run as root: + +:: + + # virsh list + error: failed to connect to the hypervisor + error: Operation not supported: Cannot use direct socket mode if no URI is set. + For more information see https://libvirt.org/kbase/failed_connection_after_install.html + +Root cause +========== + +Distribution guidelines and/or configurations may discourage or prohibit +starting services as part of a package installation. And because libvirt cannot +know where you might want to connect it cannot start it on its own. + +Solution +======== + +After installing libvirt you may need to start a particular libvirt daemon on +the local machine, set a (default) URI to connect to or, alternatively, +rebooting the machine might work. + +If you are trying to connect to a remote libvirt daemon you need to specify a `connection URI <../uri.html>`__. + +If you are trying to control a local hypervisor, then the solution depends on various factors. You should know: + +- what hypervisor driver you want to connect to, whether it is ``virtqemud`` for QEMU, ``virtchd`` for Cloud Hypervisor, etc. and +- how to start a service or socket (in case of systemd) on you system. + +Example of the most common solution, trying to use QEMU/KVM on Linux with systemd as an init system, is: + +:: + + # systemctl start virtqemud.socket + +also provided on the top of the page. diff --git a/docs/kbase/index.rst b/docs/kbase/index.rst index 896ececdf258..e51b35cbfce5 100644 --- a/docs/kbase/index.rst +++ b/docs/kbase/index.rst @@ -64,6 +64,9 @@ Usage `Secure Boot <secureboot.html>`__ Enable and disable the Secure Boot feature +`Connection fail after installation <failed_connection_after_install.html>`__ + Explanation of a common issue users stumble upon after installation + Debugging --------- diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build index 5b608293e27c..6d4ca90215a5 100644 --- a/docs/kbase/meson.build +++ b/docs/kbase/meson.build @@ -2,6 +2,7 @@ docs_kbase_files = [ 'backing_chains', 'debuglogs', 'domainstatecapture', + 'failed_connection_after_install', 'index', 'kvm-realtime', 'launch_security_sev', diff --git a/src/remote/remote_sockets.c b/src/remote/remote_sockets.c index 4ab3d72933e2..8d403b6f014a 100644 --- a/src/remote/remote_sockets.c +++ b/src/remote/remote_sockets.c @@ -398,7 +398,7 @@ remoteGetUNIXSocket(remoteDriverTransport transport, if (!direct_sock_name) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("Cannot use direct socket mode if no URI is set")); + _("Cannot use direct socket mode if no URI is set. For more information see https://libvirt.org/kbase/failed_connection_after_install.html")); return NULL; } -- 2.43.0

2 1

[PATCH] qemu: Replace the deprecated short-formed option "unix"
by Han Han 21 Dec '23

21 Dec '23

Change to the boolean option "unix=on" Signed-off-by: Han Han <hhan(a)redhat.com> --- src/qemu/qemu_command.c | 2 +- .../graphics-spice-auto-socket-cfg.x86_64-latest.args | 2 +- .../graphics-spice-auto-socket.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/name-escape.x86_64-latest.args | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b45a5e4f80..bc285c0b6f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8204,7 +8204,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig *cfg, switch (glisten->type) { case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: - virBufferAddLit(&opt, "unix,addr="); + virBufferAddLit(&opt, "unix=on,addr="); virQEMUBuildBufferEscapeComma(&opt, glisten->socket); virBufferAddLit(&opt, ","); hasInsecure = true; diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args index a50ca802ae..03fa8e868a 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ --spice unix,addr=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \ +-spice unix=on,addr=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args index a50ca802ae..03fa8e868a 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ --spice unix,addr=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \ +-spice unix=on,addr=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args index 634176a6c3..9c30cf6089 100644 --- a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ --spice unix,addr=/tmp/spice.sock,seamless-migration=on \ +-spice unix=on,addr=/tmp/spice.sock,seamless-migration=on \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args index 096a774caa..9eec8f5a9f 100644 --- a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args +++ b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args @@ -41,7 +41,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo=1,bar=2/.config \ -netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:charchannel0"}],"id":"channel0"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -vnc vnc=unix:/var/lib/libvirt/qemu/domain--1-foo=1,,bar=2/vnc.sock,audiodev=audio1 \ --spice unix,addr=/var/lib/libvirt/qemu/domain--1-foo=1,,bar=2/spice.sock,gl=on,rendernode=/dev/dri/foo,,bar,seamless-migration=on \ +-spice unix=on,addr=/var/lib/libvirt/qemu/domain--1-foo=1,,bar=2/spice.sock,gl=on,rendernode=/dev/dri/foo,,bar,seamless-migration=on \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -blockdev '{"driver":"iscsi","portal":"example.foo.org:3260","target":"iqn.1992-01.com.example:my,storage","lun":1,"transport":"tcp","node-name":"libvirt-2-backend","read-only":false}' \ -device '{"driver":"scsi-generic","drive":"libvirt-2-backend","id":"hostdev0","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":4}' \ -- 2.43.0

3 4

[PATCH 0/4] Support for dirty-limit live migration
by Hyman Huang 21 Dec '23

21 Dec '23

v2: - mark the VIR_MIGRATE_DIRTY_LIMIT flag since 9.10.0 v1: The dirty-limit functionality for live migration was introduced since qemu>=8.1. In the live migration scenario, it implements the force convergence using the dirty-limit approach, which results in better reliable read performance. A straightforward dirty-limit capability for live migration is added by this patchset. Users might not care about other dirty-limit arguments like "x-vcpu-dirty-limit-period" or "vcpu-dirty-limit," thus do not expose them to Libvirt and Keep the default configurations and values in place. For more details about dirty-limit, please see the following reference: https://lore.kernel.org/qemu- devel/169024923116.19090.10825599068950039132-0(a)git.sr.ht/ Hyman Huang (4): Add VIR_MIGRATE_DIRTY_LIMIT flag qemu_migration: Implement VIR_MIGRATE_DIRTY_LIMIT flag virsh: Add support for VIR_MIGRATE_DIRTY_LIMIT flag NEWS: document support for dirty-limit live migration NEWS.rst | 8 ++++++++ docs/manpages/virsh.rst | 10 +++++++++- include/libvirt/libvirt-domain.h | 5 +++++ src/libvirt-domain.c | 8 ++++++++ src/qemu/qemu_migration.c | 8 ++++++++ src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_params.c | 6 ++++++ src/qemu/qemu_migration_params.h | 1 + tools/virsh-domain.c | 10 ++++++++++ 9 files changed, 56 insertions(+), 1 deletion(-) -- 2.39.1

2 9

[PATCH v2] conf: fix integer overflow in virDomainControllerDefParseXML
by Egor Makrushin 20 Dec '23

20 Dec '23

Multiplication results in integer overflow. Thus, replace it with ULLONG_MAX and change def->opts.pciopts.pcihole64size type to ULL. Update variable usage according to new type. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Egor Makrushin <emakrushin(a)astralinux.ru> --- v2: update variable type according to maintainer's proposal src/conf/domain_conf.c | 4 ++-- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 58a985fc5d..9f842937e6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8523,7 +8523,7 @@ virDomainControllerDefParseXML(virDomainXMLOption *xmlopt, unsigned long long bytes; if ((rc = virParseScaledValue("./pcihole64", NULL, ctxt, &bytes, 1024, - 1024ULL * ULONG_MAX, false)) < 0) + ULLONG_MAX, false)) < 0) return NULL; if (rc == 1) @@ -23123,7 +23123,7 @@ virDomainControllerDefFormat(virBuffer *buf, if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI && def->opts.pciopts.pcihole64) { - virBufferAsprintf(&childBuf, "<pcihole64 unit='KiB'>%lu</" + virBufferAsprintf(&childBuf, "<pcihole64 unit='KiB'>%llu</" "pcihole64>\n", def->opts.pciopts.pcihole64size); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0c5e2636e1..14901b37ba 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -707,7 +707,7 @@ struct _virDomainVirtioSerialOpts { struct _virDomainPCIControllerOpts { bool pcihole64; - unsigned long pcihole64size; + unsigned long long pcihole64size; /* the exact controller name is in the "model" subelement, e.g.: * <controller type='pci' model='pcie-root-port'> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 54fb8220e8..b45a5e4f80 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6211,7 +6211,7 @@ qemuBuildGlobalControllerCommandLine(virCommand *cmd, } virCommandAddArg(cmd, "-global"); - virCommandAddArgFormat(cmd, "%s.pci-hole64-size=%luK", hoststr, + virCommandAddArgFormat(cmd, "%s.pci-hole64-size=%lluK", hoststr, cont->opts.pciopts.pcihole64size); } } -- 2.30.2

2 1

[PATCH 0/2] qemuxml2argvtest: Don't exec '/usr/libexec/qemu/vhost-user/test-vhost-user-gpu'
by Peter Krempa 20 Dec '23

20 Dec '23

'qemuExtVhostUserGPUPrepareDomain' breaks our design assumptions about the 'PrepareDomain' step which should not touch anything on the host. This patchset for now fixes the symptom by mocking the function and poisons virFork and virCommandRun so that this doesn't happen in the future. Proper fix will require splitting the vhost-user GPU prepare step to prepare the host-specific portion separately. Peter Krempa (2): qemuxml2argvmock: Mock qemuExtVhostUserGPUPrepareDomain qemuxml2argvmock: Poison virCommandRun and virFork from test context src/qemu/qemu_vhost_user_gpu.c | 4 ++++ src/qemu/qemu_vhost_user_gpu.h | 2 +- src/util/vircommand.h | 4 ++-- tests/qemuxml2argvmock.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) -- 2.43.0

2 7

[PATCH] conf: Remove multiplication to avoid overflow
by Egor Makrushin 20 Dec '23

20 Dec '23

Multiplication results in integer overflow. Replace value of 6th agrument with ULLONG_MAX. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 04bd77a19f ("conf: Move and rename virDomainParseScaledValue()") Signed-off-by: Egor Makrushin <emakrushin(a)astralinux.ru> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 58a985fc5d..871fd3a874 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8523,7 +8523,7 @@ virDomainControllerDefParseXML(virDomainXMLOption *xmlopt, unsigned long long bytes; if ((rc = virParseScaledValue("./pcihole64", NULL, ctxt, &bytes, 1024, - 1024ULL * ULONG_MAX, false)) < 0) + ULLONG_MAX, false)) < 0) return NULL; if (rc == 1) -- 2.30.2

3 3

[libvirt PATCH] remote: DeserializeDomainDiskErrors: remove dead code
by Ján Tomko 19 Dec '23

19 Dec '23

As of commit b2d079c113a which converted this function to use g_strdup, the error label is only reached when i = 0, rendering it useless. Remove it. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/572 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/remote/remote_driver.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 132d0194c6..392377deae 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1641,12 +1641,11 @@ remoteDeserializeDomainDiskErrors(remote_domain_disk_error *ret_errors_val, int maxerrors) { size_t i = 0; - size_t j; if (ret_errors_len > limit || ret_errors_len > maxerrors) { virReportError(VIR_ERR_RPC, "%s", _("returned number of disk errors exceeds limit")); - goto error; + return -1; } for (i = 0; i < ret_errors_len; i++) { @@ -1655,12 +1654,6 @@ remoteDeserializeDomainDiskErrors(remote_domain_disk_error *ret_errors_val, } return 0; - - error: - for (j = 0; j < i; j++) - VIR_FREE(errors[j].disk); - - return -1; } static int -- 2.42.0

2 1

[PATCH] apparmor: Add capabilities for PCI passthrough to virtxend profile
by Jim Fehlig 19 Dec '23

19 Dec '23

When splitting out the apparmor modular daemon profiles from the libvirtd profile, the net_admin and sys_admin capabilities were dropped from the virtxend profile. It was not known at the time that these capabilities were needed for PCI passthrough. Without the capabilities, the following messages are emitted from the audit subsystem audit: type=1400 audit(1702939277.946:63): apparmor="DENIED" \ operation="capable" class="cap" profile="virtxend" pid=3611 \ comm="rpc-virtxend" capability=21 capname="sys_admin" audit: type=1400 audit(1702940304.818:63): apparmor="DENIED" \ operation="capable" class="cap" profile="virtxend" pid=3731 \ comm="rpc-virtxend" capability=12 capname="net_admin" It appears sys_admin is needed to simply read from the PCI dev's sysfs config file. The net_admin capability is needed when setting the MAC address of an SR-IOV virtual function. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/security/apparmor/usr.sbin.virtxend.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/security/apparmor/usr.sbin.virtxend.in b/src/security/apparmor/usr.sbin.virtxend.in index 78a11305f5..77fedce352 100644 --- a/src/security/apparmor/usr.sbin.virtxend.in +++ b/src/security/apparmor/usr.sbin.virtxend.in @@ -5,8 +5,10 @@ profile virtxend @sbindir@/virtxend flags=(attach_disconnected) { #include <abstractions/dbus> capability kill, + capability net_admin, capability setgid, capability setuid, + capability sys_admin, capability sys_pacct, capability ipc_lock, -- 2.43.0

2 1

Patches on libvirt patchew are outdated
by Han Han 19 Dec '23

19 Dec '23

Hi, The libvirt patchew https://patchew.org/Libvirt/ has no update for more than one month. Is it dropped? If not, please sync the patches to it~

3 6

[vf-token 0/8] Introduce vf-token when using userspace PF
by Vivek Kashyap 18 Dec '23

18 Dec '23

The VFIO PCI ABI has been extended to require userspace PF driver to set a VF token to a known value. The VF drivers are then required to provide this token to access the VF device. The vf-token is set by the PF driver before VF drivers can access the device. The kernel provides no means to retrieve the token in use; but there is no specification describing the distribution or level of confidentiality of the token. Qemu has been extended to require the vf-token when vf device is used. An important point to note is that the vf-token is required only when both the PF and VF are used in userspace. This patch series adds support to provide the vf-token (uuid format) in the domain XML and to generate the qemu commandline including the vf-token. To support vf-token the new element will be used as follows: <hostdev mode='subsystem' type='pci' managed='yes'> <driver name='vfio'/> <source> <address domain='0x0000' bus='0x0' slot='0x00' function='0x1'> <vf-token uuid='00112233-4455-6677-8899-aabbccddeeff'/> </address> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </hostdev> The generated commandline will include the following: -device {"driver":"vfio-pci","host":"0000:00:0.1", "vf-token":"00112233-4455-6677-8899-aabbccddeeff", "id":"hostdev0","bus":"pci.0","addr":"0x1"} Changes since initial RFC: 1. Added documentation 2. Added test cases and ran successful test suite after each patch commit 3. fixed spaces, coding sytle, and uuid string format 4. Used S:vftoken in virJSONValueObjectAdd instead of a conditional Vivek Kashyap (8): Define the vf-token extension for PCI device Introduce the vf-token qemu capability This patch introduces the PCI address extension flag for vf-token This patch introduces new XML parser/formatter functions for parsing the vf-token Introduce a validation function for vf-token support in qemu and generate vf-token device attribute in qemu command line Provide information about the vf-token flag Add tests for the vf-token flag to the qemuxml2argv and qemuxml2xml test suites Update news about vf-token NEWS.rst | 8 +++ docs/formatdomain.rst | 3 ++ src/conf/device_conf.c | 49 ++++++++++++++++--- src/conf/domain_addr.h | 1 + src/conf/domain_conf.c | 8 +++ src/conf/schemas/basictypes.rng | 7 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 +++ src/qemu/qemu_domain_address.c | 3 ++ src/qemu/qemu_validate.c | 20 ++++++++ src/util/virpci.c | 7 +++ src/util/virpci.h | 10 ++++ .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + .../caps_8.1.0_x86_64.xml | 1 + .../caps_8.2.0_x86_64.xml | 1 + .../hostdev-vfio-vf-token.x86_64-latest.args | 34 +++++++++++++ .../hostdev-vfio-vf-token.xml | 22 +++++++++ tests/qemuxml2argvtest.c | 1 + .../hostdev-vfio-vf-token.x86_64-latest.xml | 40 +++++++++++++++ tests/qemuxml2xmltest.c | 1 + 22 files changed, 223 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-vf-token.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-vf-token.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-vf-token.x86_64-latest.xml -- 2.33.8

1 8

[PATCH] rpc: fix race in waking up client event loop
by Daniel P. Berrangé 18 Dec '23

18 Dec '23

The first thread to issue a client RPC request will own the event loop execution, sitting in the virNetClientIOEventLoop function. It releases the client lock while running: virNetClientUnlock() g_main_loop_run() virNetClientLock() If a second thread arrives with an RPC request, it will queue it for the first thread to process. To inform the first thread that there's a new request it calls g_main_loop_quit() to break it out of the main loop. This works if the first thread is in g_main_loop_run() at that time. There is a small window of opportunity, however, where the first thread has released the client lock, but not yet got into g_main_loop_run(). If that happens, the wakeup from the second thread is lost. This patch deals with that by changing the way the wakeup is performed. Instead of directly calling g_main_loop_quit(), the second thread creates an idle source to run the quit function from within the first thread. This guarantees that the first thread will see the wakeup. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/rpc/virnetclient.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 4ab8af68c5..68098b1c8d 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1848,6 +1848,15 @@ static void virNetClientIOUpdateCallback(virNetClient *client, } +static gboolean virNetClientIOWakeup(gpointer opaque) +{ + GMainLoop *loop = opaque; + + g_main_loop_quit(loop); + + return G_SOURCE_REMOVE; +} + /* * This function sends a message to remote server and awaits a reply * @@ -1925,7 +1934,9 @@ static int virNetClientIO(virNetClient *client, /* Check to see if another thread is dispatching */ if (client->haveTheBuck) { /* Force other thread to wakeup from poll */ - g_main_loop_quit(client->eventLoop); + GSource *wakeup = g_idle_source_new(); + g_source_set_callback(wakeup, virNetClientIOWakeup, client->eventLoop, NULL); + g_source_attach(wakeup, client->eventCtx); /* If we are non-blocking, detach the thread and keep the call in the * queue. */ -- 2.43.0

4 3

[PATCH 1/3] rpc: mark GSourceFuncs functions in vireventglibwatch.c as static
by Fima Shevrin 18 Dec '23

18 Dec '23

From: "Denis V. Lunev" <den(a)openvz.org> They are not exported from the module and thus should be static. Signed-off-by: Denis V. Lunev <den(a)openvz.org> Signed-off-by: Fima Shevrin <efim.shevrin(a)virtuozzo.com> --- src/util/vireventglibwatch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/vireventglibwatch.c b/src/util/vireventglibwatch.c index b7f3a8786a..b21e505731 100644 --- a/src/util/vireventglibwatch.c +++ b/src/util/vireventglibwatch.c @@ -71,7 +71,7 @@ virEventGLibFDSourceFinalize(GSource *source G_GNUC_UNUSED) } -GSourceFuncs virEventGLibFDSourceFuncs = { +static GSourceFuncs virEventGLibFDSourceFuncs = { .prepare = virEventGLibFDSourcePrepare, .check = virEventGLibFDSourceCheck, .dispatch = virEventGLibFDSourceDispatch, @@ -194,7 +194,7 @@ virEventGLibSocketSourceFinalize(GSource *source) } -GSourceFuncs virEventGLibSocketSourceFuncs = { +static GSourceFuncs virEventGLibSocketSourceFuncs = { .prepare = virEventGLibSocketSourcePrepare, .check = virEventGLibSocketSourceCheck, .dispatch = virEventGLibSocketSourceDispatch, -- 2.34.1

5 12

[PATCH (pushed)] qemuDomainBlockPeek: Fix format checking logic
by Peter Krempa 16 Dec '23

16 Dec '23

Recent refactor which changed the format check to use qemuBlockStorageSourceIsRaw accidentaly inverted the condition. Caught by the CI test suite. Fixes: b600b69f8291226095e0fdb2eb7503baa79063fc Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as trivial CI fix. src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9d8be15721..2d75357939 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10173,7 +10173,7 @@ qemuDomainBlockPeek(virDomainPtr dom, goto cleanup; } - if (qemuBlockStorageSourceIsRaw(disk->src)) { + if (!qemuBlockStorageSourceIsRaw(disk->src)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("peeking is only supported for disk with 'raw' format not '%1$s'"), virStorageFileFormatTypeToString(disk->src->format)); -- 2.43.0

1 0

Re: [PATCH 3/3] rpc: Rework rpc notifications in main and side thread
by Daniel P. Berrangé 15 Dec '23

15 Dec '23

On Fri, Dec 15, 2023 at 01:48:09PM +0000, Efim Shevrin wrote: > Hello, > > here are call traces with two threads generated by python script > // ============================== > [root@dandreev-vz-6-0-0-243-master libvirt]# gdb -p 288985 > (gdb) t a a bt > > Thread 2 (Thread 0x7f2112862640 (LWP 288986) "python3"): > #0 0x00007f2121d4296f in poll () at /lib64/libc.so.6 > #1 0x00007f211444650c in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0 > #2 0x00007f21143f1483 in g_main_loop_run () at /lib64/libglib-2.0.so.0 > #3 0x00007f211406800b in virNetClientIOEventLoop () at /lib64/libvirt.so.0 > #4 0x00007f2114068a0a in virNetClientIO () at /lib64/libvirt.so.0 > #5 0x00007f21140692c1 in virNetClientSendInternal () at /lib64/libvirt.so.0 > #6 0x00007f211406936d in virNetClientSendWithReply () at /lib64/libvirt.so.0 > #7 0x00007f2114061a1d in virNetClientProgramCall () at /lib64/libvirt.so.0 > #8 0x00007f21140f79ac in callFull () at /lib64/libvirt.so.0 > #9 0x00007f21140f7a2f in call () at /lib64/libvirt.so.0 > #10 0x00007f21140d8435 in remoteDomainCreate () at /lib64/libvirt.so.0 > #11 0x00007f21141dd60c in virDomainCreate () at /lib64/libvirt.so.0 > #12 0x00007f21145c8114 in libvirt_virDomainCreate () at /usr/lib64/python3.9/site-packages/libvirtmod.cpython-39-x86_64-linux-gnu.so Ok, this thread is the primary one responsible for I/O. It is waiting, while not holding any mutex. > Thread 1 (Thread 0x7f21223cf740 (LWP 288985) "python3"): > #0 0x00007f2121c9c39a in __futex_abstimed_wait_common () at /lib64/libc.so.6 > #1 0x00007f2121c9eba0 in pthread_cond_wait@@GLIBC_2.3.2 () at /lib64/libc.so.6 > #2 0x00007f2113f4982a in virCondWait () at /lib64/libvirt.so.0 > #3 0x00007f2113f1fee3 in virObjectWait () at /lib64/libvirt.so.0 > #4 0x00007f211406882a in virNetClientIO () at /lib64/libvirt.so.0 > #5 0x00007f21140692c1 in virNetClientSendInternal () at /lib64/libvirt.so.0 > #6 0x00007f211406936d in virNetClientSendWithReply () at /lib64/libvirt.so.0 > #7 0x00007f2114061a1d in virNetClientProgramCall () at /lib64/libvirt.so.0 > #8 0x00007f21140f79ac in callFull () at /lib64/libvirt.so.0 > #9 0x00007f21140f7a2f in call () at /lib64/libvirt.so.0 > #10 0x00007f21140f24eb in remoteNodeDeviceNumOfCaps () at /lib64/libvirt.so.0 > #11 0x00007f2114207a00 in virNodeDeviceNumOfCaps () at /lib64/libvirt.so.0 This is a second API call that has arrived and has queued its outgoing message, and is waiting either for the other thread to pass ownership of the socket to it, or for the other thread to provide its reply (whichever comes first). This is all totally normal, and working as expected, so I still don't see what the actual problem is ? > // ========================================================================= > > just in case here is python script > > [root@dandreev-vz-6-0-0-243-master ~]# cat a.py > import libvirt > import time > from threading import Thread > > def startVM(connection, vm_name): > try: > # Find the virtual machine by name > print('starting VM') > connection.lookupByName(vm_name).create() > print('done starting VM') > except libvirt.libvirtError as e: > print(f'Libvirt Error: {e}') > > # Replace 'qemu+tcp://10.34.66.13/system' with your actual connection URI > connection_uri = 'qemu+tcp://localhost/system' > connection = libvirt.open(connection_uri) > if connection is None: > print(f'Failed to open connection to {connection_uri}') > exit(1) > > try: > # Replace 'your_vm_name' with the actual name of your virtual machine > # startVM(connection, 'instance-00000002') > thread = Thread(target=lambda: startVM(connection, 'instance-00000002')) > thread.start() > time.sleep(3) > devs = connection.listAllDevices() > for i in range(100000): > for dev in devs: > print('listing caps for dev %i %s' % (i, dev)) > try: > dev.listCaps() > except Exception as e: > print('ERROR: %s' % e) > print('DONE listing caps') > > connection.lookupByName('instance-00000002').destroy() > except: > connection.lookupByName('instance-00000002').destroy() > finally: > thread.join() > # Close the connection outside the function > connection.close() What behaviour are you expecting this demo program to show ? When I run it, the VM starts and the the dev caps listing is then run 3 seconds later (due to the sleep). Removing the sleep, I can see the caps list running in parallel with the 'create'. Basically I see nothing wrong. With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

2 1

Re: [PATCH 3/3] rpc: Rework rpc notifications in main and side thread
by Denis V. Lunev 15 Dec '23

15 Dec '23

On 12/15/23 14:48, Efim Shevrin wrote: > Hello, > > here are call traces with two threads generated by python script > // ============================== > [root@dandreev-vz-6-0-0-243-master libvirt]# gdb -p 288985 > (gdb) t a a bt > > Thread 2 (Thread 0x7f2112862640 (LWP 288986) "python3"): > #0 0x00007f2121d4296f in poll () at /lib64/libc.so.6 > #1 0x00007f211444650c in g_main_context_iterate.constprop () at > /lib64/libglib-2.0.so.0 > #2 0x00007f21143f1483 in g_main_loop_run () at /lib64/libglib-2.0.so.0 > #3 0x00007f211406800b in virNetClientIOEventLoop () at > /lib64/libvirt.so.0 > #4 0x00007f2114068a0a in virNetClientIO () at /lib64/libvirt.so.0 > #5 0x00007f21140692c1 in virNetClientSendInternal () at > /lib64/libvirt.so.0 > #6 0x00007f211406936d in virNetClientSendWithReply () at > /lib64/libvirt.so.0 > #7 0x00007f2114061a1d in virNetClientProgramCall () at > /lib64/libvirt.so.0 > #8 0x00007f21140f79ac in callFull () at /lib64/libvirt.so.0 > #9 0x00007f21140f7a2f in call () at /lib64/libvirt.so.0 > #10 0x00007f21140d8435 in remoteDomainCreate () at /lib64/libvirt.so.0 > #11 0x00007f21141dd60c in virDomainCreate () at /lib64/libvirt.so.0 > #12 0x00007f21145c8114 in libvirt_virDomainCreate () at > /usr/lib64/python3.9/site-packages/libvirtmod.cpython-39-x86_64-linux-gnu.so > #13 0x00007f21221268a8 in cfunction_call () at /lib64/libpython3.9.so.1.0 > #14 0x00007f2122118814 in _PyObject_MakeTpCall () at > /lib64/libpython3.9.so.1.0 > #15 0x00007f212211566e in _PyEval_EvalFrameDefault () at > /lib64/libpython3.9.so.1.0 > #16 0x00007f212211d013 in function_code_fastcall () at > /lib64/libpython3.9.so.1.0 > #17 0x00007f2122110650 in _PyEval_EvalFrameDefault () at > /lib64/libpython3.9.so.1.0 > #18 0x00007f212211d013 in function_code_fastcall () at > /lib64/libpython3.9.so.1.0 > #19 0x00007f21221103e8 in _PyEval_EvalFrameDefault () at > /lib64/libpython3.9.so.1.0 > #20 0x00007f212211d013 in function_code_fastcall () at > /lib64/libpython3.9.so.1.0 > #21 0x00007f21221133d2 in _PyEval_EvalFrameDefault () at > /lib64/libpython3.9.so.1.0 > #22 0x00007f212211d013 in function_code_fastcall () at > /lib64/libpython3.9.so.1.0 > #23 0x00007f2122110650 in _PyEval_EvalFrameDefault () at > /lib64/libpython3.9.so.1.0 > #24 0x00007f212211d013 in function_code_fastcall () at > /lib64/libpython3.9.so.1.0 > #25 0x00007f2122110650 in _PyEval_EvalFrameDefault () at > /lib64/libpython3.9.so.1.0 > #26 0x00007f212211d013 in function_code_fastcall () at > /lib64/libpython3.9.so.1.0 > #27 0x00007f2122125382 in method_vectorcall () at > /lib64/libpython3.9.so.1.0 > #28 0x00007f21221d8c4a in t_bootstrap () at /lib64/libpython3.9.so.1.0 > #29 0x00007f21221d8bf8 in pythread_wrapper () at > /lib64/libpython3.9.so.1.0 > #30 0x00007f2121c9f802 in start_thread () at /lib64/libc.so.6 > #31 0x00007f2121c3f450 in clone3 () at /lib64/libc.so.6 > > Thread 1 (Thread 0x7f21223cf740 (LWP 288985) "python3"): > #0 0x00007f2121c9c39a in __futex_abstimed_wait_common () at > /lib64/libc.so.6 > #1 0x00007f2121c9eba0 in pthread_cond_wait@@GLIBC_2.3.2 () at > /lib64/libc.so.6 > #2 0x00007f2113f4982a in virCondWait () at /lib64/libvirt.so.0 > #3 0x00007f2113f1fee3 in virObjectWait () at /lib64/libvirt.so.0 > #4 0x00007f211406882a in virNetClientIO () at /lib64/libvirt.so.0 > #5 0x00007f21140692c1 in virNetClientSendInternal () at > /lib64/libvirt.so.0 > #6 0x00007f211406936d in virNetClientSendWithReply () at > /lib64/libvirt.so.0 > #7 0x00007f2114061a1d in virNetClientProgramCall () at > /lib64/libvirt.so.0 > #8 0x00007f21140f79ac in callFull () at /lib64/libvirt.so.0 > #9 0x00007f21140f7a2f in call () at /lib64/libvirt.so.0 > #10 0x00007f21140f24eb in remoteNodeDeviceNumOfCaps () at > /lib64/libvirt.so.0 > #11 0x00007f2114207a00 in virNodeDeviceNumOfCaps () at /lib64/libvirt.so.0 > #12 0x00007f21145d8edf in libvirt_virNodeDeviceListCaps.lto_priv.0 () > at > /usr/lib64/python3.9/site-packages/libvirtmod.cpython-39-x86_64-linux-gnu.so > #13 0x00007f21221268a8 in cfunction_call () at /lib64/libpython3.9.so.1.0 > #14 0x00007f2122118814 in _PyObject_MakeTpCall () at > /lib64/libpython3.9.so.1.0 > #15 0x00007f212211566e in _PyEval_EvalFrameDefault () at > /lib64/libpython3.9.so.1.0 > #16 0x00007f212211d013 in function_code_fastcall () at > /lib64/libpython3.9.so.1.0 > #17 0x00007f2122110650 in _PyEval_EvalFrameDefault () at > /lib64/libpython3.9.so.1.0 > #18 0x00007f212210f06d in _PyEval_EvalCode () at > /lib64/libpython3.9.so.1.0 > #19 0x00007f212218c495 in _PyEval_EvalCodeWithName () at > /lib64/libpython3.9.so.1.0 > --Type <RET> for more, q to quit, c to continue without paging-- > #20 0x00007f212218c42d in PyEval_EvalCodeEx () at > /lib64/libpython3.9.so.1.0 > #21 0x00007f212218c3df in PyEval_EvalCode () at /lib64/libpython3.9.so.1.0 > #22 0x00007f21221b7524 in run_eval_code_obj () at > /lib64/libpython3.9.so.1.0 > #23 0x00007f21221b5da6 in run_mod () at /lib64/libpython3.9.so.1.0 > #24 0x00007f212208f0cb in pyrun_file.cold () at /lib64/libpython3.9.so.1.0 > #25 0x00007f21221bb253 in PyRun_SimpleFileExFlags () at > /lib64/libpython3.9.so.1.0 > #26 0x00007f21221b7ee8 in Py_RunMain () at /lib64/libpython3.9.so.1.0 > #27 0x00007f212217f02d in Py_BytesMain () at /lib64/libpython3.9.so.1.0 > #28 0x00007f2121c3feb0 in __libc_start_call_main () at /lib64/libc.so.6 > #29 0x00007f2121c3ff60 in __libc_start_main_impl () at /lib64/libc.so.6 > #30 0x000056013181a095 in _start () > > // > ========================================================================= > > just in case here is python script > > [root@dandreev-vz-6-0-0-243-master ~]# cat a.py > import libvirt > import time > from threading import Thread > > def startVM(connection, vm_name): > try: > # Find the virtual machine by name > print('starting VM') > connection.lookupByName(vm_name).create() > print('done starting VM') > except libvirt.libvirtError as e: > print(f'Libvirt Error: {e}') > > # Replace 'qemu+tcp://10.34.66.13/system' with your actual connection URI > connection_uri = 'qemu+tcp://localhost/system' > connection = libvirt.open(connection_uri) > if connection is None: > print(f'Failed to open connection to {connection_uri}') > exit(1) > > try: > # Replace 'your_vm_name' with the actual name of your virtual machine > # startVM(connection, 'instance-00000002') > thread = Thread(target=lambda: startVM(connection, 'instance-00000002')) > thread.start() > time.sleep(3) > devs = connection.listAllDevices() > for i in range(100000): > for dev in devs: > print('listing caps for dev %i %s' % (i, dev)) > try: > dev.listCaps() > except Exception as e: > print('ERROR: %s' % e) > print('DONE listing caps') > > connection.lookupByName('instance-00000002').destroy() > except: > connection.lookupByName('instance-00000002').destroy() > finally: > thread.join() > # Close the connection outside the function > connection.close() > > // ================================================================= > > We use virtual machine startup as a loaded operation, but migration or > something similar could be used. > > Fima Shevrin > ------------------------------------------------------------------------ > *From:* Daniel P. Berrangé <berrange(a)redhat.com> > *Sent:* Friday, December 15, 2023 19:09 > *To:* Efim Shevrin <efim.shevrin(a)virtuozzo.com> > *Cc:* devel(a)lists.libvirt.org <devel(a)lists.libvirt.org>; > den(a)openvz.org <den(a)openvz.org> > *Subject:* Re: [PATCH 3/3] rpc: Rework rpc notifications in main and > side thread > [You don't often get email from berrange(a)redhat.com. Learn why this is > important at https://aka.ms/LearnAboutSenderIdentification ] > > On Fri, Dec 15, 2023 at 02:32:19AM +0800, Fima Shevrin wrote: > > RPC client implementation uses the following paradigm. The critical > > section is organized via virObjectLock(client)/virObjectUnlock(client) > > braces. Though this is potentially problematic as > > main thread: side thread: > > virObjectUnlock(client); > > virObjectLock(client); > > g_main_loop_quit(client->eventLoop); > > virObjectUnlock(client); > > g_main_loop_run(client->eventLoop); > > > > This means in particular that is the main thread is executing very long > > request like VM migration, the wakeup from the side thread could be > > stuck until the main request will be fully completed. > > Can you explain this in more detail, with call traces illustration > for the two threads. You're not saying where the main thread is > doing work with the 'client' lock hold for a long time. Generally > the goal should be for the main thread to only hold the lock for > a short time. Also if the side thread is already holding a reference > on 'client', then potentially we should consider if it is possible > to terminate the event loop without acquiring the mutex, as GMainLoop > protects itself wrt concurrent usage already, provided all threads > hold a reference directly or indirectly. At our opinion the problem here is missed wakeup from the side thread to the main thread. In the original code, i.e. before switching to the main_loop, the problem was not occurred as wakeup event was kept inside the pipe and the poll has been immediately woken up. I have written the same code with pipes but that code is a bit cumbersome due to the Windows compatibility. Thus this application with Prepare seems cleaner. Den

2 2

[PATCH 0/4] virsh/virt-admin: Don't use virErrorRestore
by Peter Krempa 15 Dec '23

15 Dec '23

Client application shouldn't need to reset the error. Peter Krempa (4): virshReconnect: Preserve current URI if not explicitly set in ctl->connname virshCatchDisconnect: Don't probe connection URI vshAdmConnect: Preserve connection URI in ctl->connname if auto-detected vshAdmCatchDisconnect: Don't probe connection URI tools/virsh.c | 13 +++++-------- tools/virt-admin.c | 11 ++++------- 2 files changed, 9 insertions(+), 15 deletions(-) -- 2.43.0

2 4

[PATCH 4/4] vshAdmCatchDisconnect: Don't probe connection URI
by Peter Krempa 15 Dec '23

15 Dec '23

virsh already stores the connection URI in 'ctl->connname', use that instead. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tools/virt-admin.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 02cf421cee..fa9304c772 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -72,15 +72,10 @@ vshAdmCatchDisconnect(virAdmConnectPtr conn G_GNUC_UNUSED, { vshControl *ctl = opaque; const char *str = "unknown reason"; - virErrorPtr error; - g_autofree char *uri = NULL; if (reason == VIR_CONNECT_CLOSE_REASON_CLIENT) return; - virErrorPreserveLast(&error); - uri = virAdmConnectGetURI(conn); - switch ((virConnectCloseReason) reason) { case VIR_CONNECT_CLOSE_REASON_ERROR: str = N_("Disconnected from %1$s due to I/O error"); @@ -96,8 +91,7 @@ vshAdmCatchDisconnect(virAdmConnectPtr conn G_GNUC_UNUSED, break; } - vshError(ctl, _(str), NULLSTR(uri)); - virErrorRestore(&error); + vshError(ctl, _(str), NULLSTR(ctl->connname)); } static int -- 2.43.0

1 0

[PATCH] CIM: Include <stdlib.h> in libxkutil for malloc functions
by Florian Weimer 15 Dec '23

15 Dec '23

This avoids implicit function declarations and build failures with future compilers. Not sure where to submit this. Our Fedora package references <http://libvirt.org/CIM/>, but it's 404, and I can't find a CIM component in the Gitlab organization. Thanks, Florian diff --git a/libxkutil/infostore.c b/libxkutil/infostore.c index d2b2f719dc1d3616..060a83b26e170df7 100644 --- a/libxkutil/infostore.c +++ b/libxkutil/infostore.c @@ -26,6 +26,7 @@ #include <sys/stat.h> #include <sys/file.h> #include <string.h> +#include <stdlib.h> #include <libvirt/libvirt.h> #include <libxml/parser.h> diff --git a/libxkutil/xml_parse_test.c b/libxkutil/xml_parse_test.c index 384593d056d07fb2..9af570efc75f7681 100644 --- a/libxkutil/xml_parse_test.c +++ b/libxkutil/xml_parse_test.c @@ -1,5 +1,6 @@ #include <stdio.h> #include <inttypes.h> +#include <stdlib.h> #include <getopt.h>

3 3

Public virErrorPreserveLast()/virErrorRestore()
by John Levon 15 Dec '23

15 Dec '23

These two functions are currently private to libvirt, hence not available to consumers. Would it be possible to make them public? Without them, there's no way to do any libvirt call without stomping on an existing error that you may want to preserve. I have multiple threads sharing a remote connection (to local libvirtd). I need to be able to handle connection drops (e.g. libvirtd restart). Long story short, the only approach I've found that actually works properly is that there's one main conn object, each thread has a virConnectRef() to it, and whenever a thread gets an error, we check in the error callback if !virConnectIsAlive(). If so, we close the thread's conn, and potentially also clean up the main conn. Then when the error gets returned from the relevant library call, we try to re-connect. However, virConnectIsAlive() stomps on the thread's error, meaning we lose the context on a real, non-connection-related error. So I need to be able to save and restore in the error handler. Given how much these are used inside libvirt code already, it feels likely it would be useful in other public cases too. Thoughts? thnaks john

4 13

[PATCH v2 0/3] Rework main and side threads interaction in rpc
by Fima Shevrin 15 Dec '23

15 Dec '23

From: "Fima Shevrin" <efim.shevrin(a)virtuozzo.com> RPC client implementation uses the following paradigm. The critical section is organized via virObjectLock(client)/virObjectUnlock(client) braces. Though this is potentially problematic as main thread: side thread: virObjectUnlock(client); virObjectLock(client); g_main_loop_quit(client->eventLoop); virObjectUnlock(client); g_main_loop_run(client->eventLoop); This means in particular that is the main thread is executing very long request like VM migration, the wakeup from the side thread could be stuck until the main request will be fully completed. Discrubed case is easily reproducible with the simple python scripts doing slow and fast requests in parallel from two different threads. Our idea is to release the lock at the prepare stage and avoid libvirt stuck during the interaction between main and side threads. Changes: Add cover letter and versions From 2d1a5f094101808216970dbf90383ffeadae7fe9 Mon Sep 17 00:00:00 2001 From: "Denis V. Lunev" <den(a)openvz.org> Date: Sat, 25 Nov 2023 14:11:56 +0300 Subject: [PATCH v2 1/3] rpc: mark GSourceFuncs functions in vireventglibwatch.c as static They are not exported from the module and thus should be static. Signed-off-by: Denis V. Lunev <den(a)openvz.org> Signed-off-by: Fima Shevrin <efim.shevrin(a)virtuozzo.com> --- src/util/vireventglibwatch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/vireventglibwatch.c b/src/util/vireventglibwatch.c index b7f3a8786a..b21e505731 100644 --- a/src/util/vireventglibwatch.c +++ b/src/util/vireventglibwatch.c @@ -71,7 +71,7 @@ virEventGLibFDSourceFinalize(GSource *source G_GNUC_UNUSED) } -GSourceFuncs virEventGLibFDSourceFuncs = { +static GSourceFuncs virEventGLibFDSourceFuncs = { .prepare = virEventGLibFDSourcePrepare, .check = virEventGLibFDSourceCheck, .dispatch = virEventGLibFDSourceDispatch, @@ -194,7 +194,7 @@ virEventGLibSocketSourceFinalize(GSource *source) } -GSourceFuncs virEventGLibSocketSourceFuncs = { +static GSourceFuncs virEventGLibSocketSourceFuncs = { .prepare = virEventGLibSocketSourcePrepare, .check = virEventGLibSocketSourceCheck, .dispatch = virEventGLibSocketSourceDispatch, -- 2.34.1

1 2

[PATCH 0/2] qemu: Drop support for virtiofsd written in C and modernize cmd line
by Michal Privoznik 15 Dec '23

15 Dec '23

*** BLURB HERE *** Michal Prívozník (2): qemu: Drop support for C implementation of virtiofsd qemu_virtiofs: Don't use deprecated cmd line src/qemu/qemu_validate.c | 6 ++++ src/qemu/qemu_virtiofs.c | 33 +++++++------------ .../vhost-user-fs-fd-memory.xml | 1 - 3 files changed, 17 insertions(+), 23 deletions(-) -- 2.41.0

5 6

[libvirt PATCHv2 0/9] support running virtiofsd in session mode
by Ján Tomko 14 Dec '23

14 Dec '23

Now with automatic id mapping selection. Ján Tomko (9): conf: move idmap definition earlier conf: move idmap parsing earlier conf: add idmap element to filesystem qemu: format uid/gid map for virtiofs qemu: virtiofs: do not force UID 0 qemu: allow running virtiofsd in session mode util: add virGetSubUIDs qemu: virtiofs: auto-fill idmap for unprivileged use docs: virtiofs: add section about ID remapping docs/formatdomain.rst | 8 + docs/kbase/virtiofs.rst | 19 +++ src/conf/domain_conf.c | 152 ++++++++++++------ src/conf/domain_conf.h | 29 ++-- src/conf/schemas/domaincommon.rng | 3 + src/libvirt_private.syms | 2 + src/qemu/qemu_validate.c | 7 +- src/qemu/qemu_virtiofs.c | 95 ++++++++++- src/util/virutil.c | 70 ++++++++ src/util/virutil.h | 12 ++ .../vhost-user-fs-fd-memory.xml | 4 + tests/utiltest.c | 33 ++++ tests/virutiltestdata/subuid | 4 + 13 files changed, 362 insertions(+), 76 deletions(-) create mode 100644 tests/virutiltestdata/subuid -- 2.42.0

2 14

[PATCH] Unreacheble code cleanup
by Dmitry Frolov 13 Dec '23

13 Dec '23

Removed code is unreacheble, since the following functions always return 0: virCPUx86DataAdd() libxlCapsAddCPUID() virCapabilitiesAddHostFeature() libxl_get_physinfo() virCapabilitiesSetNetPrefix() libxlMakeDomainOSCaps() libxlMakeDomainDeviceDiskCaps() libxlMakeDomainDeviceGraphicsCaps() libxlMakeDomainDeviceVideoCaps() Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov(a)swemel.ru> --- src/libxl/libxl_capabilities.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 177e8b988e..68908874fb 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -64,12 +64,7 @@ libxlCapsAddCPUID(virCPUData *data, virCPUx86CPUID *cpuid, ssize_t ncaps) item.type = VIR_CPU_X86_DATA_CPUID; for (i = 0; i < ncaps; i++) { item.data.cpuid = cpuid[i]; - - if (virCPUx86DataAdd(data, &item) < 0) { - VIR_DEBUG("Failed to add CPUID(%x,%x)", - cpuid[i].eax_in, cpuid[i].ecx_in); - return -1; - } + virCPUx86DataAdd(data, &item) < 0); } return 0; @@ -119,8 +114,7 @@ libxlCapsNodeData(virCPUDef *cpu, libxl_hwcap hwcap) return NULL; ncaps = G_N_ELEMENTS(cpuid); - if (libxlCapsAddCPUID(cpudata, cpuid, ncaps) < 0) - return NULL; + libxlCapsAddCPUID(cpudata, cpuid, ncaps); return g_steal_pointer(&cpudata); } @@ -145,9 +139,10 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_info) cpu = virCPUDefNew(); host_pae = phy_info->hw_cap[0] & LIBXL_X86_FEATURE_PAE_MASK; - if (host_pae && - virCapabilitiesAddHostFeature(caps, "pae") < 0) + if (host_pae) { + virCapabilitiesAddHostFeature(caps, "pae"); return -1; + } host_lm = (phy_info->hw_cap[2] & LIBXL_X86_FEATURE_LM_MASK); if (host_lm) @@ -179,17 +174,12 @@ libxlCapsInitHost(libxl_ctx *ctx, virCaps *caps) int ret = -1; libxl_physinfo_init(&phy_info); - if (libxl_get_physinfo(ctx, &phy_info) != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to get node physical info from libxenlight")); - goto cleanup; - } + libxl_get_physinfo(ctx, &phy_info); if (libxlCapsInitCPU(caps, &phy_info) < 0) goto cleanup; - if (virCapabilitiesSetNetPrefix(caps, LIBXL_GENERATED_PREFIX_XEN) < 0) - goto cleanup; + virCapabilitiesSetNetPrefix(caps, LIBXL_GENERATED_PREFIX_XEN); ret = 0; @@ -685,11 +675,11 @@ 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) - return -1; + libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); + libxlMakeDomainDeviceDiskCaps(disk); + libxlMakeDomainDeviceGraphicsCaps(graphics); + libxlMakeDomainDeviceVideoCaps(video); + if (STRNEQ(domCaps->machine, "xenpvh") && libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) return -1; -- 2.34.1

2 1

[PATCH v2 0/4] Support for dirty-limit live migration
by Hyman Huang 09 Dec '23

09 Dec '23

v2: - mark the VIR_MIGRATE_DIRTY_LIMIT flag since 10.0.0 v1: The dirty-limit functionality for live migration was introduced since qemu>=8.1. In the live migration scenario, it implements the force convergence using the dirty-limit approach, which results in better reliable read performance. A straightforward dirty-limit capability for live migration is added by this patchset. Users might not care about other dirty-limit arguments like "x-vcpu-dirty-limit-period" or "vcpu-dirty-limit," thus do not expose them to Libvirt and Keep the default configurations and values in place. For more details about dirty-limit, please see the following reference: https://lore.kernel.org/qemu- devel/169024923116.19090.10825599068950039132-0(a)git.sr.ht/ Hyman Huang (4): Add VIR_MIGRATE_DIRTY_LIMIT flag qemu_migration: Implement VIR_MIGRATE_DIRTY_LIMIT flag virsh: Add support for VIR_MIGRATE_DIRTY_LIMIT flag NEWS: document support for dirty-limit live migration NEWS.rst | 8 ++++++++ docs/manpages/virsh.rst | 10 +++++++++- include/libvirt/libvirt-domain.h | 5 +++++ src/libvirt-domain.c | 8 ++++++++ src/qemu/qemu_migration.c | 8 ++++++++ src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_params.c | 6 ++++++ src/qemu/qemu_migration_params.h | 1 + tools/virsh-domain.c | 10 ++++++++++ 9 files changed, 56 insertions(+), 1 deletion(-) -- 2.39.1

1 4

[PATCH v2 0/9] RFC: Add versioned CPUs to libvirt
by Jonathon Jongsma 08 Dec '23

08 Dec '23

For SEV-SNP support we will need to be able to specify versioned CPU models that are not yet available in libvirt. Rather than just adding a versioned CPU or two that would satisfy that immediate need, I decided to try to add versioned CPUs in a more standard way. This series generates CPU definitions for all cpu versions that are defined in upstream qemu (at least for recent Intel and AMD CPUs). libvirt already provides a select subset of these versions as configurable CPU models. But we only include the ones that have defined aliases in qemu, such as EPYC-IBPB. After this patchset, all verisioned cpu models supported by qemu will be available in libvirt. Note that I'm only adding versions that are not already available via their alias. For example, I am not adding an EPYC-v2 CPU model since it is already available as EPYC-IBPB. Changes in v2: - don't make any changes to existing CPU models - drop concept of aliases from libvirt and only provide new versioned models that aren't already available via their qemu alias. Jonathon Jongsma (9): cpu_map: update script to generate versioned CPUs cpu_map: Add versioned EPYC CPUs cpu_map: Add versioned Intel Skylake CPUs cpu_map: Add versioned Intel Cascadelake CPUs cpu_map: Add versioned Intel Icelake CPUs cpu_map: Add versioned Intel Cooperlake CPUs cpu_map: Add versioned Intel Snowridge CPUs cpu_map: Add versioned Intel SapphireRapids CPUs cpu_map: Add versioned Dhyana CPUs src/cpu_map/index.xml | 22 +++ src/cpu_map/meson.build | 22 +++ src/cpu_map/sync_qemu_models_i386.py | 44 ++++-- src/cpu_map/x86_Cascadelake-Server-v2.xml | 93 +++++++++++++ src/cpu_map/x86_Cascadelake-Server-v4.xml | 91 +++++++++++++ src/cpu_map/x86_Cascadelake-Server-v5.xml | 92 +++++++++++++ src/cpu_map/x86_Cooperlake-v2.xml | 98 ++++++++++++++ src/cpu_map/x86_Dhyana-v2.xml | 81 ++++++++++++ src/cpu_map/x86_EPYC-Milan-v2.xml | 108 +++++++++++++++ src/cpu_map/x86_EPYC-Rome-v2.xml | 93 +++++++++++++ src/cpu_map/x86_EPYC-Rome-v3.xml | 95 +++++++++++++ src/cpu_map/x86_EPYC-Rome-v4.xml | 94 +++++++++++++ src/cpu_map/x86_EPYC-v3.xml | 87 ++++++++++++ src/cpu_map/x86_EPYC-v4.xml | 88 ++++++++++++ src/cpu_map/x86_Icelake-Server-v3.xml | 103 +++++++++++++++ src/cpu_map/x86_Icelake-Server-v4.xml | 108 +++++++++++++++ src/cpu_map/x86_Icelake-Server-v5.xml | 109 +++++++++++++++ src/cpu_map/x86_Icelake-Server-v6.xml | 109 +++++++++++++++ src/cpu_map/x86_SapphireRapids-v2.xml | 125 ++++++++++++++++++ src/cpu_map/x86_Skylake-Client-v4.xml | 77 +++++++++++ src/cpu_map/x86_Skylake-Server-v4.xml | 83 ++++++++++++ src/cpu_map/x86_Skylake-Server-v5.xml | 85 ++++++++++++ src/cpu_map/x86_Snowridge-v2.xml | 78 +++++++++++ src/cpu_map/x86_Snowridge-v3.xml | 80 +++++++++++ src/cpu_map/x86_Snowridge-v4.xml | 78 +++++++++++ .../x86_64-cpuid-Atom-P5362-guest.xml | 3 +- .../x86_64-cpuid-Atom-P5362-json.xml | 3 +- .../x86_64-cpuid-Cooperlake-host.xml | 3 +- .../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 5 +- .../x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 9 +- ...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 8 +- ..._64-cpuid-Hygon-C86-7185-32-core-guest.xml | 5 +- ...6_64-cpuid-Hygon-C86-7185-32-core-host.xml | 5 +- ...6_64-cpuid-Hygon-C86-7185-32-core-json.xml | 6 +- ...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 9 +- .../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 9 +- ..._64-cpuid-baseline-Cascadelake+Icelake.xml | 9 +- ...-cpuid-baseline-Cooperlake+Cascadelake.xml | 9 +- ...6_64-cpuid-baseline-Cooperlake+Icelake.xml | 9 +- .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 2 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 2 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 2 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 4 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 4 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 4 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 7 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 7 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 7 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 7 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 7 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 7 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 8 ++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 8 ++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 8 ++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 15 +++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 15 +++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 15 +++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 16 +++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 16 +++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 16 +++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 17 +++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 17 +++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 17 +++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 17 +++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 17 +++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 17 +++ .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 17 +++ .../qemu_7.2.0-tcg.x86_64+hvf.xml | 17 +++ .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 17 +++ tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 17 +++ .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 17 +++ .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 17 +++ tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 17 +++ .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 27 +++- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 22 +++ tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 27 +++- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 27 +++- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 22 +++ tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 27 +++- ...-host-model-fallback-kvm.x86_64-8.1.0.args | 2 +- ...host-model-fallback-kvm.x86_64-latest.args | 2 +- .../cpu-host-model-kvm.x86_64-8.1.0.args | 2 +- .../cpu-host-model-kvm.x86_64-latest.args | 2 +- ...ost-model-nofallback-kvm.x86_64-8.1.0.args | 2 +- ...st-model-nofallback-kvm.x86_64-latest.args | 2 +- 89 files changed, 2710 insertions(+), 123 deletions(-) create mode 100644 src/cpu_map/x86_Cascadelake-Server-v2.xml create mode 100644 src/cpu_map/x86_Cascadelake-Server-v4.xml create mode 100644 src/cpu_map/x86_Cascadelake-Server-v5.xml create mode 100644 src/cpu_map/x86_Cooperlake-v2.xml create mode 100644 src/cpu_map/x86_Dhyana-v2.xml create mode 100644 src/cpu_map/x86_EPYC-Milan-v2.xml create mode 100644 src/cpu_map/x86_EPYC-Rome-v2.xml create mode 100644 src/cpu_map/x86_EPYC-Rome-v3.xml create mode 100644 src/cpu_map/x86_EPYC-Rome-v4.xml create mode 100644 src/cpu_map/x86_EPYC-v3.xml create mode 100644 src/cpu_map/x86_EPYC-v4.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v3.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v4.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v5.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v6.xml create mode 100644 src/cpu_map/x86_SapphireRapids-v2.xml create mode 100644 src/cpu_map/x86_Skylake-Client-v4.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v4.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v5.xml create mode 100644 src/cpu_map/x86_Snowridge-v2.xml create mode 100644 src/cpu_map/x86_Snowridge-v3.xml create mode 100644 src/cpu_map/x86_Snowridge-v4.xml -- 2.41.0

2 11

[PATCH] remote: Fix cached hypervisor type
by Jim Fehlig 08 Dec '23

08 Dec '23

Commit 501825011c switched the remote driver to using g_auto, but missed one case of needing to steal a pointer holding the hypervisor type. Without it, memory is freed and the output of 'virsh version' has random output Compiled against library: libvirt 10.0.0 Using library: libvirt 10.0.0 Using API: ��%�U 10.0.0 Running hypervisor: ��U 8.1.3 Ths change also fixes random SIGABRT from perl processes running libvirt-tck tests. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/remote/remote_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index c4831db6cd..132d0194c6 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1408,7 +1408,7 @@ remoteConnectGetType(virConnectPtr conn) return NULL; /* Stash. */ - return priv->type = ret.type; + return priv->type = g_steal_pointer(&ret.type); } static int remoteConnectIsSecure(virConnectPtr conn) -- 2.43.0

2 1

[PATCH 0/8] migration fixes for non-shared storage migration
by Peter Krempa 07 Dec '23

07 Dec '23

Peter Krempa (8): qemuMigrationDstPrecreateStorage: Improve error messages qemuMigrationDstPrecreateStorage: Refactor cleanup qemuMigrationDstPrecreateStorage: Fix and clarify logic qemu: migration: Improve handling of VIR_MIGRATE_PARAM_DEST_XML with VIR_MIGRATE_PERSIST_DEST qemuDomainStorageOpenStat: Remove unused 'driver' argument and untangle callers qemu: migration: Rename qemuMigrationDstPrecreateStorage to qemuMigrationDstPrepareStorage qemu: Move and export qemuDomainStorageUpdatePhysical and dependencies qemu: migration: Automatically fix non-shared-storage migration to bigger block devices src/qemu/qemu_domain.c | 114 +++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 16 ++++ src/qemu/qemu_driver.c | 149 ++++---------------------------------- src/qemu/qemu_migration.c | 146 +++++++++++++++++++++++++++---------- 4 files changed, 249 insertions(+), 176 deletions(-) -- 2.43.0

2 9

[PATCH 0/3] nodedev: Storage device size fixes
by Peter Krempa 07 Dec '23

07 Dec '23

Peter Krempa (3): virNodeDeviceCapStorageDefFormat: Don't check argument for virBufferEscapeString virNodeDeviceCapStorageDefFormat: Extract formatting of block size data virNodeDeviceCapStorageDefFormatBlocksize: Report sector size and count together src/conf/node_device_conf.c | 65 +++++++++++++++---------------------- 1 file changed, 27 insertions(+), 38 deletions(-) -- 2.43.0

2 4

[PATCH v1] qemu_driver: Don't handle the EOF event if monitor changed
by tugy＠chinatelecom.cn 07 Dec '23

07 Dec '23

From: Guoyi Tu <tugy(a)chinatelecom.cn> Currently, libvirt creates a thread pool with only on thread to handle all qemu monitor events for virtual machines, In the cases that if the thread gets stuck while handling a monitor EOF event, such as unable to kill the virtual machine process or release resources, the events of other virtual machine will be also blocked, which will lead to the abnormal behavior of other virtual machines. For instance, when another virtual machine completes a shutdown operation and the monitor EOF event has been queued but remains unprocessed, we immediately destroy and start the virtual machine again, at a later time when EOF event get processed, the processMonitorEOFEvent() will kill the virtual machine that just started. To address this issue, in the processMonitorEOFEvent(), we check whether the current virtual machine's monitor object matches the one at the time the event was generated. If they do not match, we immediately return. Signed-off-by: Guoyi Tu <tugy(a)chinatelecom.cn> Signed-off-by: dengpengcheng <dengpc12(a)chinatelecom.cn> --- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 11 +++++++++-- src/qemu/qemu_process.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 953808fcfe..435ee621df 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11470,7 +11470,6 @@ qemuProcessEventFree(struct qemuProcessEvent *event) case QEMU_PROCESS_EVENT_NETDEV_STREAM_DISCONNECTED: case QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED: case QEMU_PROCESS_EVENT_SERIAL_CHANGED: - case QEMU_PROCESS_EVENT_MONITOR_EOF: case QEMU_PROCESS_EVENT_GUEST_CRASHLOADED: g_free(event->data); break; @@ -11484,6 +11483,7 @@ qemuProcessEventFree(struct qemuProcessEvent *event) case QEMU_PROCESS_EVENT_UNATTENDED_MIGRATION: case QEMU_PROCESS_EVENT_RESET: case QEMU_PROCESS_EVENT_NBDKIT_EXITED: + case QEMU_PROCESS_EVENT_MONITOR_EOF: case QEMU_PROCESS_EVENT_LAST: break; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d00d2a27c6..57acafb48b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3854,7 +3854,8 @@ processJobStatusChangeEvent(virDomainObj *vm, static void processMonitorEOFEvent(virQEMUDriver *driver, - virDomainObj *vm) + virDomainObj *vm, + qemuMonitor *mon) { qemuDomainObjPrivate *priv = vm->privateData; int eventReason = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; @@ -3863,6 +3864,12 @@ processMonitorEOFEvent(virQEMUDriver *driver, unsigned int stopFlags = 0; virObjectEvent *event = NULL; + if (priv->mon != mon) { + VIR_DEBUG("Domain %p '%s' has been shutdown, ignoring EOF", + vm, vm->def->name); + return; + } + if (qemuProcessBeginStopJob(vm, VIR_JOB_DESTROY, true) < 0) return; @@ -4082,7 +4089,7 @@ static void qemuProcessEventHandler(void *data, void *opaque) processJobStatusChangeEvent(vm, processEvent->data); break; case QEMU_PROCESS_EVENT_MONITOR_EOF: - processMonitorEOFEvent(driver, vm); + processMonitorEOFEvent(driver, vm, processEvent->data); break; case QEMU_PROCESS_EVENT_PR_DISCONNECT: processPRDisconnectEvent(vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f32e82bbd1..ff54e947fe 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -316,7 +316,7 @@ qemuProcessHandleMonitorEOF(qemuMonitor *mon, } qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_MONITOR_EOF, - 0, 0, NULL); + 0, 0, priv->mon); /* We don't want this EOF handler to be called over and over while the * thread is waiting for a job. -- 2.17.1

3 3