December 2021 - Devel - libvirt List Archives

[libvirt PATCH] examples: hellolibvirt: fix argc check
by Ján Tomko 14 Dec '21

14 Dec '21

https://gitlab.com/libvirt/libvirt/-/issues/255 Reported-by: Jeremy Alcim Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. examples/c/misc/hellolibvirt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/c/misc/hellolibvirt.c b/examples/c/misc/hellolibvirt.c index a598e01be2..39cefe934c 100644 --- a/examples/c/misc/hellolibvirt.c +++ b/examples/c/misc/hellolibvirt.c @@ -107,11 +107,12 @@ main(int argc, char *argv[]) { int ret = 0; virConnectPtr conn; - char *uri; + char *uri = NULL; printf("Attempting to connect to hypervisor\n"); - uri = (argc > 0 ? argv[1] : NULL); + if (argc > 1) + uri = argv[1]; /* virConnectOpenAuth is called here with all default parameters, * except, possibly, the URI of the hypervisor. */ -- 2.31.1

1 0

[PATCH v3 0/4] Introduce TCG domain features
by Michal Privoznik 13 Dec '21

13 Dec '21

v3 of: https://listman.redhat.com/archives/libvir-list/2021-November/msg00194.html Note, patches 1/4 and 2/4 from v2 were pushed already. diff to v2: - Split feature validation into a separate patch - Validate that the size is a multiple of MiB, because that's QEMU's granularity - Remembered to write NEWS entry - Worked in Peter's comments from v2 (mostly to make code more future proof) Michal Prívozník (4): conf: Introduce TCG domain features qemu: Validate TCG feature is enabled only for TCG domains qemu: Generate command line for tb-cache feature NEWS: Document TCG features NEWS.rst | 5 ++ docs/formatdomain.rst | 11 ++++ docs/schemas/domaincommon.rng | 15 ++++- src/conf/domain_conf.c | 58 ++++++++++++++++++- src/conf/domain_conf.h | 7 +++ src/qemu/qemu_command.c | 5 ++ src/qemu/qemu_validate.c | 17 ++++++ ...efault-cpu-tcg-features.x86_64-latest.args | 36 ++++++++++++ .../x86_64-default-cpu-tcg-features.xml | 56 ++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + ...default-cpu-tcg-features.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 12 files changed, 210 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.xml create mode 120000 tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-features.x86_64-latest.xml -- 2.32.0

2 7

[libvirt PATCH 00/14] use g_auto for virCommand (Episode I: The End)
by Ján Tomko 13 Dec '21

13 Dec '21

A partial cleanup. The rest is in progress (TM) Ján Tomko (14): bhyve: refactor virBhyveProbeGrubCaps bhyve: refactor bhyveProbeCapsDeviceHelper bhyve: refactor bhyveProbeCapsFromHelp bhyve: refactor bhyveConnectDomainXMLToNative bhyve: use g_auto in virBhyveProcessStartImpl bhyve: use g_auto in virBhyveProcessStop bhyve: refactor virBhyveProcessBuildBhyveCmd lxc: use g_auto in lxcContainerChild lxc: refactor virLXCProcessBuildControllerCmd lxc: use g_auto for virCommand in virLXCProcessEnsureRootFS storage: logical: use two cmd vars in GetPoolSources storage: util: steal cmd in CreateQemuImgCmdFromVol security: apparmor: use automatic cleanup in load_profile qemu: use automatic cleanup for virCommand src/bhyve/bhyve_capabilities.c | 57 ++++++++++----------------- src/bhyve/bhyve_command.c | 36 ++++++++--------- src/bhyve/bhyve_driver.c | 28 ++++++------- src/bhyve/bhyve_process.c | 25 ++++-------- src/lxc/lxc_container.c | 3 +- src/lxc/lxc_process.c | 14 ++----- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_interface.c | 3 +- src/qemu/qemu_tpm.c | 4 +- src/security/security_apparmor.c | 15 ++----- src/storage/storage_backend_logical.c | 18 ++++----- src/storage/storage_util.c | 5 +-- 12 files changed, 78 insertions(+), 133 deletions(-) -- 2.31.1

2 15

[PATCH 0/3] split daemon: Support sparse streams
by Michal Privoznik 13 Dec '21

13 Dec '21

See 3/3 for explanation. Michal Prívozník (3): virStreamInData: Allow callback to not rewind the stream rpc: Introduce virNetClientStreamInData() remote_driver: Implement virStreamInData() callback src/libvirt-stream.c | 9 ++++- src/libvirt_remote.syms | 1 + src/remote/remote_daemon_stream.c | 8 ++-- src/remote/remote_driver.c | 26 +++++++++++++ src/rpc/virnetclientstream.c | 61 +++++++++++++++++++++++++++++++ src/rpc/virnetclientstream.h | 4 ++ 6 files changed, 105 insertions(+), 4 deletions(-) -- 2.32.0

3 11

[libvirt PATCH 0/8] Use g_auto for virCaps and LXCDriverConfig (glib chronicles)
by Ján Tomko 13 Dec '21

13 Dec '21

Pipeline in progress: https://gitlab.com/janotomko/libvirt/-/pipelines/427100328 Ján Tomko (8): lxc: fix error value of lxcNodeGetSecurityModel Use g_auto for freeing virCaps Use g_auto for stealing virCaps lxc: define cleanup function for virLXCDriverConfig lxc: use g_auto for virLXCDriverGetConfig lxc: remove cleanup from lxcNodeGetSecurityModel bhyve: bhyveConnectCompareCPU: remove cleanup label Remove empty cleanup sections src/bhyve/bhyve_driver.c | 46 ++++++---------- src/ch/ch_conf.c | 14 ++--- src/ch/ch_driver.c | 3 +- src/hyperv/hyperv_driver.c | 10 ++-- src/libxl/libxl_capabilities.c | 14 ++--- src/libxl/libxl_conf.c | 11 ++-- src/libxl/xen_common.c | 8 +-- src/libxl/xen_xl.c | 32 ++++------- src/lxc/lxc_conf.c | 18 +++---- src/lxc/lxc_conf.h | 2 + src/lxc/lxc_container.c | 12 ++--- src/lxc/lxc_driver.c | 97 ++++++++++++---------------------- src/lxc/lxc_native.c | 41 +++++--------- src/lxc/lxc_process.c | 44 +++++---------- src/test/test_driver.c | 14 ++--- src/util/vircgroup.c | 12 ++--- src/util/virfirmware.c | 18 +++---- src/vmware/vmware_conf.c | 5 +- src/vz/vz_driver.c | 20 +++---- tests/qemucaps2xmltest.c | 14 ++--- tests/testutilsxen.c | 5 +- tests/vboxsnapshotxmltest.c | 8 +-- tests/virconftest.c | 24 ++++----- tests/virfiletest.c | 14 ++--- tests/virstringtest.c | 16 +++--- 25 files changed, 174 insertions(+), 328 deletions(-) -- 2.31.1

2 10

[libvirt PATCH] qemu: qemuBuildChardevCommand: use chrSourcePriv unconditionally
by Ján Tomko 13 Dec '21

13 Dec '21

In the QEMU driver, we allocate private source data unconditionally for every chardev and the rest of the function just assumes it's there. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pointed out by Coverity. src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 613f7a5d2a..0017cf6ca7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1493,7 +1493,7 @@ qemuBuildChardevCommand(virCommand *cmd, * secinfo is added only to a TCP serial device during * qemuDomainSecretChardevPrepare. Subsequently called * functions can just check the config fields */ - if (chrSourcePriv && chrSourcePriv->secinfo) { + if (chrSourcePriv->secinfo) { if (qemuBuildObjectSecretCommandLine(cmd, chrSourcePriv->secinfo, qemuCaps) < 0) -- 2.31.1

2 1

[libvirt PATCH v2 00/12] Improve AMD SEV support
by Daniel P. Berrangé 13 Dec '21

13 Dec '21

This addresses a few issues in the AMD SEV support - Neither host or domain level SEV metadata is exposed in virsh commands - The domain launch security parameters don't expose enough info to validate the measurement - Support verified direct kernel boot - Report max SEV/SEV-ES guest counts The second point was the initial purpose of my work. Per the SEV API guide to calculate the measurement we need measurement = HMAC(0x04 || API_MAJOR || API_MINOR || BUILD || GCTX.POLICY || GCTX.LD || MNONCE; GCTX.TIK) The API_MINOR, API_MAJOR, BUILD values are things that are available from 'query-sev' QMP command and libvirt does not expose this info. This patch series adds them to virDomainGetLaunchSecurityParams alongside the measurement that we already report. So now the client can fetch this info and calculate an expected measurement to compare with the actual measurement they got. They will thus know if the guest is safe to inject secrets into, which is where Jim's recent patches come into play. Daniel P. Berrangé (12): include: add new launch security parameters qemu: report error querying launch params for inactive guest qemu: add monitor APIs for query-sev qemu: report new launch security parameters tools: add 'domlaunchsecinfo' virsh command tools: add 'nodesevinfo' virsh command conf: extend domain capabilities for max SEV guest count include: define parameters for reporting SEV guest limits qemu: report max number of SEV guests conf: add support for setting SEV kernel hashes qemu: probe for sev-guest.kernel-hashes property qemu: format sev-guest.kernel-hashes property docs/formatdomain.rst | 7 +- docs/formatdomaincaps.html.in | 6 + docs/manpages/virsh.rst | 31 +++++ docs/schemas/domaincaps.rng | 6 + docs/schemas/domaincommon.rng | 5 + include/libvirt/libvirt-domain.h | 32 +++++ include/libvirt/libvirt-host.h | 16 +++ src/conf/domain_capabilities.c | 4 + src/conf/domain_capabilities.h | 2 + src/conf/domain_conf.c | 8 ++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 46 ++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 7 ++ src/qemu/qemu_driver.c | 59 ++++++++-- src/qemu/qemu_monitor.c | 13 +++ src/qemu/qemu_monitor.h | 9 ++ src/qemu/qemu_monitor_json.c | 46 ++++++++ src/qemu/qemu_monitor_json.h | 9 ++ src/qemu/qemu_validate.c | 8 ++ .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 2 + .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 2 + tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 2 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 2 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 2 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 2 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 7 +- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 7 +- .../caps_2.12.0.x86_64.replies | 97 ++++++++++++---- .../caps_3.0.0.x86_64.replies | 97 ++++++++++++---- .../caps_3.1.0.x86_64.replies | 97 ++++++++++++---- .../caps_4.0.0.x86_64.replies | 97 ++++++++++++---- .../caps_4.1.0.x86_64.replies | 89 ++++++++++---- .../caps_4.2.0.x86_64.replies | 89 ++++++++++---- .../caps_5.0.0.x86_64.replies | 89 ++++++++++---- .../caps_5.1.0.x86_64.replies | 89 ++++++++++---- .../caps_5.2.0.x86_64.replies | 89 ++++++++++---- .../caps_6.0.0.x86_64.replies | 89 ++++++++++---- .../caps_6.1.0.x86_64.replies | 89 ++++++++++---- .../caps_6.2.0.x86_64.replies | 109 ++++++++++++++---- .../caps_6.2.0.x86_64.xml | 8 ++ tests/qemumonitorjsontest.c | 43 +++++++ ...unch-security-sev-direct.x86_64-6.2.0.args | 40 +++++++ .../launch-security-sev-direct.xml | 39 +++++++ tests/qemuxml2argvtest.c | 1 + tools/virsh-domain.c | 53 +++++++++ tools/virsh-host.c | 45 ++++++++ 48 files changed, 1427 insertions(+), 271 deletions(-) create mode 100644 tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/launch-security-sev-direct.xml -- 2.33.1

2 24

[PATCH] qemuProcessPrepareHost: Create domain private dirs as early as possible
by Michal Privoznik 13 Dec '21

13 Dec '21

As of ff024b60cc3 we are opening chardevs before starting QEMU. However, we also doing that before domain private directories are created. This leaves us impossible to create guest agent socket which lives under priv->channelTargetDir. While creating the dirs can be moved just before qemuProcessPrepareHostBackendChardev() it's better to do it as the very first step so that this kind of error is prevented in future. Fixes: ff024b60cc39d5d41b1e68728a00a47e103ec4dd Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4963ce383f..82d0af5549 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7024,6 +7024,14 @@ qemuProcessPrepareHost(virQEMUDriver *driver, qemuDomainObjPrivate *priv = vm->privateData; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + /* + * Create all per-domain directories in order to make sure domain + * with any possible seclabels can access it. + */ + if (qemuProcessMakeDir(driver, vm, priv->libDir) < 0 || + qemuProcessMakeDir(driver, vm, priv->channelTargetDir) < 0) + return -1; + if (qemuPrepareNVRAM(driver, vm) < 0) return -1; @@ -7085,14 +7093,6 @@ qemuProcessPrepareHost(virQEMUDriver *driver, return -1; } - /* - * Create all per-domain directories in order to make sure domain - * with any possible seclabels can access it. - */ - if (qemuProcessMakeDir(driver, vm, priv->libDir) < 0 || - qemuProcessMakeDir(driver, vm, priv->channelTargetDir) < 0) - return -1; - VIR_DEBUG("Write domain masterKey"); if (qemuDomainWriteMasterKeyFile(driver, vm) < 0) return -1; -- 2.32.0

4 3

[libvirt PATCH] nss: Use shared_library() for nss_libvirt_lib
by Andrea Bolognani 13 Dec '21

13 Dec '21

shared_module() is intended for shared objects that are loaded at runtime using dlopen() whereas NSS plugins need to be full-fledged shared libraries with, among other things, a proper SONAME. Meson seems to have become more strict about this recently, because libnss_libvirt.so.2 gets a SONAME when I build it with Meson 0.59.4 on Fedora 34 but doesn't when I use Meson 0.60.2 on Debian testing instead. Either way, shared_library() was always the right function to use for NSS plugins. Fixes: 36780c931900555706fd6db9fc2ce2b4cabf9045 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tools/nss/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/nss/meson.build b/tools/nss/meson.build index 198936f3d4..f77309ebca 100644 --- a/tools/nss/meson.build +++ b/tools/nss/meson.build @@ -59,7 +59,7 @@ nss_libvirt_guest_syms = '@0@@1@'.format( meson.current_source_dir() / nss_guest_sym_file, ) -nss_libvirt_lib = shared_module( +nss_libvirt_lib = shared_library( 'nss_libvirt', name_prefix: nss_prefix, name_suffix: 'so.@0@'.format(nss_so_ver), -- 2.31.1

3 2

[PATCH 00/24] chardev handling cleanups (chardev refactors part 2)
by Peter Krempa 13 Dec '21

13 Dec '21

In this part I'm cleaning up the command line generators and unifying them. Until now there were multiple custom -chardev generators in places where it was simpler to use it than the common code. This series fixes the common code to have sane API and refactors virtiofs, vhost-user-blk vhost-user-gpu and TPM code to use it. After this series we are left with 3 distinct generators for chardev properties: - commandline - commandline for capabilties probing - QMP After the refactors here we can finally also add DO_TEST_CAPS_LATEST of chardev tests without actually touching the host as part of the testsuite which was impossible before. In further parts the generators will be put into one place and prepared for upcoming qemu refactors. Peter Krempa (24): virDomainDeviceInfoIterateFlags: Export the symbol qemu: domain: Introduce helpers for initializing chardev backend of devices qemu: Move creation and opening of chardev backend FDs to host prepare step qemu: command: Remove unused QEMU_BUILD_CHARDEV_FILE_LOGD and QEMU_BUILD_CHARDEV_UNIX_FD_PASS qemu: command: remove the unused 'chardevStdioLogd' argument/variable qemu: domain: Refactor chardev definition preparing qemu: Store chardev 'wait' flag in chardev source private data qemuBuildChrChardevStr: Remove 'cdevflags' argument qemuBuildChrChardevStr: Remove unused arguments and clean up callers qemuxml2argvtest: Add DO_TEST_CAPS_LATEST versions for all character device tests qemuxml2argvtest: Add _LATEST version for 'name-escape' case qemuBuildConsoleCommandLine: Remove identical code qemuBuildChrChardevStr: Directly generate command line qemuBuildChardevCommand: Move earlier qemuBuildChardevCommand: Don't prefix alias qemuBuildChardevCommand: Split creation of the command and setup of other objects qemu: Store TLS config options for chardevs in qemuDomainChrSourcePrivate qemuBuildChardevCommand: Remove unused 'cfg' parameter qemu: Implement chardev source setup for disk qemu: Use qemuBuildChrChardevCommand for vhost-user disk backend qemu: Use qemuBuildChrChardevCommand for virtiofs backend chardev qemu: Use qemuBuildChrChardevCommand for vhost-user-gpu backend chardev qemu: Implement chardev source setup for tpm qemu: command: Use 'qemuBuildChrChardevCommand' to build TPM backend src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 1 - src/qemu/qemu_block.h | 1 - src/qemu/qemu_command.c | 1095 +++++++---------- src/qemu/qemu_command.h | 2 - src/qemu/qemu_domain.c | 258 +++- src/qemu/qemu_domain.h | 38 +- src/qemu/qemu_driver.c | 8 + src/qemu/qemu_hotplug.c | 3 - src/qemu/qemu_process.c | 264 +++- .../aarch64-tpm.aarch64-latest.args | 2 +- .../console-compat-auto.x86_64-latest.args | 39 + .../console-compat-chardev.x86_64-latest.args | 39 + .../console-compat.x86_64-latest.args | 38 + .../name-escape.x86_64-latest.args | 51 + ...arallel-parport-chardev.x86_64-latest.args | 39 + .../parallel-tcp-chardev.x86_64-latest.args | 39 + .../pci-serial-dev-chardev.x86_64-latest.args | 39 + .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 2 +- ...rial-dev-chardev-iobase.x86_64-latest.args | 39 + .../serial-dev-chardev.x86_64-latest.args | 39 + .../serial-file-chardev.x86_64-latest.args | 40 + .../serial-file-log.x86_64-latest.args | 40 + .../serial-many-chardev.x86_64-latest.args | 42 + .../serial-pty-chardev.x86_64-latest.args | 39 + ...erial-spiceport-nospice.x86_64-latest.args | 37 + .../serial-spiceport.x86_64-latest.args | 41 + .../serial-tcp-chardev.x86_64-latest.args | 39 + ...rial-tcp-telnet-chardev.x86_64-latest.args | 39 + ...p-tlsx509-chardev-notls.x86_64-latest.args | 41 + ...-tlsx509-chardev-verify.x86_64-latest.args | 42 + ...ial-tcp-tlsx509-chardev.x86_64-latest.args | 42 + ...-tlsx509-secret-chardev.x86_64-latest.args | 43 + .../serial-udp-chardev.x86_64-latest.args | 41 + ...rial-unix-missing-source.x86_64-latest.err | 1 + .../serial-vc-chardev.x86_64-latest.args | 39 + .../tpm-emulator-spapr.ppc64-latest.args | 2 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 2 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 2 +- .../tpm-emulator-tpm2.x86_64-latest.args | 2 +- .../tpm-emulator.x86_64-latest.args | 2 +- ...host-user-gpu-secondary.x86_64-latest.args | 2 +- ...irtio-options-video-ats.x86_64-latest.args | 2 +- ...tio-options-video-iommu.x86_64-latest.args | 2 +- ...io-options-video-packed.x86_64-latest.args | 2 +- tests/qemuxml2argvtest.c | 114 ++ 46 files changed, 1959 insertions(+), 776 deletions(-) create mode 100644 tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/console-compat.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/name-escape.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-spiceport-nospice.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/serial-unix-missing-source.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args -- 2.31.1

3 29

[libvirt PATCH 00/12] Clean up cruft in firewall/iptables code (in preparation for nftables)
by Laine Stump 13 Dec '21

13 Dec '21

These patches make no functional change, they just remove a bunch of cruft that accumulated over the years and is no longer needed. This is all in advance of adding support for native nftable support, but there is nothing nftables-specific being added here; I just wanted to get these cleanups out of way now so that the eventual nftables support patchset is smaller and less complicated. (NB: the concept of a "firewall backend" is being removed here, implying that it will no longer exist. This is not true, but the way that it will exist in the future will be different (per-firewall object rather than per-process) so almost all of the existing code won't be applicable anyway.) Laine Stump (12): network: eliminate code that uses default iptables chains util: rename/move iptablesFormatNetwork to virSocketAddrFormatWithPrefix util: rename iptables operators to something less generic tests: remove firewalld backend tests from virfirewalltest.c tests: remove unnecessary ret variables and cleanup labels tests: document why virgdbus must be mocked in networkxml2firewalltest.c util: eliminate pointless switch in virFirewallApplyRule util: simplify virFirewallBackendSynchronize() util: move and rename virFirewallBackendSynchronize() util: remove check for iptables binary during virFirewallInit util: remove currentBackend from virfirewall.c util: remove virFirewallOnceInit() src/libvirt_private.syms | 5 +- src/network/bridge_driver_linux.c | 37 +-- src/util/virfirewall.c | 143 +---------- src/util/virfirewall.h | 2 - src/util/virfirewalld.c | 43 ++++ src/util/virfirewalld.h | 2 + src/util/virfirewallpriv.h | 37 --- src/util/viriptables.c | 207 +++++++--------- src/util/viriptables.h | 2 - src/util/virsocketaddr.c | 44 ++++ src/util/virsocketaddr.h | 3 + tests/networkxml2firewalltest.c | 14 +- tests/nwfilterebiptablestest.c | 7 - tests/nwfilterxml2firewalltest.c | 8 +- tests/virfirewalltest.c | 390 ++++-------------------------- 15 files changed, 247 insertions(+), 697 deletions(-) delete mode 100644 src/util/virfirewallpriv.h -- 2.33.1

2 13

[PATCH] Fixes: #253
by JorhsonDeng 13 Dec '21

13 Dec '21

To resolve the bug: #253. The restore method should call the qemuProcessRefreshState method to refreash the state of the devices. --- src/qemu/qemu_process.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6b83a571b9..ebd60a7b84 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7703,14 +7703,11 @@ qemuProcessStart(virConnectPtr conn, if (incoming->deferredURI && qemuMigrationDstRun(driver, vm, incoming->deferredURI, asyncJob) < 0) goto stop; - } else { - /* Refresh state of devices from QEMU. During migration this happens - * in qemuMigrationDstFinish to ensure that state information is fully - * transferred. */ - if (qemuProcessRefreshState(driver, vm, asyncJob) < 0) - goto stop; } + if (qemuProcessRefreshState(driver, vm, asyncJob) < 0) + goto stop; + if (qemuProcessFinishStartup(driver, vm, asyncJob, !(flags & VIR_QEMU_PROCESS_START_PAUSED), incoming ? -- 2.27.0

3 2

[libvirt PATCH 0/6] Improve usage information and manual pages
by Andrea Bolognani 10 Dec '21

10 Dec '21

Each of the tools we ship as part of libvirt should display reasonable usage information when called without arguments and have an associated manual page. Andrea Bolognani (6): virt-ssh-helper: Don't use optind virt-ssh-helper: Improve usage information virt-ssh-helper: Add manual page virt-qemu-run: Improve usage information virt-qemu-run: Improve manual page virt-pki-query-dn: Add manual page docs/manpages/meson.build | 2 + docs/manpages/virt-pki-query-dn.rst | 91 +++++++++++++++++++++++++++ docs/manpages/virt-qemu-run.rst | 53 +++++++++------- docs/manpages/virt-ssh-helper.rst | 96 +++++++++++++++++++++++++++++ libvirt.spec.in | 2 + src/qemu/qemu_shim.c | 2 +- src/remote/remote_ssh_helper.c | 18 +++--- 7 files changed, 234 insertions(+), 30 deletions(-) create mode 100644 docs/manpages/virt-pki-query-dn.rst create mode 100644 docs/manpages/virt-ssh-helper.rst -- 2.31.1

2 15

[libvirt PATCH v2 00/17] cgroup and thread management in ch driver
by Praveen K Paladugu 10 Dec '21

10 Dec '21

I addressed all the open comments on the v1 patch set. In places where indentaion was hard to manage, I created explicit commits to apply correct indentation on files. Compared to v1, this version applies 2 code refactors: 1) some cgroup methods in src/qemu/qemu_cgroup.c were moved to src/hypervisor and shared with ch driver. 2) virProcessGetStatInfo, virProcessGetSchedInfo which were copied from qemu driver are moved to util and shared between qemu and ch drviers. Praveen K Paladugu (9): util: fix indentation in virprocess.c util: Helper functions to get process info ch_domain: fix indentation in ch_domain ch_driver: fix indentation in ch_driver ch_driver,ch_domain: vcpu info getter callbacks ch_monitor: fix indentation in ch_monitor.c qemu,hypervisor: refactor some cgroup mgmt methods ch_process: Setup emulator and iothread settings ch_driver: emulator threadinfo & pinning callbacks Vineeth Pillai (8): ch_domain: add virCHDomainGetMonitor helper method ch_domain: add methods to manage private vcpu data ch_driver: domainGetVcpuPinInfo and nodeGetCPUMap ch_monitor: Get nicindexes in prep for cgroup mgmt ch: methods for cgroup mgmt in ch driver ch_driver,ch_domain: vcpupin callback in ch driver ch_driver: enable typed param string for numatune ch_driver: add numatune callbacks for CH driver src/ch/ch_conf.c | 2 + src/ch/ch_conf.h | 6 +- src/ch/ch_domain.c | 302 ++++++--- src/ch/ch_domain.h | 32 +- src/ch/ch_driver.c | 1045 ++++++++++++++++++++++++++++---- src/ch/ch_monitor.c | 533 +++++++++++----- src/ch/ch_monitor.h | 60 +- src/ch/ch_process.c | 386 +++++++++++- src/ch/ch_process.h | 3 + src/ch/meson.build | 1 + src/hypervisor/domain_cgroup.c | 426 ++++++++++++- src/hypervisor/domain_cgroup.h | 52 ++ src/libvirt_private.syms | 12 + src/qemu/qemu_cgroup.c | 410 +------------ src/qemu/qemu_cgroup.h | 11 - src/qemu/qemu_driver.c | 130 +--- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_process.c | 17 +- src/util/virprocess.c | 609 +++++++++++-------- src/util/virprocess.h | 5 + 20 files changed, 2905 insertions(+), 1141 deletions(-) -- 2.27.0

2 28

[libvirt PATCH v3] qemu: Enable unprivileged userfaultfd for post-copy migration
by Jiri Denemark 10 Dec '21

10 Dec '21

Userfaultfd is by default allowed only for privileged processes. Since libvirt runs QEMU unprivileged, we need to enable unprivileged access to userfaultfd to enable post-copy migration. https://bugzilla.redhat.com/show_bug.cgi?id=1945420 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: If you wonder about the 60-* prefix of the installed sysctl file, we already install 60-libvirtd.conf so I think it makes sense to use the same prefix for all sysctl configuration installed by libvirt. Version 2: - setting unprivileged_userfaultfd only when it is not already enabled - virReportSystemError replaced with VIR_WARN Version 3: - set the knob via a sysctl conf file instead libvirt.spec.in | 1 + src/qemu/meson.build | 8 ++++++++ src/qemu/postcopy-migration.sysctl | 6 ++++++ 3 files changed, 15 insertions(+) create mode 100644 src/qemu/postcopy-migration.sysctl diff --git a/libvirt.spec.in b/libvirt.spec.in index 5a079cdaf3..3aa4cc75b5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1859,6 +1859,7 @@ exit 0 %files daemon-driver-qemu %config(noreplace) %{_sysconfdir}/sysconfig/virtqemud %config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf +%config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf %{_datadir}/augeas/lenses/virtqemud.aug %{_datadir}/augeas/lenses/tests/test_virtqemud.aug %{_unitdir}/virtqemud.service diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 3898d23877..66ef594006 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -170,6 +170,14 @@ if conf.has('WITH_QEMU') 'file': files('virtqemud.sysconf'), } + if conf.has('WITH_SYSCTL') + install_data( + 'postcopy-migration.sysctl', + install_dir: prefix / 'lib' / 'sysctl.d', + rename: [ '60-qemu-postcopy-migration.conf' ], + ) + endif + virt_install_dirs += [ localstatedir / 'lib' / 'libvirt' / 'qemu', runstatedir / 'libvirt' / 'qemu', diff --git a/src/qemu/postcopy-migration.sysctl b/src/qemu/postcopy-migration.sysctl new file mode 100644 index 0000000000..aa8f015ae0 --- /dev/null +++ b/src/qemu/postcopy-migration.sysctl @@ -0,0 +1,6 @@ +# This is needed to support post-copy migration for QEMU run by libvirt, +# i.e., unprivileged, as userfaultfd is by default only available to +# privileged processes. +# It can be safely overridden by a file in /etc/sysctl.d/ in case post-copy +# migration is not used on the host. +vm.unprivileged_userfaultfd = 1 -- 2.34.1

2 1

[libvirt PATCH] remote: Avoid crash in remoteSplitURIScheme()
by Andrea Bolognani 10 Dec '21

10 Dec '21

We need to make sure the URI scheme is present before passing it to strchr(), otherwise we're going to get $ virt-ssh-helper foo Segmentation fault (core dumped) Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/remote/remote_sockets.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/remote/remote_sockets.c b/src/remote/remote_sockets.c index 2979576680..c315b24d30 100644 --- a/src/remote/remote_sockets.c +++ b/src/remote/remote_sockets.c @@ -69,7 +69,15 @@ remoteSplitURIScheme(virURI *uri, char **driver, remoteDriverTransport *transport) { - char *p = strchr(uri->scheme, '+'); + char *p = NULL; + + if (!uri->scheme) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("missing scheme for URI")); + return -1; + } + + p = strchr(uri->scheme, '+'); if (p) *driver = g_strndup(uri->scheme, p - uri->scheme); -- 2.31.1

3 5

[PATCH] Revert "lxc: controller: Fix container launch on cgroup v1"
by Michal Privoznik 10 Dec '21

10 Dec '21

Unfortunately, this fix breakes machinectl in a very nasty way, for instance 'machinectl shell' drops into the host shell. It's worse than being unable to start a container with CGroupsV1. Revert until a proper fix is figured out. This reverts commit 1b9ce05ce241a581d4e80228c92ceb0266f21f94. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc_controller.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 039efcd7c7..7c593ee3a9 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -865,12 +865,12 @@ static int virLXCControllerSetupCgroupLimits(virLXCController *ctrl) nodeset = virDomainNumatuneGetNodeset(ctrl->def->numa, auto_nodeset, -1); if (!(ctrl->cgroup = virLXCCgroupCreate(ctrl->def, - getpid(), + ctrl->initpid, ctrl->nnicindexes, ctrl->nicindexes))) goto cleanup; - if (virCgroupAddMachineProcess(ctrl->cgroup, ctrl->initpid) < 0) + if (virCgroupAddMachineProcess(ctrl->cgroup, getpid()) < 0) goto cleanup; /* Add all qemu-nbd tasks to the cgroup */ -- 2.32.0

2 1

Issue labe improvements
by Peter Krempa 10 Dec '21

10 Dec '21

Hi, from time to time when I try to go through upstream issues I always feel that the labels we have are suboptimal and don't always allow to track the current state of the issue. Recently I've had a look at the qemu issues and found what I was lacking. Specifically I'm lacking the 'workflow' class of labels they use. I propose we adopt the following changes: 1) Convert the existing 'bug', 'enhancement', 'support', and 'discussion' labels into a set of scoped labels (again inspiration taken from qemu): kind::bug kind::enhancement kind::support kind::discussion kind::documentation This is mostly as the above kinds are mutually exclusive. 2) Introduce the workflow label similarly to what qemu uses: workflow::Confirmed/Triaged (<- confirmed for bugs, triaged for enhancements) workflow::Needs Info (replaces "needinfo") workflow::In progress (replaces "Doing") I'd also potentially like to have a 'Unconfirmed' state for when the bug has enough info, but it's unknown why it's happening. I want to specifically avoid the ambiguous "Triaged" when used on it's own. 3) Convert host-* labels into a scoped label. Hosts are usually mutually exclusive 4) Convert driver-* into scoped labels. Usually issues are not exceeding these boundaries 5) Remove the following unused or ambiguous labels: - critical - incident - Doing - To Do - gsoc::20* (all seem to be unused) I'm willing to go ahead and re-triage open stuff if nobody objects to the above changes.

4 3

[PATCH 0/2] remote_daemon: Set shutdown callbacks only after init is done
by Michal Privoznik 10 Dec '21

10 Dec '21

*** BLURB HERE *** Michal Prívozník (2): remote_daemon: Set shutdown callbacks only after init is done Revert "qemu: Avoid crash in qemuStateShutdownPrepare() and qemuStateShutdownWait()" src/qemu/qemu_driver.c | 6 ------ src/remote/remote_daemon.c | 7 ++++--- 2 files changed, 4 insertions(+), 9 deletions(-) -- 2.32.0

2 4

[PATCH V2 0/3] Add virDomainSetLaunchSecurityState API
by Jim Fehlig 10 Dec '21

10 Dec '21

V2 of https://listman.redhat.com/archives/libvir-list/2021-November/msg00980.html Like V1, this series is compile-tested only. I plan to work on functional testing soon, after wrapping up some tasks. Changes since V1: - Optional secret set address changed to unsigned long long - Improved documentation - Ensure VM is in paused state - Other small fixes Jim Fehlig (3): libvirt: Introduce virDomainSetLaunchSecurityState public API remote: Add RPC support for the virDomainSetLaunchSecurityState API qemu: Implement the virDomainSetLaunchSecurityState API include/libvirt/libvirt-domain.h | 35 +++++++++++++ src/driver-hypervisor.h | 7 +++ src/libvirt-domain.c | 62 ++++++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 88 ++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 14 +++++ src/qemu/qemu_monitor.h | 7 +++ src/qemu/qemu_monitor_json.c | 45 ++++++++++++++++ src/qemu/qemu_monitor_json.h | 6 +++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 17 +++++- src/remote_protocol-structs | 9 ++++ 12 files changed, 295 insertions(+), 1 deletion(-) -- 2.34.1

3 7

[PATCH v1 00/12] Add riscv kvm accel support
by Yifei Jiang 10 Dec '21

10 Dec '21

This series adds both riscv32 and riscv64 kvm support, and implements migration based on riscv. Because of RISC-V KVM has been merged into the Linux master, so this series are changed from RFC to patch v1. Several steps to use this: 1. Build emulation $ ./configure --target-list=riscv64-softmmu $ make -j$(nproc) 2. Build kernel 3. Build QEMU VM Cross built in riscv toolchain. $ PKG_CONFIG_LIBDIR=<toolchain pkgconfig path> $ export PKG_CONFIG_SYSROOT_DIR=<toolchain sysroot path> $ ./configure --target-list=riscv64-softmmu --enable-kvm \ --cross-prefix=riscv64-linux-gnu- --disable-libiscsi --disable-glusterfs \ --disable-libusb --disable-usb-redir --audio-drv-list= --disable-opengl \ --disable-libxml2 $ make -j$(nproc) 4. Start emulation $ ./qemu-system-riscv64 -M virt -m 4096M -cpu rv64,x-h=true -nographic \ -name guest=riscv-hyp,debug-threads=on \ -smp 4 \ -bios ./fw_jump.bin \ -kernel ./Image \ -drive file=./hyp.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" 5. Start kvm-acceled QEMU VM in emulation $ ./qemu-system-riscv64 -M virt,accel=kvm -m 1024M -cpu host -nographic \ -name guest=riscv-guset \ -smp 2 \ -bios none \ -kernel ./Image \ -drive file=./guest.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" Changes since RFC v6 - Rebase on recent commit 8627edfb3f1fca24a96a0954148885c3241c10f8 - Sync-up headers with Linux-5.16-rc1 Changes since RFC v5 - Rebase on QEMU v6.1.0-rc1 and kvm-riscv linux v19. - Move kvm interrupt setting to riscv_cpu_update_mip(). - Replace __u64 with uint64_t. Changes since RFC v4 - Rebase on QEMU v6.0.0-rc2 and kvm-riscv linux v17. - Remove time scaling support as software solution is incomplete. Because it will cause unacceptable performance degradation. and We will post a better solution. - Revise according to Alistair's review comments. - Remove compile time XLEN checks in kvm_riscv_reg_id - Surround TYPE_RISCV_CPU_HOST definition by CONFIG_KVM and share it between RV32 and RV64. - Add kvm-stub.c for reduce unnecessary compilation checks. - Add riscv_setup_direct_kernel() to direct boot kernel for KVM. Changes since RFC v3 - Rebase on QEMU v5.2.0-rc2 and kvm-riscv linux v15. - Add time scaling support(New patches 13, 14 and 15). - Fix the bug that guest vm can't reboot. Changes since RFC v2 - Fix checkpatch error at target/riscv/sbi_ecall_interface.h. - Add riscv migration support. Changes since RFC v1 - Add separate SBI ecall interface header. - Add riscv32 kvm accel support. Yifei Jiang (12): update-linux-headers: Add asm-riscv/kvm.h target/riscv: Add target/riscv/kvm.c to place the public kvm interface target/riscv: Implement function kvm_arch_init_vcpu target/riscv: Implement kvm_arch_get_registers target/riscv: Implement kvm_arch_put_registers target/riscv: Support start kernel directly by KVM target/riscv: Support setting external interrupt by KVM target/riscv: Handle KVM_EXIT_RISCV_SBI exit target/riscv: Add host cpu type target/riscv: Add kvm_riscv_get/put_regs_timer target/riscv: Implement virtual time adjusting with vm state changing target/riscv: Support virtual time context synchronization hw/riscv/boot.c | 11 + hw/riscv/virt.c | 7 + include/hw/riscv/boot.h | 1 + linux-headers/asm-riscv/kvm.h | 128 ++++++ linux-headers/linux/kvm.h | 8 + meson.build | 2 + target/riscv/cpu.c | 57 +++ target/riscv/cpu.h | 10 + target/riscv/cpu_helper.c | 27 -- target/riscv/kvm-stub.c | 30 ++ target/riscv/kvm.c | 610 +++++++++++++++++++++++++++++ target/riscv/kvm_riscv.h | 25 ++ target/riscv/machine.c | 14 + target/riscv/meson.build | 1 + target/riscv/sbi_ecall_interface.h | 72 ++++ 15 files changed, 976 insertions(+), 27 deletions(-) create mode 100644 linux-headers/asm-riscv/kvm.h create mode 100644 target/riscv/kvm-stub.c create mode 100644 target/riscv/kvm.c create mode 100644 target/riscv/kvm_riscv.h create mode 100644 target/riscv/sbi_ecall_interface.h -- 2.19.1

8 34

[PATCH] qemu_monitor_json.h: Unify header formatting
by Peter Krempa 10 Dec '21

10 Dec '21

Use the modern style and fix all offenders since new functions were already using the contemporary style. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_monitor_json.h | 957 ++++++++++++++++++++--------------- 1 file changed, 551 insertions(+), 406 deletions(-) diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 0984717675..64064b0519 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -28,61 +28,82 @@ #include "cpu/cpu.h" #include "util/virgic.h" -int qemuMonitorJSONIOProcessLine(qemuMonitor *mon, - const char *line, - qemuMonitorMessage *msg) G_GNUC_NO_INLINE; - -int qemuMonitorJSONIOProcess(qemuMonitor *mon, - const char *data, - size_t len, - qemuMonitorMessage *msg); - -int qemuMonitorJSONHumanCommand(qemuMonitor *mon, - const char *cmd, - char **reply); - -int qemuMonitorJSONSetCapabilities(qemuMonitor *mon); - -int qemuMonitorJSONStartCPUs(qemuMonitor *mon); -int qemuMonitorJSONStopCPUs(qemuMonitor *mon); -int qemuMonitorJSONGetStatus(qemuMonitor *mon, - bool *running, - virDomainPausedReason *reason); - -int qemuMonitorJSONSystemPowerdown(qemuMonitor *mon); -int qemuMonitorJSONSystemReset(qemuMonitor *mon); - -int qemuMonitorJSONQueryCPUs(qemuMonitor *mon, - struct qemuMonitorQueryCpusEntry **entries, - size_t *nentries, - bool force, - bool fast); -int qemuMonitorJSONUpdateVideoMemorySize(qemuMonitor *mon, - virDomainVideoDef *video, - char *path); -int qemuMonitorJSONUpdateVideoVram64Size(qemuMonitor *mon, - virDomainVideoDef *video, - char *path); -int qemuMonitorJSONGetBalloonInfo(qemuMonitor *mon, - unsigned long long *currmem); -int qemuMonitorJSONGetMemoryStats(qemuMonitor *mon, - char *balloonpath, - virDomainMemoryStatPtr stats, - unsigned int nr_stats); -int qemuMonitorJSONSetMemoryStatsPeriod(qemuMonitor *mon, - char *balloonpath, - int period); -int qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, - GHashTable *table); - -virJSONValue *qemuMonitorJSONQueryBlockstats(qemuMonitor *mon, - bool queryNodes); -int qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitor *mon, - GHashTable *hash); -int qemuMonitorJSONBlockStatsUpdateCapacity(qemuMonitor *mon, - GHashTable *stats); -int qemuMonitorJSONBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon, - GHashTable *stats); +int +qemuMonitorJSONIOProcessLine(qemuMonitor *mon, + const char *line, + qemuMonitorMessage *msg) + G_GNUC_NO_INLINE; + +int +qemuMonitorJSONIOProcess(qemuMonitor *mon, + const char *data, + size_t len, + qemuMonitorMessage *msg); + +int +qemuMonitorJSONHumanCommand(qemuMonitor *mon, + const char *cmd, + char **reply); + +int +qemuMonitorJSONSetCapabilities(qemuMonitor *mon); + +int +qemuMonitorJSONStartCPUs(qemuMonitor *mon); +int +qemuMonitorJSONStopCPUs(qemuMonitor *mon); +int +qemuMonitorJSONGetStatus(qemuMonitor *mon, + bool *running, + virDomainPausedReason *reason); + +int +qemuMonitorJSONSystemPowerdown(qemuMonitor *mon); +int +qemuMonitorJSONSystemReset(qemuMonitor *mon); + +int +qemuMonitorJSONQueryCPUs(qemuMonitor *mon, + struct qemuMonitorQueryCpusEntry **entries, + size_t *nentries, + bool force, + bool fast); +int +qemuMonitorJSONUpdateVideoMemorySize(qemuMonitor *mon, + virDomainVideoDef *video, + char *path); +int +qemuMonitorJSONUpdateVideoVram64Size(qemuMonitor *mon, + virDomainVideoDef *video, + char *path); +int +qemuMonitorJSONGetBalloonInfo(qemuMonitor *mon, + unsigned long long *currmem); +int +qemuMonitorJSONGetMemoryStats(qemuMonitor *mon, + char *balloonpath, + virDomainMemoryStatPtr stats, + unsigned int nr_stats); +int +qemuMonitorJSONSetMemoryStatsPeriod(qemuMonitor *mon, + char *balloonpath, + int period); +int +qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, + GHashTable *table); + +virJSONValue * +qemuMonitorJSONQueryBlockstats(qemuMonitor *mon, + bool queryNodes); +int +qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitor *mon, + GHashTable *hash); +int +qemuMonitorJSONBlockStatsUpdateCapacity(qemuMonitor *mon, + GHashTable *stats); +int +qemuMonitorJSONBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon, + GHashTable *stats); GHashTable * qemuMonitorJSONBlockGetNamedNodeDataJSON(virJSONValue *nodes); @@ -91,236 +112,295 @@ GHashTable * qemuMonitorJSONBlockGetNamedNodeData(qemuMonitor *mon, bool supports_flat); -int qemuMonitorJSONBlockResize(qemuMonitor *mon, - const char *device, - const char *nodename, - unsigned long long size); - -int qemuMonitorJSONSetPassword(qemuMonitor *mon, - const char *protocol, - const char *password, - const char *action_if_connected); -int qemuMonitorJSONExpirePassword(qemuMonitor *mon, - const char *protocol, - const char *expire_time); -int qemuMonitorJSONSetBalloon(qemuMonitor *mon, - unsigned long long newmem); - -int qemuMonitorJSONEjectMedia(qemuMonitor *mon, - const char *dev_name, - bool force); -int qemuMonitorJSONChangeMedia(qemuMonitor *mon, - const char *dev_name, - const char *newmedia, - const char *format); - - -int qemuMonitorJSONSaveVirtualMemory(qemuMonitor *mon, - unsigned long long offset, - unsigned long long length, - const char *path); -int qemuMonitorJSONSavePhysicalMemory(qemuMonitor *mon, - unsigned long long offset, - unsigned long long length, - const char *path); - -int qemuMonitorJSONSetMigrationSpeed(qemuMonitor *mon, - unsigned long bandwidth); - -int qemuMonitorJSONSetMigrationDowntime(qemuMonitor *mon, - unsigned long long downtime); - -int qemuMonitorJSONGetMigrationCacheSize(qemuMonitor *mon, - unsigned long long *cacheSize); -int qemuMonitorJSONSetMigrationCacheSize(qemuMonitor *mon, - unsigned long long cacheSize); - -int qemuMonitorJSONGetMigrationParams(qemuMonitor *mon, - virJSONValue **params); -int qemuMonitorJSONSetMigrationParams(qemuMonitor *mon, - virJSONValue **params); +int +qemuMonitorJSONBlockResize(qemuMonitor *mon, + const char *device, + const char *nodename, + unsigned long long size); -int qemuMonitorJSONGetMigrationStats(qemuMonitor *mon, - qemuMonitorMigrationStats *stats, - char **error); +int +qemuMonitorJSONSetPassword(qemuMonitor *mon, + const char *protocol, + const char *password, + const char *action_if_connected); +int +qemuMonitorJSONExpirePassword(qemuMonitor *mon, + const char *protocol, + const char *expire_time); +int +qemuMonitorJSONSetBalloon(qemuMonitor *mon, + unsigned long long newmem); -int qemuMonitorJSONGetMigrationCapabilities(qemuMonitor *mon, - char ***capabilities); -int qemuMonitorJSONSetMigrationCapabilities(qemuMonitor *mon, - virJSONValue **caps); +int +qemuMonitorJSONEjectMedia(qemuMonitor *mon, + const char *dev_name, + bool force); +int +qemuMonitorJSONChangeMedia(qemuMonitor *mon, + const char *dev_name, + const char *newmedia, + const char *format); -int qemuMonitorJSONGetGICCapabilities(qemuMonitor *mon, - virGICCapability **capabilities); +int +qemuMonitorJSONSaveVirtualMemory(qemuMonitor *mon, + unsigned long long offset, + unsigned long long length, + const char *path); +int +qemuMonitorJSONSavePhysicalMemory(qemuMonitor *mon, + unsigned long long offset, + unsigned long long length, + const char *path); -int qemuMonitorJSONGetSEVCapabilities(qemuMonitor *mon, - virSEVCapability **capabilities); +int +qemuMonitorJSONSetMigrationSpeed(qemuMonitor *mon, + unsigned long bandwidth); -int qemuMonitorJSONMigrate(qemuMonitor *mon, - unsigned int flags, - const char *uri); -int qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitor *mon, - bool *spice_migrated); +int +qemuMonitorJSONSetMigrationDowntime(qemuMonitor *mon, + unsigned long long downtime); +int +qemuMonitorJSONGetMigrationCacheSize(qemuMonitor *mon, + unsigned long long *cacheSize); +int +qemuMonitorJSONSetMigrationCacheSize(qemuMonitor *mon, + unsigned long long cacheSize); -int qemuMonitorJSONMigrateCancel(qemuMonitor *mon); +int +qemuMonitorJSONGetMigrationParams(qemuMonitor *mon, + virJSONValue **params); +int +qemuMonitorJSONSetMigrationParams(qemuMonitor *mon, + virJSONValue **params); -int qemuMonitorJSONQueryDump(qemuMonitor *mon, - qemuMonitorDumpStats *stats); +int +qemuMonitorJSONGetMigrationStats(qemuMonitor *mon, + qemuMonitorMigrationStats *stats, + char **error); + +int +qemuMonitorJSONGetMigrationCapabilities(qemuMonitor *mon, + char ***capabilities); +int +qemuMonitorJSONSetMigrationCapabilities(qemuMonitor *mon, + virJSONValue **caps); + +int +qemuMonitorJSONGetGICCapabilities(qemuMonitor *mon, + virGICCapability **capabilities); + +int +qemuMonitorJSONGetSEVCapabilities(qemuMonitor *mon, + virSEVCapability **capabilities); + +int +qemuMonitorJSONMigrate(qemuMonitor *mon, + unsigned int flags, + const char *uri); +int +qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitor *mon, + bool *spice_migrated); -int qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonitor *mon, - const char *capability); -int qemuMonitorJSONDump(qemuMonitor *mon, - const char *protocol, - const char *dumpformat, - bool detach); +int +qemuMonitorJSONMigrateCancel(qemuMonitor *mon); + +int +qemuMonitorJSONQueryDump(qemuMonitor *mon, + qemuMonitorDumpStats *stats); + +int +qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonitor *mon, + const char *capability); -int qemuMonitorJSONGraphicsRelocate(qemuMonitor *mon, - int type, - const char *hostname, - int port, - int tlsPort, - const char *tlsSubject); +int +qemuMonitorJSONDump(qemuMonitor *mon, + const char *protocol, + const char *dumpformat, + bool detach); -int qemuMonitorJSONAddPCIHostDevice(qemuMonitor *mon, - virPCIDeviceAddress *hostAddr, - virPCIDeviceAddress *guestAddr); +int +qemuMonitorJSONGraphicsRelocate(qemuMonitor *mon, + int type, + const char *hostname, + int port, + int tlsPort, + const char *tlsSubject); -int qemuMonitorJSONAddPCIDisk(qemuMonitor *mon, - const char *path, - const char *bus, - virPCIDeviceAddress *guestAddr); +int +qemuMonitorJSONAddPCIHostDevice(qemuMonitor *mon, + virPCIDeviceAddress *hostAddr, + virPCIDeviceAddress *guestAddr); + +int +qemuMonitorJSONAddPCIDisk(qemuMonitor *mon, + const char *path, + const char *bus, + virPCIDeviceAddress *guestAddr); -int qemuMonitorJSONAddPCINetwork(qemuMonitor *mon, - const char *nicstr, - virPCIDeviceAddress *guestAddr); +int +qemuMonitorJSONAddPCINetwork(qemuMonitor *mon, + const char *nicstr, + virPCIDeviceAddress *guestAddr); -int qemuMonitorJSONRemovePCIDevice(qemuMonitor *mon, - virPCIDeviceAddress *guestAddr); +int +qemuMonitorJSONRemovePCIDevice(qemuMonitor *mon, + virPCIDeviceAddress *guestAddr); -int qemuMonitorJSONAddFileHandleToSet(qemuMonitor *mon, - int fd, - int fdset, - const char *opaque, - qemuMonitorAddFdInfo *info); +int +qemuMonitorJSONAddFileHandleToSet(qemuMonitor *mon, + int fd, + int fdset, + const char *opaque, + qemuMonitorAddFdInfo *info); -int qemuMonitorJSONRemoveFdset(qemuMonitor *mon, - int fdset); +int +qemuMonitorJSONRemoveFdset(qemuMonitor *mon, + int fdset); -int qemuMonitorJSONQueryFdsets(qemuMonitor *mon, - qemuMonitorFdsets **fdsets); +int +qemuMonitorJSONQueryFdsets(qemuMonitor *mon, + qemuMonitorFdsets **fdsets); -int qemuMonitorJSONSendFileHandle(qemuMonitor *mon, - const char *fdname, - int fd); +int +qemuMonitorJSONSendFileHandle(qemuMonitor *mon, + const char *fdname, + int fd); -int qemuMonitorJSONCloseFileHandle(qemuMonitor *mon, - const char *fdname); +int +qemuMonitorJSONCloseFileHandle(qemuMonitor *mon, + const char *fdname); -int qemuMonitorJSONAddNetdev(qemuMonitor *mon, - virJSONValue **props); +int +qemuMonitorJSONAddNetdev(qemuMonitor *mon, + virJSONValue **props); -int qemuMonitorJSONRemoveNetdev(qemuMonitor *mon, - const char *alias); +int +qemuMonitorJSONRemoveNetdev(qemuMonitor *mon, + const char *alias); -int qemuMonitorJSONQueryRxFilter(qemuMonitor *mon, const char *alias, - virNetDevRxFilter **filter); +int +qemuMonitorJSONQueryRxFilter(qemuMonitor *mon, + const char *alias, + virNetDevRxFilter **filter); -int qemuMonitorJSONGetChardevInfo(qemuMonitor *mon, - GHashTable *info); +int +qemuMonitorJSONGetChardevInfo(qemuMonitor *mon, + GHashTable *info); -int qemuMonitorJSONAttachPCIDiskController(qemuMonitor *mon, - const char *bus, - virPCIDeviceAddress *guestAddr); +int +qemuMonitorJSONAttachPCIDiskController(qemuMonitor *mon, + const char *bus, + virPCIDeviceAddress *guestAddr); -int qemuMonitorJSONAddDeviceProps(qemuMonitor *mon, - virJSONValue **props); +int +qemuMonitorJSONAddDeviceProps(qemuMonitor *mon, + virJSONValue **props); -int qemuMonitorJSONDelDevice(qemuMonitor *mon, - const char *devalias); +int +qemuMonitorJSONDelDevice(qemuMonitor *mon, + const char *devalias); -int qemuMonitorJSONAddObject(qemuMonitor *mon, - virJSONValue **props); +int +qemuMonitorJSONAddObject(qemuMonitor *mon, + virJSONValue **props); -int qemuMonitorJSONDelObject(qemuMonitor *mon, - const char *objalias, - bool report_error); +int +qemuMonitorJSONDelObject(qemuMonitor *mon, + const char *objalias, + bool report_error); -int qemuMonitorJSONTransaction(qemuMonitor *mon, virJSONValue **actions) +int +qemuMonitorJSONTransaction(qemuMonitor *mon, + virJSONValue **actions) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONDriveMirror(qemuMonitor *mon, - const char *device, - const char *file, - const char *format, - unsigned long long speed, - unsigned int granularity, - unsigned long long buf_size, - bool shallow, - bool reuse) +int +qemuMonitorJSONDriveMirror(qemuMonitor *mon, + const char *device, + const char *file, + const char *format, + unsigned long long speed, + unsigned int granularity, + unsigned long long buf_size, + bool shallow, + bool reuse) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -int qemuMonitorJSONBlockdevMirror(qemuMonitor *mon, - const char *jobname, - bool persistjob, - const char *device, - const char *target, - unsigned long long speed, - unsigned int granularity, - unsigned long long buf_size, - bool shallow, - bool syncWrite) + +int +qemuMonitorJSONBlockdevMirror(qemuMonitor *mon, + const char *jobname, + bool persistjob, + const char *device, + const char *target, + unsigned long long speed, + unsigned int granularity, + unsigned long long buf_size, + bool shallow, + bool syncWrite) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5); -int qemuMonitorJSONDrivePivot(qemuMonitor *mon, - const char *jobname) + +int +qemuMonitorJSONDrivePivot(qemuMonitor *mon, + const char *jobname) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONBlockCommit(qemuMonitor *mon, - const char *device, - const char *jobname, - bool persistjob, - const char *top, - const char *topNode, - const char *base, - const char *baseNode, - const char *backingName, - unsigned long long bandwidth) +int +qemuMonitorJSONBlockCommit(qemuMonitor *mon, + const char *device, + const char *jobname, + bool persistjob, + const char *top, + const char *topNode, + const char *base, + const char *baseNode, + const char *backingName, + unsigned long long bandwidth) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -char *qemuMonitorJSONDiskNameLookup(qemuMonitor *mon, - const char *device, - virStorageSource *top, - virStorageSource *target) +char * +qemuMonitorJSONDiskNameLookup(qemuMonitor *mon, + const char *device, + virStorageSource *top, + virStorageSource *target) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -int qemuMonitorJSONArbitraryCommand(qemuMonitor *mon, - const char *cmd_str, - char **reply_str); +int +qemuMonitorJSONArbitraryCommand(qemuMonitor *mon, + const char *cmd_str, + char **reply_str); -int qemuMonitorJSONInjectNMI(qemuMonitor *mon); +int +qemuMonitorJSONInjectNMI(qemuMonitor *mon); -int qemuMonitorJSONSendKey(qemuMonitor *mon, - unsigned int holdtime, - unsigned int *keycodes, - unsigned int nkeycodes); +int +qemuMonitorJSONSendKey(qemuMonitor *mon, + unsigned int holdtime, + unsigned int *keycodes, + unsigned int nkeycodes); -int qemuMonitorJSONScreendump(qemuMonitor *mon, - const char *device, - unsigned int head, - const char *file); - -int qemuMonitorJSONBlockStream(qemuMonitor *mon, - const char *device, - const char *jobname, - bool persistjob, - const char *base, - const char *baseNode, - const char *backingName, - unsigned long long speed) +int +qemuMonitorJSONScreendump(qemuMonitor *mon, + const char *device, + unsigned int head, + const char *file); + +int +qemuMonitorJSONBlockStream(qemuMonitor *mon, + const char *device, + const char *jobname, + bool persistjob, + const char *base, + const char *baseNode, + const char *backingName, + unsigned long long speed) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONBlockJobCancel(qemuMonitor *mon, - const char *jobname, - bool force) +int +qemuMonitorJSONBlockJobCancel(qemuMonitor *mon, + const char *jobname, + bool force) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int @@ -329,93 +409,114 @@ qemuMonitorJSONGetJobInfo(qemuMonitor *mon, size_t *njobs); -int qemuMonitorJSONBlockJobSetSpeed(qemuMonitor *mon, - const char *jobname, - unsigned long long speed) +int +qemuMonitorJSONBlockJobSetSpeed(qemuMonitor *mon, + const char *jobname, + unsigned long long speed) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -GHashTable *qemuMonitorJSONGetAllBlockJobInfo(qemuMonitor *mon, - bool rawjobname) +GHashTable * +qemuMonitorJSONGetAllBlockJobInfo(qemuMonitor *mon, + bool rawjobname) ATTRIBUTE_NONNULL(1); -int qemuMonitorJSONJobDismiss(qemuMonitor *mon, - const char *jobname) +int +qemuMonitorJSONJobDismiss(qemuMonitor *mon, + const char *jobname) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONJobComplete(qemuMonitor *mon, - const char *jobname) +int +qemuMonitorJSONJobComplete(qemuMonitor *mon, + const char *jobname) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONSetLink(qemuMonitor *mon, - const char *name, - virDomainNetInterfaceLinkState state); +int +qemuMonitorJSONSetLink(qemuMonitor *mon, + const char *name, + virDomainNetInterfaceLinkState state); -int qemuMonitorJSONOpenGraphics(qemuMonitor *mon, - const char *protocol, - const char *fdname, - bool skipauth); +int +qemuMonitorJSONOpenGraphics(qemuMonitor *mon, + const char *protocol, + const char *fdname, + bool skipauth); -int qemuMonitorJSONSetBlockIoThrottle(qemuMonitor *mon, - const char *drivealias, - const char *qomid, - virDomainBlockIoTuneInfo *info); +int +qemuMonitorJSONSetBlockIoThrottle(qemuMonitor *mon, + const char *drivealias, + const char *qomid, + virDomainBlockIoTuneInfo *info); -int qemuMonitorJSONGetBlockIoThrottle(qemuMonitor *mon, - const char *drivealias, - const char *qdevid, - virDomainBlockIoTuneInfo *reply); +int +qemuMonitorJSONGetBlockIoThrottle(qemuMonitor *mon, + const char *drivealias, + const char *qdevid, + virDomainBlockIoTuneInfo *reply); -int qemuMonitorJSONSystemWakeup(qemuMonitor *mon); +int +qemuMonitorJSONSystemWakeup(qemuMonitor *mon); -char *qemuMonitorJSONGetSEVMeasurement(qemuMonitor *mon); +char * +qemuMonitorJSONGetSEVMeasurement(qemuMonitor *mon); -int qemuMonitorJSONGetVersion(qemuMonitor *mon, - int *major, - int *minor, - int *micro, - char **package) +int +qemuMonitorJSONGetVersion(qemuMonitor *mon, + int *major, + int *minor, + int *micro, + char **package) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -int qemuMonitorJSONGetMachines(qemuMonitor *mon, - qemuMonitorMachineInfo ***machines) +int +qemuMonitorJSONGetMachines(qemuMonitor *mon, + qemuMonitorMachineInfo ***machines) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONGetCPUDefinitions(qemuMonitor *mon, - qemuMonitorCPUDefs **cpuDefs) +int +qemuMonitorJSONGetCPUDefinitions(qemuMonitor *mon, + qemuMonitorCPUDefs **cpuDefs) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon, - qemuMonitorCPUModelExpansionType type, - virCPUDef *cpu, - bool migratable, - bool fail_no_props, - qemuMonitorCPUModelInfo **model_info) +int +qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon, + qemuMonitorCPUModelExpansionType type, + virCPUDef *cpu, + bool migratable, + bool fail_no_props, + qemuMonitorCPUModelInfo **model_info) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6); -int qemuMonitorJSONGetCPUModelBaseline(qemuMonitor *mon, - virCPUDef *cpu_a, - virCPUDef *cpu_b, - qemuMonitorCPUModelInfo **baseline) +int +qemuMonitorJSONGetCPUModelBaseline(qemuMonitor *mon, + virCPUDef *cpu_a, + virCPUDef *cpu_b, + qemuMonitorCPUModelInfo **baseline) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -int qemuMonitorJSONGetCPUModelComparison(qemuMonitor *mon, - virCPUDef *cpu_a, - virCPUDef *cpu_b, - char **result) +int +qemuMonitorJSONGetCPUModelComparison(qemuMonitor *mon, + virCPUDef *cpu_a, + virCPUDef *cpu_b, + char **result) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -int qemuMonitorJSONGetCommands(qemuMonitor *mon, - char ***commands) +int +qemuMonitorJSONGetCommands(qemuMonitor *mon, + char ***commands) ATTRIBUTE_NONNULL(2); -GHashTable *qemuMonitorJSONGetCommandLineOptions(qemuMonitor *mon); -int qemuMonitorJSONGetKVMState(qemuMonitor *mon, - bool *enabled, - bool *present) +GHashTable * +qemuMonitorJSONGetCommandLineOptions(qemuMonitor *mon); + +int +qemuMonitorJSONGetKVMState(qemuMonitor *mon, + bool *enabled, + bool *present) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -int qemuMonitorJSONGetObjectTypes(qemuMonitor *mon, - char ***types) +int +qemuMonitorJSONGetObjectTypes(qemuMonitor *mon, + char ***types) ATTRIBUTE_NONNULL(2); /* ListPath structures and API's are public only for qemumonitorjsontest */ @@ -425,12 +526,14 @@ struct _qemuMonitorJSONListPath { char *type; }; -int qemuMonitorJSONGetObjectListPaths(qemuMonitor *mon, - const char *path, - qemuMonitorJSONListPath ***paths) +int +qemuMonitorJSONGetObjectListPaths(qemuMonitor *mon, + const char *path, + qemuMonitorJSONListPath ***paths) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -void qemuMonitorJSONListPathFree(qemuMonitorJSONListPath *paths); +void +qemuMonitorJSONListPathFree(qemuMonitorJSONListPath *paths); /* ObjectProperty structures and Get/Set API's are public only * for qemumonitorjsontest @@ -462,166 +565,207 @@ struct _qemuMonitorJSONObjectProperty { } val; }; -int qemuMonitorJSONGetObjectProperty(qemuMonitor *mon, - const char *path, - const char *property, - qemuMonitorJSONObjectProperty *prop) +int +qemuMonitorJSONGetObjectProperty(qemuMonitor *mon, + const char *path, + const char *property, + qemuMonitorJSONObjectProperty *prop) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -int qemuMonitorJSONSetObjectProperty(qemuMonitor *mon, - const char *path, - const char *property, - qemuMonitorJSONObjectProperty *prop) +int +qemuMonitorJSONSetObjectProperty(qemuMonitor *mon, + const char *path, + const char *property, + qemuMonitorJSONObjectProperty *prop) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -GHashTable *qemuMonitorJSONGetDeviceProps(qemuMonitor *mon, - const char *device) +GHashTable * +qemuMonitorJSONGetDeviceProps(qemuMonitor *mon, + const char *device) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONGetObjectProps(qemuMonitor *mon, - const char *object, - char ***props) +int +qemuMonitorJSONGetObjectProps(qemuMonitor *mon, + const char *object, + char ***props) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -char *qemuMonitorJSONGetTargetArch(qemuMonitor *mon); - -int qemuMonitorJSONNBDServerStart(qemuMonitor *mon, - const virStorageNetHostDef *server, - const char *tls_alias); -int qemuMonitorJSONNBDServerAdd(qemuMonitor *mon, - const char *deviceID, - const char *export, - bool writable, - const char *bitmap); -int qemuMonitorJSONNBDServerStop(qemuMonitor *mon); - -int qemuMonitorJSONBlockExportAdd(qemuMonitor *mon, - virJSONValue **props); - -int qemuMonitorJSONGetTPMModels(qemuMonitor *mon, - char ***tpmmodels) + +char * +qemuMonitorJSONGetTargetArch(qemuMonitor *mon); + +int +qemuMonitorJSONNBDServerStart(qemuMonitor *mon, + const virStorageNetHostDef *server, + const char *tls_alias); +int +qemuMonitorJSONNBDServerAdd(qemuMonitor *mon, + const char *deviceID, + const char *export, + bool writable, + const char *bitmap); +int +qemuMonitorJSONNBDServerStop(qemuMonitor *mon); + +int +qemuMonitorJSONBlockExportAdd(qemuMonitor *mon, + virJSONValue **props); + +int +qemuMonitorJSONGetTPMModels(qemuMonitor *mon, + char ***tpmmodels) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONGetTPMTypes(qemuMonitor *mon, - char ***tpmtypes) +int +qemuMonitorJSONGetTPMTypes(qemuMonitor *mon, + char ***tpmtypes) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONAttachCharDev(qemuMonitor *mon, - const char *chrID, - virDomainChrSourceDef *chr); -int qemuMonitorJSONDetachCharDev(qemuMonitor *mon, - const char *chrID); +int +qemuMonitorJSONAttachCharDev(qemuMonitor *mon, + const char *chrID, + virDomainChrSourceDef *chr); +int +qemuMonitorJSONDetachCharDev(qemuMonitor *mon, + const char *chrID); -int qemuMonitorJSONGetDeviceAliases(qemuMonitor *mon, - char ***aliases); +int +qemuMonitorJSONGetDeviceAliases(qemuMonitor *mon, + char ***aliases); -int qemuMonitorJSONGetCPUx86Data(qemuMonitor *mon, - const char *property, - virCPUData **cpudata); +int +qemuMonitorJSONGetCPUx86Data(qemuMonitor *mon, + const char *property, + virCPUData **cpudata); -int qemuMonitorJSONGetGuestCPUx86(qemuMonitor *mon, - virCPUData **data, - virCPUData **disabled); +int +qemuMonitorJSONGetGuestCPUx86(qemuMonitor *mon, + virCPUData **data, + virCPUData **disabled); -int qemuMonitorJSONGetGuestCPU(qemuMonitor *mon, - virArch arch, - qemuMonitorCPUFeatureTranslationCallback translate, - void *opaque, - virCPUData **enabled, - virCPUData **disabled); +int +qemuMonitorJSONGetGuestCPU(qemuMonitor *mon, + virArch arch, + qemuMonitorCPUFeatureTranslationCallback translate, + void *opaque, + virCPUData **enabled, + virCPUData **disabled); -int qemuMonitorJSONRTCResetReinjection(qemuMonitor *mon); +int +qemuMonitorJSONRTCResetReinjection(qemuMonitor *mon); -int qemuMonitorJSONGetIOThreads(qemuMonitor *mon, - qemuMonitorIOThreadInfo ***iothreads, - int *niothreads) +int +qemuMonitorJSONGetIOThreads(qemuMonitor *mon, + qemuMonitorIOThreadInfo ***iothreads, + int *niothreads) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONSetIOThread(qemuMonitor *mon, - qemuMonitorIOThreadInfo *iothreadInfo) +int +qemuMonitorJSONSetIOThread(qemuMonitor *mon, + qemuMonitorIOThreadInfo *iothreadInfo) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitor *mon, - GHashTable *info) +int +qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitor *mon, + GHashTable *info) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONFindLinkPath(qemuMonitor *mon, - const char *name, - const char *alias, - char **path) +int +qemuMonitorJSONFindLinkPath(qemuMonitor *mon, + const char *name, + const char *alias, + char **path) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); -int qemuMonitorJSONMigrateIncoming(qemuMonitor *mon, - const char *uri) +int +qemuMonitorJSONMigrateIncoming(qemuMonitor *mon, + const char *uri) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONMigrateStartPostCopy(qemuMonitor *mon) +int +qemuMonitorJSONMigrateStartPostCopy(qemuMonitor *mon) ATTRIBUTE_NONNULL(1); -int qemuMonitorJSONMigrateContinue(qemuMonitor *mon, - qemuMonitorMigrationStatus status) +int +qemuMonitorJSONMigrateContinue(qemuMonitor *mon, + qemuMonitorMigrationStatus status) ATTRIBUTE_NONNULL(1); -int qemuMonitorJSONGetRTCTime(qemuMonitor *mon, - struct tm *tm) +int +qemuMonitorJSONGetRTCTime(qemuMonitor *mon, + struct tm *tm) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONGetHotpluggableCPUs(qemuMonitor *mon, - struct qemuMonitorQueryHotpluggableCpusEntry **entries, - size_t *nentries) +int +qemuMonitorJSONGetHotpluggableCPUs(qemuMonitor *mon, + struct qemuMonitorQueryHotpluggableCpusEntry **entries, + size_t *nentries) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -virJSONValue *qemuMonitorJSONQueryQMPSchema(qemuMonitor *mon) +virJSONValue * +qemuMonitorJSONQueryQMPSchema(qemuMonitor *mon) ATTRIBUTE_NONNULL(1); -int qemuMonitorJSONSetBlockThreshold(qemuMonitor *mon, - const char *nodename, - unsigned long long threshold) +int +qemuMonitorJSONSetBlockThreshold(qemuMonitor *mon, + const char *nodename, + unsigned long long threshold) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -virJSONValue *qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon, - bool flat) +virJSONValue * +qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon, + bool flat) ATTRIBUTE_NONNULL(1); -int qemuMonitorJSONSetWatchdogAction(qemuMonitor *mon, - const char *action) +int +qemuMonitorJSONSetWatchdogAction(qemuMonitor *mon, + const char *action) ATTRIBUTE_NONNULL(1); -int qemuMonitorJSONBlockdevCreate(qemuMonitor *mon, - const char *jobname, - virJSONValue **props) +int +qemuMonitorJSONBlockdevCreate(qemuMonitor *mon, + const char *jobname, + virJSONValue **props) ATTRIBUTE_NONNULL(1); -int qemuMonitorJSONBlockdevAdd(qemuMonitor *mon, - virJSONValue **props) +int +qemuMonitorJSONBlockdevAdd(qemuMonitor *mon, + virJSONValue **props) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONBlockdevReopen(qemuMonitor *mon, - virJSONValue **props) +int +qemuMonitorJSONBlockdevReopen(qemuMonitor *mon, + virJSONValue **props) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONBlockdevDel(qemuMonitor *mon, - const char *nodename) +int +qemuMonitorJSONBlockdevDel(qemuMonitor *mon, + const char *nodename) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONBlockdevTrayOpen(qemuMonitor *mon, - const char *id, - bool force) +int +qemuMonitorJSONBlockdevTrayOpen(qemuMonitor *mon, + const char *id, + bool force) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONBlockdevTrayClose(qemuMonitor *mon, - const char *id) +int +qemuMonitorJSONBlockdevTrayClose(qemuMonitor *mon, + const char *id) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONBlockdevMediumRemove(qemuMonitor *mon, - const char *id) +int +qemuMonitorJSONBlockdevMediumRemove(qemuMonitor *mon, + const char *id) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONBlockdevMediumInsert(qemuMonitor *mon, - const char *id, - const char *nodename) +int +qemuMonitorJSONBlockdevMediumInsert(qemuMonitor *mon, + const char *id, + const char *nodename) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -int qemuMonitorJSONGetPRManagerInfo(qemuMonitor *mon, - GHashTable *info) +int +qemuMonitorJSONGetPRManagerInfo(qemuMonitor *mon, + GHashTable *info) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int @@ -684,9 +828,10 @@ qemuMonitorJSONTransactionBackup(virJSONValue *actions, const char *bitmap, qemuMonitorTransactionBackupSyncMode syncmode); -int qemuMonitorJSONSetDBusVMStateIdList(qemuMonitor *mon, - const char *vmstatepath, - const char *idstr) +int +qemuMonitorJSONSetDBusVMStateIdList(qemuMonitor *mon, + const char *vmstatepath, + const char *idstr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); int -- 2.31.1

2 1

[libvirt PATCH 0/6] Improve AMD SEV support
by Daniel P. Berrangé 09 Dec '21

09 Dec '21

This addresses a few issues in the AMD SEV support - Neither host or domain level SEV metadata is exposed in virsh commands - The domain launch security parameters don't expose enough info to validate the measurement The second point was the real purpose of my work. Per the SEV API guide to calculate the measurement we need measurement = HMAC(0x04 || API_MAJOR || API_MINOR || BUILD || GCTX.POLICY || GCTX.LD || MNONCE; GCTX.TIK) The API_MINOR, API_MAJOR, BUILD values are things that are available from 'query-sev' QMP command and libvirt does not expose this info. This patch series adds them to virDomainGetLaunchSecurityParams alongside the measurement that we already report. So now the client can fetch this info and calculate an expected measurement to compare with the actual measurement they got. They will thus know if the guest is safe to inject secrets into, which is where Jim's recent patches come into play. Daniel P. Berrangé (6): include: add new launch security parameters qemu: report error querying launch params for inactive guest qemu: add monitor APIs for query-sev qemu: report new launch security parameters tools: add 'domlaunchsecinfo' virsh command tools: add 'nodesevinfo' virsh command include/libvirt/libvirt-domain.h | 32 +++++++++++++++++++ src/qemu/qemu_driver.c | 47 ++++++++++++++++++++++++---- src/qemu/qemu_monitor.c | 13 ++++++++ src/qemu/qemu_monitor.h | 9 ++++++ src/qemu/qemu_monitor_json.c | 45 +++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 8 +++++ tools/virsh-domain.c | 53 ++++++++++++++++++++++++++++++++ tools/virsh-host.c | 45 +++++++++++++++++++++++++++ 8 files changed, 246 insertions(+), 6 deletions(-) -- 2.33.1

2 14

[PATCH 00/36] virBitmap freeing cleanup
by Peter Krempa 09 Dec '21

09 Dec '21

Peter Krempa (36): virCapabilitiesInitCaches: Refactor freeing of temporary variables conf: capabilities: Clean up freeing of virBitmap virDomainSchedulerParse: Refactor cleanup virDomainNumatuneParseXML: Refactor cleanup virDomainDriverGetIOThreadsConfig: Automatically free virBitmap qemuDomainAssignMemorySlots: Refactor cleanup qemu: driver: Automatically free temporary virBitmap-s qemuDomainSelectHotplugVcpuEntities: Refactor cleanup qemuDomainSetVcpusInternal: Refactor cleanup qemuDomainSetVcpuInternal: Refactor cleanup qemuProcessValidateHotpluggableVcpus: Refactor cleanup qemuSnapshotCreateInactiveExternal: Automatically free temporary variables virHostCPUCountThreadSiblings: Refactor cleanup virHostCPUHasValidSubcoreConfiguration: Refactor cleanup virHostCPUParseNode: Use automatic memory freeing for virBitmap virCgroupGetPercpuStats: Refactor cleanup virshParseCPUList: Refactor cleanup virnumamock: Use automatic memory freeing for virBitmap test_virCapabilitiesGetCpusForNodemask: Refactor cleanup util: bitmap: Unexport 'virBitmapParseSeparator' virBitmapExpand: Remove return value virBitmapUnion: Remove return value virBitmapClearBitExpand: Remove return value virBitmapSetBitExpand: Remove return value virBitmapParseSeparator: Remove separator parsing capability virBitmapParseInternal: Allocate the bitmap in the caller util: bitmap: Unify parsing of bitmaps test_driver: Use automatic memory freeing for temporary virBitmaps lxcSetCpusetTune: Refactor memory clearing libxl_driver: Use automatic memory freeing for virBitmap libxlDomainGetNumaParameters: Don't clear a freshly allocated bitmap lxc_controller: Use automatic memory freeing for virBitmap virLXCControllerSetup(Resource|Cgroup)Limits: Refactor cleanup virt-host-validate-common: Use automatic memory freeing for virBitmap virt-host-validate-qemu: Use automatic memory freeing for virBitmap virHostCPUGetInfoPopulateLinux: Use automatic memory freeing for virBitmap src/conf/capabilities.c | 27 ++--- src/conf/domain_conf.c | 16 +-- src/conf/numa_conf.c | 55 ++++----- src/hypervisor/domain_driver.c | 7 +- src/libvirt_private.syms | 1 - src/libxl/libxl_driver.c | 7 +- src/lxc/lxc_controller.c | 39 +++--- src/lxc/lxc_native.c | 20 ++-- src/network/bridge_driver.c | 3 +- src/qemu/qemu_domain_address.c | 12 +- src/qemu/qemu_driver.c | 50 +++----- src/qemu/qemu_hotplug.c | 54 ++++----- src/qemu/qemu_process.c | 16 +-- src/qemu/qemu_snapshot.c | 12 +- src/test/test_driver.c | 17 +-- src/util/virbitmap.c | 190 ++++++++---------------------- src/util/virbitmap.h | 17 +-- src/util/vircgroup.c | 27 ++--- src/util/virhostcpu.c | 51 +++----- src/util/virnuma.c | 3 +- src/util/virqemu.c | 3 +- src/util/virtpm.c | 3 +- tests/testutils.c | 2 +- tests/virbitmaptest.c | 15 +-- tests/vircapstest.c | 19 +-- tests/virnumamock.c | 14 +-- tools/virsh-domain.c | 10 +- tools/virt-host-validate-common.c | 8 +- tools/virt-host-validate-qemu.c | 4 +- 29 files changed, 223 insertions(+), 479 deletions(-) -- 2.31.1

2 72

[PATCH] docs: Update more links to point to the new Go modules
by Andrea Bolognani 09 Dec '21

09 Dec '21

A couple of links were still pointing to the obsolete Go packages instead of the current module-aware ones. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/bindings.rst | 2 +- docs/docs.html.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/bindings.rst b/docs/bindings.rst index c5b6b94519..81a4a67067 100644 --- a/docs/bindings.rst +++ b/docs/bindings.rst @@ -10,7 +10,7 @@ other languages: - **C#**: Arnaud Champion develops `C# bindings <csharp.html>`__. - **Go**: Daniel Berrange develops `Go - bindings <https://pkg.go.dev/libvirt.org/libvirt-go>`__. + bindings <https://pkg.go.dev/libvirt.org/go/libvirt>`__. - **Java**: Daniel Veillard develops `Java bindings <java.html>`__. diff --git a/docs/docs.html.in b/docs/docs.html.in index 22a43517ed..8132090762 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -83,7 +83,7 @@ <dt><a href="bindings.html">Language bindings and API modules</a></dt> <dd>Bindings of the libvirt API for <a href="csharp.html">c#</a>, - <a href="https://pkg.go.dev/libvirt.org/libvirt-go">go</a>, + <a href="https://pkg.go.dev/libvirt.org/go/libvirt">go</a>, <a href="java.html">java</a>, <a href="https://libvirt.org/ocaml/">ocaml</a>, <a href="https://search.cpan.org/dist/Sys-Virt/">perl</a>, -- 2.31.1

1 0