- Devel - libvirt List Archives

[libvirt PATCH 0/2] [CI] Fix running integration pipeline in forks + collect daemon stack trace
by Erik Skultety 22 Mar '22

22 Mar '22

Even if users set the LIBVIRT_CI_INTEGRATION variable to 1 to enable the integration test suite with their own private runner, the pipeline will be stuck because we expect the runner to have the 'redhat-vm-host' tag. We need to define the job tag dynamically instead, so that the users can set the variable for their libvirt fork to match one of their runner's tags. A recent crash in libvirt showed us that we also need to collect stack traces as well, so this series also takes care of setting up systemd to be able to collect them on failed jobs. Both fixes are demoed with pipeline [1]. Note that for the pipeline I reverted 17fe6a090ba389cdd228c3e176788d9b2d45525f just to demonstrate the stack trace collection on a crash. [1] https://gitlab.com/eskultety/libvirt/-/pipelines/497404762 Erik Skultety (2): ci: Define the integration job tag dynamically via a variable ci: integration: Collect stack traces with coredumpctl ci/integration.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) -- 2.34.1

3 5

[PATCH] gitpublish: Drop "libvirt" from prefix
by Andrea Bolognani 22 Mar '22

22 Mar '22

We're now using GitLab MRs for all subprojects, which makes having "libvirt" in the prefix no longer necessary and a pointless deviation from git-format-patch's default, which some people still use. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitpublish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpublish b/.gitpublish index d37bf4174a..2c9a6e909e 100644 --- a/.gitpublish +++ b/.gitpublish @@ -1,4 +1,4 @@ [gitpublishprofile "default"] base = master to = libvir-list(a)redhat.com -prefix = libvirt PATCH +prefix = PATCH -- 2.35.1

3 3

[PATCH] docs: Update obsolete reference to formatdomain.html.in
by Andrea Bolognani 22 Mar '22

22 Mar '22

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/api_extension.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api_extension.rst b/docs/api_extension.rst index d70c244fd4..152e64487e 100644 --- a/docs/api_extension.rst +++ b/docs/api_extension.rst @@ -73,7 +73,7 @@ The first task is to define the public API. If the new API involves an XML extension, you have to enhance the RelaxNG schema and document the new elements or attributes: -``src/conf/schemas/domaincommon.rng docs/formatdomain.html.in`` +``src/conf/schemas/domaincommon.rng docs/formatdomain.rst`` If the API extension involves a new function, you have to add a declaration in the public header, and arrange to export the function -- 2.35.1

1 0

[libvirt PATCH v2] schemas: move out of docs, fix no-docs build
by Claudio Fontana 22 Mar '22

22 Mar '22

schemas are used for more than just documentation, virsh edit fails if schemas are not available. Therefore, fix the no-docs build by moving schemas/ to the parsing code inside src/conf/. Signed-off-by: Claudio Fontana <cfontana(a)suse.de> --- changes v1 -> v2: * move to src/conf/ instead of top_srcdir (Daniel) * meson, rename docs_schema_files to just schema_files (Daniel) * tests/virschematest.c: adapt (Andrea) * src/util/virxml.c: adapt (Andrea) * src/conf/cpu_conf.c: adapt (Andrea) * docs/api_extension.rst: adapt one additional reference docs/api_extension.rst | 2 +- docs/meson.build | 2 -- src/conf/cpu_conf.c | 2 +- src/conf/meson.build | 2 ++ {docs => src/conf}/schemas/basictypes.rng | 0 {docs => src/conf}/schemas/capability.rng | 0 {docs => src/conf}/schemas/cpu.rng | 0 {docs => src/conf}/schemas/cputypes.rng | 0 {docs => src/conf}/schemas/domain.rng | 0 {docs => src/conf}/schemas/domainbackup.rng | 0 {docs => src/conf}/schemas/domaincaps.rng | 0 .../conf}/schemas/domaincheckpoint.rng | 0 {docs => src/conf}/schemas/domaincommon.rng | 0 {docs => src/conf}/schemas/domainsnapshot.rng | 0 {docs => src/conf}/schemas/interface.rng | 0 {docs => src/conf}/schemas/meson.build | 4 +-- {docs => src/conf}/schemas/network.rng | 0 {docs => src/conf}/schemas/networkcommon.rng | 0 {docs => src/conf}/schemas/networkport.rng | 0 {docs => src/conf}/schemas/nodedev.rng | 0 {docs => src/conf}/schemas/nwfilter.rng | 0 .../conf}/schemas/nwfilter_params.rng | 0 .../conf}/schemas/nwfilterbinding.rng | 0 {docs => src/conf}/schemas/secret.rng | 0 {docs => src/conf}/schemas/storagecommon.rng | 0 {docs => src/conf}/schemas/storagepool.rng | 0 .../conf}/schemas/storagepoolcaps.rng | 0 {docs => src/conf}/schemas/storagevol.rng | 0 src/util/virxml.c | 2 +- tests/virschematest.c | 36 ++++++++++--------- 30 files changed, 26 insertions(+), 24 deletions(-) rename {docs => src/conf}/schemas/basictypes.rng (100%) rename {docs => src/conf}/schemas/capability.rng (100%) rename {docs => src/conf}/schemas/cpu.rng (100%) rename {docs => src/conf}/schemas/cputypes.rng (100%) rename {docs => src/conf}/schemas/domain.rng (100%) rename {docs => src/conf}/schemas/domainbackup.rng (100%) rename {docs => src/conf}/schemas/domaincaps.rng (100%) rename {docs => src/conf}/schemas/domaincheckpoint.rng (100%) rename {docs => src/conf}/schemas/domaincommon.rng (100%) rename {docs => src/conf}/schemas/domainsnapshot.rng (100%) rename {docs => src/conf}/schemas/interface.rng (100%) rename {docs => src/conf}/schemas/meson.build (83%) rename {docs => src/conf}/schemas/network.rng (100%) rename {docs => src/conf}/schemas/networkcommon.rng (100%) rename {docs => src/conf}/schemas/networkport.rng (100%) rename {docs => src/conf}/schemas/nodedev.rng (100%) rename {docs => src/conf}/schemas/nwfilter.rng (100%) rename {docs => src/conf}/schemas/nwfilter_params.rng (100%) rename {docs => src/conf}/schemas/nwfilterbinding.rng (100%) rename {docs => src/conf}/schemas/secret.rng (100%) rename {docs => src/conf}/schemas/storagecommon.rng (100%) rename {docs => src/conf}/schemas/storagepool.rng (100%) rename {docs => src/conf}/schemas/storagepoolcaps.rng (100%) rename {docs => src/conf}/schemas/storagevol.rng (100%) diff --git a/docs/api_extension.rst b/docs/api_extension.rst index 16d4b0a005..d70c244fd4 100644 --- a/docs/api_extension.rst +++ b/docs/api_extension.rst @@ -73,7 +73,7 @@ The first task is to define the public API. If the new API involves an XML extension, you have to enhance the RelaxNG schema and document the new elements or attributes: -``docs/schemas/domaincommon.rng docs/formatdomain.html.in`` +``src/conf/schemas/domaincommon.rng docs/formatdomain.html.in`` If the API extension involves a new function, you have to add a declaration in the public header, and arrange to export the function diff --git a/docs/meson.build b/docs/meson.build index 868267b764..7aebe08047 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -334,8 +334,6 @@ subdir('js') subdir('kbase') subdir('logos') subdir('manpages') -subdir('schemas') - foreach file : docs_assets # This hack enables us to view the web pages diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 819efcea8c..2d447da7c3 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -345,7 +345,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, g_autofree char *schemafile = NULL; if (!(schemafile = virFileFindResource("cpu.rng", - abs_top_srcdir "/docs/schemas", + abs_top_srcdir "/src/conf/schemas", PKGDATADIR "/schemas"))) return -1; diff --git a/src/conf/meson.build b/src/conf/meson.build index bd35d87e0a..82d265e975 100644 --- a/src/conf/meson.build +++ b/src/conf/meson.build @@ -111,3 +111,5 @@ virt_conf_lib = static_library( libvirt_libs += virt_conf_lib conf_inc_dir = include_directories('.') + +subdir('schemas') diff --git a/docs/schemas/basictypes.rng b/src/conf/schemas/basictypes.rng similarity index 100% rename from docs/schemas/basictypes.rng rename to src/conf/schemas/basictypes.rng diff --git a/docs/schemas/capability.rng b/src/conf/schemas/capability.rng similarity index 100% rename from docs/schemas/capability.rng rename to src/conf/schemas/capability.rng diff --git a/docs/schemas/cpu.rng b/src/conf/schemas/cpu.rng similarity index 100% rename from docs/schemas/cpu.rng rename to src/conf/schemas/cpu.rng diff --git a/docs/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng similarity index 100% rename from docs/schemas/cputypes.rng rename to src/conf/schemas/cputypes.rng diff --git a/docs/schemas/domain.rng b/src/conf/schemas/domain.rng similarity index 100% rename from docs/schemas/domain.rng rename to src/conf/schemas/domain.rng diff --git a/docs/schemas/domainbackup.rng b/src/conf/schemas/domainbackup.rng similarity index 100% rename from docs/schemas/domainbackup.rng rename to src/conf/schemas/domainbackup.rng diff --git a/docs/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.rng similarity index 100% rename from docs/schemas/domaincaps.rng rename to src/conf/schemas/domaincaps.rng diff --git a/docs/schemas/domaincheckpoint.rng b/src/conf/schemas/domaincheckpoint.rng similarity index 100% rename from docs/schemas/domaincheckpoint.rng rename to src/conf/schemas/domaincheckpoint.rng diff --git a/docs/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng similarity index 100% rename from docs/schemas/domaincommon.rng rename to src/conf/schemas/domaincommon.rng diff --git a/docs/schemas/domainsnapshot.rng b/src/conf/schemas/domainsnapshot.rng similarity index 100% rename from docs/schemas/domainsnapshot.rng rename to src/conf/schemas/domainsnapshot.rng diff --git a/docs/schemas/interface.rng b/src/conf/schemas/interface.rng similarity index 100% rename from docs/schemas/interface.rng rename to src/conf/schemas/interface.rng diff --git a/docs/schemas/meson.build b/src/conf/schemas/meson.build similarity index 83% rename from docs/schemas/meson.build rename to src/conf/schemas/meson.build index bb6a48787f..700161bf75 100644 --- a/docs/schemas/meson.build +++ b/src/conf/schemas/meson.build @@ -1,4 +1,4 @@ -docs_schema_files = [ +schema_files = [ 'basictypes.rng', 'capability.rng', 'cpu.rng', @@ -24,4 +24,4 @@ docs_schema_files = [ 'storagevol.rng', ] -install_data(docs_schema_files, install_dir: pkgdatadir / 'schemas') +install_data(schema_files, install_dir: pkgdatadir / 'schemas') diff --git a/docs/schemas/network.rng b/src/conf/schemas/network.rng similarity index 100% rename from docs/schemas/network.rng rename to src/conf/schemas/network.rng diff --git a/docs/schemas/networkcommon.rng b/src/conf/schemas/networkcommon.rng similarity index 100% rename from docs/schemas/networkcommon.rng rename to src/conf/schemas/networkcommon.rng diff --git a/docs/schemas/networkport.rng b/src/conf/schemas/networkport.rng similarity index 100% rename from docs/schemas/networkport.rng rename to src/conf/schemas/networkport.rng diff --git a/docs/schemas/nodedev.rng b/src/conf/schemas/nodedev.rng similarity index 100% rename from docs/schemas/nodedev.rng rename to src/conf/schemas/nodedev.rng diff --git a/docs/schemas/nwfilter.rng b/src/conf/schemas/nwfilter.rng similarity index 100% rename from docs/schemas/nwfilter.rng rename to src/conf/schemas/nwfilter.rng diff --git a/docs/schemas/nwfilter_params.rng b/src/conf/schemas/nwfilter_params.rng similarity index 100% rename from docs/schemas/nwfilter_params.rng rename to src/conf/schemas/nwfilter_params.rng diff --git a/docs/schemas/nwfilterbinding.rng b/src/conf/schemas/nwfilterbinding.rng similarity index 100% rename from docs/schemas/nwfilterbinding.rng rename to src/conf/schemas/nwfilterbinding.rng diff --git a/docs/schemas/secret.rng b/src/conf/schemas/secret.rng similarity index 100% rename from docs/schemas/secret.rng rename to src/conf/schemas/secret.rng diff --git a/docs/schemas/storagecommon.rng b/src/conf/schemas/storagecommon.rng similarity index 100% rename from docs/schemas/storagecommon.rng rename to src/conf/schemas/storagecommon.rng diff --git a/docs/schemas/storagepool.rng b/src/conf/schemas/storagepool.rng similarity index 100% rename from docs/schemas/storagepool.rng rename to src/conf/schemas/storagepool.rng diff --git a/docs/schemas/storagepoolcaps.rng b/src/conf/schemas/storagepoolcaps.rng similarity index 100% rename from docs/schemas/storagepoolcaps.rng rename to src/conf/schemas/storagepoolcaps.rng diff --git a/docs/schemas/storagevol.rng b/src/conf/schemas/storagevol.rng similarity index 100% rename from docs/schemas/storagevol.rng rename to src/conf/schemas/storagevol.rng diff --git a/src/util/virxml.c b/src/util/virxml.c index 268aad1d20..8ff59e7cda 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1099,7 +1099,7 @@ virXMLParseHelper(int domcode, if (validate && schemafile != NULL) { g_autofree char *schema = virFileFindResource(schemafile, - abs_top_srcdir "/docs/schemas", + abs_top_srcdir "/src/conf/schemas", PKGDATADIR "/schemas"); if (!schema || (virXMLValidateAgainstSchema(schema, xml) < 0)) diff --git a/tests/virschematest.c b/tests/virschematest.c index 4e657159e1..29a5546418 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -336,27 +336,29 @@ mymain(void) { int ret = 0; +#define SCHEMAS_PATH "src/conf/schemas/" + #define DO_TEST(sch, ent) \ if (testSchemaEntries((sch), (ent), G_N_ELEMENTS(ent)) < 0) \ ret = -1; - DO_TEST("docs/schemas/capability.rng", schemaCapability); - DO_TEST("docs/schemas/domain.rng", schemaDomain); - DO_TEST("docs/schemas/domaincaps.rng", schemaDomainCaps); - DO_TEST("docs/schemas/domainbackup.rng", schemaDomainBackup); - DO_TEST("docs/schemas/domaincheckpoint.rng", schemaDomainCheckpoint); - DO_TEST("docs/schemas/domainsnapshot.rng", schemaDomainSnapshot); - DO_TEST("docs/schemas/interface.rng", schemaInterface); - DO_TEST("docs/schemas/network.rng", schemaNetwork); - DO_TEST("docs/schemas/networkport.rng", schemaNetworkport); - DO_TEST("docs/schemas/nodedev.rng", schemaNodedev); - DO_TEST("docs/schemas/nwfilter.rng", schemaNwfilter); - DO_TEST("docs/schemas/nwfilterbinding.rng", schemaNwfilterbinding); - DO_TEST("docs/schemas/secret.rng", schemaSecret); - DO_TEST("docs/schemas/storagepoolcaps.rng", schemaStoragepoolcaps); - DO_TEST("docs/schemas/storagepool.rng", schemaStoragePool); - DO_TEST("docs/schemas/storagevol.rng", schemaStorageVol); - DO_TEST("docs/schemas/cpu.rng", schemaCpu); + DO_TEST(SCHEMAS_PATH "capability.rng", schemaCapability); + DO_TEST(SCHEMAS_PATH "domain.rng", schemaDomain); + DO_TEST(SCHEMAS_PATH "domaincaps.rng", schemaDomainCaps); + DO_TEST(SCHEMAS_PATH "domainbackup.rng", schemaDomainBackup); + DO_TEST(SCHEMAS_PATH "domaincheckpoint.rng", schemaDomainCheckpoint); + DO_TEST(SCHEMAS_PATH "domainsnapshot.rng", schemaDomainSnapshot); + DO_TEST(SCHEMAS_PATH "interface.rng", schemaInterface); + DO_TEST(SCHEMAS_PATH "network.rng", schemaNetwork); + DO_TEST(SCHEMAS_PATH "networkport.rng", schemaNetworkport); + DO_TEST(SCHEMAS_PATH "nodedev.rng", schemaNodedev); + DO_TEST(SCHEMAS_PATH "nwfilter.rng", schemaNwfilter); + DO_TEST(SCHEMAS_PATH "nwfilterbinding.rng", schemaNwfilterbinding); + DO_TEST(SCHEMAS_PATH "secret.rng", schemaSecret); + DO_TEST(SCHEMAS_PATH "storagepoolcaps.rng", schemaStoragepoolcaps); + DO_TEST(SCHEMAS_PATH "storagepool.rng", schemaStoragePool); + DO_TEST(SCHEMAS_PATH "storagevol.rng", schemaStorageVol); + DO_TEST(SCHEMAS_PATH "cpu.rng", schemaCpu); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.35.1

2 1

[PATCH] qemu_tpm: Do async IO when starting swtpm emulator
by Michal Privoznik 22 Mar '22

22 Mar '22

When vTPM is secured via virSecret libvirt passes the secret value via an FD when swtpm is started (arguments --key and --migration-key). The writing of the secret into the FDs is handled via virCommand, specifically qemu_tpm calls virCommandSetSendBuffer()) and then virCommandRunAsync() spawns a thread to handle writing into the FD via virCommandDoAsyncIOHelper. But the thread is not created unless VIR_EXEC_ASYNC_IO flag is set, which it isn't. In order to fix it, virCommandDoAsyncIO() must be called. The credit goes to Marc-André Lureau <marcandre.lureau(a)redhat.com> who has done all the debugging and proposed fix in the bugzilla. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2064115 Fixes: a9c500d2b50c5c041a1bb6ae9724402cf1cec8fe Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_tpm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 50f9caabf3..56bccee128 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -899,6 +899,7 @@ qemuTPMEmulatorStart(virQEMUDriver *driver, if (!(pidfile = qemuTPMEmulatorPidFileBuildPath(cfg->swtpmStateDir, shortName))) return -1; + virCommandDoAsyncIO(cmd); virCommandDaemonize(cmd); virCommandSetPidFile(cmd, pidfile); virCommandSetErrorFD(cmd, &errfd); -- 2.34.1

3 2

[PATCH 0/7] qemu: Add qemu-namespace XML to override device properties (-set replacement)
by Peter Krempa 22 Mar '22

22 Mar '22

The use of '-set' via the qemu argument passthrough broke when we switched to using JSON with -device. Provide a replacement using the qemu namespace XML elements. Peter Krempa (7): qemuDomainDefNamespaceFormatXML*: Convert to virXMLFormatElement docs: drvqemu: Document overriding of device properties qemu: domain: Add XML namespace code for overriding device config conf: Introduce VIR_DOMAIN_TAINT_CUSTOM_DEVICE and use it in qemu qemuBuildDeviceCommandlineFromJSON: Pass 'virDomainDef' into the function qemu: command: Override device definition according to the namespace config NEWS: Mention the qemu device property override feature NEWS.rst | 7 + docs/drvqemu.rst | 52 ++++ docs/schemas/domaincommon.rng | 32 +++ src/conf/domain_conf.c | 2 + src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 133 ++++++---- src/qemu/qemu_domain.c | 241 ++++++++++++++++-- src/qemu/qemu_domain.h | 33 +++ .../qemu-ns.x86_64-4.0.0.args | 2 +- .../qemu-ns.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/qemu-ns.xml | 12 + .../qemu-ns.x86_64-latest.xml | 12 + 12 files changed, 457 insertions(+), 72 deletions(-) -- 2.35.1

3 10

[libvirt PATCH] schemas: move out of docs, fix no-docs build
by root 21 Mar '22

21 Mar '22

From: Claudio Fontana <cfontana(a)suse.de> schemas are used for more than just documentation, virsh edit fails if schemas are not available. Therefore, fix the no-docs build by moving schemas to the top source directory. Signed-off-by: Claudio Fontana <cfontana(a)suse.de> --- docs/meson.build | 2 -- meson.build | 2 ++ {docs/schemas => schemas}/basictypes.rng | 0 {docs/schemas => schemas}/capability.rng | 0 {docs/schemas => schemas}/cpu.rng | 0 {docs/schemas => schemas}/cputypes.rng | 0 {docs/schemas => schemas}/domain.rng | 0 {docs/schemas => schemas}/domainbackup.rng | 0 {docs/schemas => schemas}/domaincaps.rng | 0 {docs/schemas => schemas}/domaincheckpoint.rng | 0 {docs/schemas => schemas}/domaincommon.rng | 0 {docs/schemas => schemas}/domainsnapshot.rng | 0 {docs/schemas => schemas}/interface.rng | 0 {docs/schemas => schemas}/meson.build | 0 {docs/schemas => schemas}/network.rng | 0 {docs/schemas => schemas}/networkcommon.rng | 0 {docs/schemas => schemas}/networkport.rng | 0 {docs/schemas => schemas}/nodedev.rng | 0 {docs/schemas => schemas}/nwfilter.rng | 0 {docs/schemas => schemas}/nwfilter_params.rng | 0 {docs/schemas => schemas}/nwfilterbinding.rng | 0 {docs/schemas => schemas}/secret.rng | 0 {docs/schemas => schemas}/storagecommon.rng | 0 {docs/schemas => schemas}/storagepool.rng | 0 {docs/schemas => schemas}/storagepoolcaps.rng | 0 {docs/schemas => schemas}/storagevol.rng | 0 26 files changed, 2 insertions(+), 2 deletions(-) rename {docs/schemas => schemas}/basictypes.rng (100%) rename {docs/schemas => schemas}/capability.rng (100%) rename {docs/schemas => schemas}/cpu.rng (100%) rename {docs/schemas => schemas}/cputypes.rng (100%) rename {docs/schemas => schemas}/domain.rng (100%) rename {docs/schemas => schemas}/domainbackup.rng (100%) rename {docs/schemas => schemas}/domaincaps.rng (100%) rename {docs/schemas => schemas}/domaincheckpoint.rng (100%) rename {docs/schemas => schemas}/domaincommon.rng (100%) rename {docs/schemas => schemas}/domainsnapshot.rng (100%) rename {docs/schemas => schemas}/interface.rng (100%) rename {docs/schemas => schemas}/meson.build (100%) rename {docs/schemas => schemas}/network.rng (100%) rename {docs/schemas => schemas}/networkcommon.rng (100%) rename {docs/schemas => schemas}/networkport.rng (100%) rename {docs/schemas => schemas}/nodedev.rng (100%) rename {docs/schemas => schemas}/nwfilter.rng (100%) rename {docs/schemas => schemas}/nwfilter_params.rng (100%) rename {docs/schemas => schemas}/nwfilterbinding.rng (100%) rename {docs/schemas => schemas}/secret.rng (100%) rename {docs/schemas => schemas}/storagecommon.rng (100%) rename {docs/schemas => schemas}/storagepool.rng (100%) rename {docs/schemas => schemas}/storagepoolcaps.rng (100%) rename {docs/schemas => schemas}/storagevol.rng (100%) diff --git a/docs/meson.build b/docs/meson.build index 868267b764..7aebe08047 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -334,8 +334,6 @@ subdir('js') subdir('kbase') subdir('logos') subdir('manpages') -subdir('schemas') - foreach file : docs_assets # This hack enables us to view the web pages diff --git a/meson.build b/meson.build index f6259e59a4..bea1b8e0ea 100644 --- a/meson.build +++ b/meson.build @@ -2125,6 +2125,8 @@ if gen_docs subdir('docs') endif +subdir('schemas') + subdir('build-aux') diff --git a/docs/schemas/basictypes.rng b/schemas/basictypes.rng similarity index 100% rename from docs/schemas/basictypes.rng rename to schemas/basictypes.rng diff --git a/docs/schemas/capability.rng b/schemas/capability.rng similarity index 100% rename from docs/schemas/capability.rng rename to schemas/capability.rng diff --git a/docs/schemas/cpu.rng b/schemas/cpu.rng similarity index 100% rename from docs/schemas/cpu.rng rename to schemas/cpu.rng diff --git a/docs/schemas/cputypes.rng b/schemas/cputypes.rng similarity index 100% rename from docs/schemas/cputypes.rng rename to schemas/cputypes.rng diff --git a/docs/schemas/domain.rng b/schemas/domain.rng similarity index 100% rename from docs/schemas/domain.rng rename to schemas/domain.rng diff --git a/docs/schemas/domainbackup.rng b/schemas/domainbackup.rng similarity index 100% rename from docs/schemas/domainbackup.rng rename to schemas/domainbackup.rng diff --git a/docs/schemas/domaincaps.rng b/schemas/domaincaps.rng similarity index 100% rename from docs/schemas/domaincaps.rng rename to schemas/domaincaps.rng diff --git a/docs/schemas/domaincheckpoint.rng b/schemas/domaincheckpoint.rng similarity index 100% rename from docs/schemas/domaincheckpoint.rng rename to schemas/domaincheckpoint.rng diff --git a/docs/schemas/domaincommon.rng b/schemas/domaincommon.rng similarity index 100% rename from docs/schemas/domaincommon.rng rename to schemas/domaincommon.rng diff --git a/docs/schemas/domainsnapshot.rng b/schemas/domainsnapshot.rng similarity index 100% rename from docs/schemas/domainsnapshot.rng rename to schemas/domainsnapshot.rng diff --git a/docs/schemas/interface.rng b/schemas/interface.rng similarity index 100% rename from docs/schemas/interface.rng rename to schemas/interface.rng diff --git a/docs/schemas/meson.build b/schemas/meson.build similarity index 100% rename from docs/schemas/meson.build rename to schemas/meson.build diff --git a/docs/schemas/network.rng b/schemas/network.rng similarity index 100% rename from docs/schemas/network.rng rename to schemas/network.rng diff --git a/docs/schemas/networkcommon.rng b/schemas/networkcommon.rng similarity index 100% rename from docs/schemas/networkcommon.rng rename to schemas/networkcommon.rng diff --git a/docs/schemas/networkport.rng b/schemas/networkport.rng similarity index 100% rename from docs/schemas/networkport.rng rename to schemas/networkport.rng diff --git a/docs/schemas/nodedev.rng b/schemas/nodedev.rng similarity index 100% rename from docs/schemas/nodedev.rng rename to schemas/nodedev.rng diff --git a/docs/schemas/nwfilter.rng b/schemas/nwfilter.rng similarity index 100% rename from docs/schemas/nwfilter.rng rename to schemas/nwfilter.rng diff --git a/docs/schemas/nwfilter_params.rng b/schemas/nwfilter_params.rng similarity index 100% rename from docs/schemas/nwfilter_params.rng rename to schemas/nwfilter_params.rng diff --git a/docs/schemas/nwfilterbinding.rng b/schemas/nwfilterbinding.rng similarity index 100% rename from docs/schemas/nwfilterbinding.rng rename to schemas/nwfilterbinding.rng diff --git a/docs/schemas/secret.rng b/schemas/secret.rng similarity index 100% rename from docs/schemas/secret.rng rename to schemas/secret.rng diff --git a/docs/schemas/storagecommon.rng b/schemas/storagecommon.rng similarity index 100% rename from docs/schemas/storagecommon.rng rename to schemas/storagecommon.rng diff --git a/docs/schemas/storagepool.rng b/schemas/storagepool.rng similarity index 100% rename from docs/schemas/storagepool.rng rename to schemas/storagepool.rng diff --git a/docs/schemas/storagepoolcaps.rng b/schemas/storagepoolcaps.rng similarity index 100% rename from docs/schemas/storagepoolcaps.rng rename to schemas/storagepoolcaps.rng diff --git a/docs/schemas/storagevol.rng b/schemas/storagevol.rng similarity index 100% rename from docs/schemas/storagevol.rng rename to schemas/storagevol.rng -- 2.35.1

4 3

Plans for the next release
by Jiri Denemark 21 Mar '22

21 Mar '22

We are getting close to the next release of libvirt. To aim for the April Fools' release on Apr 01 I suggest entering the freeze on Monday Mar 28 and tagging RC2 on Wednesday Mar 30. I hope this works for everyone. Jirka

1 0

[PATCH RFC 0/1] s390x CPU Model Feature Deprecation
by Collin Walling 21 Mar '22

21 Mar '22

The s390x architecture has a growing list of features that will no longer be supported on future hardware releases. This introduces an issue with migration such that guests, running on models with these features enabled, will be rejected outright by machines that do not support these features. A current example is the CSSKE feature that has been deprecated for some time. It has been publicly announced that gen15 will be the last release to support this feature, however we have postponed this to gen16a. A possible solution to remedy this would be to create a new QEMU QMP Response that allows users to query for deprecated/unsupported features. This presents two parts of the puzzle: how to report deprecated features to a user (libvirt) and how should libvirt handle this information. First, let's discuss the latter. The patch presented alongside this cover letter attempts to solve the migration issue by hard-coding the CSSKE feature to be disabled for all s390x CPU models. This is done by simply appending the CSSKE feature with the disabled policy to the host-model. libvirt pseudo: if arch is s390x set CSSKE to disabled for host-model This will be recorded under the host-model as (observable via domcapabilities): <mode name='host-model' supported='yes'> <model fallback='forbid'>z13.2-base</model> <feature policy='require' name='aen'/> <feature policy='require' name='aefsi'/> <feature policy='require' name='diag318'/> ... <feature policy='disable' name='csske'/> ... Obviously a hard-coded path is not a desired approach and requires a constant update whenever newer features are listed for deprecation. The patch is presented to instead spin up the discussion as to where it is appropriate to record these deprecated features (e.g. should these be reported under the host-model? or added to the guest CPU definition prior to start up? etc). There is one issue observed by this change to the host-model, denoted directly below. A change in the host-model XML affects the hypervisor-cpu-comparison command, which uses the libvirt-recorded host-model XML. Issuing comparison on a machine that still supports CSSKE (but with it flagged as disabled in the host-model XML) with an equal or older CPU model that does *not* present CSSKE as disabled in the XML will be reported as incompatible. The response should report "identical" or "superset" because technically the hardware still supports the feature. A possible solution is to modify the hypervisor-cpu-comparison command to query the host-model via expansion to get the proper hypervisor CPU model as opposed to using libvirt's modified definition. Secondly, let's discuss the how to report the deprecated features. Namely, an introduction of a new QEMU QMP response. This would be a long-term approach that allows a user to query a list of deprecated features for a particular architecture. A list will be kept within QEMU that contains all deprecated CPU features. This allows the retention of CPU model definitions within QEMU. Libvirt may query this list and update the host-model definition to disable the features reported by QEMU. QEMU QMP Response example: { "execute": "query-cpu-model-deprecated-features" } { "return": { "props": { "name": "csske", "name": "feat_a", "name": "feat_b" }}} libvirt pseudo: if query_deprecated_features is supported list = query_deprecated_features() for each feat in list set feat to disabled for host-model Then, any new features that are flagged for deprecated in the future may simply be added to this "deprecated features" list in QEMU alongside a new CPU definition. Please let me know your thoughts on these approaches. All input is welcome. Thanks. Collin Walling (1): qemu: capabilities: disable csske for host cpu src/qemu/qemu_capabilities.c | 10 ++++++++++ tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.8.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.9.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + 8 files changed, 17 insertions(+) -- 2.31.1

5 27

[libvirt RFC v2] virfile: set pipe size in virFileWrapperFdNew to improve throughput
by root 21 Mar '22

21 Mar '22

From: Claudio Fontana <cfontana(a)suse.de> virsh save is very slow with a default pipe size, so set a larger one. This change improves throughput by ~400% on fast nvme or ramdisk, for the current only user of virFileWrapperFdNew: the qemu driver. Best value currently measured is 1MB, which happens to be also the kernel default for the pipe-max-size. We do not try to use a pipe buffer larger than what the setting of /proc/sys/fs/pipe-max-size currently allows. Signed-off-by: Claudio Fontana <cfontana(a)suse.de> --- src/util/virfile.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) see v1 at https://listman.redhat.com/archives/libvir-list/2022-March/229252.html Changes v1 -> v2: * removed VIR_FILE_WRAPPER_BIG_PIPE, made the new pipe resizing unconditional (Michal) * moved code to separate functions (Michal) * removed ternary op, disliked in libvirt (Michal) * added #ifdef __linux__ (Ani Sinha) * try smallest value between currently best measured value (1MB) and the pipe-max-size setting. If pipe-max-size cannot be read, try kernel default max (1MB). (Daniel) diff --git a/src/util/virfile.c b/src/util/virfile.c index a04f888e06..13bdd42c68 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -201,6 +201,71 @@ struct _virFileWrapperFd { }; #ifndef WIN32 + +#ifdef __linux__ +/** + * virFileWrapperGetBestPipeSize: + * + * get the best pipe size to use with virFileWrapper. + * + * We first check the maximum we are allowed by the system pipe-max-size, + * and then use the minimum between that and our tested best value. + * This is because a request beyond pipe-max-size may fail with EPERM. + * If we are unable to read pipe-max-size, use the kernel default (1MB). + * + * Return value is the pipe size to use. + */ + +static int virFileWrapperGetBestPipeSize(void) +{ + const char path[] = "/proc/sys/fs/pipe-max-size"; + int best_sz = 1024 * 1024; /* good virsh save results with this size */ + int max_sz; + + if (virFileReadValueInt(&max_sz, path) < 0) { + max_sz = 1024 * 1024; /* this is the kernel default pipe-max-size */ + VIR_WARN("failed to read %s, trying default %d", path, max_sz); + } else if (max_sz > best_sz) { + max_sz = best_sz; + } + return max_sz; +} + +/** + * virFileWrapperSetPipeSize: + * @fd: the fd of the pipe + * + * Set best pipe size on the passed file descriptor for bulk transfers of data. + * + * default pipe size (usually 64K) is generally not suited for large transfers + * to fast devices. This has been measured to improve virsh save by 400% + * in ideal conditions. + * + * Return value is 0 on success, -1 and errno set on error. + * OS note: only for linux, on other OS this is a no-op. + */ +static int +virFileWrapperSetPipeSize(int fd) +{ + int pipe_sz = virFileWrapperGetBestPipeSize(); + int rv = fcntl(fd, F_SETPIPE_SZ, pipe_sz); + + if (rv < 0) { + VIR_ERROR(_("failed to set pipe size to %d (errno=%d)"), pipe_sz, errno); + return -1; + } + VIR_INFO("fd %d pipe size adjusted to %d", fd, rv); + return 0; +} + +#else /* !__linux__ */ +static int virFileWrapperSetPipeSize(int fd) +{ + return 0; +} +#endif /* !__linux__ */ + + /** * virFileWrapperFdNew: * @fd: pointer to fd to wrap @@ -282,6 +347,10 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) ret->cmd = virCommandNewArgList(iohelper_path, name, NULL); + if (virFileWrapperSetPipeSize(pipefd[!output]) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", _("unable to set pipe size, data transfer might be slow")); + } + if (output) { virCommandSetInputFD(ret->cmd, pipefd[0]); virCommandSetOutputFD(ret->cmd, fd); -- 2.35.1

1 0

[PATCH] domain_conf: include checks against dom->os.type and dom->virtType
by Jamm02 21 Mar '22

21 Mar '22

All the checks against dom->os.type and dom->virtType in virDomainInputDefParseXML shifted to virDomainInputDefValidate function Signed-off-by: Jamm02 <codeguy.moteen(a)gmail.com> --- src/conf/domain_conf.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e0dfc9e45f..b237fd9ab1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11837,6 +11837,55 @@ virDomainPanicDefParseXML(virDomainXMLOption *xmlopt, return NULL; } +static virDomainInputDef * +virDomainInputDefValidate(const virDomainDef *dom, + xmlNodePtr node, + xmlXPathContextPtr ctxt) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt) + virDomainInputDef *def; + g_autofree char *bus = NULL; + + def = g_new0(virDomainInputDef, 1); + + ctxt->node = node; + bus = virXMLPropString(node, "bus"); + + if (bus) { + if ((def->bus = virDomainInputBusTypeFromString(bus)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown input bus type '%s'"), bus); + goto error; + } + + } else { + if (dom->os.type == VIR_DOMAIN_OSTYPE_HVM) { + if ((def->type == VIR_DOMAIN_INPUT_TYPE_MOUSE || + def->type == VIR_DOMAIN_INPUT_TYPE_KBD) && + (ARCH_IS_X86(dom->os.arch) || dom->os.arch == VIR_ARCH_NONE)) { + def->bus = VIR_DOMAIN_INPUT_BUS_PS2; + } else if (ARCH_IS_S390(dom->os.arch) || + def->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) { + def->bus = VIR_DOMAIN_INPUT_BUS_VIRTIO; + } else if (def->type == VIR_DOMAIN_INPUT_TYPE_EVDEV) { + def->bus = VIR_DOMAIN_INPUT_BUS_NONE; + } else { + def->bus = VIR_DOMAIN_INPUT_BUS_USB; + } + } else if (dom->os.type == VIR_DOMAIN_OSTYPE_XEN || + dom->os.type == VIR_DOMAIN_OSTYPE_XENPVH) { + def->bus = VIR_DOMAIN_INPUT_BUS_XEN; + } else { + if ((dom->virtType == VIR_DOMAIN_VIRT_VZ || + dom->virtType == VIR_DOMAIN_VIRT_PARALLELS)) + def->bus = VIR_DOMAIN_INPUT_BUS_PARALLELS; + } + } + + error: + virDomainInputDefFree(def); + return NULL; +} /* Parse the XML definition for an input device */ static virDomainInputDef * virDomainInputDefParseXML(virDomainXMLOption *xmlopt, -- 2.35.1

2 1

[PATCH] domain_conf: include checks against dom->os.type and dom->virtType
by Jamm02 19 Mar '22

19 Mar '22

All the checks against dom->os.type and dom->virtType in virDomainInputDefParseXML shifted to virDomainInputDefValidate function Signed-off-by: Jamm02 <codeguy.moteen(a)gmail.com> --- src/conf/domain_conf.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e0dfc9e45f..b237fd9ab1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11837,6 +11837,55 @@ virDomainPanicDefParseXML(virDomainXMLOption *xmlopt, return NULL; } +static virDomainInputDef * +virDomainInputDefValidate(const virDomainDef *dom, + xmlNodePtr node, + xmlXPathContextPtr ctxt) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt) + virDomainInputDef *def; + g_autofree char *bus = NULL; + + def = g_new0(virDomainInputDef, 1); + + ctxt->node = node; + bus = virXMLPropString(node, "bus"); + + if (bus) { + if ((def->bus = virDomainInputBusTypeFromString(bus)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown input bus type '%s'"), bus); + goto error; + } + + } else { + if (dom->os.type == VIR_DOMAIN_OSTYPE_HVM) { + if ((def->type == VIR_DOMAIN_INPUT_TYPE_MOUSE || + def->type == VIR_DOMAIN_INPUT_TYPE_KBD) && + (ARCH_IS_X86(dom->os.arch) || dom->os.arch == VIR_ARCH_NONE)) { + def->bus = VIR_DOMAIN_INPUT_BUS_PS2; + } else if (ARCH_IS_S390(dom->os.arch) || + def->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) { + def->bus = VIR_DOMAIN_INPUT_BUS_VIRTIO; + } else if (def->type == VIR_DOMAIN_INPUT_TYPE_EVDEV) { + def->bus = VIR_DOMAIN_INPUT_BUS_NONE; + } else { + def->bus = VIR_DOMAIN_INPUT_BUS_USB; + } + } else if (dom->os.type == VIR_DOMAIN_OSTYPE_XEN || + dom->os.type == VIR_DOMAIN_OSTYPE_XENPVH) { + def->bus = VIR_DOMAIN_INPUT_BUS_XEN; + } else { + if ((dom->virtType == VIR_DOMAIN_VIRT_VZ || + dom->virtType == VIR_DOMAIN_VIRT_PARALLELS)) + def->bus = VIR_DOMAIN_INPUT_BUS_PARALLELS; + } + } + + error: + virDomainInputDefFree(def); + return NULL; +} /* Parse the XML definition for an input device */ static virDomainInputDef * virDomainInputDefParseXML(virDomainXMLOption *xmlopt, -- 2.35.1

1 0

[PATCH] virNWFilterLockIface: Preserve correct lock ordering
by Michal Privoznik 18 Mar '22

18 Mar '22

In the not so distant past, the lock ordering in virNWFilterLockIface() was as follows: global mutex ifaceMapLock was acquired, then internal representation of given interface was looked up in a hash table (or created brand new if none was found), the global lock was released and the lock of the interface was acquired. But this was mistakenly changed as the function was rewritten to use automatic mutexes, because now the global lock is held throughout the whole run of the function and thus the interface specific lock is acquired with the global lock held. This results in a deadlock. Fixes: dd8150c48dcf94e8d3b0481be08eeef822b98b02 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/nwfilter/nwfilter_learnipaddr.c | 49 +++++++++++++++-------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 2c85972012..ec2d337188 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -143,37 +143,40 @@ static bool threadsTerminate; int virNWFilterLockIface(const char *ifname) { - VIR_LOCK_GUARD lock = virLockGuardLock(&ifaceMapLock); - virNWFilterIfaceLock *ifaceLock = virHashLookup(ifaceLockMap, ifname); + virNWFilterIfaceLock *ifaceLock = NULL; - if (!ifaceLock) { - ifaceLock = g_new0(virNWFilterIfaceLock, 1); + VIR_WITH_MUTEX_LOCK_GUARD(&ifaceMapLock) { + ifaceLock = virHashLookup(ifaceLockMap, ifname); - if (virMutexInitRecursive(&ifaceLock->lock) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("mutex initialization failed")); - g_free(ifaceLock); - return -1; - } + if (!ifaceLock) { + ifaceLock = g_new0(virNWFilterIfaceLock, 1); - if (virStrcpyStatic(ifaceLock->ifname, ifname) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("interface name %s does not fit into buffer"), - ifaceLock->ifname); - g_free(ifaceLock); - return -1; - } + if (virMutexInitRecursive(&ifaceLock->lock) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("mutex initialization failed")); + g_free(ifaceLock); + return -1; + } + + if (virStrcpyStatic(ifaceLock->ifname, ifname) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("interface name %s does not fit into buffer"), + ifaceLock->ifname); + g_free(ifaceLock); + return -1; + } + + while (virHashAddEntry(ifaceLockMap, ifname, ifaceLock)) { + g_free(ifaceLock); + return -1; + } - while (virHashAddEntry(ifaceLockMap, ifname, ifaceLock)) { - g_free(ifaceLock); - return -1; + ifaceLock->refctr = 0; } - ifaceLock->refctr = 0; + ifaceLock->refctr++; } - ifaceLock->refctr++; - virMutexLock(&ifaceLock->lock); return 0; -- 2.34.1

2 1

[libvirt PATCH v2 00/17] qemu: Implement virtio-iommu support
by Andrea Bolognani 18 Mar '22

18 Mar '22

The first patch adds replies files and as such has been aggressively snipped to deal with mailing list message size limits. Grab the unabriged version with $ git fetch https://gitlab.com/abologna/libvirt.git virtio-iommu The QEMU side of the feature has now been merged, so this can finally go in as well. I have retained the R-bs for most patches, but there are a few that have been changed enough to warrant another look before I push them. Changes from [v1]: * rebase on top of master; * generate -device argument as JSON. [v1] https://listman.redhat.com/archives/libvir-list/2021-October/223977.html Andrea Bolognani (17): tests: Add capabilities for QEMU 7.0.0 on aarch64 conf: Introduce VIR_PCI_CONNECT_INTEGRATED qemu: Tweak some code qemu: Introduce QEMU_CAPS_DEVICE_VIRTIO_IOMMU_PCI qemu: Introduce QEMU_CAPS_VIRTIO_IOMMU_BOOT_BYPASS conf: Introduce virtio model for <iommu> tests: Add test cases for virtio-iommu qemu: Validate machine type used with virtio-iommu qemu: Validate capabilities for virtio-iommu qemu: Validate use of ACPI with virtio-iommu conf: Add virDomainDeviceInfo to virDomainIOMMUDef qemu: Assign PCI address to virtio-iommu qemu: Validate address type for virtio-iommu tests: Add test for virtio-iommu address qemu: Generate command line for virtio-iommu docs: Document virtio-iommu news: Document virtio-iommu NEWS.rst | 4 + docs/formatdomain.rst | 5 +- docs/schemas/domaincommon.rng | 64 +- src/conf/domain_addr.c | 17 + src/conf/domain_addr.h | 26 +- src/conf/domain_conf.c | 38 +- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 10 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 30 +- src/qemu/qemu_domain_address.c | 33 +- src/qemu/qemu_validate.c | 32 + .../qemu_7.0.0-virt.aarch64.xml | 193 + tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 187 + .../caps_5.0.0.aarch64.replies | 71 +- .../caps_5.0.0.aarch64.xml | 1 + .../caps_5.0.0.ppc64.replies | 59 +- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.replies | 55 +- .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.replies | 71 +- .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.replies | 71 +- .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.replies | 71 +- .../caps_5.2.0.aarch64.xml | 1 + .../caps_5.2.0.ppc64.replies | 59 +- .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.replies | 55 +- .../caps_5.2.0.riscv64.xml | 1 + .../caps_5.2.0.s390x.replies | 59 +- .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.replies | 71 +- .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.replies | 71 +- .../caps_6.0.0.aarch64.xml | 1 + .../caps_6.0.0.s390x.replies | 59 +- .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.replies | 71 +- .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.replies | 71 +- .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.replies | 71 +- .../caps_6.2.0.aarch64.xml | 1 + .../caps_6.2.0.ppc64.replies | 59 +- .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 + .../caps_6.2.0.x86_64.replies | 71 +- .../caps_6.2.0.x86_64.xml | 1 + ...h64.replies => caps_7.0.0.aarch64.replies} | 8112 ++++++++++++----- ...2.0.aarch64.xml => caps_7.0.0.aarch64.xml} | 34 +- .../caps_7.0.0.ppc64.replies | 59 +- .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 + .../caps_7.0.0.x86_64.replies | 275 +- .../caps_7.0.0.x86_64.xml | 2 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 6 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 6 +- .../aarch64-tpm.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 36 +- .../aarch64-virt-headless.aarch64-latest.args | 28 +- ...ult-video-type-aarch64.aarch64-latest.args | 6 +- .../disk-arm-virtio-sd.aarch64-latest.args | 2 +- ...e-expander-bus-aarch64.aarch64-latest.args | 2 +- ... virtio-iommu-aarch64.aarch64-latest.args} | 17 +- .../qemuxml2argvdata/virtio-iommu-aarch64.xml | 20 + ...mmu-invalid-address-type.x86_64-latest.err | 1 + .../virtio-iommu-invalid-address-type.xml | 20 + ...io-iommu-invalid-address.x86_64-latest.err | 1 + .../virtio-iommu-invalid-address.xml | 20 + .../virtio-iommu-no-acpi.x86_64-latest.err | 1 + .../qemuxml2argvdata/virtio-iommu-no-acpi.xml | 15 + ...rtio-iommu-wrong-machine.x86_64-latest.err | 1 + .../virtio-iommu-wrong-machine.xml | 18 + .../virtio-iommu-x86_64.x86_64-6.1.0.err | 1 + .../virtio-iommu-x86_64.x86_64-latest.args | 32 + .../qemuxml2argvdata/virtio-iommu-x86_64.xml | 18 + tests/qemuxml2argvtest.c | 7 + .../virtio-iommu-aarch64.aarch64-latest.xml | 34 + .../virtio-iommu-x86_64.x86_64-latest.xml | 36 + tests/qemuxml2xmltest.c | 2 + 79 files changed, 7862 insertions(+), 2728 deletions(-) create mode 100644 tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_7.0.0.aarch64.xml copy tests/qemucapabilitiesdata/{caps_6.2.0.aarch64.replies => caps_7.0.0.aarch64.replies} (87%) copy tests/qemucapabilitiesdata/{caps_6.2.0.aarch64.xml => caps_7.0.0.aarch64.xml} (96%) copy tests/qemuxml2argvdata/{aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args => virtio-iommu-aarch64.aarch64-latest.args} (55%) create mode 100644 tests/qemuxml2argvdata/virtio-iommu-aarch64.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address-type.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address-type.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-no-acpi.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-no-acpi.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-wrong-machine.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-wrong-machine.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-6.1.0.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-iommu-x86_64.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-iommu-aarch64.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-iommu-x86_64.x86_64-latest.xml -- 2.35.1

1 17

[PATCH] virnwfilterobj: Don't use virObjectLockGuard() with virNWFilterObj
by Michal Privoznik 18 Mar '22

18 Mar '22

While its name would suggest that virNWFilterObj is an actual virObject it is not. It's a plain structure (with virMutex as its first member). Therefore, when locking the struct virObjectLockGuard() can' be used and virLockGuardLock() must be used instead. Spotted-by: Martin Kletzander <mkletzan(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/virnwfilterobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index 309f8bddb4..e9bb2b1811 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -386,7 +386,7 @@ virNWFilterObjListCount(void *key G_GNUC_UNUSED, { virNWFilterObj *obj = payload; struct virNWFilterObjListData *data = opaque; - VIR_LOCK_GUARD lock = virObjectLockGuard(obj); + VIR_LOCK_GUARD lock = virLockGuardLock(&obj->lock); if (data->filter(data->conn, obj->def)) data->count++; @@ -423,7 +423,7 @@ virNWFilterObjListCopyNames(void *key G_GNUC_UNUSED, { virNWFilterObj *obj = payload; struct virNWFilterNameData *data = opaque; - VIR_LOCK_GUARD lock = virObjectLockGuard(obj); + VIR_LOCK_GUARD lock = virLockGuardLock(&obj->lock); if (data->filter && !data->filter(data->conn, obj->def)) -- 2.34.1

2 1

[PATCH] qemu: use qemuDomainSaveStatus() and remove qemuDomainObjSaveStatus()
by Kristina Hanicova 18 Mar '22

18 Mar '22

It does not make sense to have both of these, since one of them is only a wrapper for the other one. I decided to preserve the more general one, which requires only virDomainObj and rewrote it a bit, so that it pulls the qemu driver from privateData. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/THREADS.txt | 4 +- src/qemu/qemu_backup.c | 20 +-- src/qemu/qemu_block.c | 18 +- src/qemu/qemu_blockjob.c | 20 +-- src/qemu/qemu_checkpoint.c | 14 +- src/qemu/qemu_domain.c | 35 ++-- src/qemu/qemu_domain.h | 7 +- src/qemu/qemu_domainjob.c | 19 +- src/qemu/qemu_domainjob.h | 12 +- src/qemu/qemu_driver.c | 296 +++++++++++++++---------------- src/qemu/qemu_hotplug.c | 136 +++++++------- src/qemu/qemu_migration.c | 120 ++++++------- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_migration_params.c | 8 +- src/qemu/qemu_process.c | 65 ++++--- src/qemu/qemu_process.h | 3 +- src/qemu/qemu_snapshot.c | 14 +- 17 files changed, 384 insertions(+), 409 deletions(-) diff --git a/src/qemu/THREADS.txt b/src/qemu/THREADS.txt index 98aa3165e3..30cf3ce210 100644 --- a/src/qemu/THREADS.txt +++ b/src/qemu/THREADS.txt @@ -294,7 +294,7 @@ Design patterns goto error; } ...start qemu job... - qemuDomainObjExitMonitor(driver, obj); + qemuDomainObjExitMonitor(obj); while (!finished) { if (qemuDomainObjEnterMonitorAsync(driver, obj, @@ -303,7 +303,7 @@ Design patterns goto error; } ...monitor job progress... - qemuDomainObjExitMonitor(driver, obj); + qemuDomainObjExitMonitor(obj); virObjectUnlock(obj); sleep(aWhile); diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 2471242e60..f31b840617 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -132,7 +132,7 @@ qemuBackupDiskDataCleanupOne(virDomainObj *vm, if (dd->added) { qemuDomainObjEnterMonitor(priv->driver, vm); qemuBlockStorageSourceAttachRollback(priv->mon, dd->crdata->srcdata[0]); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); } if (dd->created) { @@ -474,7 +474,7 @@ qemuBackupDiskPrepareOneStorage(virDomainObj *vm, rc = qemuBlockStorageSourceAttachApply(priv->mon, dd->crdata->srcdata[0]); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; } @@ -623,7 +623,7 @@ qemuBackupJobTerminate(virDomainObj *vm, g_clear_pointer(&priv->backup, virDomainBackupDefFree); if (priv->job.asyncJob == QEMU_ASYNC_JOB_BACKUP) - qemuDomainObjEndAsyncJob(priv->driver, vm); + qemuDomainObjEndAsyncJob(vm); } @@ -681,7 +681,7 @@ qemuBackupJobCancelBlockjobs(virDomainObj *vm, rc = qemuMonitorBlockJobCancel(priv->mon, job->name, true); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); if (rc == 0) { backupdisk->state = VIR_DOMAIN_BACKUP_DISK_STATE_CANCELLING; @@ -893,7 +893,7 @@ qemuBackupBegin(virDomainObj *vm, if (rc == 0) rc = qemuMonitorTransaction(priv->mon, &actions); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; @@ -915,7 +915,7 @@ qemuBackupBegin(virDomainObj *vm, /* note that if the export fails we've already created the checkpoint * and we will not delete it */ rc = qemuBackupBeginPullExportDisks(vm, dd, ndd); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) { qemuBackupJobCancelBlockjobs(vm, priv->backup, false, QEMU_ASYNC_JOB_BACKUP); @@ -939,7 +939,7 @@ qemuBackupBegin(virDomainObj *vm, ignore_value(qemuMonitorDelObject(priv->mon, tlsAlias, false)); if (tlsSecretAlias) ignore_value(qemuMonitorDelObject(priv->mon, tlsSecretAlias, false)); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); } if (ret < 0 && !job_started && priv->backup) @@ -948,7 +948,7 @@ qemuBackupBegin(virDomainObj *vm, if (ret == 0) qemuDomainObjReleaseAsyncJob(vm); else - qemuDomainObjEndAsyncJob(priv->driver, vm); + qemuDomainObjEndAsyncJob(vm); return ret; } @@ -1007,7 +1007,7 @@ qemuBackupNotifyBlockjobEnd(virDomainObj *vm, ignore_value(qemuMonitorDelObject(priv->mon, backup->tlsAlias, false)); if (backup->tlsSecretAlias) ignore_value(qemuMonitorDelObject(priv->mon, backup->tlsSecretAlias, false)); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); /* update the final statistics with the current job's data */ backup->pull_tmp_used += cur; @@ -1165,7 +1165,7 @@ qemuBackupGetJobInfoStats(virQEMUDriver *driver, rc = qemuMonitorGetJobInfo(priv->mon, &blockjobs, &nblockjobs); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto cleanup; diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 4195883a1e..f70b6d3e63 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -326,7 +326,7 @@ qemuBlockNodeNamesDetect(virQEMUDriver *driver, data = qemuMonitorQueryNamedBlockNodes(qemuDomainGetMonitor(vm)); blockstats = qemuMonitorQueryBlockstats(qemuDomainGetMonitor(vm)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (!data || !blockstats) return -1; @@ -2133,7 +2133,7 @@ qemuBlockStorageSourceDetachOneBlockdev(virQEMUDriver *driver, if (ret == 0) ret = qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm), src->nodestorage); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -2712,7 +2712,7 @@ qemuBlockStorageSourceCreateGeneric(virDomainObj *vm, rc = qemuMonitorBlockdevCreate(priv->mon, job->name, &props); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto cleanup; @@ -2859,7 +2859,7 @@ qemuBlockStorageSourceCreate(virDomainObj *vm, rc = qemuBlockStorageSourceAttachApplyStorageDeps(priv->mon, data); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto cleanup; @@ -2874,7 +2874,7 @@ qemuBlockStorageSourceCreate(virDomainObj *vm, if (rc == 0) rc = qemuBlockStorageSourceAttachApplyFormatDeps(priv->mon, data); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto cleanup; @@ -2893,7 +2893,7 @@ qemuBlockStorageSourceCreate(virDomainObj *vm, rc = qemuBlockStorageSourceAttachApplyFormat(priv->mon, data); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto cleanup; @@ -2905,7 +2905,7 @@ qemuBlockStorageSourceCreate(virDomainObj *vm, qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) == 0) { qemuBlockStorageSourceAttachRollback(priv->mon, data); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); } return ret; @@ -3033,7 +3033,7 @@ qemuBlockGetNamedNodeData(virDomainObj *vm, blockNamedNodeData = qemuMonitorBlockGetNamedNodeData(priv->mon, supports_flat); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (!blockNamedNodeData) return NULL; @@ -3391,7 +3391,7 @@ qemuBlockReopenFormat(virDomainObj *vm, rc = qemuBlockReopenFormatMon(priv->mon, src); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 7032814d21..87f8ae7b52 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -504,7 +504,7 @@ qemuBlockJobRefreshJobs(virQEMUDriver *driver, rc = qemuMonitorGetJobInfo(priv->mon, &jobinfo, &njobinfo); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto cleanup; @@ -528,7 +528,7 @@ qemuBlockJobRefreshJobs(virQEMUDriver *driver, if (rc == -1 && jobinfo[i]->status == QEMU_MONITOR_JOB_STATUS_CONCLUDED) VIR_WARN("can't cancel job '%s' with invalid data", job->name); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) qemuBlockJobUnregister(job, vm); @@ -852,7 +852,7 @@ qemuBlockJobEventProcessConcludedRemoveChain(virQEMUDriver *driver, qemuBlockStorageSourceChainDetach(qemuDomainGetMonitor(vm), data); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); qemuDomainStorageSourceChainAccessRevoke(driver, vm, chain); } @@ -967,7 +967,7 @@ qemuBlockJobProcessEventCompletedPullBitmaps(virDomainObj *vm, qemuMonitorTransaction(priv->mon, &actions); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); return 0; } @@ -1140,7 +1140,7 @@ qemuBlockJobProcessEventCompletedCommitBitmaps(virDomainObj *vm, qemuMonitorTransaction(priv->mon, &actions); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); if (!active) { if (qemuBlockReopenReadOnly(vm, job->data.commit.base, asyncJob) < 0) @@ -1357,7 +1357,7 @@ qemuBlockJobProcessEventCompletedCopyBitmaps(virDomainObj *vm, qemuMonitorTransaction(priv->mon, &actions); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); return 0; } @@ -1455,7 +1455,7 @@ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDriver *driver, disk->mirror->nodeformat, "libvirt-tmp-activewrite"); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); /* Ideally, we would make the backing chain read only again (yes, SELinux * can do that using different labels). But that is not implemented yet and @@ -1501,7 +1501,7 @@ qemuBlockJobProcessEventConcludedCreate(virQEMUDriver *driver, qemuBlockStorageSourceAttachRollback(qemuDomainGetMonitor(vm), backend); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); qemuDomainStorageSourceAccessRevoke(driver, vm, job->data.create.src); } @@ -1536,7 +1536,7 @@ qemuBlockJobProcessEventConcludedBackup(virQEMUDriver *driver, job->disk->src->nodeformat, job->data.backup.bitmap); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (job->data.backup.store) qemuDomainStorageSourceAccessRevoke(driver, vm, job->data.backup.store); @@ -1649,7 +1649,7 @@ qemuBlockJobEventProcessConcluded(qemuBlockJobData *job, /* dismiss job in qemu */ ignore_value(qemuMonitorJobDismiss(qemuDomainGetMonitor(vm), job->name)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if ((job->newstate == QEMU_BLOCKJOB_STATE_COMPLETED || job->newstate == QEMU_BLOCKJOB_STATE_FAILED) && diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 69f287399b..2a495dfe08 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -237,7 +237,7 @@ qemuCheckpointDiscardBitmaps(virDomainObj *vm, qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorTransaction(priv->mon, &actions); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); relabel: for (next = relabelimages; next; next = next->next) { @@ -524,7 +524,7 @@ qemuCheckpointCreate(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorTransaction(qemuDomainGetMonitor(vm), &actions); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) { qemuCheckpointRollbackMetadata(vm, chk); return NULL; @@ -629,7 +629,7 @@ qemuCheckpointCreateXML(virDomainPtr domain, checkpoint = virGetDomainCheckpoint(domain, chk->def->name); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); return checkpoint; } @@ -736,7 +736,7 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, if (rc == 0) rc = qemuMonitorTransaction(priv->mon, &mergeactions); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; @@ -748,7 +748,7 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, rc = qemuMonitorTransaction(priv->mon, &cleanupactions); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; @@ -768,7 +768,7 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); return ret; } @@ -921,6 +921,6 @@ qemuCheckpointDelete(virDomainObj *vm, } endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); return ret; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b4184285bf..7180ae616b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5822,9 +5822,10 @@ virDomainDefParserConfig virQEMUDriverDomainDefParserConfig = { void -qemuDomainObjSaveStatus(virQEMUDriver *driver, - virDomainObj *obj) +qemuDomainSaveStatus(virDomainObj *obj) { + qemuDomainObjPrivate *priv = obj->privateData; + virQEMUDriver *driver = priv->driver; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); if (virDomainObjIsActive(obj)) { @@ -5834,13 +5835,6 @@ qemuDomainObjSaveStatus(virQEMUDriver *driver, } -void -qemuDomainSaveStatus(virDomainObj *obj) -{ - qemuDomainObjSaveStatus(QEMU_DOMAIN_PRIVATE(obj)->driver, obj); -} - - void qemuDomainSaveConfig(virDomainObj *obj) { @@ -5887,7 +5881,7 @@ qemuDomainObjEnterMonitorInternal(virQEMUDriver *driver, if (!virDomainObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("domain is no longer running")); - qemuDomainObjEndJob(driver, obj); + qemuDomainObjEndJob(obj); return -1; } } else if (priv->job.asyncOwner == virThreadSelfID()) { @@ -5916,8 +5910,7 @@ qemuDomainObjEnterMonitorInternal(virQEMUDriver *driver, * */ void -qemuDomainObjExitMonitor(virQEMUDriver *driver, - virDomainObj *obj) +qemuDomainObjExitMonitor(virDomainObj *obj) { qemuDomainObjPrivate *priv = obj->privateData; bool hasRefs; @@ -5938,7 +5931,7 @@ qemuDomainObjExitMonitor(virQEMUDriver *driver, priv->mon = NULL; if (priv->job.active == QEMU_JOB_ASYNC_NESTED) - qemuDomainObjEndJob(driver, obj); + qemuDomainObjEndJob(obj); } void qemuDomainObjEnterMonitor(virQEMUDriver *driver, @@ -7004,7 +6997,7 @@ qemuDomainSnapshotDiscard(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); /* we continue on even in the face of error */ qemuMonitorDeleteSnapshot(priv->mon, snap->def->name); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } } @@ -7169,7 +7162,7 @@ qemuDomainRemoveInactiveJob(virQEMUDriver *driver, qemuDomainRemoveInactive(driver, vm); if (haveJob) - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); } @@ -7190,7 +7183,7 @@ qemuDomainRemoveInactiveJobLocked(virQEMUDriver *driver, qemuDomainRemoveInactiveLocked(driver, vm); if (haveJob) - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); } @@ -8213,7 +8206,7 @@ qemuDomainUpdateDeviceList(virQEMUDriver *driver, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; rc = qemuMonitorGetDeviceAliases(priv->mon, &aliases); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -8241,7 +8234,7 @@ qemuDomainUpdateMemoryDeviceInfo(virQEMUDriver *driver, rc = qemuMonitorGetMemoryDeviceInfo(priv->mon, &meminfo); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -9515,7 +9508,7 @@ qemuDomainRefreshVcpuInfo(virQEMUDriver *driver, rc = qemuMonitorGetCPUInfo(qemuDomainGetMonitor(vm), &info, maxvcpus, hotplug, fast); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto cleanup; @@ -9669,7 +9662,7 @@ qemuDomainRefreshVcpuHalted(virQEMUDriver *driver, QEMU_CAPS_QUERY_CPUS_FAST); haltedmap = qemuMonitorGetCpuHalted(qemuDomainGetMonitor(vm), maxvcpus, fast); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (!haltedmap) return -1; @@ -10100,7 +10093,7 @@ qemuDomainCheckMonitor(virQEMUDriver *driver, ret = qemuMonitorCheck(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index be56b5dbb3..edafb585b3 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -61,10 +61,6 @@ typedef void (*qemuDomainCleanupCallback)(virQEMUDriver *driver, #define QEMU_DOMAIN_MASTER_KEY_LEN 32 /* 32 bytes for 256 bit random key */ -void -qemuDomainObjSaveStatus(virQEMUDriver *driver, - virDomainObj *obj); - void qemuDomainSaveStatus(virDomainObj *obj); void qemuDomainSaveConfig(virDomainObj *obj); @@ -500,8 +496,7 @@ qemuMonitor *qemuDomainGetMonitor(virDomainObj *vm) void qemuDomainObjEnterMonitor(virQEMUDriver *driver, virDomainObj *obj) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -void qemuDomainObjExitMonitor(virQEMUDriver *driver, - virDomainObj *obj) +void qemuDomainObjExitMonitor(virDomainObj *obj) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int qemuDomainObjEnterMonitorAsync(virQEMUDriver *driver, virDomainObj *obj, diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 28c09ae179..cf1e093e22 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -703,8 +703,7 @@ qemuDomainJobDataToParams(virDomainJobData *jobData, void -qemuDomainObjSetJobPhase(virQEMUDriver *driver, - virDomainObj *obj, +qemuDomainObjSetJobPhase(virDomainObj *obj, int phase) { qemuDomainObjPrivate *priv = obj->privateData; @@ -727,7 +726,7 @@ qemuDomainObjSetJobPhase(virQEMUDriver *driver, priv->job.phase = phase; priv->job.asyncOwner = me; - qemuDomainObjSaveStatus(driver, obj); + qemuDomainSaveStatus(obj); } void @@ -743,14 +742,14 @@ qemuDomainObjSetAsyncJobMask(virDomainObj *obj, } void -qemuDomainObjDiscardAsyncJob(virQEMUDriver *driver, virDomainObj *obj) +qemuDomainObjDiscardAsyncJob(virDomainObj *obj) { qemuDomainObjPrivate *priv = obj->privateData; if (priv->job.active == QEMU_JOB_ASYNC_NESTED) qemuDomainObjResetJob(&priv->job); qemuDomainObjResetAsyncJob(&priv->job); - qemuDomainObjSaveStatus(driver, obj); + qemuDomainSaveStatus(obj); } void @@ -926,7 +925,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, } if (qemuDomainTrackJob(job)) - qemuDomainObjSaveStatus(driver, obj); + qemuDomainSaveStatus(obj); return 0; @@ -1134,7 +1133,7 @@ qemuDomainObjBeginJobNowait(virQEMUDriver *driver, * earlier qemuDomainBeginJob() call */ void -qemuDomainObjEndJob(virQEMUDriver *driver, virDomainObj *obj) +qemuDomainObjEndJob(virDomainObj *obj) { qemuDomainObjPrivate *priv = obj->privateData; qemuDomainJob job = priv->job.active; @@ -1148,7 +1147,7 @@ qemuDomainObjEndJob(virQEMUDriver *driver, virDomainObj *obj) qemuDomainObjResetJob(&priv->job); if (qemuDomainTrackJob(job)) - qemuDomainObjSaveStatus(driver, obj); + qemuDomainSaveStatus(obj); /* We indeed need to wake up ALL threads waiting because * grabbing a job requires checking more variables. */ virCondBroadcast(&priv->job.cond); @@ -1174,7 +1173,7 @@ qemuDomainObjEndAgentJob(virDomainObj *obj) } void -qemuDomainObjEndAsyncJob(virQEMUDriver *driver, virDomainObj *obj) +qemuDomainObjEndAsyncJob(virDomainObj *obj) { qemuDomainObjPrivate *priv = obj->privateData; @@ -1185,7 +1184,7 @@ qemuDomainObjEndAsyncJob(virQEMUDriver *driver, virDomainObj *obj) obj, obj->def->name); qemuDomainObjResetAsyncJob(&priv->job); - qemuDomainObjSaveStatus(driver, obj); + qemuDomainSaveStatus(obj); virCondBroadcast(&priv->job.asyncCond); } diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index a078e62a1f..bec6e3a61c 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -208,21 +208,17 @@ int qemuDomainObjBeginJobNowait(virQEMUDriver *driver, qemuDomainJob job) G_GNUC_WARN_UNUSED_RESULT; -void qemuDomainObjEndJob(virQEMUDriver *driver, - virDomainObj *obj); +void qemuDomainObjEndJob(virDomainObj *obj); void qemuDomainObjEndAgentJob(virDomainObj *obj); -void qemuDomainObjEndAsyncJob(virQEMUDriver *driver, - virDomainObj *obj); +void qemuDomainObjEndAsyncJob(virDomainObj *obj); void qemuDomainObjAbortAsyncJob(virDomainObj *obj); -void qemuDomainObjSetJobPhase(virQEMUDriver *driver, - virDomainObj *obj, +void qemuDomainObjSetJobPhase(virDomainObj *obj, int phase); void qemuDomainObjSetAsyncJobMask(virDomainObj *obj, unsigned long long allowedJobs); int qemuDomainObjRestoreJob(virDomainObj *obj, qemuDomainJobObj *job); -void qemuDomainObjDiscardAsyncJob(virQEMUDriver *driver, - virDomainObj *obj); +void qemuDomainObjDiscardAsyncJob(virDomainObj *obj); void qemuDomainObjReleaseAsyncJob(virDomainObj *obj); int qemuDomainJobDataUpdateTime(virDomainJobData *jobData) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index de7d2b93b9..b7e83c769a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -208,7 +208,7 @@ qemuAutostartDomain(virDomainObj *vm, vm->def->name, virGetLastErrorMessage()); } - qemuProcessEndJob(driver, vm); + qemuProcessEndJob(vm); } ret = 0; @@ -1631,7 +1631,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, start_flags) < 0) { virDomainAuditStart(vm, "booted", false); qemuDomainRemoveInactive(driver, vm); - qemuProcessEndJob(driver, vm); + qemuProcessEndJob(vm); goto cleanup; } @@ -1652,7 +1652,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); - qemuProcessEndJob(driver, vm); + qemuProcessEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1706,7 +1706,7 @@ static int qemuDomainSuspend(virDomainPtr dom) ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1762,7 +1762,7 @@ static int qemuDomainResume(virDomainPtr dom) ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1827,10 +1827,10 @@ qemuDomainShutdownFlagsMonitor(virQEMUDriver *driver, qemuDomainSetFakeReboot(vm, isReboot); qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemPowerdown(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); return ret; } @@ -1952,10 +1952,10 @@ qemuDomainRebootMonitor(virQEMUDriver *driver, qemuDomainSetFakeReboot(vm, isReboot); qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemPowerdown(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); return ret; } @@ -2041,7 +2041,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) priv = vm->privateData; qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemReset(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); priv->fakeReboot = false; @@ -2050,7 +2050,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_CRASHED); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2121,7 +2121,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, endjob: if (ret == 0) qemuDomainRemoveInactive(driver, vm); - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2276,7 +2276,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, priv = vm->privateData; qemuDomainObjEnterMonitor(driver, vm); r = qemuMonitorSetBalloon(priv->mon, newmem); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (r < 0) goto endjob; @@ -2299,7 +2299,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2357,7 +2357,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int period, qemuDomainObjEnterMonitor(driver, vm); r = qemuMonitorSetMemoryStatsPeriod(priv->mon, def->memballoon, period); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (r < 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("unable to set balloon driver collection period")); @@ -2382,7 +2382,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int period, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2414,10 +2414,10 @@ static int qemuDomainInjectNMI(virDomainPtr domain, unsigned int flags) qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorInjectNMI(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2473,10 +2473,10 @@ static int qemuDomainSendKey(virDomainPtr domain, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSendKey(priv->mon, holdtime, keycodes, nkeycodes); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2739,7 +2739,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, virErrorRestore(&save_err); } } - qemuDomainObjEndAsyncJob(driver, vm); + qemuDomainObjEndAsyncJob(vm); if (ret == 0) qemuDomainRemoveInactiveJob(driver, vm); @@ -3013,14 +3013,14 @@ qemuDumpToFd(virQEMUDriver *driver, _("unsupported dumpformat '%s' " "for this QEMU binary"), dumpformat); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return -1; } } ret = qemuMonitorDumpToFd(priv->mon, fd, dumpformat, detach); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0) return -1; @@ -3199,7 +3199,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, if ((ret == 0) && (flags & VIR_DUMP_RESET)) { qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemReset(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } if (resume && virDomainObjIsActive(vm)) { @@ -3216,7 +3216,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, } } - qemuDomainObjEndAsyncJob(driver, vm); + qemuDomainObjEndAsyncJob(vm); if (ret == 0 && flags & VIR_DUMP_CRASH) qemuDomainRemoveInactiveJob(driver, vm); @@ -3313,10 +3313,10 @@ qemuDomainScreenshot(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); if (qemuMonitorScreendump(priv->mon, videoAlias, screen, tmp) < 0) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto endjob; } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (VIR_CLOSE(tmp_fd) < 0) { virReportSystemError(errno, _("unable to close %s"), tmp); @@ -3336,7 +3336,7 @@ qemuDomainScreenshot(virDomainPtr dom, if (unlink_tmp) unlink(tmp); - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -3412,7 +3412,7 @@ processWatchdogEvent(virQEMUDriver *driver, } endjob: - qemuDomainObjEndAsyncJob(driver, vm); + qemuDomainObjEndAsyncJob(vm); } static int @@ -3524,7 +3524,7 @@ processGuestPanicEvent(virQEMUDriver *driver, } endjob: - qemuDomainObjEndAsyncJob(driver, vm); + qemuDomainObjEndAsyncJob(vm); if (removeInactive) qemuDomainRemoveInactiveJob(driver, vm); } @@ -3561,7 +3561,7 @@ processDeviceDeletedEvent(virQEMUDriver *driver, qemuDomainSaveStatus(vm); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); } @@ -3816,7 +3816,7 @@ processNicRxFilterChangedEvent(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorQueryRxFilter(priv->mon, devAlias, &guestFilter); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0) goto endjob; @@ -3858,7 +3858,7 @@ processNicRxFilterChangedEvent(virQEMUDriver *driver, } endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virNetDevRxFilterFree(hostFilter); @@ -3941,7 +3941,7 @@ processSerialChangedEvent(virQEMUDriver *driver, } endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); } @@ -3980,7 +3980,7 @@ processBlockJobEvent(virQEMUDriver *driver, qemuBlockJobUpdate(vm, job, QEMU_ASYNC_JOB_NONE); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); } @@ -4000,7 +4000,7 @@ processJobStatusChangeEvent(virQEMUDriver *driver, qemuBlockJobUpdate(vm, job, QEMU_ASYNC_JOB_NONE); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); } @@ -4046,7 +4046,7 @@ processMonitorEOFEvent(virQEMUDriver *driver, endjob: qemuDomainRemoveInactive(driver, vm); - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); } @@ -4160,7 +4160,7 @@ processMemoryDeviceSizeChange(virQEMUDriver *driver, mem->currentsize); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); virObjectEventStateQueue(driver->domainEventState, event); } @@ -4369,7 +4369,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, if (useAgent) qemuDomainObjEndAgentJob(vm); else - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -4525,7 +4525,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -4673,7 +4673,7 @@ qemuDomainPinEmulator(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virObjectEventStateQueue(driver->domainEventState, event); @@ -4856,7 +4856,7 @@ qemuDomainGetIOThreadsMon(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorGetIOThreads(priv->mon, iothreads, niothreads); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -4918,7 +4918,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriver *driver, ret = niothreads; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: if (info_ret) { @@ -5083,7 +5083,7 @@ qemuDomainPinIOThread(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virObjectEventStateQueue(driver->domainEventState, event); @@ -5130,7 +5130,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriver *driver, if (qemuMonitorGetIOThreads(priv->mon, &new_iothreads, &new_niothreads) < 0) goto exit_monitor; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (new_niothreads != exp_niothreads) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -5177,7 +5177,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriver *driver, if (qemuMonitorDelObject(priv->mon, alias, true) < 0) VIR_WARN("deletion of iothread object %d of domain %s failed when cleanup", iothread_id, vm->def->name); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } } @@ -5191,7 +5191,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriver *driver, return ret; exit_monitor: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto cleanup; } @@ -5214,7 +5214,7 @@ qemuDomainHotplugModIOThread(virQEMUDriver *driver, rc = qemuMonitorSetIOThread(priv->mon, &iothread); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -5250,7 +5250,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriver *driver, if (qemuMonitorGetIOThreads(priv->mon, &new_iothreads, &new_niothreads) < 0) goto exit_monitor; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (new_niothreads != exp_niothreads) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -5279,7 +5279,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriver *driver, return ret; exit_monitor: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto cleanup; } @@ -5488,7 +5488,7 @@ qemuDomainChgIOThread(virQEMUDriver *driver, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); return ret; } @@ -5832,7 +5832,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, ret = qemuSaveImageStartVM(conn, driver, vm, &fd, data, path, false, reset_nvram, QEMU_ASYNC_JOB_START); - qemuProcessEndJob(driver, vm); + qemuProcessEndJob(vm); cleanup: VIR_FORCE_CLOSE(fd); @@ -6420,7 +6420,7 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) ret = 0; endjob: - qemuProcessEndJob(driver, vm); + qemuProcessEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -6645,7 +6645,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -7823,7 +7823,7 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -7926,7 +7926,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, } endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: if (dev != dev_copy) @@ -8108,7 +8108,7 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -8143,7 +8143,7 @@ qemuDomainDetachDeviceAlias(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -8242,7 +8242,7 @@ static int qemuDomainSetAutostart(virDomainPtr dom, vm->autostart = autostart; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); } ret = 0; @@ -8382,7 +8382,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, } endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -8554,7 +8554,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -8835,7 +8835,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -9028,7 +9028,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -9090,7 +9090,7 @@ qemuDomainGetPerfEvents(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -9479,7 +9479,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -9793,15 +9793,15 @@ qemuDomainBlockResize(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); if (qemuMonitorBlockResize(priv->mon, device, nodename, size) < 0) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto endjob; } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -9888,7 +9888,7 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver, rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, blockstats); } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (nstats < 0 || rc < 0) return -1; @@ -9985,7 +9985,7 @@ qemuDomainBlockStats(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -10073,7 +10073,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, *nparams = nstats; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: VIR_FREE(blockstats); @@ -10376,7 +10376,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -10509,7 +10509,7 @@ qemuDomainMemoryStatsInternal(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorGetMemoryStats(qemuDomainGetMonitor(vm), vm->def->memballoon, stats, nr_stats); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0 || ret >= nr_stats) return ret; @@ -10552,7 +10552,7 @@ qemuDomainMemoryStats(virDomainPtr dom, ret = qemuDomainMemoryStatsInternal(driver, vm, stats, nr_stats); - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -10677,16 +10677,16 @@ qemuDomainMemoryPeek(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); if (flags == VIR_MEMORY_VIRTUAL) { if (qemuMonitorSaveVirtualMemory(priv->mon, offset, size, tmp) < 0) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto endjob; } } else { if (qemuMonitorSavePhysicalMemory(priv->mon, offset, size, tmp) < 0) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto endjob; } } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); /* Read the memory file into buffer. */ if (saferead(fd, buffer, size) == (ssize_t)-1) { @@ -10699,7 +10699,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: VIR_FORCE_CLOSE(fd); @@ -11012,7 +11012,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: VIR_FREE(entry); virDomainObjEndAPI(&vm); @@ -12461,7 +12461,7 @@ qemuDomainGetJobInfoDumpStats(virQEMUDriver *driver, rc = qemuMonitorQueryDump(priv->mon, &stats); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -12563,7 +12563,7 @@ qemuDomainGetJobStatsInternal(virQEMUDriver *driver, ret = 0; cleanup: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); return ret; } @@ -12660,7 +12660,7 @@ qemuDomainAbortJobMigration(virDomainObj *vm) qemuDomainObjAbortAsyncJob(vm); qemuDomainObjEnterMonitor(priv->driver, vm); ret = qemuMonitorMigrateCancel(priv->mon); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -12748,7 +12748,7 @@ static int qemuDomainAbortJob(virDomainPtr dom) } endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -12801,7 +12801,7 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom, } else { qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorSetMigrationDowntime(priv->mon, downtime); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; } @@ -12809,7 +12809,7 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -12862,7 +12862,7 @@ qemuDomainMigrateGetMaxDowntime(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -12917,7 +12917,7 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom, } else { qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorGetMigrationCacheSize(priv->mon, cacheSize); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; } @@ -12925,7 +12925,7 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -12983,7 +12983,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, } else { qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorSetMigrationCacheSize(priv->mon, cacheSize); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; } @@ -12991,7 +12991,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -13072,7 +13072,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorSetMigrationSpeed(priv->mon, bandwidth); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; } @@ -13083,7 +13083,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -13138,7 +13138,7 @@ qemuDomainMigrationGetPostcopyBandwidth(virQEMUDriver *driver, ret = 0; cleanup: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); return ret; } @@ -13221,10 +13221,10 @@ qemuDomainMigrateStartPostCopy(virDomainPtr dom, VIR_DEBUG("Starting post-copy"); qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorMigrateStartPostCopy(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -13955,10 +13955,10 @@ qemuDomainQemuMonitorCommandWithFiles(virDomainPtr domain, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorArbitraryCommand(priv->mon, cmd, fd, result, hmp); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -14240,7 +14240,7 @@ qemuDomainBlockPivot(virQEMUDriver *driver, } else { ret = qemuMonitorDrivePivot(priv->mon, job->name); } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); /* The pivot failed. The block job in QEMU remains in the synchronised state */ if (ret < 0) @@ -14371,7 +14371,7 @@ qemuDomainBlockPullCommon(virDomainObj *vm, (!baseSource || basePath)) ret = qemuMonitorBlockStream(priv->mon, device, jobname, persistjob, basePath, nodebase, backingPath, speed); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0) goto endjob; @@ -14379,7 +14379,7 @@ qemuDomainBlockPullCommon(virDomainObj *vm, qemuBlockJobStarted(job, vm); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: qemuBlockJobStartupFinalize(vm, job); @@ -14445,7 +14445,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, } else { qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorBlockJobCancel(priv->mon, job->name, false); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0) goto endjob; @@ -14487,7 +14487,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, endjob: if (job && !async) qemuBlockJobSyncEnd(vm, job, QEMU_ASYNC_JOB_NONE); - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -14589,7 +14589,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); blockjobstats = qemuMonitorGetAllBlockJobInfo(qemuDomainGetMonitor(vm), true); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (!blockjobstats) goto endjob; @@ -14603,7 +14603,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, ret = 1; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -14662,10 +14662,10 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, ret = qemuMonitorBlockJobSetSpeed(qemuDomainGetMonitor(vm), job->name, speed); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -15061,7 +15061,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, if (data) { qemuDomainObjEnterMonitor(driver, vm); rc = qemuBlockStorageSourceChainAttach(priv->mon, data); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; @@ -15096,7 +15096,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, } virDomainAuditDisk(vm, NULL, mirror, "mirror", ret >= 0); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0) { qemuDomainStorageSourceChainAccessRevoke(driver, vm, mirror); goto endjob; @@ -15118,7 +15118,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, qemuBlockStorageSourceChainDetach(priv->mon, data); if (crdata) qemuBlockStorageSourceAttachRollback(priv->mon, crdata->srcdata[0]); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } if (need_revoke) qemuDomainStorageSourceChainAccessRevoke(driver, vm, mirror); @@ -15126,7 +15126,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, if (need_unlink && virStorageSourceUnlink(mirror) < 0) VIR_WARN("%s", _("unable to remove just-created copy target")); virStorageSourceDeinit(mirror); - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); qemuBlockJobStartupFinalize(vm, job); return ret; @@ -15534,7 +15534,7 @@ qemuDomainBlockCommit(virDomainPtr dom, topPath, nodetop, basePath, nodebase, backingPath, speed); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0) goto endjob; @@ -15559,7 +15559,7 @@ qemuDomainBlockCommit(virDomainPtr dom, virErrorRestore(&orig_err); } qemuBlockJobStartupFinalize(vm, job); - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -15627,10 +15627,10 @@ qemuDomainOpenGraphics(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorOpenGraphics(priv->mon, protocol, fd, "graphicsfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH) != 0); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -15703,8 +15703,8 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorOpenGraphics(priv->mon, protocol, pair[1], "graphicsfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH)); - qemuDomainObjExitMonitor(driver, vm); - qemuDomainObjEndJob(driver, vm); + qemuDomainObjExitMonitor(vm); + qemuDomainObjEndJob(vm); if (ret < 0) goto cleanup; @@ -16139,7 +16139,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorSetBlockIoThrottle(priv->mon, drivealias, qdevid, &info); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; @@ -16189,7 +16189,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: VIR_FREE(info.group_name); @@ -16271,7 +16271,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, } qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorGetBlockIoThrottle(priv->mon, drivealias, qdevid, &reply); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; @@ -16344,7 +16344,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: VIR_FREE(reply.group_name); @@ -16391,7 +16391,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); table = qemuMonitorGetBlockInfo(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (!table) goto endjob; @@ -16418,7 +16418,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, ret = n; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -16466,7 +16466,7 @@ qemuDomainSetMetadata(virDomainPtr dom, virObjectEventStateQueue(driver->domainEventState, ev); } - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -16555,7 +16555,7 @@ qemuDomainProbeQMPCurrentMachine(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); rv = qemuMonitorGetCurrentMachineInfo(priv->mon, &info); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rv < 0) return -1; @@ -16585,7 +16585,7 @@ qemuDomainQueryWakeupSuspendSupport(virQEMUDriver *driver, ret = qemuDomainProbeQMPCurrentMachine(driver, vm, wakeupSupported); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); return ret; } @@ -16720,10 +16720,10 @@ qemuDomainPMWakeup(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemWakeup(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -17106,7 +17106,7 @@ qemuDomainGetHostnameLease(virQEMUDriver *driver, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); return ret; } @@ -17280,7 +17280,7 @@ qemuDomainSetTime(virDomainPtr dom, if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_RTC_RESET_REINJECTION)) { qemuDomainObjEnterMonitor(driver, vm); rv = qemuMonitorRTCResetReinjection(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rv < 0) goto endjob; @@ -17289,7 +17289,7 @@ qemuDomainSetTime(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -18412,7 +18412,7 @@ qemuDomainGetStatsBlock(virQEMUDriver *driver, if (fetchnodedata) nodedata = qemuMonitorQueryNamedBlockNodes(priv->mon); - qemuDomainObjExitMonitor(driver, dom); + qemuDomainObjExitMonitor(dom); /* failure to retrieve stats is fine at this point */ if (rc < 0 || (fetchnodedata && !nodedata)) @@ -18546,7 +18546,7 @@ qemuDomainGetStatsDirtyRateMon(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorQueryDirtyRate(priv->mon, info); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -18814,7 +18814,7 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, rc = qemuDomainGetStats(conn, vm, requestedStats, &tmp, domflags); if (HAVE_JOB(domflags)) - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); virObjectUnlock(vm); @@ -18995,7 +18995,7 @@ qemuDomainGetFSInfo(virDomainPtr dom, ret = virDomainFSInfoFormat(agentinfo, nfs, vm->def, info); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: if (agentinfo) { @@ -19311,7 +19311,7 @@ static int qemuDomainRename(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -19571,7 +19571,7 @@ qemuDomainSetVcpu(virDomainPtr dom, ret = qemuDomainSetVcpuInternal(driver, vm, def, persistentDef, map, !!state); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -19640,7 +19640,7 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorSetBlockThreshold(priv->mon, nodename, threshold); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; @@ -19651,7 +19651,7 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -19756,7 +19756,7 @@ qemuDomainModifyLifecycleActionLive(virDomainObj *vm, QEMU_MONITOR_ACTION_WATCHDOG_KEEP, QEMU_MONITOR_ACTION_PANIC_KEEP); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -19834,7 +19834,7 @@ qemuDomainSetLifecycleAction(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -19954,13 +19954,13 @@ qemuDomainGetSEVInfo(virQEMUDriver *driver, if (!tmp) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto endjob; } rv = qemuMonitorGetSEVInfo(QEMU_DOMAIN_PRIVATE(vm)->mon, &apiMajor, &apiMinor, &buildID, &policy); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rv < 0) goto endjob; @@ -19989,7 +19989,7 @@ qemuDomainGetSEVInfo(virQEMUDriver *driver, ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); return ret; } @@ -20109,14 +20109,14 @@ qemuDomainSetLaunchSecurityState(virDomainPtr domain, qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorSetLaunchSecurityState(QEMU_DOMAIN_PRIVATE(vm)->mon, secrethdr, secret, setaddr, hasSetaddr); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -20509,7 +20509,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom, qemuAgentDiskInfoFormatParams(agentdiskinfo, ndisks, vm->def, params, nparams, &maxparams); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); } if (nifaces > 0) { @@ -20772,10 +20772,10 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorStartDirtyRateCalc(priv->mon, seconds, mode); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c70bc361fd..8ea95406c7 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -110,7 +110,7 @@ qemuDomainDeleteDevice(virDomainObj *vm, rc = qemuMonitorDelDevice(priv->mon, alias); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) { /* Deleting device failed. Let's check if DEVICE_DELETED @@ -313,7 +313,7 @@ qemuDomainChangeMediaLegacy(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorEjectMedia(priv->mon, driveAlias, force); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); /* If the tray is present wait for it to open. */ if (!force && diskPriv->tray) { @@ -324,7 +324,7 @@ qemuDomainChangeMediaLegacy(virQEMUDriver *driver, /* re-issue ejection command to pop out the media */ qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorEjectMedia(priv->mon, driveAlias, false); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -346,7 +346,7 @@ qemuDomainChangeMediaLegacy(virQEMUDriver *driver, driveAlias, sourcestr, format); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } if (rc < 0) @@ -394,7 +394,7 @@ qemuHotplugAttachDBusVMState(virQEMUDriver *driver, if (ret == 0) priv->dbusVMState = true; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -430,7 +430,7 @@ qemuHotplugRemoveDBusVMState(virQEMUDriver *driver, if (ret == 0) priv->dbusVMState = false; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -477,7 +477,7 @@ qemuHotplugAttachManagedPR(virQEMUDriver *driver, rc = qemuMonitorAddObject(priv->mon, &props, NULL); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto cleanup; @@ -517,7 +517,7 @@ qemuHotplugRemoveManagedPR(virQEMUDriver *driver, goto cleanup; ignore_value(qemuMonitorDelObject(priv->mon, qemuDomainGetManagedPRAlias(), false)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); qemuProcessKillManagedPRDaemon(vm); @@ -574,7 +574,7 @@ qemuDomainChangeMediaBlockdev(virQEMUDriver *driver, if (diskPriv->tray && disk->tray_status != VIR_DOMAIN_DISK_TRAY_OPEN) { qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorBlockdevTrayOpen(priv->mon, diskPriv->qomName, force); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -613,7 +613,7 @@ qemuDomainChangeMediaBlockdev(virQEMUDriver *driver, if (rc < 0 && newbackend) qemuBlockStorageSourceChainDetach(priv->mon, newbackend); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -782,7 +782,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, rc = qemuBlockStorageSourceChainAttach(priv->mon, data); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto rollback; @@ -832,7 +832,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, VIR_WARN("failed to set blkdeviotune for '%s' of '%s'", disk->dst, vm->def->name); } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto rollback; @@ -848,7 +848,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, qemuBlockStorageSourceChainDetach(priv->mon, data); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return -1; } @@ -912,7 +912,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriver *driver, ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &controller->info)); exit_monitor: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret == 0) virDomainControllerInsertPreAlloced(vm->def, controller); @@ -1461,7 +1461,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, if (qemuMonitorAddFileHandleToSet(priv->mon, vdpafd, -1, net->data.vdpa.devicepath, &fdinfo) < 0) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto cleanup; } vdpafdName = g_strdup_printf("/dev/fdset/%d", fdinfo.fdset); @@ -1471,13 +1471,13 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, tapfdName, tapfdSize, vhostfdName, vhostfdSize, slirpfdName, vdpafdName))) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto cleanup; } if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) { if (qemuHotplugChardevAttach(priv->mon, charDevAlias, net->data.vhostuser) < 0) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditNet(vm, NULL, net, "attach", false); goto cleanup; } @@ -1488,13 +1488,13 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, tapfd, tapfdName, tapfdSize, vhostfd, vhostfdName, vhostfdSize, slirpfd, slirpfdName) < 0) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditNet(vm, NULL, net, "attach", false); goto try_remove; } netdevPlugged = true; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); for (i = 0; i < tapfdSize; i++) VIR_FORCE_CLOSE(tapfd[i]); @@ -1507,18 +1507,18 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); if (qemuDomainAttachExtensionDevice(priv->mon, &net->info) < 0) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditNet(vm, NULL, net, "attach", false); goto try_remove; } if (qemuMonitorAddDeviceProps(priv->mon, &nicprops) < 0) { ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &net->info)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditNet(vm, NULL, net, "attach", false); goto try_remove; } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); /* set link state */ if (net->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN) { @@ -1529,12 +1529,12 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); if (qemuMonitorSetLink(priv->mon, net->info.alias, VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN) < 0) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditNet(vm, NULL, net, "attach", false); goto try_remove; } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } /* link set to down */ } @@ -1628,7 +1628,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) VIR_WARN("Failed to remove network backend for netdev %s", netdev_name); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virErrorRestore(&originalError); goto cleanup; } @@ -1739,7 +1739,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver, ignore_value(qemuDomainDetachExtensionDevice(priv->mon, hostdev->info)); exit_monitor: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); done: virDomainAuditHostdev(vm, hostdev, "attach", ret == 0); @@ -1795,7 +1795,7 @@ qemuDomainDelTLSObjects(virQEMUDriver *driver, if (secAlias) ignore_value(qemuMonitorDelObject(priv->mon, secAlias, false)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); cleanup: virErrorRestore(&orig_err); @@ -1827,12 +1827,12 @@ qemuDomainAddTLSObjects(virQEMUDriver *driver, qemuMonitorAddObject(priv->mon, tlsProps, NULL) < 0) goto error; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return 0; error: virErrorPreserveLast(&orig_err); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virErrorRestore(&orig_err); qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, NULL); @@ -1948,7 +1948,7 @@ qemuDomainDelChardevTLSObjects(virQEMUDriver *driver, if (secAlias) ignore_value(qemuMonitorDelObject(priv->mon, secAlias, false)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return 0; } @@ -1995,7 +1995,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriver *driver, if (qemuMonitorAddDeviceProps(priv->mon, &devprops) < 0) goto exit_monitor; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); def->redirdevs[def->nredirdevs++] = redirdev; ret = 0; @@ -2011,7 +2011,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriver *driver, /* detach associated chardev on error */ if (chardevAdded) ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virErrorRestore(&orig_err); qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, secAlias, tlsAlias); @@ -2238,7 +2238,7 @@ qemuDomainAttachChrDevice(virQEMUDriver *driver, qemuFDPassTransferMonitor(charpriv->logfd, priv->mon) < 0) goto exit_monitor; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } if (guestfwd) { @@ -2277,7 +2277,7 @@ qemuDomainAttachChrDevice(virQEMUDriver *driver, goto exit_monitor; } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); qemuDomainChrInsertPreAlloced(vmdef, chr); ret = 0; @@ -2305,7 +2305,7 @@ qemuDomainAttachChrDevice(virQEMUDriver *driver, qemuMonitorDetachCharDev(priv->mon, charAlias); qemuFDPassTransferMonitorRollback(charpriv->sourcefd, priv->mon); qemuFDPassTransferMonitorRollback(charpriv->logfd, priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virErrorRestore(&orig_err); qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, @@ -2385,7 +2385,7 @@ qemuDomainAttachRNGDevice(virQEMUDriver *driver, goto exit_monitor; } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); VIR_APPEND_ELEMENT_INPLACE(vm->def->rngs, vm->def->nrngs, rng); @@ -2411,7 +2411,7 @@ qemuDomainAttachRNGDevice(virQEMUDriver *driver, ignore_value(qemuMonitorDelObject(priv->mon, objAlias, false)); if (rng->backend == VIR_DOMAIN_RNG_BACKEND_EGD && chardevAdded) ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virErrorRestore(&orig_err); qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, @@ -2504,7 +2504,7 @@ qemuDomainAttachMemory(virQEMUDriver *driver, if (qemuMonitorAddDeviceProps(priv->mon, &devprops) < 0) goto exit_monitor; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); event = virDomainEventDeviceAddedNewFromObj(vm, objalias); virObjectEventStateQueue(driver->domainEventState, event); @@ -2543,7 +2543,7 @@ qemuDomainAttachMemory(virQEMUDriver *driver, virErrorPreserveLast(&orig_err); if (objAdded) ignore_value(qemuMonitorDelObject(priv->mon, objalias, false)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (objAdded && mem) ignore_value(qemuProcessDestroyMemoryBackingPath(driver, vm, mem)); @@ -2608,7 +2608,7 @@ qemuDomainAttachHostUSBDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorAddDeviceProps(priv->mon, &devprops); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditHostdev(vm, hostdev, "attach", ret == 0); if (ret < 0) goto cleanup; @@ -2701,7 +2701,7 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriver *driver, if (qemuMonitorAddDeviceProps(priv->mon, &devprops) < 0) goto exit_monitor; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditHostdev(vm, hostdev, "attach", true); @@ -2727,7 +2727,7 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriver *driver, exit_monitor: virErrorPreserveLast(&orig_err); qemuBlockStorageSourceAttachRollback(priv->mon, data); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virErrorRestore(&orig_err); virDomainAuditHostdev(vm, hostdev, "attach", false); @@ -2826,7 +2826,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriver *driver, ignore_value(qemuMonitorCloseFileHandle(priv->mon, vhostfdName)); if (removeextension) ignore_value(qemuDomainDetachExtensionDevice(priv->mon, hostdev->info)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0) goto audit; @@ -2920,7 +2920,7 @@ qemuDomainAttachMediatedDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorAddDeviceProps(priv->mon, &devprops); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditHostdev(vm, hostdev, "attach", ret == 0); if (ret < 0) @@ -3074,7 +3074,7 @@ qemuDomainAttachShmemDevice(virQEMUDriver *driver, goto exit_monitor; } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); /* Doing a copy here just so the pointer doesn't get nullified * because we need it in the audit function */ @@ -3101,7 +3101,7 @@ qemuDomainAttachShmemDevice(virQEMUDriver *driver, ignore_value(qemuMonitorDelObject(priv->mon, memAlias, false)); } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virErrorRestore(&orig_err); @@ -3200,7 +3200,7 @@ qemuDomainAttachWatchdog(virQEMUDriver *driver, if (rv >= 0) rv = qemuMonitorAddDeviceProps(priv->mon, &props); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rv < 0) goto cleanup; @@ -3287,7 +3287,7 @@ qemuDomainAttachInputDevice(virQEMUDriver *driver, goto exit_monitor; } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); VIR_APPEND_ELEMENT_COPY_INPLACE(vm->def->inputs, vm->def->ninputs, input); @@ -3313,7 +3313,7 @@ qemuDomainAttachInputDevice(virQEMUDriver *driver, return ret; exit_monitor: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto audit; } @@ -3370,7 +3370,7 @@ qemuDomainAttachVsockDevice(virQEMUDriver *driver, if ((ret = qemuMonitorAddDeviceProps(priv->mon, &devprops)) < 0) goto exit_monitor; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); vm->def->vsock = g_steal_pointer(&vsock); @@ -3391,7 +3391,7 @@ qemuDomainAttachVsockDevice(virQEMUDriver *driver, ignore_value(qemuMonitorCloseFileHandle(priv->mon, fdname)); if (removeextension) ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &vsock->info)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto cleanup; } @@ -3459,7 +3459,7 @@ qemuDomainAttachFSDevice(virQEMUDriver *driver, goto exit_monitor; } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); VIR_APPEND_ELEMENT_COPY(vm->def->fss, vm->def->nfss, fs); @@ -3483,7 +3483,7 @@ qemuDomainAttachFSDevice(virQEMUDriver *driver, virErrorPreserveLast(&origErr); if (chardevAdded) ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virErrorRestore(&origErr); goto audit; } @@ -3652,7 +3652,7 @@ int qemuDomainChangeNetLinkState(virQEMUDriver *driver, dev->linkstate = linkstate; cleanup: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -4246,7 +4246,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriver *driver, ret = qemuMonitorExpirePassword(priv->mon, type, expire); end_job: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -4521,7 +4521,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriver *driver, if (diskBackend) qemuBlockStorageSourceChainDetach(priv->mon, diskBackend); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditDisk(vm, disk->src, NULL, "detach", true); @@ -4593,7 +4593,7 @@ qemuDomainRemoveMemoryDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorDelObject(priv->mon, backendAlias, true); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditMemory(vm, oldmem, newmem, "update", rc == 0); if (rc < 0) @@ -4692,7 +4692,7 @@ qemuDomainRemoveHostDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); qemuBlockStorageSourceAttachRollback(priv->mon, detachscsi); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } if (hostdev->parentnet) { @@ -4809,7 +4809,7 @@ qemuDomainRemoveNetDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditNet(vm, net, NULL, "detach", false); return -1; } @@ -4826,7 +4826,7 @@ qemuDomainRemoveNetDevice(virQEMUDriver *driver, qemuHotplugRemoveFDSet(priv->mon, net->info.alias, net->data.vdpa.devicepath); } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp) qemuSlirpStop(QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp, vm, driver, net); @@ -4901,7 +4901,7 @@ qemuDomainRemoveChrDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorDetachCharDev(priv->mon, charAlias); qemuHotplugRemoveFDSet(priv->mon, chr->info.alias, NULL); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } if (rc == 0 && @@ -4967,7 +4967,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriver *driver, qemuMonitorDetachCharDev(priv->mon, charAlias) < 0) rc = -1; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rng->backend == VIR_DOMAIN_RNG_BACKEND_EGD && rc == 0 && @@ -5021,7 +5021,7 @@ qemuDomainRemoveShmemDevice(virQEMUDriver *driver, else rc = qemuMonitorDelObject(priv->mon, memAlias, true); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditShmem(vm, shmem, "detach", rc == 0); @@ -5113,7 +5113,7 @@ qemuDomainRemoveRedirdevDevice(virQEMUDriver *driver, */ ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (qemuDomainDelChardevTLSObjects(driver, vm, dev->source, charAlias) < 0) return -1; @@ -5150,7 +5150,7 @@ qemuDomainRemoveFSDevice(virQEMUDriver *driver, if (qemuMonitorDetachCharDev(priv->mon, charAlias) < 0) rc = -1; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } virDomainAuditFS(vm, fs, NULL, "detach", rc == 0); @@ -5891,7 +5891,7 @@ qemuDomainDetachDeviceChr(virQEMUDriver *driver, int rc; qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorRemoveNetdev(priv->mon, tmpChr->info.alias); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto cleanup; @@ -6431,7 +6431,7 @@ qemuDomainHotplugAddVcpu(virQEMUDriver *driver, rc = qemuMonitorAddDeviceProps(qemuDomainGetMonitor(vm), &vcpuprops); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virDomainAuditVcpu(vm, oldvcpus, oldvcpus + nvcpus, "update", rc == 0); @@ -6913,7 +6913,7 @@ qemuDomainChangeMemoryRequestedSize(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorChangeMemoryRequestedSize(priv->mon, alias, requestedsize); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return rc; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 69bcdafdf8..f109598fb4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -89,16 +89,14 @@ qemuMigrationJobStart(virQEMUDriver *driver, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; static void -qemuMigrationJobSetPhase(virQEMUDriver *driver, - virDomainObj *vm, +qemuMigrationJobSetPhase(virDomainObj *vm, qemuMigrationJobPhase phase) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + ATTRIBUTE_NONNULL(1); static void -qemuMigrationJobStartPhase(virQEMUDriver *driver, - virDomainObj *vm, +qemuMigrationJobStartPhase(virDomainObj *vm, qemuMigrationJobPhase phase) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + ATTRIBUTE_NONNULL(1); static void qemuMigrationJobContinue(virDomainObj *obj) @@ -110,9 +108,8 @@ qemuMigrationJobIsActive(virDomainObj *vm, ATTRIBUTE_NONNULL(1); static void -qemuMigrationJobFinish(virQEMUDriver *driver, - virDomainObj *obj) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +qemuMigrationJobFinish(virDomainObj *obj) + ATTRIBUTE_NONNULL(1); static void qemuMigrationSrcStoreDomainState(virDomainObj *vm) @@ -515,7 +512,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, if (qemuBlockExportAddNBD(vm, diskAlias, disk->src, diskAlias, true, NULL) < 0) goto exit_monitor; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } if (server.transport == VIR_STORAGE_NET_HOST_TRANS_TCP) @@ -529,7 +526,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, return ret; exit_monitor: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto cleanup; } @@ -550,7 +547,7 @@ qemuMigrationDstStopNBDServer(virQEMUDriver *driver, if (qemuMonitorNBDServerStop(priv->mon) < 0) VIR_WARN("Unable to stop NBD server"); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); virPortAllocatorRelease(priv->nbdPort); priv->nbdPort = 0; @@ -750,7 +747,7 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriver *driver, * consistency on the destination so that we can force cancel the mirror */ rv = qemuMonitorBlockJobCancel(priv->mon, job->name, abortMigration); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rv < 0) return -1; @@ -871,7 +868,7 @@ qemuMigrationSrcCancelRemoveTempBitmaps(virDomainObj *vm, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; qemuMonitorBitmapRemove(priv->mon, t->nodename, t->bitmapname); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } return 0; @@ -969,7 +966,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *driver, if (mon_ret != 0) qemuBlockStorageSourceAttachRollback(qemuDomainGetMonitor(vm), data); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (mon_ret < 0) return -1; @@ -1011,7 +1008,7 @@ qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriver *driver, diskAlias, nbd_dest, "raw", mirror_speed, 0, 0, mirror_shallow, true); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (mon_ret < 0) return -1; @@ -1690,7 +1687,7 @@ qemuMigrationAnyFetchStats(virQEMUDriver *driver, rv = qemuMonitorGetMigrationStats(priv->mon, &stats, error); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rv < 0) return -1; @@ -2055,7 +2052,7 @@ qemuMigrationSrcGraphicsRelocate(virQEMUDriver *driver, ret = qemuMonitorGraphicsRelocate(priv->mon, type, listenAddress, port, tlsPort, tlsSubject); jobPriv->spiceMigration = !ret; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } cleanup: @@ -2159,7 +2156,7 @@ qemuMigrationDstRun(virQEMUDriver *driver, rv = qemuMonitorMigrateIncoming(priv->mon, uri); exit_monitor: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rv < 0) return -1; @@ -2206,7 +2203,7 @@ qemuMigrationSrcCleanup(virDomainObj *vm, switch ((qemuMigrationJobPhase) priv->job.phase) { case QEMU_MIGRATION_PHASE_BEGIN3: /* just forget we were about to migrate */ - qemuMigrationJobFinish(driver, vm); + qemuMigrationJobFinish(vm); break; case QEMU_MIGRATION_PHASE_PERFORM3_DONE: @@ -2216,7 +2213,7 @@ qemuMigrationSrcCleanup(virDomainObj *vm, qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, jobPriv->migParams, priv->job.apiFlags); /* clear the job and let higher levels decide what to do */ - qemuMigrationJobFinish(driver, vm); + qemuMigrationJobFinish(vm); break; case QEMU_MIGRATION_PHASE_PERFORM3: @@ -2352,7 +2349,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, * change protection. */ if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT) - qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_BEGIN3); + qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_BEGIN3); if (!qemuMigrationSrcIsAllowed(driver, vm, true, flags)) return NULL; @@ -2567,9 +2564,9 @@ qemuMigrationSrcBegin(virConnectPtr conn, endjob: if (flags & VIR_MIGRATE_CHANGE_PROTECTION) - qemuMigrationJobFinish(driver, vm); + qemuMigrationJobFinish(vm); else - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); goto cleanup; } @@ -2594,7 +2591,7 @@ qemuMigrationDstPrepareCleanup(virQEMUDriver *driver, if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_IN)) return; - qemuDomainObjDiscardAsyncJob(driver, vm); + qemuDomainObjDiscardAsyncJob(vm); } static qemuProcessIncomingDef * @@ -2931,7 +2928,7 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, flags) < 0) goto cleanup; - qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PREPARE); + qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PREPARE); /* Domain starts inactive, even if the domain XML had an id field. */ vm->def->id = -1; @@ -3125,7 +3122,7 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver, QEMU_ASYNC_JOB_MIGRATION_IN, stopFlags); } - qemuMigrationJobFinish(driver, vm); + qemuMigrationJobFinish(vm); goto cleanup; } @@ -3401,7 +3398,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver, virCheckFlags(QEMU_MIGRATION_FLAGS, -1); - qemuMigrationJobSetPhase(driver, vm, + qemuMigrationJobSetPhase(vm, retcode == 0 ? QEMU_MIGRATION_PHASE_CONFIRM3 : QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED); @@ -3507,7 +3504,7 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, else phase = QEMU_MIGRATION_PHASE_CONFIRM3; - qemuMigrationJobStartPhase(driver, vm, phase); + qemuMigrationJobStartPhase(vm, phase); virCloseCallbacksUnset(driver->closeCallbacks, vm, qemuMigrationSrcCleanup); @@ -3515,7 +3512,7 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, cookiein, cookieinlen, flags, cancelled); - qemuMigrationJobFinish(driver, vm); + qemuMigrationJobFinish(vm); if (!virDomainObjIsActive(vm)) { if (!cancelled && ret == 0 && flags & VIR_MIGRATE_UNDEFINE_SOURCE) { virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); @@ -3829,7 +3826,7 @@ qemuMigrationSrcContinue(virQEMUDriver *driver, ret = qemuMonitorMigrateContinue(priv->mon, status); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -3852,7 +3849,7 @@ qemuMigrationSetDBusVMState(virQEMUDriver *driver, rv = qemuMonitorSetDBusVMStateIdList(priv->mon, priv->dbusVMStateIds); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return rv; } else { @@ -3952,7 +3949,7 @@ qemuMigrationSrcRunPrepareBlockDirtyBitmapsMerge(virDomainObj *vm, rc = qemuMonitorTransaction(priv->mon, &actions); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -4261,7 +4258,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, break; } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto error; @@ -4383,7 +4380,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) == 0) { qemuMonitorMigrateCancel(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } /* cancel any outstanding NBD jobs */ @@ -4404,7 +4401,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, goto cleanup; exit_monitor: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto error; } @@ -4657,7 +4654,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driver, * until the migration is complete. */ VIR_DEBUG("Perform %p", sconn); - qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM2); + qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM2); if (flags & VIR_MIGRATE_TUNNELLED) ret = qemuMigrationSrcPerformTunnel(driver, vm, st, NULL, NULL, 0, NULL, NULL, @@ -4901,7 +4898,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver, * confirm migration completion. */ VIR_DEBUG("Perform3 %p uri=%s", sconn, NULLSTR(uri)); - qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM3); + qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3); VIR_FREE(cookiein); cookiein = g_steal_pointer(&cookieout); cookieinlen = cookieoutlen; @@ -4926,8 +4923,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver, if (ret < 0) { virErrorPreserveLast(&orig_err); } else { - qemuMigrationJobSetPhase(driver, vm, - QEMU_MIGRATION_PHASE_PERFORM3_DONE); + qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3_DONE); } /* If Perform returns < 0, then we need to cancel the VM @@ -5303,7 +5299,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, migParams, flags, dname, resource, &v3proto); } else { - qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM2); + qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM2); ret = qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, cookiein, cookieinlen, cookieout, cookieoutlen, flags, resource, NULL, NULL, 0, NULL, @@ -5339,7 +5335,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, qemuMigrationSrcRestoreDomainState(driver, vm); - qemuMigrationJobFinish(driver, vm); + qemuMigrationJobFinish(vm); if (!virDomainObjIsActive(vm) && ret == 0) { if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) { virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); @@ -5389,7 +5385,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, return ret; } - qemuMigrationJobStartPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM3); + qemuMigrationJobStartPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3); virCloseCallbacksUnset(driver->closeCallbacks, vm, qemuMigrationSrcCleanup); @@ -5403,7 +5399,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, goto endjob; } - qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM3_DONE); + qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3_DONE); if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn, qemuMigrationSrcCleanup) < 0) @@ -5413,7 +5409,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, if (ret < 0) { qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, jobPriv->migParams, priv->job.apiFlags); - qemuMigrationJobFinish(driver, vm); + qemuMigrationJobFinish(vm); } else { qemuMigrationJobContinue(vm); } @@ -5648,7 +5644,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, ignore_value(virTimeMillisNow(&timeReceived)); - qemuMigrationJobStartPhase(driver, vm, + qemuMigrationJobStartPhase(vm, v3proto ? QEMU_MIGRATION_PHASE_FINISH3 : QEMU_MIGRATION_PHASE_FINISH2); @@ -5878,7 +5874,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, jobPriv->migParams, priv->job.apiFlags); - qemuMigrationJobFinish(driver, vm); + qemuMigrationJobFinish(vm); if (!virDomainObjIsActive(vm)) qemuDomainRemoveInactiveJob(driver, vm); @@ -5940,7 +5936,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, qemuMonitorSetMigrationSpeed(priv->mon, QEMU_DOMAIN_MIG_BANDWIDTH_MAX); priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX; - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } } @@ -5977,11 +5973,11 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, if (virSetCloseExec(pipeFD[1]) < 0) { virReportSystemError(errno, "%s", _("Unable to set cloexec flag")); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto cleanup; } if (virCommandRunAsync(compressor, NULL) < 0) { - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); goto cleanup; } rc = qemuMonitorMigrateToFd(priv->mon, @@ -5991,7 +5987,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, VIR_CLOSE(pipeFD[1]) < 0) VIR_WARN("failed to close intermediate pipe"); } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto cleanup; @@ -6004,7 +6000,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, if (virDomainObjIsActive(vm) && qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { qemuMonitorMigrateCancel(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } } goto cleanup; @@ -6031,7 +6027,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, } else { if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } } priv->migMaxBandwidth = saveMigBandwidth; @@ -6063,7 +6059,7 @@ qemuMigrationSrcCancel(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); ignore_value(qemuMonitorMigrateCancel(priv->mon)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDef *disk = vm->def->disks[i]; @@ -6125,8 +6121,7 @@ qemuMigrationJobStart(virQEMUDriver *driver, } static void -qemuMigrationJobSetPhase(virQEMUDriver *driver, - virDomainObj *vm, +qemuMigrationJobSetPhase(virDomainObj *vm, qemuMigrationJobPhase phase) { qemuDomainObjPrivate *priv = vm->privateData; @@ -6138,15 +6133,14 @@ qemuMigrationJobSetPhase(virQEMUDriver *driver, return; } - qemuDomainObjSetJobPhase(driver, vm, phase); + qemuDomainObjSetJobPhase(vm, phase); } static void -qemuMigrationJobStartPhase(virQEMUDriver *driver, - virDomainObj *vm, +qemuMigrationJobStartPhase(virDomainObj *vm, qemuMigrationJobPhase phase) { - qemuMigrationJobSetPhase(driver, vm, phase); + qemuMigrationJobSetPhase(vm, phase); } static void @@ -6176,9 +6170,9 @@ qemuMigrationJobIsActive(virDomainObj *vm, } static void -qemuMigrationJobFinish(virQEMUDriver *driver, virDomainObj *vm) +qemuMigrationJobFinish(virDomainObj *vm) { - qemuDomainObjEndAsyncJob(driver, vm); + qemuDomainObjEndAsyncJob(vm); } @@ -6263,7 +6257,7 @@ qemuMigrationSrcFetchMirrorStats(virQEMUDriver *driver, blockinfo = qemuMonitorGetAllBlockJobInfo(priv->mon, false); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (!blockinfo) return -1; diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 079f31eb90..52ed2c518b 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -504,7 +504,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig, rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stats); else rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index e30fd04ada..39f84983bc 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -889,7 +889,7 @@ qemuMigrationParamsApply(virQEMUDriver *driver, ret = 0; cleanup: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (xbzrleCacheSize_old) migParams->params[xbzrle].set = true; @@ -1098,7 +1098,7 @@ qemuMigrationParamsFetch(virQEMUDriver *driver, rc = qemuMonitorGetMigrationParams(priv->mon, &jsonParams); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -1399,7 +1399,7 @@ qemuMigrationCapsCheck(virQEMUDriver *driver, rc = qemuMonitorGetMigrationCapabilities(priv->mon, &caps); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -1432,7 +1432,7 @@ qemuMigrationCapsCheck(virQEMUDriver *driver, rc = qemuMonitorSetMigrationCapabilities(priv->mon, &json); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) { virResetLastError(); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b19a6218d0..7931eeb23b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -474,7 +474,7 @@ qemuProcessFakeReboot(void *opaque) qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorSystemReset(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto endjob; @@ -495,7 +495,7 @@ qemuProcessFakeReboot(void *opaque) ret = 0; endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: priv->pausedShutdown = false; @@ -1906,7 +1906,7 @@ qemuProcessInitMonitor(virQEMUDriver *driver, ret = qemuMonitorSetCapabilities(QEMU_DOMAIN_PRIVATE(vm)->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -2200,7 +2200,7 @@ qemuRefreshVirtioChannelState(virQEMUDriver *driver, return -1; rc = qemuMonitorGetChardevInfo(priv->mon, &info); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -2250,7 +2250,7 @@ qemuRefreshPRManagerState(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorGetPRManagerInfo(priv->mon, &info); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -2277,7 +2277,7 @@ qemuRefreshRTC(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); now = time(NULL); rv = qemuMonitorGetRTCTime(priv->mon, &thenbits); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rv < 0) return; @@ -2316,7 +2316,7 @@ qemuProcessRefreshBalloonState(virQEMUDriver *driver, return -1; rc = qemuMonitorGetBalloonInfo(qemuDomainGetMonitor(vm), &balloon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -2367,7 +2367,7 @@ qemuProcessWaitForMonitor(virQEMUDriver *driver, goto cleanup; ret = qemuMonitorGetChardevInfo(priv->mon, &info); VIR_DEBUG("qemuMonitorGetChardevInfo returned %i", ret); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret == 0) { if ((ret = qemuProcessFindCharDevicePTYsMonitor(vm, info)) < 0) @@ -2407,7 +2407,7 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriver *driver, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) goto cleanup; ret = qemuMonitorGetIOThreads(priv->mon, &iothreads, &niothreads); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0) goto cleanup; @@ -2582,7 +2582,7 @@ qemuProcessSetLinkStates(virQEMUDriver *driver, ret = 0; cleanup: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -3106,7 +3106,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver, } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); cfg = virQEMUDriverGetConfig(driver); ret = virDomainObjSave(vm, driver->xmlopt, cfg->stateDir); @@ -3114,7 +3114,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver, return ret; error: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return -1; } @@ -3237,7 +3237,7 @@ qemuProcessStartCPUs(virQEMUDriver *driver, virDomainObj *vm, goto release; ret = qemuMonitorStartCPUs(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0) goto release; @@ -3274,7 +3274,7 @@ int qemuProcessStopCPUs(virQEMUDriver *driver, goto cleanup; ret = qemuMonitorStopCPUs(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0) goto cleanup; @@ -3385,7 +3385,7 @@ qemuProcessUpdateState(virQEMUDriver *driver, virDomainObj *vm) qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorGetStatus(priv->mon, &running, &reason); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0) return -1; @@ -3621,7 +3621,7 @@ qemuProcessRecoverJob(virQEMUDriver *driver, case QEMU_ASYNC_JOB_SNAPSHOT: qemuDomainObjEnterMonitor(driver, vm); ignore_value(qemuMonitorMigrateCancel(priv->mon)); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); /* resume the domain but only if it was paused as a result of * running a migration-to-file operation. Although we are * recovering an async job, this function is run at startup @@ -4282,7 +4282,7 @@ qemuProcessFetchGuestCPU(virQEMUDriver *driver, rc = qemuMonitorGetGuestCPUx86(priv->mon, cpuQOMPath, &dataEnabled, &dataDisabled); } - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc == -1) return -1; @@ -4391,7 +4391,7 @@ qemuProcessFetchCPUDefinitions(virQEMUDriver *driver, rc = virQEMUCapsFetchCPUModels(priv->mon, vm->def->os.arch, &models); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -4634,10 +4634,9 @@ qemuProcessBeginJob(virQEMUDriver *driver, void -qemuProcessEndJob(virQEMUDriver *driver, - virDomainObj *vm) +qemuProcessEndJob(virDomainObj *vm) { - qemuDomainObjEndAsyncJob(driver, vm); + qemuDomainObjEndAsyncJob(vm); } @@ -5105,7 +5104,7 @@ qemuProcessSetupBalloon(virQEMUDriver *driver, ret = 0; cleanup: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -6000,7 +5999,7 @@ qemuProcessSetupHotpluggableVcpus(virQEMUDriver *driver, rc = qemuMonitorAddDeviceProps(qemuDomainGetMonitor(vm), &vcpuprops); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto cleanup; @@ -7162,7 +7161,7 @@ qemuProcessSetupDiskThrottlingBlockdev(virQEMUDriver *driver, ret = 0; cleanup: - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); return ret; } @@ -7282,7 +7281,7 @@ qemuProcessSetupDisksTransientHotplug(virDomainObj *vm, rc = qemuMonitorSystemReset(priv->mon); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; } @@ -7334,7 +7333,7 @@ qemuProcessSetupLifecycleActions(virDomainObj *vm, QEMU_MONITOR_ACTION_WATCHDOG_KEEP, QEMU_MONITOR_ACTION_PANIC_KEEP); - qemuDomainObjExitMonitor(priv->driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -8370,7 +8369,7 @@ void qemuProcessStop(virQEMUDriver *driver, endjob: if (asyncJob != QEMU_ASYNC_JOB_NONE) - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); cleanup: virErrorRestore(&orig_err); @@ -8395,7 +8394,7 @@ qemuProcessAutoDestroy(virDomainObj *dom, if (priv->job.asyncJob) { VIR_DEBUG("vm=%s has long-term job active, cancelling", dom->def->name); - qemuDomainObjDiscardAsyncJob(driver, dom); + qemuDomainObjDiscardAsyncJob(dom); } VIR_DEBUG("Killing domain"); @@ -8413,7 +8412,7 @@ qemuProcessAutoDestroy(virDomainObj *dom, qemuDomainRemoveInactive(driver, dom); - qemuDomainObjEndJob(driver, dom); + qemuDomainObjEndJob(dom); virObjectEventStateQueue(driver->domainEventState, event); } @@ -8457,7 +8456,7 @@ qemuProcessRefreshDisks(virQEMUDriver *driver, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { table = qemuMonitorGetBlockInfo(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } if (!table) @@ -8524,7 +8523,7 @@ qemuProcessRefreshCPUMigratability(virQEMUDriver *driver, rc = qemuMonitorGetCPUMigratable(priv->mon, cpuQOMPath, &migratable); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; @@ -8681,7 +8680,7 @@ qemuProcessRefreshLegacyBlockjobs(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); blockJobs = qemuMonitorGetAllBlockJobInfo(qemuDomainGetMonitor(vm), true); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (!blockJobs) return -1; @@ -8998,7 +8997,7 @@ qemuProcessReconnect(void *opaque) if (jobStarted) { if (!virDomainObjIsActive(obj)) qemuDomainRemoveInactive(driver, obj); - qemuDomainObjEndJob(driver, obj); + qemuDomainObjEndJob(obj); } else { if (!virDomainObjIsActive(obj)) qemuDomainRemoveInactiveJob(driver, obj); diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 289cd74eb7..7e6f9f20e5 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -69,8 +69,7 @@ int qemuProcessBeginJob(virQEMUDriver *driver, virDomainObj *vm, virDomainJobOperation operation, unsigned long apiFlags); -void qemuProcessEndJob(virQEMUDriver *driver, - virDomainObj *vm); +void qemuProcessEndJob(virDomainObj *vm); typedef enum { VIR_QEMU_PROCESS_START_COLD = 1 << 0, diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index a7901779fc..6eebe69919 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -322,7 +322,7 @@ qemuSnapshotCreateActiveInternal(virQEMUDriver *driver, } ret = qemuMonitorCreateSnapshot(priv->mon, snap->def->name); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (ret < 0) goto cleanup; @@ -875,7 +875,7 @@ qemuSnapshotDiskCleanup(qemuSnapshotDiskData *data, qemuBlockStorageSourceAttachRollback(qemuDomainGetMonitor(vm), data[i].crdata->srcdata[0]); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); } } @@ -1024,7 +1024,7 @@ qemuSnapshotDiskPrepareOneBlockdev(virQEMUDriver *driver, rc = qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm), dd->crdata->srcdata[0]); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitor(vm); if (rc < 0) return -1; } else { @@ -1281,7 +1281,7 @@ qemuSnapshotDiskCreate(qemuSnapshotDiskContext *snapctxt) rc = qemuMonitorTransaction(priv->mon, &snapctxt->actions); - qemuDomainObjExitMonitor(driver, snapctxt->vm); + qemuDomainObjExitMonitor(snapctxt->vm); for (i = 0; i < snapctxt->ndd; i++) { qemuSnapshotDiskData *dd = snapctxt->dd + i; @@ -1887,7 +1887,7 @@ qemuSnapshotCreateXML(virDomainPtr domain, snapshot = qemuSnapshotCreate(vm, domain, def, driver, cfg, flags); } - qemuDomainObjEndAsyncJob(driver, vm); + qemuDomainObjEndAsyncJob(vm); return snapshot; } @@ -2322,7 +2322,7 @@ qemuSnapshotRevert(virDomainObj *vm, } endjob: - qemuProcessEndJob(driver, vm); + qemuProcessEndJob(vm); return ret; } @@ -2454,7 +2454,7 @@ qemuSnapshotDelete(virDomainObj *vm, } endjob: - qemuDomainObjEndJob(driver, vm); + qemuDomainObjEndJob(vm); return ret; } -- 2.35.1

2 1

[libvirt PATCH] qemu: fix recording of CPU deprecations
by Daniel P. Berrangé 18 Mar '22

18 Mar '22

The code parsing thue query-cpu-definitions response will short-circuit the for loop in the case where usable=yes, resulting in us failing to parse the CPU deprecation flag. IOW, we only reported deprecations in domain capabilities for CPU models which were not runnable on the host. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 27c5e1c992..d5622bd6d9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5309,10 +5309,9 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitor *mon, if (g_strv_length(cpu->blockers) == 0) { cpu->usable = VIR_DOMCAPS_CPU_USABLE_YES; g_clear_pointer(&cpu->blockers, g_strfreev); - continue; + } else { + cpu->usable = VIR_DOMCAPS_CPU_USABLE_NO; } - - cpu->usable = VIR_DOMCAPS_CPU_USABLE_NO; } if (virJSONValueObjectHasKey(child, "deprecated") && -- 2.34.1

2 1

[libvirt PATCH v2] nwfilter: merge updateMutex and updateLock
by Daniel P. Berrangé 18 Mar '22

18 Mar '22

The updateLock is a R/W lock held by anything which needs to read or modify the rules associated with an NWFilter. APIs for defining/undefining NW filters rules hold a write lock on updateLock. APIs for creating/deleting NW filter bindings hold a read lock on updateLock, which prevents define/undefine taking place concurrently. The problems arise when we attempt to creating two NW filter bindings in parallel. Thread 1 can acquire the mutex for filter A Thread 2 can acquire the mutex for filter B Consider if filters A and B both reference filters C and D, but in different orders: Filter A -> filter C -> filter D Filter B -> filter D -> filter C Thread 1 will try to acquire locks in order A, C, D while thread 1 will try to acquire in order A, D, C. Deadlock can still occur. Think we can sort the list of filters before acquiring locks on all of them ? Nope, we allow arbitrary recursion: Filter A -> filter C -> filter E -> filter F -> filter H -> filter K -> filter D -> filter G -> filter I So we can't tell from looking at 'A' which filters we're going to need to lock. We can only see the first level of filters references and we need to lock those before we can see the second level of filters, etc. We could probably come up with some cleverness to address this but it isn't worth the time investment. It is simpler to just keep the process of creating NW filter bindings totally serialized. Using two separate locks for this serialization though is pointless. Every code path which gets a read(updateLock) will go on to hold updateMutex. It is simpler to just hold write(updateLock) and get rid of updateMutex. At that point we don't need updateLock to be a R/W lock, it can be a plain mutex. Thus this patch gets rid of the current updateLock and updateMutex and introduces a new top level updateMutex. This has a secondary benefit of introducing fairness into the locking. With a POSIX R/W lock, you get writer starvation if you have lots of readers. IOW, if we call virNWFilterBIndingCreate and virNWFilterBindingDelete in a tight loop from a couple of threads, we can prevent virNWFilterDefine from ever acquiring a write lock. Getting rid of the R/W lock gives us FIFO lock acquisition preventing starvation of any API call servicing. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/nwfilter_conf.c | 33 +--------- src/conf/nwfilter_conf.h | 9 --- src/conf/virnwfilterobj.h | 3 + src/libvirt_private.syms | 3 - src/nwfilter/nwfilter_driver.c | 77 ++++++++++++------------ src/nwfilter/nwfilter_gentech_driver.c | 83 +++----------------------- 6 files changed, 52 insertions(+), 156 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 3e1d4f5927..5171145c75 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -151,33 +151,6 @@ static const struct int_map chain_priorities[] = { }; -/* - * only one filter update allowed - */ -static virRWLock updateLock; -static bool initialized; - -void -virNWFilterReadLockFilterUpdates(void) -{ - virRWLockRead(&updateLock); -} - - -void -virNWFilterWriteLockFilterUpdates(void) -{ - virRWLockWrite(&updateLock); -} - - -void -virNWFilterUnlockFilterUpdates(void) -{ - virRWLockUnlock(&updateLock); -} - - /* * attribute names for the rules XML */ @@ -3059,6 +3032,7 @@ virNWFilterDefFormat(const virNWFilterDef *def) return virBufferContentAndReset(&buf); } +static bool initialized; static virNWFilterTriggerRebuildCallback rebuildCallback; static void *rebuildOpaque; @@ -3074,9 +3048,6 @@ virNWFilterConfLayerInit(virNWFilterTriggerRebuildCallback cb, initialized = true; - if (virRWLockInit(&updateLock) < 0) - return -1; - return 0; } @@ -3087,8 +3058,6 @@ virNWFilterConfLayerShutdown(void) if (!initialized) return; - virRWLockDestroy(&updateLock); - initialized = false; rebuildCallback = NULL; rebuildOpaque = NULL; diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index bbe12284a5..46867afc8c 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -552,15 +552,6 @@ virNWFilterDefParseString(const char *xml, virNWFilterDef * virNWFilterDefParseFile(const char *filename); -void -virNWFilterWriteLockFilterUpdates(void); - -void -virNWFilterReadLockFilterUpdates(void); - -void -virNWFilterUnlockFilterUpdates(void); - typedef int (*virNWFilterTriggerRebuildCallback)(void *opaque); int diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h index 44ba31f732..30a9020097 100644 --- a/src/conf/virnwfilterobj.h +++ b/src/conf/virnwfilterobj.h @@ -43,6 +43,9 @@ struct _virNWFilterDriverState { char *stateDir; char *configDir; char *bindingDir; + + /* Recursive. Hold for filter changes, instantiation or deletion */ + virMutex updateLock; }; virNWFilterDef * diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3a8e16525b..03697d81a8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -949,7 +949,6 @@ virNWFilterDeleteDef; virNWFilterJumpTargetTypeToString; virNWFilterPrintStateMatchFlags; virNWFilterPrintTCPFlags; -virNWFilterReadLockFilterUpdates; virNWFilterRuleActionTypeToString; virNWFilterRuleDirectionTypeToString; virNWFilterRuleIsProtocolEthernet; @@ -958,8 +957,6 @@ virNWFilterRuleIsProtocolIPv6; virNWFilterRuleProtocolTypeToString; virNWFilterSaveConfig; virNWFilterTriggerRebuild; -virNWFilterUnlockFilterUpdates; -virNWFilterWriteLockFilterUpdates; # conf/nwfilter_ipaddrmap.h diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index a493205c80..732d83e563 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -176,6 +176,8 @@ nwfilterStateInitialize(bool privileged, driver->lockFD = -1; if (virMutexInit(&driver->lock) < 0) goto err_free_driverstate; + if (virMutexInitRecursive(&driver->updateLock) < 0) + goto err_free_driverstate; driver->privileged = privileged; if (!(driver->nwfilters = virNWFilterObjListNew())) @@ -293,13 +295,12 @@ nwfilterStateReload(void) virNWFilterLearnThreadsTerminate(true); nwfilterDriverLock(); - virNWFilterWriteLockFilterUpdates(); - - virNWFilterObjListLoadAllConfigs(driver->nwfilters, driver->configDir); - virNWFilterUnlockFilterUpdates(); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->updateLock) { + virNWFilterObjListLoadAllConfigs(driver->nwfilters, driver->configDir); - virNWFilterBuildAll(driver, false); + virNWFilterBuildAll(driver, false); + } nwfilterDriverUnlock(); @@ -343,6 +344,7 @@ nwfilterStateCleanup(void) /* free inactive nwfilters */ virNWFilterObjListFree(driver->nwfilters); + virMutexDestroy(&driver->updateLock); virMutexDestroy(&driver->lock); g_clear_pointer(&driver, g_free); @@ -550,7 +552,6 @@ nwfilterDefineXMLFlags(virConnectPtr conn, } nwfilterDriverLock(); - virNWFilterWriteLockFilterUpdates(); if (!(def = virNWFilterDefParseString(xml, flags))) goto cleanup; @@ -558,8 +559,10 @@ nwfilterDefineXMLFlags(virConnectPtr conn, if (virNWFilterDefineXMLFlagsEnsureACL(conn, def) < 0) goto cleanup; - if (!(obj = virNWFilterObjListAssignDef(driver->nwfilters, def))) - goto cleanup; + VIR_WITH_MUTEX_LOCK_GUARD(&driver->updateLock) { + if (!(obj = virNWFilterObjListAssignDef(driver->nwfilters, def))) + goto cleanup; + } def = NULL; objdef = virNWFilterObjGetDef(obj); @@ -574,8 +577,6 @@ nwfilterDefineXMLFlags(virConnectPtr conn, virNWFilterDefFree(def); if (obj) virNWFilterObjUnlock(obj); - - virNWFilterUnlockFilterUpdates(); nwfilterDriverUnlock(); return nwfilter; } @@ -592,39 +593,39 @@ nwfilterDefineXML(virConnectPtr conn, static int nwfilterUndefine(virNWFilterPtr nwfilter) { - virNWFilterObj *obj; + virNWFilterObj *obj = NULL; virNWFilterDef *def; int ret = -1; nwfilterDriverLock(); - virNWFilterWriteLockFilterUpdates(); - if (!(obj = nwfilterObjFromNWFilter(nwfilter->uuid))) - goto cleanup; - def = virNWFilterObjGetDef(obj); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->updateLock) { + if (!(obj = nwfilterObjFromNWFilter(nwfilter->uuid))) + goto cleanup; + def = virNWFilterObjGetDef(obj); - if (virNWFilterUndefineEnsureACL(nwfilter->conn, def) < 0) - goto cleanup; + if (virNWFilterUndefineEnsureACL(nwfilter->conn, def) < 0) + goto cleanup; - if (virNWFilterObjTestUnassignDef(obj) < 0) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", - _("nwfilter is in use")); - goto cleanup; - } + if (virNWFilterObjTestUnassignDef(obj) < 0) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", + _("nwfilter is in use")); + goto cleanup; + } - if (virNWFilterDeleteDef(driver->configDir, def) < 0) - goto cleanup; + if (virNWFilterDeleteDef(driver->configDir, def) < 0) + goto cleanup; - virNWFilterObjListRemove(driver->nwfilters, obj); - obj = NULL; + virNWFilterObjListRemove(driver->nwfilters, obj); + obj = NULL; + } ret = 0; cleanup: if (obj) virNWFilterObjUnlock(obj); - virNWFilterUnlockFilterUpdates(); nwfilterDriverUnlock(); return ret; } @@ -764,14 +765,14 @@ nwfilterBindingCreateXML(virConnectPtr conn, if (!(ret = virGetNWFilterBinding(conn, def->portdevname, def->filter))) goto cleanup; - virNWFilterReadLockFilterUpdates(); - if (virNWFilterInstantiateFilter(driver, def) < 0) { - virNWFilterUnlockFilterUpdates(); - virNWFilterBindingObjListRemove(driver->bindings, obj); - g_clear_pointer(&ret, virObjectUnref); - goto cleanup; + VIR_WITH_MUTEX_LOCK_GUARD(&driver->updateLock) { + if (virNWFilterInstantiateFilter(driver, def) < 0) { + virNWFilterBindingObjListRemove(driver->bindings, obj); + g_clear_pointer(&ret, virObjectUnref); + goto cleanup; + } } - virNWFilterUnlockFilterUpdates(); + virNWFilterBindingObjSave(obj, driver->bindingDir); cleanup: @@ -808,9 +809,9 @@ nwfilterBindingDelete(virNWFilterBindingPtr binding) if (virNWFilterBindingDeleteEnsureACL(binding->conn, def) < 0) goto cleanup; - virNWFilterReadLockFilterUpdates(); - virNWFilterTeardownFilter(def); - virNWFilterUnlockFilterUpdates(); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->updateLock) { + virNWFilterTeardownFilter(def); + } virNWFilterBindingObjDelete(obj, driver->bindingDir); virNWFilterBindingObjListRemove(driver->bindings, obj); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index c609405ac0..7e323afb1a 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -55,56 +55,10 @@ static virNWFilterTechDriver *filter_tech_drivers[] = { NULL }; -/* - * Serializes instantiation of filters. - * - * When instantiating a filter, we need to resolve references - * to other filters and acquire locks on them. - * - * We retain a lock on the referenced filter once found. - * The order in which the locks are acquired depends on - * the order in which filters reference each other. - * - * Filter A: - * Reference Filter C - * Reference Filter D - * - * Filter B: - * Reference Filter D - * Reference Filter C - * - * In one example, we lock A, C, D, in the other example - * we lock A, D, C. - * - * Because C & D are locked in differing orders we are - * once again at risk of deadlocks. - * - * There can be multiple levels of recursion, so it is - * not viable to determine the lock order upfront, it - * has to be done as we traverse the tree. - * - * Thus we serialize any code that needs to traverse - * the filter references. - * - * This covers the following APIs: - * - * virNWFilterDefineXML - * virNWFilterUndefine - * virNWFilterBindingCreate - * virNWFilterBindingDelete - * - * In addition to the asynchronous filter instantiation - * triggered by the IP address learning backends. - */ -static virMutex updateMutex; - int virNWFilterTechDriversInit(bool privileged) { size_t i = 0; VIR_DEBUG("Initializing NWFilter technology drivers"); - if (virMutexInitRecursive(&updateMutex) < 0) - return -1; - while (filter_tech_drivers[i]) { if (!(filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) filter_tech_drivers[i]->init(privileged); @@ -122,7 +76,6 @@ void virNWFilterTechDriversShutdown(void) filter_tech_drivers[i]->shutdown(); i++; } - virMutexDestroy(&updateMutex); } @@ -744,9 +697,6 @@ virNWFilterInstantiateFilterInternal(virNWFilterDriverState *driver, bool *foundNewFilter) { int ifindex; - int rc; - - virMutexLock(&updateMutex); /* after grabbing the filter update lock check for the interface; if it's not there anymore its filters will be or are being removed @@ -756,20 +706,14 @@ virNWFilterInstantiateFilterInternal(virNWFilterDriverState *driver, /* interfaces / VMs can disappear during filter instantiation; don't mark it as an error */ virResetLastError(); - rc = 0; - goto cleanup; + return 0; } - rc = virNWFilterInstantiateFilterUpdate(driver, teardownOld, - binding, - ifindex, - useNewFilter, - false, foundNewFilter); - - cleanup: - virMutexUnlock(&updateMutex); - - return rc; + return virNWFilterInstantiateFilterUpdate(driver, teardownOld, + binding, + ifindex, + useNewFilter, + false, foundNewFilter); } @@ -778,11 +722,9 @@ virNWFilterInstantiateFilterLate(virNWFilterDriverState *driver, virNWFilterBindingDef *binding, int ifindex) { - int rc; + int rc = 0; bool foundNewFilter = false; - - virNWFilterReadLockFilterUpdates(); - virMutexLock(&updateMutex); + VIR_LOCK_GUARD lock = virLockGuardLock(&driver->updateLock); rc = virNWFilterInstantiateFilterUpdate(driver, true, binding, ifindex, @@ -798,9 +740,6 @@ virNWFilterInstantiateFilterLate(virNWFilterDriverState *driver, } } - virNWFilterUnlockFilterUpdates(); - virMutexUnlock(&updateMutex); - return rc; } @@ -921,11 +860,7 @@ _virNWFilterTeardownFilter(const char *ifname) int virNWFilterTeardownFilter(virNWFilterBindingDef *binding) { - int ret; - virMutexLock(&updateMutex); - ret = _virNWFilterTeardownFilter(binding->portdevname); - virMutexUnlock(&updateMutex); - return ret; + return _virNWFilterTeardownFilter(binding->portdevname); } enum { -- 2.35.1

2 1

[libvirt PATCH 0/2] ci: integration test tweaks
by Daniel P. Berrangé 18 Mar '22

18 Mar '22

Daniel P. Berrangé (2): ci: rename integration test template ci: only run integration tests if $LIBVIRT_CI_INTEGRATION=1 is set ci/integration.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) -- 2.34.1

2 4

[PATCH 0/2] qemu_process: Start probing process more robustly
by Michal Privoznik 17 Mar '22

17 Mar '22

I've found these in an old branch where dnsmasq starting is reworked too. But that part is not ready yet, so let's merge at least the first two patches. Michal Prívozník (2): qemu_process: Be nicer to killing QEMU when probing caps qemu_process: Start QEMU for caps probing more robustly src/qemu/qemu_process.c | 64 +++++++++++++++++++++++++++-------------- src/qemu/qemu_process.h | 1 - 2 files changed, 43 insertions(+), 22 deletions(-) -- 2.34.1

3 5

[libvirt PATCH v3 0/2] Automatic mutex management - part 4
by Tim Wiederhake 17 Mar '22

17 Mar '22

Use the recently implemented VIR_LOCK_GUARD and VIR_WITH_MUTEX_LOCK_GUARD to simplify mutex management. V1: https://listman.redhat.com/archives/libvir-list/2022-March/229144.html V2: https://listman.redhat.com/archives/libvir-list/2022-March/229329.html Changes since V2: * Rewrote virQEMUDriverGetCapabilities, thanks Michal! * Added VIR_WITH_MUTEX_LOCK_GUARD to nwfilterConnectNumOfNWFilters * Other patches were reviewed and pushed. Tim Wiederhake (2): nwfilter_driver: Use automatic mutex management qemu_conf: Use automatic memory management src/nwfilter/nwfilter_driver.c | 94 +++++++++++++++------------------- src/qemu/qemu_conf.c | 63 ++++++++--------------- 2 files changed, 61 insertions(+), 96 deletions(-) -- 2.31.1

2 3

[libvirt PATCH] esx_stream: Fix NULL dereferences
by Tim Wiederhake 17 Mar '22

17 Mar '22

A wrong reordering caused "priv" to be derefenced before the NULL-check in esxStreamSend and esxStreamRecvFlags. Fixes: 12e19f172d2a908eec2a4557202ff764cdbb951e Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/esx/esx_stream.c | 102 +++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 47 deletions(-) diff --git a/src/esx/esx_stream.c b/src/esx/esx_stream.c index 2b49c8dd12..b356fbed70 100644 --- a/src/esx/esx_stream.c +++ b/src/esx/esx_stream.c @@ -198,8 +198,8 @@ esxStreamTransfer(esxStreamPrivate *priv, bool blocking) static int esxStreamSend(virStreamPtr stream, const char *data, size_t nbytes) { + int result = -1; esxStreamPrivate *priv = stream->privateData; - VIR_LOCK_GUARD lock = virLockGuardLock(&priv->curl->lock); if (nbytes == 0) return 0; @@ -214,29 +214,33 @@ esxStreamSend(virStreamPtr stream, const char *data, size_t nbytes) return -1; } - priv->buffer = (char *)data; - priv->buffer_size = nbytes; - priv->buffer_used = nbytes; + VIR_WITH_MUTEX_LOCK_GUARD(&priv->curl->lock) { + priv->buffer = (char *)data; + priv->buffer_size = nbytes; + priv->buffer_used = nbytes; - if (stream->flags & VIR_STREAM_NONBLOCK) { - if (esxStreamTransfer(priv, false) < 0) - return -1; + if (stream->flags & VIR_STREAM_NONBLOCK) { + if (esxStreamTransfer(priv, false) < 0) + return -1; - if (priv->buffer_used >= priv->buffer_size) - return -2; - } else /* blocking */ { - do { - int status = esxStreamTransfer(priv, true); + if (priv->buffer_used >= priv->buffer_size) + return -2; + } else /* blocking */ { + do { + int status = esxStreamTransfer(priv, true); - if (status < 0) - return -1; + if (status < 0) + return -1; + + if (status > 0) + break; + } while (priv->buffer_used > 0); + } - if (status > 0) - break; - } while (priv->buffer_used > 0); + result = priv->buffer_size - priv->buffer_used; } - return priv->buffer_size - priv->buffer_used; + return result; } static int @@ -245,8 +249,8 @@ esxStreamRecvFlags(virStreamPtr stream, size_t nbytes, unsigned int flags) { + int result = -1; esxStreamPrivate *priv = stream->privateData; - VIR_LOCK_GUARD lock = virLockGuardLock(&priv->curl->lock); virCheckFlags(0, -1); @@ -263,40 +267,44 @@ esxStreamRecvFlags(virStreamPtr stream, return -1; } - priv->buffer = data; - priv->buffer_size = nbytes; - priv->buffer_used = 0; - - if (priv->backlog_used > 0) { - if (priv->buffer_size > priv->backlog_used) - priv->buffer_used = priv->backlog_used; - else - priv->buffer_used = priv->buffer_size; + VIR_WITH_MUTEX_LOCK_GUARD(&priv->curl->lock) { + priv->buffer = data; + priv->buffer_size = nbytes; + priv->buffer_used = 0; + + if (priv->backlog_used > 0) { + if (priv->buffer_size > priv->backlog_used) + priv->buffer_used = priv->backlog_used; + else + priv->buffer_used = priv->buffer_size; + + memcpy(priv->buffer, priv->backlog, priv->buffer_used); + memmove(priv->backlog, priv->backlog + priv->buffer_used, + priv->backlog_used - priv->buffer_used); + + priv->backlog_used -= priv->buffer_used; + } else if (stream->flags & VIR_STREAM_NONBLOCK) { + if (esxStreamTransfer(priv, false) < 0) + return -1; - memcpy(priv->buffer, priv->backlog, priv->buffer_used); - memmove(priv->backlog, priv->backlog + priv->buffer_used, - priv->backlog_used - priv->buffer_used); + if (priv->buffer_used <= 0) + return -2; + } else /* blocking */ { + do { + int status = esxStreamTransfer(priv, true); - priv->backlog_used -= priv->buffer_used; - } else if (stream->flags & VIR_STREAM_NONBLOCK) { - if (esxStreamTransfer(priv, false) < 0) - return -1; + if (status < 0) + return -1; - if (priv->buffer_used <= 0) - return -2; - } else /* blocking */ { - do { - int status = esxStreamTransfer(priv, true); - - if (status < 0) - return -1; + if (status > 0) + break; + } while (priv->buffer_used < priv->buffer_size); + } - if (status > 0) - break; - } while (priv->buffer_used < priv->buffer_size); + result = priv->buffer_used; } - return priv->buffer_used; + return result; } static int -- 2.31.1

2 1

[CI][GitLab] Request to register a private runner machine
by Erik Skultety 17 Mar '22

17 Mar '22

This request is a direct result of [1] having been approved. However, before [1] can be merged we need to have the runner registered with the libvirt project first. Therefore I'd like to ask anyone who has admin access to the libvirt GitLab group to *privately* share the registration token with me. Regards, Erik [1] https://listman.redhat.com/archives/libvir-list/2022-March/229287.html

2 1

[PATCH] conf: fix inverted parameters in hash iterator callbacks
by Daniel P. Berrangé 17 Mar '22

17 Mar '22

virHashTableForEach unhelpfully has payload/key args in its callback reversed compared to g_hash_table_foreach. When converting from one to the other the semantics change but you don't get a compile error Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- This fixes the virNWFilterObjList conversion to GHashTable which I clearly forgot to re-test properly after replacing virHashTableForEach with g_hash_table_foreach in my patch. src/conf/virnwfilterobj.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index a569a52002..309f8bddb4 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -380,8 +380,8 @@ struct virNWFilterObjListData { static void -virNWFilterObjListCount(void *payload, - void *key G_GNUC_UNUSED, +virNWFilterObjListCount(void *key G_GNUC_UNUSED, + void *payload, void *opaque) { virNWFilterObj *obj = payload; @@ -417,8 +417,8 @@ struct virNWFilterNameData { static void -virNWFilterObjListCopyNames(void *payload, - void *key G_GNUC_UNUSED, +virNWFilterObjListCopyNames(void *key G_GNUC_UNUSED, + void *payload, void *opaque) { virNWFilterObj *obj = payload; @@ -460,15 +460,15 @@ struct virNWFilterListData { static void -virNWFilterObjListCollectIterator(void *payload, - void *key G_GNUC_UNUSED, +virNWFilterObjListCollectIterator(void *key G_GNUC_UNUSED, + void *payload, void *opaque) { struct virNWFilterListData *data = opaque; virNWFilterObj *obj = payload; virNWFilterObjLock(obj); - data->filters[data->nfilters++] = payload; + data->filters[data->nfilters++] = obj; } -- 2.35.1

2 1

[libvirt PATCH v2 00/13] Automatic mutex management - part 4
by Tim Wiederhake 17 Mar '22

17 Mar '22

Use the recently implemented VIR_LOCK_GUARD and VIR_WITH_MUTEX_LOCK_GUARD to simplify mutex management. V1: https://listman.redhat.com/archives/libvir-list/2022-March/229144.html Changes since V1: * Renamed mutex in nwfilter_driver.c * Removed all instances where a lock guard had to be initialized with NULL (i.e. referencing no mutex). Tim Wiederhake (13): nwfilter_driver: Statically initialize mutex nwfilter_driver: Split up nwfilterStateCleanup nwfilter_driver: Use automatic mutex management nwfilter_gentech: Use automatic mutex management nwfilter_dhcpsnoop: Replace virNWFilterSnoopActiveLock macros nwfilter_dhcpsnoop: Replace virNWFilterSnoopLock macros nwfilter_dhcpsnoop: Replace virNWFilterSnoopReqLock functions nwfilter_learnipaddr: Use automatic mutex management nwfilter_ipaddrmap: Use automatic mutex management virNetlinkEventAddClient: Remove goto virnetlink: Use automatic memory management remote_daemon_stream: Use automatic memory management qemu_conf: Use automatic memory management src/conf/nwfilter_ipaddrmap.c | 80 ++--- src/conf/virnwfilterobj.h | 1 - src/nwfilter/nwfilter_dhcpsnoop.c | 396 ++++++++----------------- src/nwfilter/nwfilter_driver.c | 175 +++++------ src/nwfilter/nwfilter_gentech_driver.c | 33 +-- src/nwfilter/nwfilter_learnipaddr.c | 83 ++---- src/qemu/qemu_conf.c | 70 ++--- src/remote/remote_daemon_stream.c | 34 +-- src/util/virnetlink.c | 226 +++++++------- 9 files changed, 423 insertions(+), 675 deletions(-) -- 2.31.1

2 15

sigfault in virObjectLockGuard
by Claudio Fontana 17 Mar '22

17 Mar '22

Hello all, while experimenting with upstream libvirt, I encountered the following segfault when trying to virt-install a centos7 guest: ---- #! /bin/bash ISO=CentOS-7-x86_64-Minimal-2009.iso DISK=centos7.qcow2 rm ${DISK} qemu-img create -f qcow2 ${DISK} 30G virt-install --virt-type=kvm --name=centos7 --vcpus=2 --memory=30720 --location ${ISO} --disk path=${DISK},format=qcow2 --network default --graphics none --os-variant=centos7.0 --extra-args console=ttyS0 ----- This triggers a segfault in libvirtd as follows: Thread 5 "rpc-libvirtd" received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7fca0b7fe640 (LWP 55658)] ___pthread_mutex_lock (mutex=mutex@entry=0x18) at pthread_mutex_lock.c:80 80 unsigned int type = PTHREAD_MUTEX_TYPE_ELISION (mutex); (gdb) bt #0 ___pthread_mutex_lock (mutex=mutex@entry=0x18) at pthread_mutex_lock.c:80 #1 0x00007fca132b8275 in virMutexLock (m=m@entry=0x18) at ../src/util/virthread.c:91 #2 0x00007fca132b829a in virLockGuardLock (m=0x18) at ../src/util/virthread.c:102 #3 0x00007fca1329c519 in virObjectLockGuard (anyobj=anyobj@entry=0x7fca13539310 <virNetDevGenNames+16>) at ../src/util/virobject.c:441 #4 0x00007fca1328b5f1 in virNetDevGenerateName (ifname=ifname@entry=0x7fca00018158, type=type@entry=VIR_NET_DEV_GEN_NAME_VNET) at ../src/util/virnetdev.c:3619 #5 0x00007fca13293b9d in virNetDevTapCreate (ifname=ifname@entry=0x7fca00018158, tunpath=tunpath@entry=0x7fca0845accd "/dev/net/tun", tapfd=tapfd@entry=0x7fca00043fc0, tapfdSize=tapfdSize@entry=1, flags=flags@entry=3) at ../src/util/virnetdevtap.c:183 #6 0x00007fca13294501 in virNetDevTapCreateInBridgePort (brname=brname@entry=0x7fca000163c0 "br0", ifname=ifname@entry=0x7fca00018158, macaddr=macaddr@entry=0x7fca00018034, vmuuid=vmuuid@entry=0x7fca000156b8 "\232T\020\250~\024Mn\211\227\062\"\264\001\025\030", tunpath=tunpath@entry=0x7fca0845accd "/dev/net/tun", tapfd=tapfd@entry=0x7fca00043fc0, tapfdSize=1, virtPortProfile=0x0, virtVlan=0x0, isolatedPort=VIR_TRISTATE_BOOL_ABSENT, coalesce=0x0, mtu=0, actualMTU=0x0, flags=3) at ../src/util/virnetdevtap.c:602 #7 0x00007fca083d66f5 in qemuInterfaceBridgeConnect (def=def@entry=0x7fca000156b0, driver=driver@entry=0x7fc9c0050980, net=net@entry=0x7fca00018030, tapfd=tapfd@entry=0x7fca00043fc0, tapfdSize=tapfdSize@entry=0x7fca0b7fd410) at ../src/qemu/qemu_interface.c:564 #8 0x00007fca08370f35 in qemuBuildInterfaceCommandLine (vm=<optimized out>, vm=<optimized out>, nicindexes=0x7fca0b7fd570, nnicindexes=0x7fca0b7fd568, standalone=false, vmop=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, qemuCaps=0x7fc9fc0145a0 [virQEMUCaps], net=0x7fca00018030, cmd=0x7fca00041300, driver=0x7fc9c0050980) at ../src/qemu/qemu_command.c:8669 #9 qemuBuildNetCommandLine (nicindexes=0x7fca0b7fd570, nnicindexes=0x7fca0b7fd568, standalone=<optimized out>, vmop=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, qemuCaps=0x7fc9fc0145a0 [virQEMUCaps], cmd=0x7fca00041300, vm=<optimized out>, driver=0x7fc9c0050980) at ../src/qemu/qemu_command.c:8958 #10 qemuBuildCommandLine (driver=driver@entry=0x7fc9c0050980, vm=0x7fc9fc31f5e0 [virDomainObj], vm@entry=0x2200000000, migrateURI=0x0, snapshot=0x0, snapshot@entry=0x7fc9c0013190, vmop=vmop@entry=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, standalone=standalone@entry=false, enableFips=false, nnicindexes=0x7fca0b7fd568, nicindexes=0x7fca0b7fd570, flags=0) at ../src/qemu/qemu_command.c:10548 #11 0x00007fca0841adc2 in qemuProcessLaunch (conn=0x7fc9c0022070, driver=0x7fc9c0050980, vm=0x2200000000, asyncJob=QEMU_ASYNC_JOB_NONE, incoming=0x0, snapshot=0x7fc9c0013190, vmop=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, flags=17) at ../src/qemu/qemu_process.c:7435 #12 0x00007fca08420669 in qemuProcessStart (conn=conn@entry=0x7fc9c0013190, driver=driver@entry=0x7fc9c0050980, vm=0x7fc9fc31f5e0 [virDomainObj], updatedCPU=updatedCPU@entry=0x0, asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_START, migrateFrom=migrateFrom@entry=0x0, migrateFd=-1, migratePath=0x0, snapshot=0x0, vmop=VIR_NETDE--Type <RET> for more, q to quit, c to continue without paging-- V_VPORT_PROFILE_OP_CREATE, flags=<optimized out>) at ../src/qemu/qemu_process.c:7855 #13 0x00007fca083b3e10 in qemuDomainCreateXML (conn=0x7fc9c0013190, xml=<optimized out>, flags=0) at ../src/qemu/qemu_driver.c:1628 #14 0x00007fca133e46f0 in virDomainCreateXML (conn=0x7fc9c0013190, xmlDesc=0x7fca00008760 "<domain type=\"kvm\">\n <name>centos7</name>\n <uuid>9a5410a8-7e14-4d6e-8997-3222b4011518</uuid>\n <metadata>\n <libosinfo:libosinfo xmlns:libosinfo=\"http://libosinfo.org/xmlns/libvirt/domain/1.0\">\n "..., flags=0) at ../src/libvirt-domain.c:180 #15 0x0000564bb33d631f in remoteDispatchDomainCreateXML (server=0x564bb3dd1880 [virNetServer], msg=0x564bb3e81620, ret=0x7fca0000bfa0, args=0x7fca00002510, rerr=0x7fca0b7fd9a0, client=0x564bb3e80030 [virNetServerClient]) at src/remote/remote_daemon_dispatch_stubs.h:5083 #16 remoteDispatchDomainCreateXMLHelper (server=0x564bb3dd1880 [virNetServer], client=0x564bb3e80030 [virNetServerClient], msg=0x564bb3e81620, rerr=0x7fca0b7fd9a0, args=0x7fca00002510, ret=0x7fca0000bfa0) at src/remote/remote_daemon_dispatch_stubs.h:5064 #17 0x00007fca13374426 in virNetServerProgramDispatchCall (msg=0x564bb3e81620, client=0x564bb3e80030 [virNetServerClient], server=0x564bb3dd1880 [virNetServer], prog=0x564bb3e3c010 [virNetServerProgram]) at ../src/rpc/virnetserverprogram.c:428 #18 virNetServerProgramDispatch (prog=0x564bb3e3c010 [virNetServerProgram], server=server@entry=0x564bb3dd1880 [virNetServer], client=0x564bb3e80030 [virNetServerClient], msg=0x564bb3e81620) at ../src/rpc/virnetserverprogram.c:302 #19 0x00007fca133796d4 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x564bb3dd1880 [virNetServer]) at ../src/rpc/virnetserver.c:140 #20 virNetServerHandleJob (jobOpaque=0x564bb3e7fd50, opaque=0x564bb3dd1880) at ../src/rpc/virnetserver.c:160 #21 0x00007fca132b8eaf in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164 #22 0x00007fca132b84f5 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256 #23 0x00007fca12c362ba in start_thread (arg=<optimized out>) at pthread_create.c:442 #24 0x00007fca12cc0460 in clone3 () at ../sysdeps/unix/sysv/linux/x86_64/clone3.S:81 ---- In order to work around the problem this is the hack I used (to get things to work), but clearly it is no solution: diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 5df48af60c..e22d3cb5c5 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3616,7 +3616,7 @@ virNetDevGenerateName(char **ifname, virNetDevGenNameType type) g_autofree char *try = NULL; int id = 0; - VIR_WITH_OBJECT_LOCK_GUARD(&virNetDevGenNames[type].mutex) { + /* VIR_WITH_OBJECT_LOCK_GUARD(&virNetDevGenNames[type].mutex) */ { id = ++virNetDevGenNames[type].lastID; /* reset before overflow */ ---- With this applied things run fine for me, install is successful and domain is functional. Ciao, Claudio -- Claudio Fontana Engineering Manager Virtualization, SUSE Labs Core SUSE Software Solutions Italy Srl

2 2

[PATCH] nwfilter: fix crash when counting number of network filters
by Daniel P. Berrangé 17 Mar '22

17 Mar '22

The virNWFilterObjListNumOfNWFilters method iterates over the driver->nwfilters, accessing virNWFilterObj instances. As such it needs to be protected against concurrent modification of the driver->nwfilters object. This API allows unprivileged users to connect, so users with read-only access to libvirt can cause a denial of service crash if they are able to race with a call of virNWFilterUndefine. Since network filters are usually statically defined, this is considered a low severity problem. This is assigned CVE-2022-0897. Reviewed-by: Eric Blake <eblake(a)redhat.com> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a pre-reviewed patch from the security list src/nwfilter/nwfilter_driver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 3ce8fce7f9..a493205c80 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -478,11 +478,15 @@ nwfilterLookupByName(virConnectPtr conn, static int nwfilterConnectNumOfNWFilters(virConnectPtr conn) { + int ret; if (virConnectNumOfNWFiltersEnsureACL(conn) < 0) return -1; - return virNWFilterObjListNumOfNWFilters(driver->nwfilters, conn, - virConnectNumOfNWFiltersCheckACL); + nwfilterDriverLock(); + ret = virNWFilterObjListNumOfNWFilters(driver->nwfilters, conn, + virConnectNumOfNWFiltersCheckACL); + nwfilterDriverUnlock(); + return ret; } -- 2.35.1

1 0

[libvirt PATCH v2 00/10] Automatic mutex management - part 3
by Tim Wiederhake 17 Mar '22

17 Mar '22

Use the recently implemented VIR_LOCK_GUARD and VIR_WITH_MUTEX_LOCK_GUARD to simplify mutex management. v1: https://listman.redhat.com/archives/libvir-list/2022-February/msg00674.html Changed since v1: * Removed locking / unlocking in storage driver initialization and cleanup instead of working around the issue of the lifetime of the mutex. Tim Wiederhake (10): test: Use automatic mutex management openvz: Use automatic mutex management remote_daemon_dispatch: Use automatic mutex management netdev: Use automatic mutex management nodesuspend: Use automatic mutex management admin: Use automatic mutex management esx_stream: Use automatic mutex management esx_vi: Use automatic mutex management storage: Removing mutex locking in initialization and cleanup storage: Use automatic mutex management src/admin/admin_server_dispatch.c | 3 +- src/esx/esx_stream.c | 65 ++++------ src/esx/esx_vi.c | 109 +++++++--------- src/openvz/openvz_driver.c | 91 +++++--------- src/remote/remote_daemon_dispatch.c | 187 +++++++++------------------- src/storage/storage_driver.c | 32 ++--- src/test/test_driver.c | 15 +-- src/util/virnetdev.c | 20 ++- src/util/virnodesuspend.c | 54 +++----- 9 files changed, 193 insertions(+), 383 deletions(-) -- 2.31.1

3 16

[PATCH v2 0/4] nodedev: dynamic parent update on mdev definitions
by Boris Fiuczynski 17 Mar '22

17 Mar '22

Mdev definitions can be created regardless of the existence of there parent devices in mdevctl. Parent objects of mdev definitions can also vanish dynamically. This series adds the missing support for these scenarios. Boris Fiuczynski (4): nodedev: fix typo in mdevctl update warning virnodedeviceobj: export virNodeDeviceObjHasCap nodedev: update mdevs on parent change nodedev: trigger mdev device definition update on udev add and remove src/conf/virnodedeviceobj.c | 3 +-- src/conf/virnodedeviceobj.h | 4 ++++ src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 4 +++- src/node_device/node_device_udev.c | 11 ++++++++++- 5 files changed, 19 insertions(+), 4 deletions(-) -- 2.33.1

2 5

[libvirt PATCH 0/4] Functional CI - GitLab enablement
by Erik Skultety 17 Mar '22

17 Mar '22

RFC here [1] Since RFC: - renamed the stage to integration_tests - dropped both the test child pipeline as well as triggering a multi-project CI pipeline to build the Perl bindings and instead use the latest bindings artifacts we have available from the libvirt-perl project. -> basically now we only have a regular CI stage with no extra jobs that just spins up a bunch of private runners and uploads RPM artifacts into them and runs the TCK tests - replaced sed invocations to edit daemon logging settings with augtool - used a pattern for log filters from [2] - used the "$CI_JOB_STATUS" variable in the after_script to determine whether the main script failed so as not to try moving and collecting logs on successful jobs (the logs would have been published as artifacts on failures anyway) Demo pipeline: https://gitlab.com/eskultety/libvirt/-/pipelines/491838828 [1] https://listman.redhat.com/archives/libvir-list/2022-January/227947.html [2] https://libvirt.org/kbase/debuglogs.html#less-verbose-logging-for-qemu-vms Erik Skultety (4): ci: gitlab: Refresh gitlab.yml ci: manifest: Publish RPMs as artifacts on CentOS Stream and Fedoras gitlab-ci: Introduce new 'integration_tests' pipeline stage DO NOT MERGE: Demo a functional CI pipeline running Fedoras CentOS only .gitlab-ci.yml | 99 +------- ci/gitlab.yml | 606 ++------------------------------------------- ci/integration.yml | 99 ++++++++ ci/manifest.yml | 21 +- 4 files changed, 142 insertions(+), 683 deletions(-) create mode 100644 ci/integration.yml -- 2.34.1

2 5

[PATCH] virnetdev: Use VIR_WITH_MUTEX_LOCK_GUARD in virNetDevGenerateName()
by Michal Privoznik 17 Mar '22

17 Mar '22

The virNetDevGenerateName() function uses a global array of virNetDevGenName structs to find next unused name for network device. This obviously needs some locking and in fact each member of the array has its own lock. However, these members are not virObjects, they are just plain structs, therefore VIR_WITH_MUTEX_LOCK_GUARD() must be used instead of VIR_WITH_OBJECT_LOCK_GUARD() to lock individual mutexes. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 5df48af60c..1c15a475fa 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3616,7 +3616,7 @@ virNetDevGenerateName(char **ifname, virNetDevGenNameType type) g_autofree char *try = NULL; int id = 0; - VIR_WITH_OBJECT_LOCK_GUARD(&virNetDevGenNames[type].mutex) { + VIR_WITH_MUTEX_LOCK_GUARD(&virNetDevGenNames[type].mutex) { id = ++virNetDevGenNames[type].lastID; /* reset before overflow */ -- 2.34.1

2 1

[PATCH] nodedev: fix typo in mdevctl update warning
by Boris Fiuczynski 16 Mar '22

16 Mar '22

Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- src/node_device/node_device_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index b0a5e6302c..17b6bb9299 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -2035,7 +2035,7 @@ mdevctlHandlerThread(void *opaque G_GNUC_UNUSED) VIR_LOCK_GUARD lock = virLockGuardLock(&priv->mdevctlLock); if (nodeDeviceUpdateMediatedDevices() < 0) - VIR_WARN("mdevctl failed to updated mediated devices"); + VIR_WARN("mdevctl failed to update mediated devices"); } -- 2.33.1

2 1

[PATCH 0/3] nodedev: dynamic parent update on mdev definitions
by Boris Fiuczynski 16 Mar '22

16 Mar '22

Mdev definitions can be created regardless of the existence of there parent devices in mdevctl. Parent objects of mdev definitions can also vanish dynamically. This series adds the missing support for these scenarios. Boris Fiuczynski (3): virnodedeviceobj: export virNodeDeviceObjHasCap nodedev: update mdevs on parent change nodedev: trigger mdev device definition update on udev add and remove src/conf/virnodedeviceobj.c | 3 +-- src/conf/virnodedeviceobj.h | 4 ++++ src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 4 +++- src/node_device/node_device_udev.c | 9 +++++++++ 5 files changed, 18 insertions(+), 3 deletions(-) -- 2.33.1

3 6

[PATCH v2 0/2] qemu: domainjob: Allow operations if cb is not set in job structure
by Kristina Hanicova 16 Mar '22

16 Mar '22

This is v2 of: https://listman.redhat.com/archives/libvir-list/2022-March/228905.html Diff to v1: * add checks for cb structure in other functions as well (suggested by Michal) Kristina Hanicova (2): qemu: domainjob: Allow operations if cb is not set in job structure qemu: domainjob: Allow InitJob if cb is not set in qemuDomainObjInitJob() src/qemu/qemu_domainjob.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) -- 2.35.1

2 3

Re: Virtqemud wants to unlink /dev/urandom
by Martin Kletzander 16 Mar '22

16 Mar '22

[adding back libvir-list to the Cc] On Fri, Mar 11, 2022 at 03:55:03PM +0100, Nikola Knazekova wrote: >Hey Martin, > >thanks for your resposne. > >I don't know if it is happening in the mount namespace. Can you look at the >logs in attachment? > >It was happening on clear install on F35, F36 and on older versions >probably too. >But it is only an issue in the new selinux policy for libvirt. In old >selinux policy is allowed for virtd to unlink /dev/urandom char files. >I just wanted to be sure if it is ok to allow it for virtqemud. > That actually might be the case, that it actually does set the context on /dev/urandom correctly and then the unlink fails for virtqemud since the selinux policy only accounts for libvirtd even though we switched to modular daemons making virtqemud the one to do the work. @Michal can you confirm what I'm guessing here since you did a lot of the mount namespace work which I presume is what contributes to the issue here. In the meantime, would you mind trying this with the mount namespace feature turned off in /etc/libvirt/qemu.conf like this: namespaces = [] Thanks. >Regards, >Nikola > >On Thu, Feb 24, 2022 at 3:00 PM Martin Kletzander <mkletzan(a)redhat.com> >wrote: > >> On Thu, Feb 24, 2022 at 01:41:50PM +0100, Nikola Knazekova wrote: >> >Hi, >> > >> >when I am creating virtual machine on system with new SELinux policy for >> >Libvirt, I am getting this error message: >> > >> >Unable to complete install: 'Unable to create device /dev/urandom: File >> >exists' >> >Traceback (most recent call last): >> > File "/usr/share/virt-manager/virtManager/asyncjob.py", line 65, in >> >cb_wrapper >> > callback(asyncjob, *args, **kwargs) >> > File "/usr/share/virt-manager/virtManager/createvm.py", line 2001, in >> >_do_async_install >> > installer.start_install(guest, meter=meter) >> > File "/usr/share/virt-manager/virtinst/install/installer.py", line 701, >> >in start_install >> > domain = self._create_guest( >> > File "/usr/share/virt-manager/virtinst/install/installer.py", line 649, >> >in _create_guest >> > domain = self.conn.createXML(install_xml or final_xml, 0) >> > File "/usr/lib64/python3.10/site-packages/libvirt.py", line 4393, in >> >createXML >> > raise libvirtError('virDomainCreateXML() failed') >> >libvirt.libvirtError: Unable to create device /dev/urandom: File exists >> > >> >And SELinux denial, where SELinux prevents virtqemud to unlink character >> >device /dev/urandom: >> > >> >time->Wed Feb 23 19:30:33 2022 >> >type=PROCTITLE msg=audit(1645662633.819:930): >> >> >proctitle=2F7573722F7362696E2F7669727471656D7564002D2D74696D656F757400313230 >> >type=PATH msg=audit(1645662633.819:930): item=1 name="/dev/urandom" >> inode=6 >> >dev=00:44 mode=020666 ouid=0 ogid=0 rdev=01:09 >> >obj=system_u:object_r:urandom_device_t:s0 nametype=DELETE cap_fp=0 >> cap_fi=0 >> >cap_fe=0 cap_fver=0 cap_frootid=0 >> >type=PATH msg=audit(1645662633.819:930): item=0 name="/dev/" inode=1 >> >dev=00:44 mode=040755 ouid=0 ogid=0 rdev=00:00 >> >obj=system_u:object_r:tmpfs_t:s0 nametype=PARENT cap_fp=0 cap_fi=0 >> cap_fe=0 >> >cap_fver=0 cap_frootid=0 >> >type=CWD msg=audit(1645662633.819:930): cwd="/" >> >type=SYSCALL msg=audit(1645662633.819:930): arch=c000003e syscall=87 >> >success=no exit=-13 a0=7f9418064f50 a1=7f943909c930 a2=7f941d0ef6d4 a3=0 >> >items=2 ppid=6722 pid=7196 auid=4294967295 uid=0 gid=0 euid=0 suid=0 >> >fsuid=0 egid=0 sgid=0 fsgid=0 tty=(none) ses=4294967295 comm="rpc-worker" >> >exe="/usr/sbin/virtqemud" subj=system_u:system_r:virtqemud_t:s0 key=(null) >> >type=AVC msg=audit(1645662633.819:930): avc: denied { unlink } for >> > pid=7196 comm="rpc-worker" name="urandom" dev="tmpfs" ino=6 >> >scontext=system_u:system_r:virtqemud_t:s0 >> >tcontext=system_u:object_r:urandom_device_t:s0 tclass=chr_file >> permissive=0 >> > >> >Is this expected behavior? >> > >> >> The error is not, but creating and removing /dev/urandom is fine, as far >> as it happens in the mount namespace of the domain, which we create and >> as such we also need to create some basic /dev structure in there. >> >> Unfortunately this error does not show whether it is happening in the >> mount namespace, although it should definitely _not_ happen outside of it. >> >> Does this happen on clean install? What is the version of libvirt and >> the selinux policy? What's the distro+version of the system? Would you >> mind capturing the debug logs and attaching them? >> >> How to capture debug logs: https://libvirt.org/kbase/debuglogs.html >> >> >Thanks, >> >Nikola >> >2022-03-04 03:08:28.053+0000: starting up libvirt version: 8.0.0, package: 2.fc36 (Fedora Project, 2022-01-20-17:44:09, ), qemu version: 6.2.0qemu-6.2.0-5.fc36, kernel: 5.17.0-0.rc5.102.fc36.x86_64, hostname: fedora >LC_ALL=C \ >PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin \ >HOME=/var/lib/libvirt/qemu/domain-4-fedora35-3 \ >XDG_DATA_HOME=/var/lib/libvirt/qemu/domain-4-fedora35-3/.local/share \ >XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain-4-fedora35-3/.cache \ >XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain-4-fedora35-3/.config \ >/usr/bin/qemu-system-x86_64 \ >-name guest=fedora35-3,debug-threads=on \ >-S \ >-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain-4-fedora35-3/master-key.aes"}' \ >-machine pc-q35-6.2,usb=off,vmport=off,dump-guest-core=off,memory-backend=pc.ram \ >-accel kvm \ >-cpu host,migratable=on \ >-m 2048 \ >-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ >-overcommit mem-lock=off \ >-smp 2,sockets=2,cores=1,threads=1 \ >-uuid 818068b5-c72b-475c-a960-231f29f60464 \ >-no-user-config \ >-nodefaults \ >-chardev socket,id=charmonitor,fd=28,server=on,wait=off \ >-mon chardev=charmonitor,id=monitor,mode=control \ >-rtc base=utc,driftfix=slew \ >-global kvm-pit.lost_tick_policy=delay \ >-no-hpet \ >-no-shutdown \ >-global ICH9-LPC.disable_s3=1 \ >-global ICH9-LPC.disable_s4=1 \ >-boot strict=on \ >-device pcie-root-port,port=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \ >-device pcie-root-port,port=17,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \ >-device pcie-root-port,port=18,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \ >-device pcie-root-port,port=19,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x3 \ >-device pcie-root-port,port=20,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x4 \ >-device pcie-root-port,port=21,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x5 \ >-device pcie-root-port,port=22,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x6 \ >-device pcie-root-port,port=23,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x7 \ >-device pcie-root-port,port=24,chassis=9,id=pci.9,bus=pcie.0,multifunction=on,addr=0x3 \ >-device pcie-root-port,port=25,chassis=10,id=pci.10,bus=pcie.0,addr=0x3.0x1 \ >-device pcie-root-port,port=26,chassis=11,id=pci.11,bus=pcie.0,addr=0x3.0x2 \ >-device pcie-root-port,port=27,chassis=12,id=pci.12,bus=pcie.0,addr=0x3.0x3 \ >-device pcie-root-port,port=28,chassis=13,id=pci.13,bus=pcie.0,addr=0x3.0x4 \ >-device pcie-root-port,port=29,chassis=14,id=pci.14,bus=pcie.0,addr=0x3.0x5 \ >-device qemu-xhci,p2=15,p3=15,id=usb,bus=pci.2,addr=0x0 \ >-device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \ >-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/fedora35-3.qcow2","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ >-blockdev '{"node-name":"libvirt-2-format","read-only":false,"discard":"unmap","driver":"qcow2","file":"libvirt-2-storage","backing":null}' \ >-device virtio-blk-pci,bus=pci.4,addr=0x0,drive=libvirt-2-format,id=virtio-disk0,bootindex=2 \ >-blockdev '{"driver":"file","filename":"/home/n/Downloads/Fedora-Workstation-Live-x86_64-35-1.2.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ >-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ >-device ide-cd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \ >-netdev tap,fd=29,id=hostnet0,vhost=on,vhostfd=31 \ >-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:81:d4:90,bus=pci.1,addr=0x0 \ >-chardev pty,id=charserial0 \ >-device isa-serial,chardev=charserial0,id=serial0 \ >-chardev socket,id=charchannel0,fd=27,server=on,wait=off \ >-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 \ >-chardev spicevmc,id=charchannel1,name=vdagent \ >-device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=com.redhat.spice.0 \ >-device usb-tablet,id=input0,bus=usb.0,port=1 \ >-audiodev '{"id":"audio1","driver":"spice"}' \ >-spice port=5900,addr=127.0.0.1,disable-ticketing=on,image-compression=off,seamless-migration=on \ >-device virtio-vga,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \ >-device ich9-intel-hda,id=sound0,bus=pcie.0,addr=0x1b \ >-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \ >-chardev spicevmc,id=charredir0,name=usbredir \ >-device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=2 \ >-chardev spicevmc,id=charredir1,name=usbredir \ >-device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=3 \ >-device virtio-balloon-pci,id=balloon0,bus=pci.5,addr=0x0 \ >-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \ >-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.6,addr=0x0 \ >-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ >-msg timestamp=on >char device redirected to /dev/pts/2 (label charserial0) >2022-03-04T03:09:24.261105Z qemu-system-x86_64: terminating on signal 15 from pid 8179 (/usr/sbin/virtqemud) >2022-03-04 03:09:24.461+0000: shutting down, reason=destroyed

3 3

[libvirt PATCH] Add Alpine builds to CI
by Martin Kletzander 16 Mar '22

16 Mar '22

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- ci/containers/alpine-314.Dockerfile | 82 ++++++++++++++++++++++++++++ ci/containers/alpine-edge.Dockerfile | 81 +++++++++++++++++++++++++++ ci/gitlab.yml | 35 +++++++++++- ci/manifest.yml | 8 +++ 4 files changed, 204 insertions(+), 2 deletions(-) create mode 100644 ci/containers/alpine-314.Dockerfile create mode 100644 ci/containers/alpine-edge.Dockerfile diff --git a/ci/containers/alpine-314.Dockerfile b/ci/containers/alpine-314.Dockerfile new file mode 100644 index 000000000000..4ca35a949bda --- /dev/null +++ b/ci/containers/alpine-314.Dockerfile @@ -0,0 +1,82 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/alpine:3.14 + +RUN apk update && \ + apk upgrade && \ + apk add \ + acl-dev \ + attr-dev \ + audit-dev \ + augeas \ + bash-completion \ + ca-certificates \ + ccache \ + ceph-dev \ + clang \ + curl-dev \ + cyrus-sasl-dev \ + diffutils \ + dnsmasq \ + eudev-dev \ + fuse-dev \ + gcc \ + gettext \ + git \ + glib-dev \ + gnutls-dev \ + grep \ + iproute2 \ + iptables \ + kmod \ + libcap-ng-dev \ + libnl3-dev \ + libpcap-dev \ + libpciaccess-dev \ + libselinux-dev \ + libssh-dev \ + libssh2-dev \ + libtirpc-dev \ + libxml2-dev \ + libxml2-utils \ + libxslt \ + lvm2 \ + lvm2-dev \ + make \ + meson \ + musl-dev \ + netcf-dev \ + nfs-utils \ + numactl-dev \ + open-iscsi \ + parted-dev \ + perl \ + pkgconf \ + polkit \ + py3-docutils \ + py3-flake8 \ + python3 \ + qemu-img \ + readline-dev \ + rpcgen \ + samurai \ + sed \ + util-linux-dev \ + wireshark-dev \ + xen-dev \ + yajl-dev && \ + apk list | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/containers/alpine-edge.Dockerfile b/ci/containers/alpine-edge.Dockerfile new file mode 100644 index 000000000000..d171ed1be77d --- /dev/null +++ b/ci/containers/alpine-edge.Dockerfile @@ -0,0 +1,81 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/alpine:edge + +RUN apk update && \ + apk upgrade && \ + apk add \ + acl-dev \ + attr-dev \ + audit-dev \ + augeas \ + bash-completion \ + ca-certificates \ + ccache \ + ceph-dev \ + clang \ + curl-dev \ + cyrus-sasl-dev \ + diffutils \ + dnsmasq \ + eudev-dev \ + fuse-dev \ + gcc \ + gettext \ + git \ + glib-dev \ + gnutls-dev \ + grep \ + iproute2 \ + iptables \ + kmod \ + libcap-ng-dev \ + libnl3-dev \ + libpcap-dev \ + libpciaccess-dev \ + libselinux-dev \ + libssh-dev \ + libssh2-dev \ + libtirpc-dev \ + libxml2-dev \ + libxml2-utils \ + libxslt \ + lvm2 \ + lvm2-dev \ + make \ + meson \ + musl-dev \ + netcf-dev \ + nfs-utils \ + numactl-dev \ + open-iscsi \ + parted-dev \ + perl \ + pkgconf \ + polkit \ + py3-docutils \ + py3-flake8 \ + python3 \ + qemu-img \ + readline-dev \ + samurai \ + sed \ + util-linux-dev \ + wireshark-dev \ + xen-dev \ + yajl-dev && \ + apk list | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/gitlab.yml b/ci/gitlab.yml index cc03a2fe49f8..a19ec2a23f09 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -10,8 +10,7 @@ stage: containers needs: [] services: - - name: registry.gitlab.com/libvirt/libvirt-ci/docker-dind:master - alias: docker + - docker:dind before_script: - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest" - export COMMON_TAG="$CI_REGISTRY/libvirt/libvirt/ci-$NAME:latest" @@ -87,6 +86,20 @@ x86_64-almalinux-8-container: NAME: almalinux-8 +x86_64-alpine-314-container: + extends: .container_job + allow_failure: false + variables: + NAME: alpine-314 + + +x86_64-alpine-edge-container: + extends: .container_job + allow_failure: false + variables: + NAME: alpine-edge + + x86_64-centos-stream-8-container: extends: .container_job allow_failure: false @@ -400,6 +413,24 @@ x86_64-almalinux-8-clang: RPM: skip +x86_64-alpine-314: + extends: .native_build_job + needs: + - x86_64-alpine-314-container + allow_failure: false + variables: + NAME: alpine-314 + + +x86_64-alpine-edge: + extends: .native_build_job + needs: + - x86_64-alpine-edge-container + allow_failure: false + variables: + NAME: alpine-edge + + x86_64-centos-stream-8: extends: .native_build_job needs: diff --git a/ci/manifest.yml b/ci/manifest.yml index 87d923ae7839..26704bef2362 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -18,6 +18,14 @@ targets: RPM: skip CC: clang + alpine-314: + jobs: + - arch: x86_64 + + alpine-edge: + jobs: + - arch: x86_64 + centos-stream-8: jobs: - arch: x86_64 -- 2.35.1

2 4

[PATCH 0/4] qemu_cgroup: Slightly rework
by Michal Privoznik 16 Mar '22

16 Mar '22

These are inspired by my earlier patches that solved the same issue for namespaces: https://listman.redhat.com/archives/libvir-list/2022-March/229266.html Michal Prívozník (4): qemu_cgroup: Drop ENOENT special case for RNG devices qemu_cgroup: Introduce and use qemuCgroupAllowDevicePath() qemu_cgroup: Introduce and use qemuCgroupDenyDevicePath() qemu_cgroup: Don't deny devices from cgroupDeviceACL src/qemu/qemu_cgroup.c | 246 +++++++++++++++++------------------------ 1 file changed, 100 insertions(+), 146 deletions(-) -- 2.34.1

2 5

[PATCH] add build dependency on lxc_protocol.h to remote_daemon
by Joe Slater 16 Mar '22

16 Mar '22

remote_daemon.c and others need the generated header lxc_protocol.h, but do not have it as a dependency in meson.build. This means that builds will randomly (ok, very occasionally) fail. Restructure how the header is built so that remote_daemon can have it as a dependency. Signed-off-by: Joe Slater <joe.slater(a)windriver.com> --- src/remote/meson.build | 48 ++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/src/remote/meson.build b/src/remote/meson.build index 0a18826..31a30ee 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -1,27 +1,11 @@ -remote_driver_sources = [ - 'remote_driver.c', - 'remote_sockets.c', -] - -remote_driver_generated = [] +remote_xxx_generated = [] foreach name : [ 'remote', 'qemu', 'lxc' ] - client_bodies_h = '@0@_client_bodies.h'.format(name) protocol_c = '@0@_protocol.c'.format(name) protocol_h = '@0@_protocol.h'.format(name) protocol_x = '@0@_protocol.x'.format(name) - remote_driver_generated += custom_target( - client_bodies_h, - input: protocol_x, - output: client_bodies_h, - command: [ - gendispatch_prog, '--mode=client', name, name.to_upper(), '@INPUT@', - ], - capture: true, - ) - - remote_driver_generated += custom_target( + remote_xxx_generated += custom_target( protocol_h, input: protocol_x, output: protocol_h, @@ -30,7 +14,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] ], ) - remote_driver_generated += custom_target( + remote_xxx_generated += custom_target( protocol_c, input: protocol_x, output: protocol_c, @@ -42,6 +26,30 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] rpc_probe_files += files(protocol_x) endforeach + +remote_driver_sources = [ + 'remote_driver.c', + 'remote_sockets.c', +] + +remote_driver_generated =remote_xxx_generated + +foreach name : [ 'remote', 'qemu', 'lxc' ] + client_bodies_h = '@0@_client_bodies.h'.format(name) + protocol_x = '@0@_protocol.x'.format(name) + + remote_driver_generated += custom_target( + client_bodies_h, + input: protocol_x, + output: client_bodies_h, + command: [ + gendispatch_prog, '--mode=client', name, name.to_upper(), '@INPUT@', + ], + capture: true, + ) + +endforeach + remote_daemon_sources = files( 'remote_daemon.c', 'remote_daemon_config.c', @@ -49,7 +57,7 @@ remote_daemon_sources = files( 'remote_daemon_stream.c', ) -remote_daemon_generated = [] +remote_daemon_generated = remote_xxx_generated virt_ssh_helper_sources = files( 'remote_sockets.c', -- 2.32.0

5 5

[libvirt][PATCH RESEND v10 0/5] Support query and use SGX
by Haibin Huang 15 Mar '22

15 Mar '22

Because the 5th patch was sent by mistake, so replace the 5th patch and send it again. This patch series provides support for enabling Intel's Software Guard Extensions (SGX) feature in guest VM. Giving the SGX support in QEMU had been merged. Intel SGX is a set of instructions that increases the security of application code and data, giving them more protection from disclosure or modification. Developers can partition sensitive information into enclaves, which are areas of execution in memory with more security protection. It depends on QEMU fixing[1], which will move cpu QOM object from /machine/unattached/device[nn] to /machine/cpu[nn]. It requires libvirt to change the default cpu QOM object location once QEMU patch gets accepted, but it is out of this SGX patch scope. The typical flow looks below at very high level: 1. Calls virConnectGetDomainCapabilities API to domain capabilities that includes the following SGX information. <feature> ... <sgx supported='yes'> <epc_size unit='KiB'>N</epc_size> </sgx> ... </feature> 2. User requests to start a guest calling virCreateXML() with SGX requirement. It does not support NUMA yet, since latest QEMU 6.2 release does not support NUMA. It should contain <devices> ... <memory model='sgx-epc'> <target> <size unit='KiB'>N</size> </target> </memory> ... </devices> [1] https://lists.nongnu.org/archive/html/qemu-devel/2022-01/msg03534.html Haibin Huang (3): qemu: provide support to query the SGX capability conf: expose SGX feature in domain capabilities Add unit test for domaincapsdata sgx Lin Yang (2): conf: Introduce SGX EPC element into device memory xml Update default CPU location in qemu QOM tree docs/formatdomain.rst | 9 +- docs/formatdomaincaps.html.in | 26 ++++ docs/schemas/domaincaps.rng | 22 ++- docs/schemas/domaincommon.rng | 1 + src/conf/domain_capabilities.c | 29 ++++ src/conf/domain_capabilities.h | 13 ++ src/conf/domain_conf.c | 6 + src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 16 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 3 + src/qemu/qemu_capabilities.c | 137 ++++++++++++++++++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_capspriv.h | 4 + src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 38 +++-- src/qemu/qemu_domain_address.c | 6 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_monitor.c | 10 ++ src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 84 ++++++++++- src/qemu/qemu_monitor_json.h | 9 ++ src/qemu/qemu_process.c | 2 + src/qemu/qemu_validate.c | 8 + src/security/security_apparmor.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + tests/domaincapsdata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsdata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsdata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsdata/empty.xml | 1 + tests/domaincapsdata/libxl-xenfv.xml | 1 + tests/domaincapsdata/libxl-xenpv.xml | 1 + .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 1 + .../qemu_2.12.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-tcg.x86_64.xml | 1 + .../qemu_2.6.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.7.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.8.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.8.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 1 + .../qemu_4.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 4 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 4 + .../qemu_6.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 4 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 4 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 4 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 4 + .../caps_6.2.0.x86_64.replies | 22 ++- .../caps_6.2.0.x86_64.xml | 5 + .../caps_7.0.0.x86_64.replies | 22 ++- .../caps_7.0.0.x86_64.xml | 5 + tests/qemuxml2argvdata/sgx-epc.xml | 36 +++++ .../sgx-epc.x86_64-latest.xml | 52 +++++++ tests/qemuxml2xmltest.c | 2 + 138 files changed, 675 insertions(+), 30 deletions(-) create mode 100644 tests/qemuxml2argvdata/sgx-epc.xml create mode 100644 tests/qemuxml2xmloutdata/sgx-epc.x86_64-latest.xml -- 2.17.1

5 22

[PATCH 0/3] virsh: Completers improvements
by Michal Privoznik 15 Mar '22

15 Mar '22

*** BLURB HERE *** Michal Prívozník (3): virsh: Properly terminate string list in virshDomainInterfaceSourceModeCompleter() virsh: Introduce virshEnumComplete() virsh: Don't open code virshEnumComplete() tools/virsh-completer-domain.c | 147 ++++++-------------------------- tools/virsh-completer-host.c | 11 +-- tools/virsh-completer-nodedev.c | 7 +- tools/virsh-completer-pool.c | 7 +- tools/virsh-completer-volume.c | 11 +-- tools/virsh-completer.c | 27 ++++++ tools/virsh-completer.h | 4 + 7 files changed, 67 insertions(+), 147 deletions(-) -- 2.34.1

2 4

REST service for libvirt to simplify SEV(ES) launch measurement
by Daniel P. Berrangé 14 Mar '22

14 Mar '22

Extending management apps using libvirt to support measured launch of QEMU guests with SEV/SEV-ES is unreasonably complicated today, both for the guest owner and for the cloud management apps. We have APIs for exposing info about the SEV host, the SEV guest, guest measurements and secret injections. This is a "bags of bits" solution. We expect apps to them turn this into a user facting solution. It is possible but we're heading to a place where every cloud mgmt app essentially needs to reinvent the same wheel and the guest owner will need to learn custom APIs for dealing with SEV/SEV-ES for each cloud mgmt app. This is pretty awful. We need to do a better job at providing a solution that is more general purpose IMHO. Consider a cloud mgmt app, right now the flow to use the bag of bits libvirt exposes, looks something like * Guest owner tells mgmt app they want to launch a VM * Mgmt app decides what host the VM will be launched on * Guest owner requests cert chain for the virt host from mgmt app * Guest owner validates cert chain for the virt host * Guest owner generates launch blob for the VM * Guest owner provides launch blob to the mgmt app * Management app tells libvirt to launch VM with blob, with CPUs in a paused state * Libvirt luanches QEMU with CPUs stopped * Guest owner requests launch measurement from mgmt app * Guest owner validates measurement * Guest owner generates secret blob * Guest owner sends secret blob to management app * Management app tells libvirt to inject secrets * Libvirt injects secrets to QEMU * Management app tells libvirt to start QEMU CPUs * Libvirt tells QEMU to start CPUs Compare to a non-confidental VM * Guest owner tells mgmt app they want to launch a VM * Mgmt app decides what host the VM will be launched on * Mgmt app tells libvirt to launch VM with CPUs in running state * Libvirt launches QEMU with CPUs running Now, of course the guest owner wouldn't be manually performing the earlier steps, they would want some kind of software to take care of this. No matter what, it still involves a large number of back and forth operations between the guest owner & mgmt app, and between the mgmt app and libvirt. One of libvirt's key jobs is to isolate mgmt apps from differences in behaviour of underlying hypervisor technologies, and we're failing at that job with SEV/SEV-ES, because the mgmt app needs to go through a multi-stage dance on every VM start, that is different from what they do with non-confidential VMs. It is especially unpleasant because there needs to be a "wait state" between when the app selects a host to deploy a VM on, and when it can actually start a VM. In essence the app needs to reserve capacity on a host ahead of time for a VM that will be created some arbitrary time later. This can have significant implications for the mgmt app architectural design that are not neccessarily easy to address, when they expect to just call virDomainCreate have the VM running in one step. It also harms interoperability to libvirt tools. For example if a mgmt tool like virt-manager/OpenStack created a VM using SEV, and you want to start it manually using a different tool like 'virsh', you enter a world of complexity and pain, due to the multi step dance required. AFAICT, in all of this, the mgmt app is really acting as a conduit and is not implementing any interesting logic. The clever stuff is all the responsibility of the guest owner, and/or whatever software for attestation they are using remotely. I think there is scope for enhancing libvirt, such that usage of SEV/SEV-ES has little-to-no burden for the management apps, and much less burden for guest owners. The key to achieving this is to define a protocol for libvirt to connect to a remote service to handle the launch measurements & secret acquisition. The guest owner can provide the address of a service they control (or trust), and libvirt can take care of all the interactions with it. This frees both the user and mgmt app from having to know much about SEV/SEV-ES, with VM startup process being essentially the same as it has always been. The sequence would look like * Guest owner tells attestation service they intend to create a VM with a given UUID, policy, and any other criteria such as cert of the cloud owner, valid OVMF firmware hashes, and providing any needed LUKS keys. * Guest owner tells mgmt app they want to launch a VM, using attestation service at https://somehost/and/url * Mgmt app decides what host the VM will be launched on * Mgmt app tells libvirt to launch VM with CPUs in running state The next steps involve solely libvirt & the attestation service. The mgmt app and guest owner have done their work. * Libvirt contacts the service providing certificate chain for the host to be used, the UUID of the guest, and any other required info about the host. * Attestation service validates the cert chain to ensure it belongs to the cloud owner that was identified previously * Attestation service generates a launch blob and puts it in the response back to libvirt * Libvirt launches QEMU with CPUs paused * Libvirt gets the launch measurement and sends it to the attestation server, with any other required info about the VM instance * Attestation service validates the measurement * Attestation builds the secret table with LUKS keys and puts it in the response back to libvirt * Libvirt injects the secret table to QEMU * Libvirt tells QEMU to start CPUs All the same exchanges of information are present, but the management app doesn't have to get involved. The guest owner also doesn't have to get involved except for a one-time setup step. The software the guest owner uses for attestation also doesn't have to be written to cope with talking to OpenStack, CNV and whatever other vendor specific cloud mgmt apps exist today. This will significantly reduce the burden if supporting SEV/SEV-ES launch measurement in libvirt based apps, and make SEV/SEV-ES guests more "normal" from a mgmt POV. What could this look like from POV of an attestation server API, if we assume HTTPS REST service with a simple JSON payload ... * Guest Owner: Register a new VM to be booted: POST /vm/<UUID> Request body: { "scheme": "amd-sev", "cloud-cert": "certificate of the cloud owner that signs the PEK", "policy": 0x3, "cpu-count": 3, "firmware-hashes": [ "xxxx", "yyyy", ], "kernel-hash": "aaaa", "initrd-hash": "bbbb", "cmdline-hash": "cccc", "secrets": [ { "type": "luks-passphrase", "passphrase": "<blah>" } ] } * Libvirt: Request permission to launch a VM on a host POST /vm/<UUID>/launch Request body: { "pdh": "<blah>", "cert-chain": "<blah>", "cpu-id": "<CPU ID>", ...other relevant bits... } Service decides if the proposed host is acceptable Response body (on success) { "session": "<blah>", "owner-cert": "<blah>", "policy": 3, } * Libvirt: Request secrets to inject to launched VM POST /vm/<UUID>/validate Request body: { "api-minor": 1, "api-major": 2, "build-id": 241, "policy": 3, "measurement": "<blah>", "firmware-hash": "xxxx", "cpu-count": 3, ....other relevant stuff.... } Service validates the measurement... Response body (on success): { "secret-header": "<blah>", "secret-table": "<blah>", } So we can see there are only a couple of REST API calls we need to be able to define. If we could do that then creating a SEV/SEV-ES enabled guest with libvirt would not involve anything more complicated for the mgmt app that providing the URI of the guest owner's attestation service and an identifier for the VM. ie. the XML config could be merely: <launchSecurity type="sev"> <attestation vmid="57f669c2-c427-4132-bc7a-26f56b6a718c" service="http://somehost/some/url"/> </launchSecurity> And then involve virDomainCreate as normal with any other libvirt / QEMU guest. No special workflow is required by the mgmt app. There is a small extra task for the guest owner to register existance of their VM with the attestation service. Aside from that the only change to the way they interact with the cloud mgmt app is to provide the VM ID and URI for the attestation service. No need to learn custom APIs for each different cloud vendor, for dealing with fetching launch measurements or injecting secrets. Finally this attestation service REST protocol doesn't have to be something controlled or defined by libvirt. I feel like it could be a protocol that is defined anywhere and libvirt merely be one consumer of it. Other apps that directly use QEMU may also wish to avail themselves of it. All that really matters from libvirt POV is: - The protocol definition exist to enable the above workflow, with a long term API stability guarantee that it isn't going to changed in incompatible ways - There exists a fully open source reference implementation of sufficient quality to deploy in the real world I know https://github.com/slp/sev-attestation-server exists, but its current design has assumptions about it being used with libkrun AFAICT. I have heard of others interested in writing similar servers, but I've not seen code. We are at a crucial stage where mgmt apps are looking to support measured boot with SEV/SEV-ES and if we delay they'll all go off and do their own thing, and it'll be too late, leading to https://xkcd.com/927/. Especially for apps using libvirt to manage QEMU, I feel we have got a few months window of opportunity to get such a service available, before they all end up building out APIs for the tedious manual workflow, reinventing the wheel. 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 :|

5 12

[PATCH 0/2] qemu_namespace: Two simple improvements
by Michal Privoznik 14 Mar '22

14 Mar '22

These are inspired by Nikola's question here: https://listman.redhat.com/archives/libvir-list/2022-February/228812.html See my reply here: https://listman.redhat.com/archives/libvir-list/2022-March/229263.html Michal Prívozník (2): qemu_namespace: Don't unlink paths from cgroupDeviceACL qemu_namespace: Be less aggressive in removing /dev nodes from namespace src/qemu/qemu_namespace.c | 92 +++++++++++++++++++++++++++------------ 1 file changed, 63 insertions(+), 29 deletions(-) -- 2.34.1

2 3

[PATCH v3 00/29] ppc64 PowerNV machines support
by Daniel Henrique Barboza 14 Mar '22

14 Mar '22

Hi, This new version contains changes proposed by Jano. The most notable change is on patch 9, where pnv_pnv3/pnv_phb4 capabilities are now being probed and, if the QEMU version isn't high enough, they are cleared from qemuCaps. For convenience, the patches that are pending review/acks are patches 14, 17, 19, 20, 22, 23 and 24. v2 link: https://listman.redhat.com/archives/libvir-list/2022-January/msg01149.html Daniel Henrique Barboza (29): qemu_domain.c: add PowerNV machine helpers qemu_capabilities.c: use 'MachineIsPowerPC' in DeviceDiskCaps qemu_domain: turn qemuDomainMachineIsPSeries() static qemu_validate.c: use qemuDomainIsPowerPC() in qemuValidateDomainChrDef() qemu_domain.c: define ISA as default PowerNV serial qemu_validate.c: enhance 'machine type not supported' message qemu_domain.c: disable default devices for PowerNV machines tests: add basic PowerNV8 test qemu: introduce QEMU_CAPS_DEVICE_PNV_PHB3 conf, qemu: add 'pnv-phb3-root-port' PCI controller model name conf, qemu: add 'pnv-phb3' PCI controller model name domain_conf.c: fix identation in virDomainControllerDefParseXML() conf: parse and format <target chip-id='...'/> formatdomain.rst: add 'index' semantics for PowerNV domains conf: introduce virDomainControllerIsPowerNVPHB conf, qemu: add default 'chip-id' value for pnv-phb3 controllers conf, qemu: add default 'targetIndex' value for pnv-phb3 devs qemu_command.c: add command line for the pnv-phb3 device qemu_domain_address.c: change pnv-phb3 minimal downstream slot domain_conf: always format pnv-phb3-root-port address tests: add pnv-phb3-root-port test domain_validate.c: allow targetIndex 0 out of idx 0 for PowerNV PHBs domain_conf.c: reject duplicated pnv-phb3 devices qemu: introduce QEMU_CAPS_DEVICE_PNV_PHB4 conf, qemu: add 'pnv-phb4-root-port' PCI controller model name domain_conf.c: add phb4-root-port to IsPowerNVRootPort() conf, qemu: add 'pnv-phb4' controller model name domain_conf.c: add pnv-phb4 to ControllerIsPowerNVPHB() tests: add PowerNV9 tests docs/formatdomain.rst | 12 +- docs/schemas/domaincommon.rng | 10 ++ src/conf/domain_conf.c | 156 ++++++++++++++---- src/conf/domain_conf.h | 8 + src/conf/domain_validate.c | 5 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 19 ++- src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 21 ++- src/qemu/qemu_domain.c | 51 +++++- src/qemu/qemu_domain.h | 4 +- src/qemu/qemu_domain_address.c | 64 ++++++- src/qemu/qemu_validate.c | 62 ++++++- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 2 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 2 + .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 2 + .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 2 + .../powernv8-basic.ppc64-latest.args | 34 ++++ tests/qemuxml2argvdata/powernv8-basic.xml | 16 ++ tests/qemuxml2argvdata/powernv8-dupPHBs.err | 1 + .../powernv8-dupPHBs.ppc64-latest.err | 1 + tests/qemuxml2argvdata/powernv8-dupPHBs.xml | 27 +++ .../powernv8-root-port.ppc64-latest.args | 35 ++++ tests/qemuxml2argvdata/powernv8-root-port.xml | 17 ++ .../powernv8-two-sockets.ppc64-latest.args | 35 ++++ .../qemuxml2argvdata/powernv8-two-sockets.xml | 26 +++ .../powernv9-dupPHBs.ppc64-latest.err | 1 + tests/qemuxml2argvdata/powernv9-dupPHBs.xml | 27 +++ .../powernv9-root-port.ppc64-latest.args | 35 ++++ tests/qemuxml2argvdata/powernv9-root-port.xml | 17 ++ tests/qemuxml2argvtest.c | 7 + .../powernv8-basic.ppc64-latest.xml | 34 ++++ .../powernv8-root-port.ppc64-latest.xml | 39 +++++ .../powernv8-two-sockets.ppc64-latest.xml | 39 +++++ .../powernv9-root-port.ppc64-latest.xml | 39 +++++ .../qemuxml2xmloutdata/powernv9-root-port.xml | 36 ++++ tests/qemuxml2xmltest.c | 5 + 37 files changed, 848 insertions(+), 48 deletions(-) create mode 100644 tests/qemuxml2argvdata/powernv8-basic.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/powernv8-basic.xml create mode 100644 tests/qemuxml2argvdata/powernv8-dupPHBs.err create mode 100644 tests/qemuxml2argvdata/powernv8-dupPHBs.ppc64-latest.err create mode 100644 tests/qemuxml2argvdata/powernv8-dupPHBs.xml create mode 100644 tests/qemuxml2argvdata/powernv8-root-port.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/powernv8-root-port.xml create mode 100644 tests/qemuxml2argvdata/powernv8-two-sockets.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/powernv8-two-sockets.xml create mode 100644 tests/qemuxml2argvdata/powernv9-dupPHBs.ppc64-latest.err create mode 100644 tests/qemuxml2argvdata/powernv9-dupPHBs.xml create mode 100644 tests/qemuxml2argvdata/powernv9-root-port.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/powernv9-root-port.xml create mode 100644 tests/qemuxml2xmloutdata/powernv8-basic.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/powernv8-root-port.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/powernv8-two-sockets.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/powernv9-root-port.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/powernv9-root-port.xml -- 2.35.1

1 30

[PATCH] scripts: Fix the parameter of warning function
by luzhipeng 14 Mar '22

14 Mar '22

The parameter of self.warning is inconsistent with it's definition, So fix it. Signed-off-by: luzhipeng <luzhipeng(a)cestc.cn> --- scripts/apibuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/apibuild.py b/scripts/apibuild.py index bdd3077c48..99b16f47fa 100755 --- a/scripts/apibuild.py +++ b/scripts/apibuild.py @@ -317,7 +317,7 @@ class index: if type in type_map: type_map[type][name] = d else: - self.warning("Unable to register type ", type) + self.warning("Unable to register type %s" % type) if name == debugsym and not quiet: print("New symbol: %s" % (d)) -- 2.34.0.windows.1

1 0

[PATCH 0/1]scripts: Fix the parameter of warning function
by luzhipeng 14 Mar '22

14 Mar '22

luzhipeng (1): scripts: Fix the parameter of warning function scripts/apibuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.34.0.windows.1

2 2

[PATCH] scripts: Fix the parameter of warning function
by luzhipeng 14 Mar '22

14 Mar '22

--- scripts/apibuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/apibuild.py b/scripts/apibuild.py index bdd3077c48..99b16f47fa 100755 --- a/scripts/apibuild.py +++ b/scripts/apibuild.py @@ -317,7 +317,7 @@ class index: if type in type_map: type_map[type][name] = d else: - self.warning("Unable to register type ", type) + self.warning("Unable to register type %s" % type) if name == debugsym and not quiet: print("New symbol: %s" % (d)) -- 2.34.0.windows.1

1 0

[PATCH 0/3] qemu: Introduce 'manual' snapshot mode for storage providers not managed by libvirt
by Peter Krempa 14 Mar '22

14 Mar '22

Peter Krempa (3): conf: snapshot: Introduce 'manual' mode for snapshot of a disk qemuSnapshotCreateActiveExternal: Implement manual snapshot mode kbase: Introduce 'snapshots' page and describe the new 'manual' snapshot docs/formatdomain.rst | 15 +++++----- docs/formatsnapshot.rst | 9 ++++++ docs/kbase/index.rst | 3 ++ docs/kbase/meson.build | 1 + docs/kbase/snapshots.rst | 53 +++++++++++++++++++++++++++++++++ docs/schemas/domainsnapshot.rng | 3 ++ src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/conf/snapshot_conf.c | 6 ++++ src/qemu/qemu_snapshot.c | 24 +++++++++++---- src/test/test_driver.c | 17 +++++++++++ 11 files changed, 121 insertions(+), 12 deletions(-) create mode 100644 docs/kbase/snapshots.rst -- 2.35.1

2 5

[libvirt PATCH] docs: downloads: fix link to libvirt GitLab group
by Ján Tomko 11 Mar '22

11 Mar '22

s/libvirt.org/libvirt/ Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- docs/downloads.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as trivial. diff --git a/docs/downloads.rst b/docs/downloads.rst index d438166b78..e32fd1ba99 100644 --- a/docs/downloads.rst +++ b/docs/downloads.rst @@ -314,7 +314,7 @@ GIT source repository --------------------- All modules maintained by the libvirt project have their primary source -available in the `libvirt group on GitLab <https://gitlab.com/libvirt.org/>`__. +available in the `libvirt group on GitLab <https://gitlab.com/libvirt/>`__. Each module can be cloned anonymously using: :: -- 2.35.1

1 0

[RFC patch 0/2] nwfilter: don't query netfilter inside transactions
by Nikolay Shirokovskiy 11 Mar '22

11 Mar '22

Hi, all. In the process of fixing a corner case in nwfilter in case of libvirtd crash I noticed the peculiar way it works for recursive removes/renames of chains. So I proposing a change which is described in the second patch. This is an RFC and as such is incomplete: - only recursive removing is patched and renaming is not - tests are not fixed Nikolay Shirokovskiy (2): utils: make virFirewallAddRuleFullV public nwfilter: don't query netfilter inside transactions src/libvirt_private.syms | 1 + src/nwfilter/nwfilter_ebiptables_driver.c | 154 +++++++++++----------- src/util/virfirewall.c | 2 +- src/util/virfirewall.h | 7 + 4 files changed, 84 insertions(+), 80 deletions(-) -- 2.31.1

2 4

[PATCH RESEND] virsh: Provide completer for vol-wipe algorithms
by Haonan Wang 11 Mar '22

11 Mar '22

Related issue: https://gitlab.com/libvirt/libvirt/-/issues/9 Signed-off-by: Haonan Wang <hnwanga1(a)gmail.com> --- tools/virsh-completer-volume.c | 19 +++++++++++++++++++ tools/virsh-completer-volume.h | 6 ++++++ tools/virsh-volume.c | 3 +-- tools/virsh-volume.h | 3 +++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/tools/virsh-completer-volume.c b/tools/virsh-completer-volume.c index ac3c472177..bed45fa1ca 100644 --- a/tools/virsh-completer-volume.c +++ b/tools/virsh-completer-volume.c @@ -26,6 +26,7 @@ #include "virsh-pool.h" #include "virsh.h" #include "virstring.h" +#include "virsh-volume.h" char ** virshStorageVolNameCompleter(vshControl *ctl, @@ -116,3 +117,21 @@ virshStorageVolKeyCompleter(vshControl *ctl, virshStoragePoolListFree(list); return ret; } + +char ** +virshStorageVolWipeAlgorithmCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, + unsigned int flags) +{ + char **ret = NULL; + size_t i; + + virCheckFlags(0, NULL); + + ret = g_new0(char *, VIR_STORAGE_VOL_WIPE_ALG_LAST + 1); + + for (i = 0; i < VIR_STORAGE_VOL_WIPE_ALG_LAST; i++) + ret[i] = g_strdup(virshStorageVolWipeAlgorithmTypeToString(i)); + + return ret; +} diff --git a/tools/virsh-completer-volume.h b/tools/virsh-completer-volume.h index dc6eeb4b3c..17e50f450d 100644 --- a/tools/virsh-completer-volume.h +++ b/tools/virsh-completer-volume.h @@ -33,3 +33,9 @@ char ** virshStorageVolKeyCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + + +char ** +virshStorageVolWipeAlgorithmCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index d005602fe8..b6fa9555ad 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -902,12 +902,12 @@ static const vshCmdOptDef opts_vol_wipe[] = { VIRSH_COMMON_OPT_POOL_OPTIONAL, {.name = "algorithm", .type = VSH_OT_STRING, + .completer = virshStorageVolWipeAlgorithmCompleter, .help = N_("perform selected wiping algorithm") }, {.name = NULL} }; -VIR_ENUM_DECL(virshStorageVolWipeAlgorithm); VIR_ENUM_IMPL(virshStorageVolWipeAlgorithm, VIR_STORAGE_VOL_WIPE_ALG_LAST, "zero", "nnsa", "dod", "bsi", "gutmann", "schneier", @@ -950,7 +950,6 @@ cmdVolWipe(vshControl *ctl, const vshCmd *cmd) } -VIR_ENUM_DECL(virshStorageVol); VIR_ENUM_IMPL(virshStorageVol, VIR_STORAGE_VOL_LAST, N_("file"), diff --git a/tools/virsh-volume.h b/tools/virsh-volume.h index 15cab0fd8c..32e5394f5c 100644 --- a/tools/virsh-volume.h +++ b/tools/virsh-volume.h @@ -33,3 +33,6 @@ virStorageVolPtr virshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, VIRSH_BYUUID | VIRSH_BYNAME) extern const vshCmdDef storageVolCmds[]; + +VIR_ENUM_DECL(virshStorageVolWipeAlgorithm); +VIR_ENUM_DECL(virshStorageVol); -- 2.25.1

2 1

[libvirt PATCH 0/3] docs: downloads: mark GitLab as the primary source
by Ján Tomko 11 Mar '22

11 Mar '22

Also remove links to gitweb interface on libvirt.org which is no longer available. Ján Tomko (3): docs: downloads: remove links to libvirt.org mirrors docs: downloads: remove reference to git:// docs: downloads: mark GitLab as the primary source docs/downloads.rst | 106 +++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 66 deletions(-) -- 2.35.1

2 4

[libvirt] [PATCH RESEND v2 0/4] re-introduce <acpi-hotplug-bridge>
by Ani Sinha 11 Mar '22

11 Mar '22

Changelog: v2 - rebased the patch series to latest master. I am re-introducing the patchset for <acpi-hotplug-bridge> which got reverted here few months back: https://www.spinics.net/linux/fedora/libvir/msg224089.html The reason for the reversal was that there seemed to be some instability/issues around the use of the qemu commandline which this patchset tries to support. In particular, some guest operating systems did not like the way QEMU was trying to disable native hotplug on pcie root ports. Subsequently, in QEMU 6.2, we have changed our mechanism using which we disable native hotplug. As I understand, we do not have any reported issues so far in 6.2 around this area. QEMU will enter a soft feature freeze in the first week of march in prep for 7.0 release. Libvirt is also entering a new release cycle phaze. Hence, I am introducing this patchset early enough in the release cycles so that if we do see any issues on the qemu side during the rc0, rc1 cycles and if reversal of this patchset is again required, it can be done in time before the next libvirt release end of March. All the patches in this series had been previously reviewed. Some subsequent fixes were made after my initial patches were pushed. I have squashed all those fixes and consolidated them into four patches. I have also updated the documentation to reflect the new changes from the QEMU side and rebased my changes fixing the tests in the process. What changed in QEMU post version 6.1 ? ========================================= We have made basically two major changes in QEMU. First is this change: (1) commit 211afe5c69b597acf85fdd577eb497f5be1ffbd8 Author: Julia Suvorova <jusual(a)redhat.com> Date: Fri Nov 12 06:08:56 2021 -0500 hw/i386/acpi-build: Deny control on PCIe Native Hot-plug in _OSC There are two ways to enable ACPI PCI Hot-plug: * Disable the Hot-plug Capable bit on PCIe slots. This was the first approach which led to regression [1-2], as I/O space for a port is allocated only when it is hot-pluggable, which is determined by HPC bit. * Leave the HPC bit on and disable PCIe Native Hot-plug in _OSC method. This removes the (future) ability of hot-plugging switches with PCIe Native hotplug since ACPI PCI Hot-plug only works with cold-plugged bridges. If the user wants to explicitely use this feature, they can disable ACPI PCI Hot-plug with: --global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off Change the bit in _OSC method so that the OS selects ACPI PCI Hot-plug instead of PCIe Native. [1] https://gitlab.com/qemu-project/qemu/-/issues/641 [2] https://bugzilla.redhat.com/show_bug.cgi?id=2006409 Signed-off-by: Julia Suvorova <jusual(a)redhat.com> Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> Message-Id: <20211112110857.3116853-5-imammedo(a)redhat.com> Reviewed-by: Ani Sinha <ani(a)anisinha.ca> Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> The patch description says it all. Instead of masking out the HPC bit in pcie slots, we keep them turned on. Instead, we do not advertize native hotplug capability for PCIE using _OSC control method. See section 6.2.11 in ACPI spec 6.2. At the same time, we turn on ACPI hotplug for these slots so now the guest OS can select ACPI hotplug instead. The second change is introduction of a property with which we keep the existing behavior for pc-q35-6.1 machines. This means HPC bit is masked and ACPI hotplug is enabled by default for pcie root ports. The QEMU commit is: (2) commit c318bef76206c2ecb6016e8e68c4ac6ff9a4c8cb Author: Julia Suvorova <jusual(a)redhat.com> Date: Fri Nov 12 06:08:54 2021 -0500 hw/acpi/ich9: Add compat prop to keep HPC bit set for 6.1 machine type To solve issues [1-2] the Hot Plug Capable bit in PCIe Slots will be turned on, while the switch to ACPI Hot-plug will be done in the DSDT table. Introducing 'x-keep-native-hpc' property disables the HPC bit only in 6.1 and as a result keeps the forced 'reserve-io' on pcie-root-ports in 6.1 too. [1] https://gitlab.com/qemu-project/qemu/-/issues/641 [2] https://bugzilla.redhat.com/show_bug.cgi?id=2006409 Signed-off-by: Julia Suvorova <jusual(a)redhat.com> Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> Message-Id: <20211112110857.3116853-3-imammedo(a)redhat.com> Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Lastly, as a related side note, because from QEMU 6.2 onwards, we do not mask out HPC bit in PCIE, the work done by this patch is no longer needed: (3) commit e2a6290aab578b2170c1f5909fa556385dc0d820 Author: Marcel Apfelbaum <marcel.apfelbaum(a)gmail.com> Date: Mon Aug 2 12:00:57 2021 +0300 hw/pcie-root-port: Fix hotplug for PCI devices requiring IO Q35 has now ACPI hotplug enabled by default for PCI(e) devices. As opposed to native PCIe hotplug, guests like Fedora 34 will not assign IO range to pcie-root-ports not supporting native hotplug, resulting into a regression. Reproduce by: qemu-bin -M q35 -device pcie-root-port,id=p1 -monitor stdio device_add e1000,bus=p1 In the Guest OS the respective pcie-root-port will have the IO range disabled. Fix it by setting the "reserve-io" hint capability of the pcie-root-ports so the firmware will allocate the IO range instead. Acked-by: Igor Mammedov <imammedo(a)redhat.com> Signed-off-by: Marcel Apfelbaum <marcel(a)redhat.com> Message-Id: <20210802090057.1709775-1-marcel(a)redhat.com> Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> This is what commit (2) alludes to. In pc-q35-6.1 machines we do need patch (3) since we mask out HPC bit from pcie ports. I know this is convoluted mess. In fairness I am trying all I can in my spare time to help from the QEMU side. I am determined to see this patchset through into libvirt. Thanks Ani Sinha (4): qemu: capablities: detect acpi-pci-hotplug-with-bridge-support conf: introduce support for acpi-bridge-hotplug feature qemu: command: add support for acpi-bridge-hotplug feature NEWS: document new acpi pci hotplug config option NEWS.rst | 8 ++ docs/formatdomain.rst | 32 +++++++ docs/schemas/domaincommon.rng | 15 ++++ src/conf/domain_conf.c | 89 ++++++++++++++++++- src/conf/domain_conf.h | 9 ++ src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 19 ++++ src/qemu/qemu_validate.c | 42 +++++++++ .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + ...-hotplug-bridge-disable.aarch64-latest.err | 1 + .../aarch64-acpi-hotplug-bridge-disable.xml | 13 +++ ...-hotplug-bridge-disable.x86_64-latest.args | 35 ++++++++ .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 36 ++++++++ .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 36 ++++++++ ...pi-hotplug-bridge-disable.x86_64-6.0.0.err | 1 + ...-hotplug-bridge-disable.x86_64-latest.args | 38 ++++++++ .../q35-acpi-hotplug-bridge-disable.xml | 53 +++++++++++ .../q35-acpi-hotplug-bridge-enable.xml | 53 +++++++++++ tests/qemuxml2argvtest.c | 7 ++ ...i-hotplug-bridge-disable.x86_64-latest.xml | 1 + ...pi-hotplug-bridge-enable.x86_64-latest.xml | 1 + ...i-hotplug-bridge-disable.x86_64-latest.xml | 1 + ...pi-hotplug-bridge-enable.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 4 + 27 files changed, 504 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.xml create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-6.0.0.err create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.xml -- 2.25.1

4 14

[PATCH 0/8] docs: Convert some pages to rST and clean up (part 2)
by Peter Krempa 10 Mar '22

10 Mar '22

Jano asked me to expedite the conversion of the 'downloads' page so he can do some modifications. Peter Krempa (8): docs: Convert 'downloads' page to rST https://pipo.sk.gitlab.io/-/libvirt/-/jobs/2188545131/artifacts/website/dow… docs: Convert 'contact' page to rST https://pipo.sk.gitlab.io/-/libvirt/-/jobs/2188545131/artifacts/website/con… docs: Convert 'testapi' page to rST https://pipo.sk.gitlab.io/-/libvirt/-/jobs/2188545131/artifacts/website/tes… syntax-check: Don't check for non-reentrant functions in '.rst' files docs: Convert 'nss' page to rST https://pipo.sk.gitlab.io/-/libvirt/-/jobs/2188545131/artifacts/website/nss… docs: Convert 'pci-hotplug' page to rST https://pipo.sk.gitlab.io/-/libvirt/-/jobs/2188545131/artifacts/website/pci… docs: Convert 'testtck' page to rST https://pipo.sk.gitlab.io/-/libvirt/-/jobs/2188545131/artifacts/website/tes… docs: Convert 'testsuites' page to rST https://pipo.sk.gitlab.io/-/libvirt/-/jobs/2188545131/artifacts/website/tes… build-aux/syntax-check.mk | 2 +- docs/contact.html.in | 116 ------- docs/contact.rst | 94 ++++++ docs/downloads.html.in | 661 -------------------------------------- docs/downloads.rst | 417 ++++++++++++++++++++++++ docs/meson.build | 14 +- docs/nss.html.in | 189 ----------- docs/nss.rst | 154 +++++++++ docs/pci-hotplug.html.in | 185 ----------- docs/pci-hotplug.rst | 146 +++++++++ docs/testapi.html.in | 35 -- docs/testapi.rst | 34 ++ docs/testsuites.html.in | 41 --- docs/testsuites.rst | 37 +++ docs/testtck.html.in | 40 --- docs/testtck.rst | 37 +++ 16 files changed, 927 insertions(+), 1275 deletions(-) delete mode 100644 docs/contact.html.in create mode 100644 docs/contact.rst delete mode 100644 docs/downloads.html.in create mode 100644 docs/downloads.rst delete mode 100644 docs/nss.html.in create mode 100644 docs/nss.rst delete mode 100644 docs/pci-hotplug.html.in create mode 100644 docs/pci-hotplug.rst delete mode 100644 docs/testapi.html.in create mode 100644 docs/testapi.rst delete mode 100644 docs/testsuites.html.in create mode 100644 docs/testsuites.rst delete mode 100644 docs/testtck.html.in create mode 100644 docs/testtck.rst -- 2.35.1

2 11

[PATCH] virsh: Provide completer for vol-wipe algorithms
by Haonan Wang 10 Mar '22

10 Mar '22

Related issue: https://gitlab.com/libvirt/libvirt/-/issues/9 Signed-off-by: Haonan Wang <hnwanga1(a)gmail.com> --- tools/virsh-completer-volume.c | 20 ++++++++++++++++++++ tools/virsh-completer-volume.h | 6 ++++++ tools/virsh-volume.c | 3 +-- tools/virsh-volume.h | 3 +++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/tools/virsh-completer-volume.c b/tools/virsh-completer-volume.c index ac3c472177..66b8828702 100644 --- a/tools/virsh-completer-volume.c +++ b/tools/virsh-completer-volume.c @@ -26,6 +26,7 @@ #include "virsh-pool.h" #include "virsh.h" #include "virstring.h" +#include "virsh-volume.h" char ** virshStorageVolNameCompleter(vshControl *ctl, @@ -116,3 +117,22 @@ virshStorageVolKeyCompleter(vshControl *ctl, virshStoragePoolListFree(list); return ret; } + +char** +virshStorageVolWipeAlgorithmCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, + unsigned int completerflags G_GNUC_UNUSED) +{ + size_t nalgorithms = VIR_STORAGE_VOL_WIPE_ALG_LAST; + size_t i = 0; + char **ret = NULL; + g_auto(GStrv) tmp = g_new0(char *, nalgorithms); + + for (i = 0; i < nalgorithms; i++) { + const char *str = virshStorageVolWipeAlgorithmTypeToString(i); + tmp[i] = g_strdup(str); + } + + ret = g_steal_pointer(&tmp); + return ret; +} diff --git a/tools/virsh-completer-volume.h b/tools/virsh-completer-volume.h index dc6eeb4b3c..17e50f450d 100644 --- a/tools/virsh-completer-volume.h +++ b/tools/virsh-completer-volume.h @@ -33,3 +33,9 @@ char ** virshStorageVolKeyCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + + +char ** +virshStorageVolWipeAlgorithmCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index d005602fe8..b6fa9555ad 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -902,12 +902,12 @@ static const vshCmdOptDef opts_vol_wipe[] = { VIRSH_COMMON_OPT_POOL_OPTIONAL, {.name = "algorithm", .type = VSH_OT_STRING, + .completer = virshStorageVolWipeAlgorithmCompleter, .help = N_("perform selected wiping algorithm") }, {.name = NULL} }; -VIR_ENUM_DECL(virshStorageVolWipeAlgorithm); VIR_ENUM_IMPL(virshStorageVolWipeAlgorithm, VIR_STORAGE_VOL_WIPE_ALG_LAST, "zero", "nnsa", "dod", "bsi", "gutmann", "schneier", @@ -950,7 +950,6 @@ cmdVolWipe(vshControl *ctl, const vshCmd *cmd) } -VIR_ENUM_DECL(virshStorageVol); VIR_ENUM_IMPL(virshStorageVol, VIR_STORAGE_VOL_LAST, N_("file"), diff --git a/tools/virsh-volume.h b/tools/virsh-volume.h index 15cab0fd8c..32e5394f5c 100644 --- a/tools/virsh-volume.h +++ b/tools/virsh-volume.h @@ -33,3 +33,6 @@ virStorageVolPtr virshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, VIRSH_BYUUID | VIRSH_BYNAME) extern const vshCmdDef storageVolCmds[]; + +VIR_ENUM_DECL(virshStorageVolWipeAlgorithm); +VIR_ENUM_DECL(virshStorageVol); -- 2.25.1

1 0

[PATCH 00/14] Snapshot definition cleanups
by Peter Krempa 10 Mar '22

10 Mar '22

Cleanup patches extracted from my upcoming series for handling snapshots with outsourced storage. Peter Krempa (14): virDomainDiskDefFormat: Refactor to virXMLFormatElement qemuSnapshotDiskPrepareActiveExternal: Handle only external snapshots qemuSnapshotCreateAlignDisks: Rewrite logic for selecting default memory snapshot mode virDomainSnapshotDiskDefParseXML: Automatically free temporary variables and remove cleanup virStorageSource: Convert 'type' to proper enum conf: Move definition of 'virDomainSnapshotLocation' Rename VIR_DOMAIN_SNAPSHOT_LOCATION_NONE to VIR_DOMAIN_SNAPSHOT_LOCATION_NO qemuDomainSnapshotForEachQcow2Raw: Act only on internal snapshots conf: snapshot: Remove VIR_DOMAIN_SNAPSHOT_PARSE_DISKS flag virDomainSnapshotDefParse: Refactor cleanup virDomainSnapshotDefParse: Avoid 'memoryfile' temporary variable virDomainSnapshotDefParse: Decouple parsing of memory snapshot config conf: snapshot: Use proper types for snapshot location qemuSnapshotCreateActiveExternal: Remove duplicit assignment src/ch/ch_monitor.c | 1 + src/conf/domain_conf.c | 122 ++++++------ src/conf/domain_conf.h | 14 +- src/conf/domain_validate.c | 2 +- src/conf/snapshot_conf.c | 255 ++++++++++++-------------- src/conf/snapshot_conf.h | 23 +-- src/conf/storage_source_conf.h | 2 +- src/libvirt_private.syms | 4 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 1 - src/qemu/qemu_snapshot.c | 23 ++- src/test/test_driver.c | 7 +- src/vbox/vbox_common.c | 4 +- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 2 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- 16 files changed, 221 insertions(+), 245 deletions(-) -- 2.35.1

2 15

[PATCH 00/10] qemu: Update capabilities and use 'tls-hostname' field for NBD
by Peter Krempa 10 Mar '22

10 Mar '22

Technically patch 7/10 is more of a RFC for now as my migration setup doesn't work properly so I could not test it. Peter Krempa (10): tests: qemucapabilities: Update caps_7.0.0.x86_64 qemu: capabilities: Introduce QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME qemuMigrationSrcRun: Fix misleading comment about NBD with TLS support storage_source: Add 'tlsHostname' field to virStorageSource qemu: Add support for 'tlsHostname' setting of virStorageSource conf: Add support for setting expected TLS hostname for NBD disks qemu: migration: Use 'VIR_MIGRATE_PARAM_TLS_DESTINATION' for the NBD connection NEWS: Mention that VIR_MIGRATE_PARAM_TLS_DESTINATION works now for non-shared storage migration qemuMigrationSrcNBDStorageCopyOne: Refactor cleanup qemuBlockJobDiskNew: Remove misleading return value description NEWS.rst | 6 + docs/formatdomain.rst | 4 +- docs/schemas/domaincommon.rng | 3 + src/conf/domain_conf.c | 3 + src/conf/storage_source_conf.c | 2 + src/conf/storage_source_conf.h | 3 + src/qemu/qemu_block.c | 6 +- src/qemu/qemu_blockjob.c | 2 - src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_domain.c | 15 + src/qemu/qemu_migration.c | 46 +- src/qemu/qemu_migration_params.c | 17 + src/qemu/qemu_migration_params.h | 3 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + .../caps_7.0.0.x86_64.replies | 2202 +++++++++-------- .../caps_7.0.0.x86_64.xml | 43 +- ...work-tlsx509-nbd-hostname.x86_64-6.2.0.err | 1 + ...rk-tlsx509-nbd-hostname.x86_64-latest.args | 38 + .../disk-network-tlsx509-nbd-hostname.xml | 31 + tests/qemuxml2argvtest.c | 2 + ...ork-tlsx509-nbd-hostname.x86_64-latest.xml | 37 + tests/qemuxml2xmltest.c | 1 + 23 files changed, 1390 insertions(+), 1083 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.xml create mode 100644 tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.xml -- 2.35.1

2 12

[libvirt PATCH 0/2] nwfilter: switch nwfilter list from array to hash
by Daniel P. Berrangé 10 Mar '22

10 Mar '22

Currently the virNWFilterObjList has O(N) complexity for object lookup and requires taking locks on every object examined. This switches to as hash table which O(1) complexity and lockless lookup. Daniel P. Berrangé (2): nwfilter: update comment about locking filter updates conf: use a hash table for storing nwfilter object list src/conf/virnwfilterobj.c | 264 +++++++++++++++++-------- src/nwfilter/nwfilter_gentech_driver.c | 51 +++-- 2 files changed, 217 insertions(+), 98 deletions(-) -- 2.35.1

2 4

[PATCH] virsh: fflush(stdout) after fputs()
by Michal Privoznik 10 Mar '22

10 Mar '22

We are not guaranteed that the string we are printing onto stdout contains '\n' and thus that the stdout is flushed. In fact, I've met this problem when virsh asked me whether I want to edit the domain XML again (vshAskReedit()) but the prompt wasn't displayed (as it does not contain a newline character) and virsh just sat there waiting for my input, I sat there waiting for virsh's output. Flush stdout after all fputs()-s which do not flush stdout. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/vsh.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/vsh.c b/tools/vsh.c index bbde594967..499794c8fc 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1863,6 +1863,7 @@ vshDebug(vshControl *ctl, int level, const char *format, ...) str = g_strdup_vprintf(format, ap); va_end(ap); fputs(str, stdout); + fflush(stdout); } void @@ -1878,6 +1879,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ...) str = g_strdup_vprintf(format, ap); va_end(ap); fputs(str, stdout); + fflush(stdout); } @@ -1891,6 +1893,7 @@ vshPrint(vshControl *ctl G_GNUC_UNUSED, const char *format, ...) str = g_strdup_vprintf(format, ap); va_end(ap); fputs(str, stdout); + fflush(stdout); } @@ -2938,6 +2941,7 @@ vshReadline(vshControl *ctl G_GNUC_UNUSED, int len; fputs(prompt, stdout); + fflush(stdout); r = fgets(line, sizeof(line), stdin); if (r == NULL) return NULL; /* EOF */ -- 2.34.1

2 1

[PATCH] conf: remove misleading comments about access being 'lockless'
by Daniel P. Berrangé 10 Mar '22

10 Mar '22

For the various structs storing lists of objects, the access to the hash tables is not lockless. The mutex on the object owning the hash table must be held. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/virdomainobjlist.c | 4 ++-- src/conf/virinterfaceobj.c | 2 +- src/conf/virnodedeviceobj.c | 2 +- src/conf/virnwfilterbindingobjlist.c | 2 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 10 +++++----- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 70b73e87ec..66bd4bcba7 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -46,11 +46,11 @@ struct _virDomainObjList { virObjectRWLockable parent; /* uuid string -> virDomainObj mapping - * for O(1), lockless lookup-by-uuid */ + * for O(1), lookup-by-uuid */ GHashTable *objs; /* name -> virDomainObj mapping for O(1), - * lockless lookup-by-name */ + * lookup-by-name */ GHashTable *objsName; }; diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 62b21b5e5f..95279d5b1c 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -44,7 +44,7 @@ struct _virInterfaceObjList { virObjectRWLockable parent; /* name string -> virInterfaceObj mapping - * for O(1), lockless lookup-by-name */ + * for O(1), lookup-by-name */ GHashTable *objsName; }; diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index ba84dce82b..fd23ea5fc7 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -48,7 +48,7 @@ struct _virNodeDeviceObjList { virObjectRWLockable parent; /* name string -> virNodeDeviceObj mapping - * for O(1), lockless lookup-by-name */ + * for O(1), lookup-by-name */ GHashTable *objs; }; diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c index 03441c9c1b..53713d815a 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -39,7 +39,7 @@ struct _virNWFilterBindingObjList { virObjectRWLockable parent; /* port dev name -> virNWFilterBindingObj mapping - * for O(1), lockless lookup-by-port dev */ + * for O(1), lookup-by-port dev */ GHashTable *objs; }; diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index ed62856d61..92985c4b63 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -54,7 +54,7 @@ struct _virSecretObjList { virObjectRWLockable parent; /* uuid string -> virSecretObj mapping - * for O(1), lockless lookup-by-uuid */ + * for O(1), lookup-by-uuid */ GHashTable *objs; }; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index d527132184..b57c1cb8b2 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -66,15 +66,15 @@ struct _virStorageVolObjList { virObjectRWLockable parent; /* key string -> virStorageVolObj mapping - * for (1), lockless lookup-by-key */ + * for (1), lookup-by-key */ GHashTable *objsKey; /* name string -> virStorageVolObj mapping - * for (1), lockless lookup-by-name */ + * for (1), lookup-by-name */ GHashTable *objsName; /* path string -> virStorageVolObj mapping - * for (1), lockless lookup-by-path */ + * for (1), lookup-by-path */ GHashTable *objsPath; }; @@ -98,11 +98,11 @@ struct _virStoragePoolObjList { virObjectRWLockable parent; /* uuid string -> virStoragePoolObj mapping - * for (1), lockless lookup-by-uuid */ + * for (1), lookup-by-uuid */ GHashTable *objs; /* name string -> virStoragePoolObj mapping - * for (1), lockless lookup-by-name */ + * for (1), lookup-by-name */ GHashTable *objsName; }; -- 2.35.1

2 1

[PATCH] run: include 'src' in $PATH for the daemons
by Daniel P. Berrangé 10 Mar '22

10 Mar '22

Currently the 'run' script modifies $PATH to add the 'tools' directly to pick up client programs. It fails to add the 'src' directory to pick up the daemons. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- run.in | 1 + 1 file changed, 1 insertion(+) diff --git a/run.in b/run.in index 174b191675..3be7818d32 100644 --- a/run.in +++ b/run.in @@ -70,6 +70,7 @@ env = os.environ prepend(env, "LD_LIBRARY_PATH", os.path.join(here, "src")) prepend(env, "PKG_CONFIG_PATH", os.path.join(here, "src")) prepend(env, "PATH", os.path.join(here, "tools")) +prepend(env, "PATH", os.path.join(here, "src")) # Ensure that any 3rd party apps using libvirt.so from the build tree get # files resolved to the build/source tree too. Typically useful for language -- 2.35.1

2 1

[PATCH] run: gracefully handle SIGHUP, SIGQUIT, SIGTERM
by Daniel P. Berrangé 10 Mar '22

10 Mar '22

When using thue 'run' script to launch a daemon, it is intended to temporarily stop the systemd units and re-start them again after. When using this script over an SSH connection, it will get SIGHUP if the connection goes away, and in this case it fails to re-start the systemd units. We need to catch SIGHUP and turn it into a normal python exception. For good measure we do the same for SIGQUIT and SIGTERM too. SIGINT already gets turned into an exception by default which we handle. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- run.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/run.in b/run.in index 3be7818d32..c6d3411082 100644 --- a/run.in +++ b/run.in @@ -43,6 +43,7 @@ import os import os.path import random +import signal import sys import subprocess @@ -155,6 +156,13 @@ else: print("Temporarily stopping systemd units...") stopped_units = [] + def sighandler(signum, frame): + raise OSError("Signal %d received, terminating" % signum) + + signal.signal(signal.SIGHUP, sighandler) + signal.signal(signal.SIGTERM, sighandler) + signal.signal(signal.SIGQUIT, sighandler) + try: for unit in try_stop_units: print(" > %s" % unit) @@ -167,6 +175,8 @@ else: ret = subprocess.call(args, env=env) except KeyboardInterrupt: pass + except Exception as e: + print("%s" % e, file=sys.stderr) finally: print("Re-starting original systemd units...") stopped_units.reverse() -- 2.35.1

2 1

[libvirt PATCH] news: Document that we build with musl
by Martin Kletzander 09 Mar '22

09 Mar '22

A bit of effort by me and Michal helped make this the case, and it helped us uncover some potential issues. I am not documenting it as supported or adding an Alpine container into the CI, but since there were some distribution bugs mentioning libvirt issues I thing it would be nice of us to notify those distribution maintainers that read our release news. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- NEWS.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index a5b6106bc2c2..f0270b9bb159 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -21,6 +21,9 @@ v8.2.0 (unreleased) * **Bug fixes** + * Both build and tests should now pass on Alpine Linux or any other + distribution with musl libc. + v8.1.0 (2022-03-01) =================== -- 2.35.1

3 7

[libvirt PATCH 00/12] Automatic mutex management - part 4
by Tim Wiederhake 09 Mar '22

09 Mar '22

Use the recently implemented VIR_LOCK_GUARD and VIR_WITH_MUTEX_LOCK_GUARD to simplify mutex management. Tim Wiederhake (12): nwfilter_driver: Statically initialize mutex nwfilter_driver: Split up nwfilterStateCleanup nwfilter_driver: Use automatic mutex management nwfilter_gentech: Use automatic mutex management nwfilter_dhcpsnoop: Replace virNWFilterSnoopActiveLock macros nwfilter_dhcpsnoop: Replace virNWFilterSnoopLock macros nwfilter_dhcpsnoop: Replace virNWFilterSnoopReqLock functions nwfilter_learnipaddr: Use automatic mutex management nwfilter_ipaddrmap: Use automatic mutex management virnetlink: Use automatic memory management remote_daemon_stream: Use automatic memory management qemu_conf: Use automatic memory management src/conf/nwfilter_ipaddrmap.c | 80 ++--- src/conf/virnwfilterobj.h | 1 - src/nwfilter/nwfilter_dhcpsnoop.c | 393 ++++++++----------------- src/nwfilter/nwfilter_driver.c | 175 +++++------ src/nwfilter/nwfilter_gentech_driver.c | 34 +-- src/nwfilter/nwfilter_learnipaddr.c | 83 ++---- src/qemu/qemu_conf.c | 70 ++--- src/remote/remote_daemon_stream.c | 34 +-- src/util/virnetlink.c | 101 +++---- 9 files changed, 357 insertions(+), 614 deletions(-) -- 2.31.1

2 14

[libvirt PATCH v3] qemu: support multiqueue for vdpa net device
by Jonathon Jongsma 09 Mar '22

09 Mar '22

The vdpa device supports multiqueue, so remove the restriction from qemuDomainValidateActualNetDef() that prevents us from using this functionality. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2024406 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- Changes in v3: - Do not set the model type in virDomainNetDefParseXML(). Other virtio devices require the model to be explicitly set to 'virtio' in the xml definition in order to parse the virtio driver options, and it doesn't make sense to treat the vdpa device differently. If we want this behavior to change, it should probably be changed so that it applies to all devices that default to a virtio device model. Changes in v2: - remove error message in virDomainNetDefParseXML(). The model is already checked in the post parse validation step. src/qemu/qemu_domain.c | 3 +- .../net-vdpa-multiqueue.x86_64-latest.args | 36 +++++++++++++++++++ .../qemuxml2argvdata/net-vdpa-multiqueue.xml | 30 ++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../net-vdpa-multiqueue.xml | 36 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 6 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-vdpa-multiqueue.xml create mode 100644 tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index acc76c1cd6..6b61fefb8f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4523,7 +4523,8 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net, actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || actualType == VIR_DOMAIN_NET_TYPE_DIRECT || actualType == VIR_DOMAIN_NET_TYPE_ETHERNET || - actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER)) { + actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER || + actualType == VIR_DOMAIN_NET_TYPE_VDPA)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("interface %s - multiqueue is not supported for network interfaces of type %s"), macstr, virDomainNetTypeToString(actualType)); diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args new file mode 100644 index 0000000000..26ef666036 --- /dev/null +++ b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-add-fd set=0,fd=1732,opaque=net0-vdpa \ +-netdev vhost-vdpa,vhostdev=/dev/fdset/0,id=hostnet0 \ +-device '{"driver":"virtio-net-pci","mq":true,"vectors":6,"netdev":"hostnet0","id":"net0","mac":"52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.xml b/tests/qemuxml2argvdata/net-vdpa-multiqueue.xml new file mode 100644 index 0000000000..6e369c1916 --- /dev/null +++ b/tests/qemuxml2argvdata/net-vdpa-multiqueue.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <interface type='vdpa'> + <mac address='52:54:00:95:db:c0'/> + <source dev='/dev/vhost-vdpa-0'/> + <model type='virtio'/> + <driver queues='2'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ce475df466..7e1167e60e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1609,6 +1609,7 @@ mymain(void) DO_TEST_FAILURE("net-hostdev-fail", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_LATEST("net-vdpa"); + DO_TEST_CAPS_LATEST("net-vdpa-multiqueue"); DO_TEST("hostdev-pci-multifunction", QEMU_CAPS_KVM, diff --git a/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml b/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml new file mode 100644 index 0000000000..0876d5df62 --- /dev/null +++ b/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <interface type='vdpa'> + <mac address='52:54:00:95:db:c0'/> + <source dev='/dev/vhost-vdpa-0'/> + <model type='virtio'/> + <driver queues='2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 052950b86f..2174965784 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -485,6 +485,7 @@ mymain(void) DO_TEST_NOCAPS("net-coalesce"); DO_TEST_NOCAPS("net-many-models"); DO_TEST("net-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA); + DO_TEST("net-vdpa-multiqueue", QEMU_CAPS_NETDEV_VHOST_VDPA); DO_TEST_NOCAPS("serial-tcp-tlsx509-chardev"); DO_TEST_NOCAPS("serial-tcp-tlsx509-chardev-notls"); -- 2.35.1

2 1

[PATCH 0/4] docs cleanups
by Peter Krempa 09 Mar '22

09 Mar '22

Cleanups based on review of series converting a bunch of docs to rST format. Peter Krempa (4): docs: securityprocess: Don't claim that we have maint branches docs: formatsnapshot: Move paragraphs describing 'disk' element together docs: formatsnapshot: Remove explicit listing of supported snapshot formats docs: formatsnapshot: Remove empty 'seclabel' definition docs/formatsnapshot.rst | 24 +++++++++++------------- docs/securityprocess.rst | 6 ++---- 2 files changed, 13 insertions(+), 17 deletions(-) -- 2.35.1

3 12

[libvirt PATCH v2 0/1] meson: Fixes and improvements to handling of qemu_user and qemu_group
by Andrea Bolognani 09 Mar '22

09 Mar '22

Changes from [v1]: * most patches have been pushed; * added comments. [v1] https://listman.redhat.com/archives/libvir-list/2022-January/msg01189.html Andrea Bolognani (1): meson: Check for os-release's ID_LIKE in addition to ID meson.build | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) -- 2.34.1

2 4

[libvirt PATCH 0/2] nwfilter cleanups for legacy platforms
by Daniel P. Berrangé 09 Mar '22

09 Mar '22

We have a couple of compatibility hacks to cope with changes in iptables userspace and kernel. These were very long ago so not relevant to our current build platforms. Removing them makes the code clearer. The tests have churn because we were never properly testing this aspect in the past Daniel P. Berrangé (2): nwfilter: drop support for legacy iptables match syntax nwfilter: drop support for legacy iptables conntrack direction src/nwfilter/nwfilter_ebiptables_driver.c | 128 +- .../ah-ipv6-linux.args | 54 +- tests/nwfilterxml2firewalldata/ah-linux.args | 54 +- .../all-ipv6-linux.args | 54 +- tests/nwfilterxml2firewalldata/all-linux.args | 54 +- .../comment-linux.args | 90 +- .../conntrack-linux.args | 18 +- .../esp-ipv6-linux.args | 54 +- tests/nwfilterxml2firewalldata/esp-linux.args | 54 +- .../example-1-linux.args | 54 +- .../example-2-linux.args | 28 +- .../hex-data-linux.args | 36 +- .../icmp-direction-linux.args | 12 +- .../icmp-direction2-linux.args | 12 +- .../icmp-direction3-linux.args | 18 +- .../nwfilterxml2firewalldata/icmp-linux.args | 12 +- .../icmpv6-linux.args | 16 +- .../nwfilterxml2firewalldata/igmp-linux.args | 54 +- .../nwfilterxml2firewalldata/ipset-linux.args | 72 +- .../nwfilterxml2firewalldata/iter1-linux.args | 54 +- .../nwfilterxml2firewalldata/iter2-linux.args | 1026 +++++++++++------ .../nwfilterxml2firewalldata/iter3-linux.args | 90 +- .../sctp-ipv6-linux.args | 54 +- .../nwfilterxml2firewalldata/sctp-linux.args | 54 +- .../target-linux.args | 36 +- .../target2-linux.args | 18 +- .../tcp-ipv6-linux.args | 54 +- tests/nwfilterxml2firewalldata/tcp-linux.args | 18 +- .../udp-ipv6-linux.args | 54 +- tests/nwfilterxml2firewalldata/udp-linux.args | 54 +- .../udplite-ipv6-linux.args | 54 +- .../udplite-linux.args | 54 +- 32 files changed, 1570 insertions(+), 924 deletions(-) -- 2.35.1

2 3

[libvirt PATCH v2 0/6] Add support for 'blob' to virtio video device
by Jonathon Jongsma 08 Mar '22

08 Mar '22

Add support to libvirt for the 'blob' option for virtio video devices in qemu. Also do a little preparatory refactoring of the video device xml parsing code. Changes in v2: - Added some basic documentation - add a qemu capability - Make sure that the /dev/udmabuf device is accessible to qemu (cgroups, etc) Jonathon Jongsma (6): conf: Refactor video model parsing conf: switch to virXMLProp* functions conf: use enum variable for video type conf: add support for 'blob' in virtio video device qemu: Add capability for virtio-gpu.blob qemu: Implement 'blob' support for virtio gpu docs/formatdomain.rst | 6 + docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 133 +++++++++--------- src/conf/domain_conf.h | 3 +- src/conf/domain_validate.c | 13 +- src/libxl/libxl_conf.c | 10 ++ src/libxl/libxl_domain.c | 11 ++ src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_cgroup.c | 28 ++-- src/qemu/qemu_command.c | 3 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_monitor_json.c | 16 ++- src/qemu/qemu_namespace.c | 22 +++ src/qemu/qemu_process.c | 7 + src/qemu/qemu_validate.c | 9 ++ .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + .../video-virtio-blob-absent.args | 34 +++++ .../video-virtio-blob-absent.xml | 33 +++++ .../video-virtio-blob-off.args | 34 +++++ .../video-virtio-blob-off.xml | 33 +++++ .../video-virtio-blob-on.args | 34 +++++ .../qemuxml2argvdata/video-virtio-blob-on.xml | 33 +++++ .../video-virtio-vga-blob-on.args | 34 +++++ .../video-virtio-vga-blob-on.xml | 33 +++++ tests/qemuxml2argvtest.c | 12 ++ .../video-virtio-blob-absent.xml | 41 ++++++ .../video-virtio-blob-off.xml | 41 ++++++ .../video-virtio-blob-on.xml | 41 ++++++ .../video-virtio-vga-blob-on.xml | 41 ++++++ tests/qemuxml2xmltest.c | 12 ++ 36 files changed, 652 insertions(+), 84 deletions(-) create mode 100644 tests/qemuxml2argvdata/video-virtio-blob-absent.args create mode 100644 tests/qemuxml2argvdata/video-virtio-blob-absent.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-blob-off.args create mode 100644 tests/qemuxml2argvdata/video-virtio-blob-off.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-blob-on.args create mode 100644 tests/qemuxml2argvdata/video-virtio-blob-on.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-blob-on.args create mode 100644 tests/qemuxml2argvdata/video-virtio-vga-blob-on.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-blob-absent.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-blob-off.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-blob-on.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-vga-blob-on.xml -- 2.35.1

1 7

[PATCH 00/17] docs: Convert some pages to rST and clean up (part 1)
by Peter Krempa 08 Mar '22

08 Mar '22

Peter Krempa (17): docs: Remove 'virshcmdref' page docs: Drop 'devguide' page docs: formatsnapshot: Convert to 'rst' docs: Convert 'goals' to rST docs: Convert 'strategy' to rST docs: Convert 'contribute' page to rST docs: Convert 'bugs' page to rST docs: Convert 'errors' page to rST docs: Convert 'support' page to rST docs: Convert 'securityprocess' page to rST docs: securityprocess: Don't claim that we have maint branches docs: Convert 'governance' page to rST docs: page.xsl: Update anchor to the 'Code of conduct' paragraph docs: Convert 'drivers' page to rST docs: Convert 'formatsecret' page to rST docs: formatsecret: Drop few unneeded empty lines docs: meson: Restore alphabetical order docs/bugs.html.in | 161 ----------- docs/bugs.rst | 125 ++++++++ docs/contribute.html.in | 143 --------- docs/contribute.rst | 105 +++++++ docs/devguide.html.in | 42 --- docs/drivers.html.in | 44 --- docs/drivers.rst | 31 ++ docs/errors.html.in | 84 ------ docs/errors.rst | 109 +++++++ docs/formatsecret.html.in | 414 --------------------------- docs/formatsecret.rst | 332 +++++++++++++++++++++ docs/formatsnapshot.html.in | 352 ----------------------- docs/formatsnapshot.rst | 297 +++++++++++++++++++ docs/formatstorageencryption.html.in | 2 +- docs/goals.html.in | 64 ----- docs/goals.rst | 56 ++++ docs/governance.html.in | 298 ------------------- docs/governance.rst | 232 +++++++++++++++ docs/meson.build | 32 +-- docs/page.xsl | 2 +- docs/securityprocess.html.in | 119 -------- docs/securityprocess.rst | 91 ++++++ docs/strategy.html.in | 133 --------- docs/strategy.rst | 105 +++++++ docs/support.html.in | 258 ----------------- docs/support.rst | 207 ++++++++++++++ docs/virshcmdref.html.in | 75 ----- 27 files changed, 1707 insertions(+), 2206 deletions(-) delete mode 100644 docs/bugs.html.in create mode 100644 docs/bugs.rst delete mode 100644 docs/contribute.html.in create mode 100644 docs/contribute.rst delete mode 100644 docs/devguide.html.in delete mode 100644 docs/drivers.html.in create mode 100644 docs/drivers.rst delete mode 100644 docs/errors.html.in create mode 100644 docs/errors.rst delete mode 100644 docs/formatsecret.html.in create mode 100644 docs/formatsecret.rst delete mode 100644 docs/formatsnapshot.html.in create mode 100644 docs/formatsnapshot.rst delete mode 100644 docs/goals.html.in create mode 100644 docs/goals.rst delete mode 100644 docs/governance.html.in create mode 100644 docs/governance.rst delete mode 100644 docs/securityprocess.html.in create mode 100644 docs/securityprocess.rst delete mode 100644 docs/strategy.html.in create mode 100644 docs/strategy.rst delete mode 100644 docs/support.html.in create mode 100644 docs/support.rst delete mode 100644 docs/virshcmdref.html.in -- 2.35.1

2 35

[PATCH 0/2] libvirt-qemu: Two simple fixes
by Michal Privoznik 08 Mar '22

08 Mar '22

*** BLURB HERE *** Michal Prívozník (2): libvirt-qemu: Don't allow NULL cmd in virDomainQemuMonitorCommandWithFiles() libvirt-qemu: Fix capitalization of QEMU src/libvirt-qemu.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) -- 2.34.1

2 3

[libvirt PATCH] spec: Move virkey* manual pages from -daemon to -client
by Andrea Bolognani 08 Mar '22

08 Mar '22

The documentation included in these manual pages is mostly useful to users of the 'send-key' virsh command, and the virsh manual page refers to them, so it makes more sense to install them along with virsh instead of libvirtd. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 0e6cd13bb2..6855b3a760 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1733,7 +1733,6 @@ exit 0 %{_mandir}/man8/virtlogd.8* %{_mandir}/man8/virtlockd.8* %{_mandir}/man8/virtproxyd.8* -%{_mandir}/man7/virkey*.7* %{_bindir}/virt-host-validate %{_bindir}/virt-admin @@ -2010,6 +2009,7 @@ exit 0 %{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-pki-query-dn.1* %{_mandir}/man1/virt-pki-validate.1* +%{_mandir}/man7/virkey*.7* %{_bindir}/virsh %{_bindir}/virt-xml-validate %{_bindir}/virt-pki-query-dn -- 2.34.1

2 2

[PATCH] qemu: domainjob: Allow free if cb is not set in qemuDomainObjClearJob
by Kristina Hanicova 08 Mar '22

08 Mar '22

We should allow resetting and freeing qemuDomainJobObj even if 'cb' attribute is not set. This is theoretical for now, but the attribute must not be always set in the future, so early return would create memory leaks. It is sufficient to check if 'cb' exists before dereferencing it in qemuDomainObjClearJob() and also qemuDomainObjResetAsyncJob() as the latter is called from the former. This commit partially reverts af16e754cd4efc3ca1. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/qemu_domainjob.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 3e73eba4ed..587c166d94 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -239,8 +239,10 @@ qemuDomainObjResetAsyncJob(qemuDomainJobObj *job) job->abortJob = false; VIR_FREE(job->error); g_clear_pointer(&job->current, virDomainJobDataFree); - job->cb->resetJobPrivate(job->privateData); job->apiFlags = 0; + + if (job->cb) + job->cb->resetJobPrivate(job->privateData); } int @@ -270,16 +272,15 @@ qemuDomainObjRestoreJob(virDomainObj *obj, void qemuDomainObjClearJob(qemuDomainJobObj *job) { - if (!job->cb) - return; - qemuDomainObjResetJob(job); qemuDomainObjResetAsyncJob(job); - g_clear_pointer(&job->privateData, job->cb->freeJobPrivate); g_clear_pointer(&job->current, virDomainJobDataFree); g_clear_pointer(&job->completed, virDomainJobDataFree); virCondDestroy(&job->cond); virCondDestroy(&job->asyncCond); + + if (job->cb) + g_clear_pointer(&job->privateData, job->cb->freeJobPrivate); } bool -- 2.35.1

2 1

[PULL v4 21/47] hw/i386/pc_piix: Mark the machine types from version 1.4 to 1.7 as deprecated
by Michael S. Tsirkin 07 Mar '22

07 Mar '22

From: Thomas Huth <thuth(a)redhat.com> The list of machine types grows larger and larger each release ... and it is unlikely that many people still use the very old ones for live migration. QEMU v1.7 has been released more than 8 years ago, so most people should have updated their machines to a newer version in those 8 years at least once. Thus let's mark the very old 1.x machine types as deprecated now. Signed-off-by: Thomas Huth <thuth(a)redhat.com> Message-Id: <20220117191639.278497-1-thuth(a)redhat.com> Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> --- hw/i386/pc_piix.c | 1 + docs/about/deprecated.rst | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 8d33cf689d..b72c03d0a6 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -757,6 +757,7 @@ static void pc_i440fx_1_7_machine_options(MachineClass *m) m->hw_version = "1.7.0"; m->default_machine_opts = NULL; m->option_rom_has_mr = true; + m->deprecation_reason = "old and unattended - use a newer version instead"; compat_props_add(m->compat_props, pc_compat_1_7, pc_compat_1_7_len); pcmc->smbios_defaults = false; pcmc->gigabyte_align = false; diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 85773db631..cf02ef6821 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -324,6 +324,14 @@ machine is hardly emulated at all (e.g. neither the LCD nor the USB part had been implemented), so there is not much value added by this board. Use the ``ref405ep`` machine instead. +``pc-i440fx-1.4`` up to ``pc-i440fx-1.7`` (since 7.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''' + +These old machine types are quite neglected nowadays and thus might have +various pitfalls with regards to live migration. Use a newer machine type +instead. + + Backend options --------------- -- MST

1 0

[libvirt PATCH] Drop YouCompleteMe and color_coded integration
by Andrea Bolognani 07 Mar '22

07 Mar '22

I introduced support for these vim plugins several years ago but have since moved away from them. These days developers are likely better served by lsp-based tooling, which doesn't require additional per-project configuration. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .color_coded.in | 38 --------------------------------- .ycm_extra_conf.py.in | 43 -------------------------------------- build-aux/syntax-check.mk | 1 - docs/developer-tooling.rst | 13 ------------ docs/hacking.rst | 1 - docs/meson.build | 1 - meson.build | 19 ----------------- 7 files changed, 116 deletions(-) delete mode 100644 .color_coded.in delete mode 100644 .ycm_extra_conf.py.in delete mode 100644 docs/developer-tooling.rst diff --git a/.color_coded.in b/.color_coded.in deleted file mode 100644 index f39c6860ab..0000000000 --- a/.color_coded.in +++ /dev/null @@ -1,38 +0,0 @@ --I@abs_top_builddir@ --I@abs_top_srcdir@ --I@abs_top_builddir@/include --I@abs_top_srcdir@/include --I@abs_top_builddir@/src --I@abs_top_srcdir@/src --I@abs_top_builddir@/src/access --I@abs_top_srcdir@/src/access --I@abs_top_builddir@/src/admin --I@abs_top_srcdir@/src/admin --I@abs_top_builddir@/src/bhyve --I@abs_top_srcdir@/src/bhyve --I@abs_top_builddir@/src/conf --I@abs_top_srcdir@/src/conf --I@abs_top_builddir@/src/libxl --I@abs_top_srcdir@/src/libxl --I@abs_top_builddir@/src/locking --I@abs_top_srcdir@/src/locking --I@abs_top_builddir@/src/logging --I@abs_top_srcdir@/src/logging --I@abs_top_builddir@/src/lxc --I@abs_top_srcdir@/src/lxc --I@abs_top_builddir@/src/qemu --I@abs_top_srcdir@/src/qemu --I@abs_top_builddir@/src/remote --I@abs_top_srcdir@/src/remote --I@abs_top_builddir@/src/rpc --I@abs_top_srcdir@/src/rpc --I@abs_top_builddir@/src/secret --I@abs_top_srcdir@/src/secret --I@abs_top_builddir@/src/security --I@abs_top_srcdir@/src/security --I@abs_top_builddir@/src/util --I@abs_top_srcdir@/src/util --I@abs_top_builddir@/src/vmx --I@abs_top_srcdir@/src/vmx --I@abs_top_builddir@/src/xenconfig --I@abs_top_srcdir@/src/xenconfig diff --git a/.ycm_extra_conf.py.in b/.ycm_extra_conf.py.in deleted file mode 100644 index 2e24334079..0000000000 --- a/.ycm_extra_conf.py.in +++ /dev/null @@ -1,43 +0,0 @@ -flags = [ - '-I@abs_top_builddir@', - '-I@abs_top_srcdir@', - '-I@abs_top_builddir@/include', - '-I@abs_top_srcdir@/include', - '-I@abs_top_builddir@/src', - '-I@abs_top_srcdir@/src', - '-I@abs_top_builddir@/src/access', - '-I@abs_top_srcdir@/src/access', - '-I@abs_top_builddir@/src/admin', - '-I@abs_top_srcdir@/src/admin', - '-I@abs_top_builddir@/src/bhyve', - '-I@abs_top_srcdir@/src/bhyve', - '-I@abs_top_builddir@/src/conf', - '-I@abs_top_srcdir@/src/conf', - '-I@abs_top_builddir@/src/libxl', - '-I@abs_top_srcdir@/src/libxl', - '-I@abs_top_builddir@/src/locking', - '-I@abs_top_srcdir@/src/locking', - '-I@abs_top_builddir@/src/logging', - '-I@abs_top_srcdir@/src/logging', - '-I@abs_top_builddir@/src/lxc', - '-I@abs_top_srcdir@/src/lxc', - '-I@abs_top_builddir@/src/qemu', - '-I@abs_top_srcdir@/src/qemu', - '-I@abs_top_builddir@/src/remote', - '-I@abs_top_srcdir@/src/remote', - '-I@abs_top_builddir@/src/rpc', - '-I@abs_top_srcdir@/src/rpc', - '-I@abs_top_builddir@/src/secret', - '-I@abs_top_srcdir@/src/secret', - '-I@abs_top_builddir@/src/security', - '-I@abs_top_srcdir@/src/security', - '-I@abs_top_builddir@/src/util', - '-I@abs_top_srcdir@/src/util', - '-I@abs_top_builddir@/src/vmx', - '-I@abs_top_srcdir@/src/vmx', - '-I@abs_top_builddir@/src/xenconfig', - '-I@abs_top_srcdir@/src/xenconfig', -] - -def FlagsForFile(filename, **kwargs): - return { 'flags': flags, 'do_cache': True } diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index a8c9153b20..fac1338589 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -921,7 +921,6 @@ http_sites += www.javvin.com # 404 links http_sites += publib.boulder.ibm.com http_sites += kerneltrap.org -http_sites += valloric.github.io http_sites += www.microsoft.com http_sites += xenbits.xen.org http_sites += lovezutto.googlepages.com diff --git a/docs/developer-tooling.rst b/docs/developer-tooling.rst deleted file mode 100644 index c8980e3e4f..0000000000 --- a/docs/developer-tooling.rst +++ /dev/null @@ -1,13 +0,0 @@ -================= -Developer tooling -================= - -libvirt includes support for some useful development tools right -in its source repository, meaning users will be able to take -advantage of them without little or no configuration. Examples -include: - -- `color_coded <https://github.com/jeaye/color_coded>`__, a vim - plugin for libclang-powered semantic syntax highlighting; -- `YouCompleteMe <http://valloric.github.io/YouCompleteMe/>`__, a - vim plugin for libclang-powered semantic code completion. diff --git a/docs/hacking.rst b/docs/hacking.rst index cd009c4c73..1be9daab80 100644 --- a/docs/hacking.rst +++ b/docs/hacking.rst @@ -72,7 +72,6 @@ This page only covers the very basics, so it's recommended that you also take a look at the following documents: - `Programming languages <programming-languages.html>`__ -- `Developer tooling <developer-tooling.html>`__ - `Advanced test suite usage <advanced-tests.html>`__ - `Adoption of GLib APIs <glib-adoption.html>`__ - `Committer guidelines <committer-guidelines.html>`__ diff --git a/docs/meson.build b/docs/meson.build index 7e070d68ad..690715a12e 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -95,7 +95,6 @@ docs_rst_files = [ 'committer-guidelines', 'compiling', 'daemons', - 'developer-tooling', 'drvqemu', 'drvch', 'formatbackup', diff --git a/meson.build b/meson.build index 519a928c9a..987d8a393f 100644 --- a/meson.build +++ b/meson.build @@ -2215,25 +2215,6 @@ configure_file( run_command('chmod', 'a+x', meson.current_build_dir() / 'run', check: true) -# generate developer tooling files -tooling_files = [ - '.color_coded.in', - '.ycm_extra_conf.py.in', -] - -tooling_conf = configuration_data() -tooling_conf.set('abs_top_builddir', meson.build_root()) -tooling_conf.set('abs_top_srcdir', meson.source_root()) - -foreach file : tooling_files - configure_file( - input: file, - output: '@BASENAME@', - configuration: tooling_conf, - ) -endforeach - - # print configuration summary driver_summary = { -- 2.35.1

2 1

[libvirt PATCH 0/5] Miscelaneous libc-related fixes
by Martin Kletzander 07 Mar '22

07 Mar '22

Compiling libvirt on alpine showed a bunch of things that are potentially wrong, we just haven't noticed elsewhere. Martin Kletzander (5): syntax-check: Rework mock-noinline to get all files at once Include poll.h instead of sys/poll.h Include sys/wait.h instead of wait.h nwfilter: Avoid memory alignment issues tests: Allow expansion of mocked stat symbols build-aux/syntax-check.mk | 2 +- scripts/mock-noinline.py | 2 +- src/lxc/lxc_driver.c | 4 ++-- src/network/bridge_driver.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 15 ++++++++------- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/security/security_apparmor.c | 2 +- src/vz/vz_driver.c | 2 +- tests/virmock.h | 4 +++- 10 files changed, 20 insertions(+), 17 deletions(-) -- 2.35.1

4 11

[libvirt PATCH] wireshark: Fix dissector for quad types
by Martin Kletzander 07 Mar '22

07 Mar '22

This uses the right type that is expected to make it work even on platforms where gint64 != quad_t. Due to indentation changes it is best to view this patch with -w. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/wireshark/src/packet-libvirt.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c index eeacbcdf0e14..ee20e3734d74 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -74,17 +74,17 @@ static gint ett_libvirt_stream_hole = -1; VIR_WARNINGS_NO_UNUSED_FUNCTION -XDR_PRIMITIVE_DISSECTOR(int, gint32, int) -XDR_PRIMITIVE_DISSECTOR(u_int, guint32, uint) -XDR_PRIMITIVE_DISSECTOR(short, gint16, int) -XDR_PRIMITIVE_DISSECTOR(u_short, guint16, uint) -XDR_PRIMITIVE_DISSECTOR(char, gchar, int) -XDR_PRIMITIVE_DISSECTOR(u_char, guchar, uint) -XDR_PRIMITIVE_DISSECTOR(hyper, gint64, int64) -XDR_PRIMITIVE_DISSECTOR(u_hyper, guint64, uint64) -XDR_PRIMITIVE_DISSECTOR(float, gfloat, float) -XDR_PRIMITIVE_DISSECTOR(double, gdouble, double) -XDR_PRIMITIVE_DISSECTOR(bool, bool_t, boolean) +XDR_PRIMITIVE_DISSECTOR(int, gint32, int) +XDR_PRIMITIVE_DISSECTOR(u_int, guint32, uint) +XDR_PRIMITIVE_DISSECTOR(short, gint16, int) +XDR_PRIMITIVE_DISSECTOR(u_short, guint16, uint) +XDR_PRIMITIVE_DISSECTOR(char, gchar, int) +XDR_PRIMITIVE_DISSECTOR(u_char, guchar, uint) +XDR_PRIMITIVE_DISSECTOR(hyper, quad_t, int64) +XDR_PRIMITIVE_DISSECTOR(u_hyper, u_quad_t, uint64) +XDR_PRIMITIVE_DISSECTOR(float, gfloat, float) +XDR_PRIMITIVE_DISSECTOR(double, gdouble, double) +XDR_PRIMITIVE_DISSECTOR(bool, bool_t, boolean) VIR_WARNINGS_RESET -- 2.35.1

2 1

[PATCH 00/17] lxc_fuse: Implement support for FUSE3
by Michal Privoznik 07 Mar '22

07 Mar '22

Unfortunately, we can't just replace FUSE with FUSE3 because Ubuntu1804 doesn't have fuse3 package, but in a few weeks time, when the support for old Ubuntu is dropped, we can drop old FUSE support too. Michal Prívozník (17): lxc_fuse: Hide struct virLXCFuse lxc_fuse: Move virLXCMeminfo struct into lxc_cgroup.h lxc_fuse.h: Don't include lxc_conf.h lxc_fuse: Move #include <fuse.h> lxc_fuse: Drop some G_GNUC_UNUSED attributes lxc_fuse.c: Modernize function declarations lxc_fuse: Prefer O_ACCMODE instead of & 3 lxcSetupFuse: Cleanup error paths lxcProcReadMeminfo: Rename @fd to @fp lxc_fuse: Use automatic file closing lxcProcReadMeminfo: Drop needless label lxcProcReadMeminfo: Drop @new_meminfo variable lxcProcReadMeminfo: Fix case when @offset != 0 lxc_fuse: Prefer fuse_file_info::direct_io over mount option lxc_fuse: Tell FUSE that /proc/meminfo is nonseekable lxc_fuse: Implement support for FUSE3 meson: Detect newer fuse meson.build | 12 +- src/lxc/lxc_cgroup.h | 13 +++ src/lxc/lxc_fuse.c | 258 ++++++++++++++++++++++++++++++------------- src/lxc/lxc_fuse.h | 28 +---- 4 files changed, 207 insertions(+), 104 deletions(-) -- 2.34.1

2 18

[libvirt PATCH] Add .gitattributes file
by Andrea Bolognani 07 Mar '22

07 Mar '22

The files marked as export-ignore here are not going to be included in the tarball produced by 'meson dist' when using meson >= 0.60. Older versions of meson excluded a small subset of these files automatically, but since we have more control now we can be more aggressive and leave out anything that doesn't make sense in a release tarball. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitattributes | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..6f0a34d2a0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,22 @@ +# Generic git stuff +**/.gitattributes export-ignore +**/.gitignore export-ignore +/.gitmodules export-ignore +/.mailmap export-ignore + +# Project-specific git stuff +/.gitpublish export-ignore +/docs/gitdm export-ignore +/docs/gitdm/** export-ignore +/gitdm.config export-ignore + +# Code hosting stuff +/.github export-ignore +/.github/** export-ignore +/.gitlab export-ignore +/.gitlab/** export-ignore + +# CI stuff +/.gitlab-ci.yml export-ignore +/ci export-ignore +/ci/** export-ignore -- 2.35.1

4 4

[libvirt PATCH] docs: remove extra closing tag
by Ján Tomko 07 Mar '22

07 Mar '22

Reported-by: Юлій В. Чирков <juliyvchirkov(a)gmail.com> Closes: https://gitlab.com/libvirt/libvirt/-/merge_requests/143 Fixes: d3ac12e3a1c01d1205b4db3f6cd640f3da98579b Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. docs/formatnetwork.html.in | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index fad43f77ea..56ff32fbf4 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -1250,7 +1250,6 @@ </dhcp> </ip> <ip family="ipv6" address="fdXX:XXXX:XXXX:NNNN:: prefix="64"/> - </ip> </network></pre> <p>IPv6 NAT addressing has some caveats over the more straight -- 2.35.1

1 0

[PULL v2 21/47] hw/i386/pc_piix: Mark the machine types from version 1.4 to 1.7 as deprecated
by Michael S. Tsirkin 07 Mar '22

07 Mar '22

From: Thomas Huth <thuth(a)redhat.com> The list of machine types grows larger and larger each release ... and it is unlikely that many people still use the very old ones for live migration. QEMU v1.7 has been released more than 8 years ago, so most people should have updated their machines to a newer version in those 8 years at least once. Thus let's mark the very old 1.x machine types as deprecated now. Signed-off-by: Thomas Huth <thuth(a)redhat.com> Message-Id: <20220117191639.278497-1-thuth(a)redhat.com> Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> --- hw/i386/pc_piix.c | 1 + docs/about/deprecated.rst | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 8d33cf689d..b72c03d0a6 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -757,6 +757,7 @@ static void pc_i440fx_1_7_machine_options(MachineClass *m) m->hw_version = "1.7.0"; m->default_machine_opts = NULL; m->option_rom_has_mr = true; + m->deprecation_reason = "old and unattended - use a newer version instead"; compat_props_add(m->compat_props, pc_compat_1_7, pc_compat_1_7_len); pcmc->smbios_defaults = false; pcmc->gigabyte_align = false; diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 85773db631..cf02ef6821 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -324,6 +324,14 @@ machine is hardly emulated at all (e.g. neither the LCD nor the USB part had been implemented), so there is not much value added by this board. Use the ``ref405ep`` machine instead. +``pc-i440fx-1.4`` up to ``pc-i440fx-1.7`` (since 7.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''' + +These old machine types are quite neglected nowadays and thus might have +various pitfalls with regards to live migration. Use a newer machine type +instead. + + Backend options --------------- -- MST

1 0

Release of libvirt-8.1.0
by Jiri Denemark 07 Mar '22

07 Mar '22

The 8.1.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://libvirt.org/sources/ https://libvirt.org/sources/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing feedback. Your work is greatly appreciated. * New features * qemu: Add hvf domain type for Hypervisor.framework It works on Intel machines as well as recent machines powered by Apple Silicon. QEMU 6.2.0 is needed for Apple Silicon support. * qemu: Support mode option for dirtyrate calculation Introduce ``virDomainDirtyRateCalcFlags`` as parameter of ``virDomainStartDirtyRateCalc``, which is used to specify the mode of dirty page rate calculation. Add ``--mode`` option to ``virsh domdirtyrate-calc``, which can be either of the following 3 options: ``page-sampling, dirty-bitmap, dirty-ring``. Add ``calc_mode`` field for dirtyrate statistics returned by ``virsh domstats --dirtyrate``, also add ``vCPU dirtyrate`` if ``dirty-ring`` mode was used in last measurement. * Improvements * packaging: sysconfig files no longer installed libvirt used to provide defaults in various /etc/sysconfig/ files, such as /etc/sysconfig/libvirtd. Since these files are owned by the admin, this made it difficult to change built-in defaults in case such file was modified by the admin. The built-in defaults are now part of the provided systemd unit files, such as libvirtd.service. These unit files continue to parse sysconfig files, in case they are created by the admin and filled with the desired key=value pairs. * virnetdev: Ignore EPERM on implicit clearing of VF VLAN ID Libvirt will now ignore EPERM errors on attempts to implicitly clear a VLAN ID (when a VLAN is not explicitly provided via an interface XML using a 0 or a non-zero value) as SmartNIC DPUs do not expose VLAN programming capabilities to the hypervisor host. This allows Libvirt clients to avoid specifying a VLAN and expect VF configuration to work since Libvirt tries to clear a VLAN in the same operation as setting a MAC address for VIR_DOMAIN_NET_TYPE_HOSTDEV devices which is now split into two distinct operations. EPERM errors received while trying to program a non-zero VLAN ID or explicitly program a VLAN ID 0 will still cause errors as before so there is no change in behavior in those cases. * Bug fixes * Remove unix sockets from filesystem when disabling a '.socket' systemd unit The presence of the socket files is used by our remote driver to determine which service to access. Since neiter systemd nor the daemons clean up the socket file clients were running into problems when a modular deployment was switched to monolithic ``libvirtd``. * qemu: Fixes of fd passing during hotplug and hotunplug of chardevs FDs used as chardev backing are now properly removed when hot-unplugging a chardev from qemu and hotplugged chardevs now properly use ``virtlogd`` to handle the input and output from qemu. * RPM: Run pre/post-install steps on ``daemon-driver-storage-core`` Previously the pre/post-install code was part of the meta-package which installed all storage driver sub-packages thus a minimalistic install of the storage driver didn't behave correctly. Enjoy. Jirka

2 2

[PATCH v2 0/8] softmmu: move and refactor -runas, -chroot and -daemonize
by Daniel P. Berrangé 04 Mar '22

04 Mar '22

This small series was motivated by my thoughts on the proposals in https://lists.gnu.org/archive/html/qemu-devel/2022-03/msg01135.html It demonstrates the approach I mention there, and has the further benefit of untangling and isolating the implementation of UID changing, chrooting and daemonizing, from the parsing of the corresponding command line options. Changed in v2: - Fix mistake that left stderr open when daemonizing - Remove use of is_daemonized from chardev - Remove use of is_daemonized from logging - Eliminate is_daemonized function Daniel P. Berrangé (8): softmmu: remove deprecated --enable-fips option os-posix: refactor code handling the -runas argument os-posix: refactor code handling the -chroot argument util: remove use of is_daemonized flag from logging code softmmu: refactor use of is_daemonized() method chardev: add API to block use of the stdio implementation softmmu: move parsing of -runas, -chroot and -daemonize code softmmu: remove is_daemonized() method chardev/char-stdio.c | 12 +- docs/about/deprecated.rst | 12 -- docs/about/removed-features.rst | 11 ++ include/chardev/char-stdio.h | 29 ++++ include/qemu/log.h | 1 + include/qemu/osdep.h | 3 - include/sysemu/os-posix.h | 6 +- include/sysemu/os-win32.h | 6 - os-posix.c | 227 ++++++++++---------------------- os-win32.c | 9 -- qemu-options.hx | 10 -- softmmu/vl.c | 92 +++++++++++-- stubs/is-daemonized.c | 9 -- stubs/meson.build | 1 - ui/vnc.c | 7 - util/log.c | 12 +- util/osdep.c | 28 ---- 17 files changed, 213 insertions(+), 262 deletions(-) create mode 100644 include/chardev/char-stdio.h delete mode 100644 stubs/is-daemonized.c -- 2.34.1

2 13

[PATCH 0/4] softmmu: move and refactor -runas, -chroot and -daemonize
by Daniel P. Berrangé 04 Mar '22

04 Mar '22

This small series was motivated by my thoughts on the proposals in https://lists.gnu.org/archive/html/qemu-devel/2022-03/msg01135.html It demostrates the approach I mention there, and has the further benefit of untangling and isolating the implementation of UID changing, chrooting and daemonized, from the parsing of the corresponding command line options. Daniel P. Berrangé (4): softmmu: remove deprecated --enable-fips option os-posix: refactor code handling the -runas argument os-posix: refactor code handling the -chroot argument softmmu: move parsing of -runas, -chroot and -daemonize code docs/about/deprecated.rst | 12 -- docs/about/removed-features.rst | 11 ++ include/qemu/osdep.h | 3 - include/sysemu/os-posix.h | 4 +- include/sysemu/os-win32.h | 1 - os-posix.c | 222 ++++++++++---------------------- os-win32.c | 9 -- qemu-options.hx | 10 -- softmmu/vl.c | 76 ++++++++++- ui/vnc.c | 7 - util/osdep.c | 28 ---- 11 files changed, 154 insertions(+), 229 deletions(-) -- 2.34.1

3 10

[libvirt PATCH v2] qemu: support multiqueue for vdpa net device
by Jonathon Jongsma 04 Mar '22

04 Mar '22

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2024406 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- Changes in v2: - remove error message in virDomainNetDefParseXML(). The model is already checked in the post parse validation step. src/conf/domain_conf.c | 2 ++ src/qemu/qemu_domain.c | 3 +- .../net-vdpa-multiqueue.x86_64-latest.args | 36 +++++++++++++++++++ .../qemuxml2argvdata/net-vdpa-multiqueue.xml | 29 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../net-vdpa-multiqueue.xml | 36 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 7 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-vdpa-multiqueue.xml create mode 100644 tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 34fec887a3..9634c9256e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10552,6 +10552,8 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, goto error; } def->data.vdpa.devicepath = g_steal_pointer(&dev); + if (!def->model) + def->model = VIR_DOMAIN_NET_MODEL_VIRTIO; break; case VIR_DOMAIN_NET_TYPE_BRIDGE: diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index acc76c1cd6..6b61fefb8f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4523,7 +4523,8 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net, actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || actualType == VIR_DOMAIN_NET_TYPE_DIRECT || actualType == VIR_DOMAIN_NET_TYPE_ETHERNET || - actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER)) { + actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER || + actualType == VIR_DOMAIN_NET_TYPE_VDPA)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("interface %s - multiqueue is not supported for network interfaces of type %s"), macstr, virDomainNetTypeToString(actualType)); diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args new file mode 100644 index 0000000000..26ef666036 --- /dev/null +++ b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-add-fd set=0,fd=1732,opaque=net0-vdpa \ +-netdev vhost-vdpa,vhostdev=/dev/fdset/0,id=hostnet0 \ +-device '{"driver":"virtio-net-pci","mq":true,"vectors":6,"netdev":"hostnet0","id":"net0","mac":"52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.xml b/tests/qemuxml2argvdata/net-vdpa-multiqueue.xml new file mode 100644 index 0000000000..2e38c6f976 --- /dev/null +++ b/tests/qemuxml2argvdata/net-vdpa-multiqueue.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <interface type='vdpa'> + <mac address='52:54:00:95:db:c0'/> + <source dev='/dev/vhost-vdpa-0'/> + <driver queues='2'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ce475df466..7e1167e60e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1609,6 +1609,7 @@ mymain(void) DO_TEST_FAILURE("net-hostdev-fail", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_LATEST("net-vdpa"); + DO_TEST_CAPS_LATEST("net-vdpa-multiqueue"); DO_TEST("hostdev-pci-multifunction", QEMU_CAPS_KVM, diff --git a/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml b/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml new file mode 100644 index 0000000000..0876d5df62 --- /dev/null +++ b/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <interface type='vdpa'> + <mac address='52:54:00:95:db:c0'/> + <source dev='/dev/vhost-vdpa-0'/> + <model type='virtio'/> + <driver queues='2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 052950b86f..2174965784 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -485,6 +485,7 @@ mymain(void) DO_TEST_NOCAPS("net-coalesce"); DO_TEST_NOCAPS("net-many-models"); DO_TEST("net-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA); + DO_TEST("net-vdpa-multiqueue", QEMU_CAPS_NETDEV_VHOST_VDPA); DO_TEST_NOCAPS("serial-tcp-tlsx509-chardev"); DO_TEST_NOCAPS("serial-tcp-tlsx509-chardev-notls"); -- 2.35.1

2 1

[PULL 25/45] hw/i386/pc_piix: Mark the machine types from version 1.4 to 1.7 as deprecated
by Michael S. Tsirkin 04 Mar '22

04 Mar '22

From: Thomas Huth <thuth(a)redhat.com> The list of machine types grows larger and larger each release ... and it is unlikely that many people still use the very old ones for live migration. QEMU v1.7 has been released more than 8 years ago, so most people should have updated their machines to a newer version in those 8 years at least once. Thus let's mark the very old 1.x machine types as deprecated now. Signed-off-by: Thomas Huth <thuth(a)redhat.com> Message-Id: <20220117191639.278497-1-thuth(a)redhat.com> Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> --- hw/i386/pc_piix.c | 1 + docs/about/deprecated.rst | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 8d33cf689d..b72c03d0a6 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -757,6 +757,7 @@ static void pc_i440fx_1_7_machine_options(MachineClass *m) m->hw_version = "1.7.0"; m->default_machine_opts = NULL; m->option_rom_has_mr = true; + m->deprecation_reason = "old and unattended - use a newer version instead"; compat_props_add(m->compat_props, pc_compat_1_7, pc_compat_1_7_len); pcmc->smbios_defaults = false; pcmc->gigabyte_align = false; diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 85773db631..cf02ef6821 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -324,6 +324,14 @@ machine is hardly emulated at all (e.g. neither the LCD nor the USB part had been implemented), so there is not much value added by this board. Use the ``ref405ep`` machine instead. +``pc-i440fx-1.4`` up to ``pc-i440fx-1.7`` (since 7.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''' + +These old machine types are quite neglected nowadays and thus might have +various pitfalls with regards to live migration. Use a newer machine type +instead. + + Backend options --------------- -- MST

1 0

[PATCH] rpc: Fix memory leak of fds
by Peng Liang 04 Mar '22

04 Mar '22

In virSystemdActivationClaimFDs, the memory of ent->fds has been stolen and stored in fds, but fds is never freed, which causes a memory leak. Fix it by declaring fds as g_autofree. Reported-by: Jie Tang <tangjie18(a)huawei.com> Signed-off-by: Peng Liang <liangpeng10(a)huawei.com> --- src/rpc/virnetserver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index ad581a36ddf3..d9430a2cfa76 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -655,7 +655,7 @@ virNetServerAddServiceActivation(virNetServer *srv, size_t max_queued_clients, size_t nrequests_client_max) { - int *fds; + g_autofree int *fds = NULL; size_t nfds; if (act == NULL) -- 2.35.1

2 1

[PATCH 0/4] tests: Miscellaneous fixes and improvements
by Michal Privoznik 04 Mar '22

04 Mar '22

I've been trying to compile libvirt with musl lately and seen couple of tests failing. Some of them were related strictly to how musl works, but the rest are genuine bugs we have and it's by pure chance that we haven't met them with glibc (1/4 for instance). Green pipeline can be seen here: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/483864407 Michal Prívozník (4): vircgroupmock: Be wiser about detecting fakerootdir change vircgroupmock: Make global variables static sockettest: Check for IPv4-in-IPv6 parsing and formatting tests: Update IPv4-in-IPv6 addresses tests/nwfilterxml2firewalldata/ah-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/ah-ipv6.xml | 2 +- .../nwfilterxml2firewalldata/all-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/all-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/comment-linux.args | 4 ++-- tests/nwfilterxml2firewalldata/comment.xml | 4 ++-- .../nwfilterxml2firewalldata/esp-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/esp-ipv6.xml | 2 +- .../nwfilterxml2firewalldata/hex-data-linux.args | 4 ++-- tests/nwfilterxml2firewalldata/hex-data.xml | 4 ++-- tests/nwfilterxml2firewalldata/icmpv6-linux.args | 2 +- tests/nwfilterxml2firewalldata/icmpv6.xml | 2 +- tests/nwfilterxml2firewalldata/ipv6-linux.args | 4 ++-- tests/nwfilterxml2firewalldata/ipv6.xml | 4 ++-- .../nwfilterxml2firewalldata/sctp-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/sctp-ipv6.xml | 2 +- .../nwfilterxml2firewalldata/tcp-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/tcp-ipv6.xml | 2 +- .../nwfilterxml2firewalldata/udp-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/udp-ipv6.xml | 2 +- .../udplite-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/udplite-ipv6.xml | 2 +- tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/comment-test-invalid.xml | 4 ++-- tests/nwfilterxml2xmlin/esp-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/hex-data-test-invalid.xml | 4 ++-- tests/nwfilterxml2xmlin/icmpv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/ipv6-test-invalid.xml | 4 ++-- .../nwfilterxml2xmlin/sctp-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml | 2 +- .../udplite-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlout/ah-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/all-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/comment-test.xml | 2 +- tests/nwfilterxml2xmlout/esp-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/hex-data-test.xml | 2 +- tests/nwfilterxml2xmlout/icmpv6-test.xml | 2 +- tests/nwfilterxml2xmlout/ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/sctp-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/tcp-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/udp-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/udplite-ipv6-test.xml | 2 +- tests/sockettest.c | 2 ++ tests/vircgroupmock.c | 15 ++++++--------- 46 files changed, 75 insertions(+), 76 deletions(-) -- 2.34.1

2 6

[PATCH] deprecation: x86 default machine types
by Dr. David Alan Gilbert (git) 03 Mar '22

03 Mar '22

From: "Dr. David Alan Gilbert" <dgilbert(a)redhat.com> Declare the intent to require a machine type to be specified on x86 system emulation. Signed-off-by: Dr. David Alan Gilbert <dgilbert(a)redhat.com> --- docs/about/deprecated.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 85773db631..143c60d105 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -324,6 +324,14 @@ machine is hardly emulated at all (e.g. neither the LCD nor the USB part had been implemented), so there is not much value added by this board. Use the ``ref405ep`` machine instead. +x86 default machine type +'''''''''''''''''''''''' + +x86 currently defaults to the ```pc``` machine type which is based on the very +old ```i440fx``` chipset. This default will be removed and the user will be +required to specify a machine type explicitly using -M; users are encouraged to +switch to the not quite as old ```q35``` machine types. + Backend options --------------- -- 2.35.1

4 5

[libvirt PATCH 0/4] [RFC] Functional CI - GitLab enablement
by Erik Skultety 03 Mar '22

03 Mar '22

I'd like to propose a PoC of a GitLab-driven functional CI based on GitLab's custom executor runner feature. ** TL;DR ** - there's some RH owned HW that can be utilized for upstream functional CI running workloads on Red Hat-sponsored distros (see the pipeline) - the PoC utilizes GitLab's custom executor feature [1] which allows literally any infrastructure to be plugged into the CI machinery - the PoC solution (as proposed) is relying on nested virt capability and backed by plain libvirt + QEMU/KVM - the test environment comprises of the libvirt-TCK suite [2] and Avocado test framework [3] as the harness engine (as a wrapper and future replacement of the existing Perl implementation) - example pipeline (simplified to only a couple of distros) can be found here [4] - libvirt debug logs are exposed as artifacts and can be downloaded on job failure ** LONG VERSION ** This RFC is driven by GitLab's custom executor feature which can be integrated with any VMM and hence libvirt+QEMU/KVM as well. Example pipeline can be found here [4]. Architecture ============ Platform ~~~~~~~~ It doesn't matter what platform is used with this PoC, but FWIW the one tested with this PoC is a baremetal KVM virtualization host provided and owned by Red Hat, utilizing libvirt, QEMU, a bit of lcitool [5], and libguestfs. Custom executor ~~~~~~~~~~~~~~ If you're wondering why this PoC revolves around the custom executor GitLab runner type [6], some time ago GitLab decided that instead of adding and supporting different types of virtualization runners, they'd create some kind of gateway suitable basically for any solution out there and named it 'custom executor' - it's nothing more than a bunch of shell scripts categorized to various stages of a pipeline job (which will run either on the host or the guest depending how you set it up). Provisioner ~~~~~~~~~~~ Wait, why is this section needed, just take the example scripts from [1]... If you look at the example Bash scripts in GitLab's docs on custom executor [1] you'll see that the example scripts are very straight forward and concise but there are few things that are suboptimal - creating a new disk image for every single VM instance of the same distro out of the virt-builder template - injecting a bunch of commands directly with virt-builder instead of using something more robust like Ansible when there is more than a single VM to be created - static hostname for every single VM instance - waiting for the either the VM getting an IP or for the SSH connection to be available for a quite limited fixed period of time Because I wanted to address all of the ^above pitfalls, I created a Python based provisioner relying on libvirt-NSS, transient machines, backing chain overlay images, cloud-init, etc. instead. You can find the code base for the provisioner here [7]. Child pipelines & Multiproject CI pipelines ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ child pipeline = a "downstream" (or subpipeline) of the main pipeline useful when there are multiple stages which should be part of a single stage of the main pipeline multiproject pipeline = a pipeline that is kicked off by the main pipeline of your project and runs in context of a different project which your main pipeline can then depend on Technically speaking none of the above 2 GitLab features is needed to really integrate this PoC to upstream libvirt CI, but it was a nice experiment from 3 perspectives: 1) seeing that GitLab's own public SaaS deployment has features from all tiers available 2) it made some job descriptions shorter because e.g. we didn't have to rebuild libvirt in the VM when it was done in the previous step in a container; we don't need to build the Perl bindings (which we need for libvirt-TCK) in the VM either, since we already have a project and hence a pipeline for that already, we just need to harness the results which combined makes the actual VM's purpose more obvious 3) installing libvirt and libvirt-perl using the RPM artifacts built in previous pipeline stages is closer to a real life deployment/environment than re-building everything in the VM followed by doing 'sudo make install' Artifacts ~~~~~~~~~ Apart from the RPMs being published as artifacts from an earlier stage of the pipeline as mentioned in the previous section, in order for this to be any useful to the developers (I know, NOTHING beats a local setup, just be patient with us/me for another while...), when there's a genuine test failure (no infrastructure is failproof), the job description as proposed in patch 4/5 exposes libvirt debug logs as artifacts which can be downloaded and inspected. Test framework ============== For the SW testing part a combination of libvirt-TCK [2] and Avocado [3] were used. The reasoning for this combined test environment was discussed in this thread [8], but essentially we'd like to port most of the Perl-native TCK tests to Python, as more people are familiar with the language, making maintenance of them easier as well as making it easier to contribute new tests to the somewhat ancient test suite. Avocado can definitely help here as it does provide a good foundation and building stones to achieve both. Work in progress ================ One of the things that we already know is problematic with the current hybrid TCK+Avocado setup is that if a test fails, the summary that Avocado produces doesn't quickly tell us which tests have failed and one has to either scroll through the GitLab job output or wade through Avocado job logs. -> this issue is tracked in upstream Avocado and should be addressed soon: https://github.com/avocado-framework/avocado/issues/5200 Another annoying thing in terms of test failure analysis is that TCK in its current shape cannot save libvirt debug logs on a per-test basis and so a massive dump is produced for the whole test run. This is very suboptimal, but this can only be solved with libvirt admin API which can enable/modify/redirect logs at runtime, however, the perl bindings are currently missings -> I'm already working on adding the bindings to libvirt-perl and then we need to teach TCK to use that feature Known issues ============ There are already a couple of known test failures which can be seen in the example pipeline: 1) modular daemons occasionally hang in some test scenarios (doesn't happen with monolithic) https://bugzilla.redhat.com/show_bug.cgi?id=2044379 2) QEMU tray status detection when a CD media is changed -> this one is also intermittent, but no good reproducer data to attach to an official QEMU BZ has been harnessed so far [1] https://docs.gitlab.com/runner/executors/custom.html [2] https://gitlab.com/libvirt/libvirt-tck/ [3] https://avocado-framework.readthedocs.io/ [4] https://gitlab.com/eskultety/libvirt/-/pipelines/457836923 [5] https://gitlab.com/libvirt/libvirt-ci/ [6] https://docs.gitlab.com/runner/executors/ [7] https://gitlab.com/eskultety/libvirt-gitlab-executor [8] https://listman.redhat.com/archives/libvir-list/2021-June/msg00836.html Erik Skultety (4): ci: manifest: Allow RPM builds on CentOS Stream 8 ci: containers: Add CentOS Stream 9 target ci: manifest: Publish RPMs as artifacts on CentOS Stream and Fedoras gitlab-ci: Introduce a new test 'integration' pipeline stage .gitlab-ci-integration.yml | 116 +++++++++++++++++++++++ .gitlab-ci.yml | 17 +++- ci/containers/centos-stream-9.Dockerfile | 87 +++++++++++++++++ ci/gitlab.yml | 33 ++++++- ci/manifest.yml | 26 ++++- 5 files changed, 274 insertions(+), 5 deletions(-) create mode 100644 .gitlab-ci-integration.yml create mode 100644 ci/containers/centos-stream-9.Dockerfile -- 2.34.1

5 37

[libvirt PATCH 0/2] coverity fixes
by Ján Tomko 03 Mar '22

03 Mar '22

Ján Tomko (2): remote: close outfiles faster remote: dispatch: free and close infiles too src/remote/remote_daemon_dispatch.c | 5 ++++- src/remote/remote_driver.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) -- 2.34.1

2 3

[libvirt PATCH] qemu: support multiqueue for vdpa net device
by Jonathon Jongsma 03 Mar '22

03 Mar '22

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2024406 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/conf/domain_conf.c | 11 ++++++ src/qemu/qemu_domain.c | 3 +- .../net-vdpa-multiqueue.x86_64-latest.args | 36 +++++++++++++++++++ .../qemuxml2argvdata/net-vdpa-multiqueue.xml | 29 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../net-vdpa-multiqueue.xml | 36 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 7 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-vdpa-multiqueue.xml create mode 100644 tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 34fec887a3..87117a2ddb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10552,6 +10552,17 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, goto error; } def->data.vdpa.devicepath = g_steal_pointer(&dev); + + if (!def->model) + def->model = VIR_DOMAIN_NET_MODEL_VIRTIO; + + if (!virDomainNetIsVirtioModel(def)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Wrong <model> 'type' attribute specified " + "with <interface type='vdpa'/>. " + "vdpa requires the virtio-net* frontend")); + goto error; + } break; case VIR_DOMAIN_NET_TYPE_BRIDGE: diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index acc76c1cd6..6b61fefb8f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4523,7 +4523,8 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net, actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || actualType == VIR_DOMAIN_NET_TYPE_DIRECT || actualType == VIR_DOMAIN_NET_TYPE_ETHERNET || - actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER)) { + actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER || + actualType == VIR_DOMAIN_NET_TYPE_VDPA)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("interface %s - multiqueue is not supported for network interfaces of type %s"), macstr, virDomainNetTypeToString(actualType)); diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args new file mode 100644 index 0000000000..26ef666036 --- /dev/null +++ b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-add-fd set=0,fd=1732,opaque=net0-vdpa \ +-netdev vhost-vdpa,vhostdev=/dev/fdset/0,id=hostnet0 \ +-device '{"driver":"virtio-net-pci","mq":true,"vectors":6,"netdev":"hostnet0","id":"net0","mac":"52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.xml b/tests/qemuxml2argvdata/net-vdpa-multiqueue.xml new file mode 100644 index 0000000000..2e38c6f976 --- /dev/null +++ b/tests/qemuxml2argvdata/net-vdpa-multiqueue.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <interface type='vdpa'> + <mac address='52:54:00:95:db:c0'/> + <source dev='/dev/vhost-vdpa-0'/> + <driver queues='2'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ce475df466..7e1167e60e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1609,6 +1609,7 @@ mymain(void) DO_TEST_FAILURE("net-hostdev-fail", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_LATEST("net-vdpa"); + DO_TEST_CAPS_LATEST("net-vdpa-multiqueue"); DO_TEST("hostdev-pci-multifunction", QEMU_CAPS_KVM, diff --git a/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml b/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml new file mode 100644 index 0000000000..0876d5df62 --- /dev/null +++ b/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <interface type='vdpa'> + <mac address='52:54:00:95:db:c0'/> + <source dev='/dev/vhost-vdpa-0'/> + <model type='virtio'/> + <driver queues='2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 052950b86f..2174965784 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -485,6 +485,7 @@ mymain(void) DO_TEST_NOCAPS("net-coalesce"); DO_TEST_NOCAPS("net-many-models"); DO_TEST("net-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA); + DO_TEST("net-vdpa-multiqueue", QEMU_CAPS_NETDEV_VHOST_VDPA); DO_TEST_NOCAPS("serial-tcp-tlsx509-chardev"); DO_TEST_NOCAPS("serial-tcp-tlsx509-chardev-notls"); -- 2.35.1

2 3

[PATCH] libxl: Turn on user aliases
by Michal Privoznik 03 Mar '22

03 Mar '22

When I implemented user aliases I've invented this virDomainDefFeatures flag so that individual drivers can signal support for user provided aliases. The reasoning was that a device alias might be part of guest ABI, or used in a different way then in QEMU. Well, neither applies to the libxl driver, so it's safe to allow user aliases there. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/231 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libxl/libxl_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index c91e531a9a..0816c5baa4 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -452,7 +452,8 @@ virDomainDefParserConfig libxlDomainDefParserConfig = { .domainPostParseCallback = libxlDomainDefPostParse, .domainValidateCallback = libxlDomainDefValidate, - .features = VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT | + .features = VIR_DOMAIN_DEF_FEATURE_USER_ALIAS | + VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT | VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING, }; -- 2.34.1

4 5

ANNOUNCE: virt-manager 4.0.0 released
by Cole Robinson 02 Mar '22

02 Mar '22

I'm happy to announce the release of virt-manager 4.0.0! The release can be downloaded from: http://virt-manager.org/download/ Some notable defaults changes: * virt-install: missing --os-variant/--osinfo is now a hard error in most cases. If you weren't specifying a value, or getting one from install media detection, you were probably getting crappy defaults and didn't realize it. If you hit this case you will see a big descriptive error hopefully guiding you to an easy solution. You can see the error and some more details in this email: https://listman.redhat.com/archives/virt-tools-list/2022-February/msg00021.… * For qemu x86 we now use mode=host-passthrough as the CPU default instead of mode=host-model * We now use video model virtio-gpu/virtio-vga in many cases where we previously used qxl, following the suggestions here: https://www.kraxel.org/blog/2019/09/display-devices-in-qemu/ * We now add an TPM emulated device when the VM will use UEFI * qemu x86 q35 VMs will be created with extra pcie-root-ports to facilitate device hotplug. * We set disk discard=unmap when we know the disk storage sparse, or when storage is a block device. Some other notable changes: - Add 'Enable shared memory' UI checkbox (Lin Ma) - add UI preference to default to UEFI for new VMs (Charles Arnold) - Add virtiofs filesystem driver UI option - Fill in all --cputune, --cpu, --shmem, --input, and --boot suboptions (Hugues Fafard) - virt-* mdev improvements (Shalini Chellathurai Saroja) - bhyve improvments (Roman Bogorodskiy) - Revive network portgroup UI Notes for distro maintainers: * We replaced usage of isoinfo with xorisso * We now depend on python setuptools for build + install * We added an explicit runtime requirement to pygobject >= 3.31.3. This is from June 2014 so probably not relevant for modern distros. Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[PATCH 00/23] virsh: various small cleanups
by Peter Krempa 02 Mar '22

02 Mar '22

A collection of mostly small patches caused by the geopolitically induced attention span shortening. Peter Krempa (23): virsh: cmdBlockcopy: Use virXMLFormatElement virsh: cmdStart: Rewrite ternary operator use to standard if conditions virsh: doSave: Use if-else instead of ternary operator virsh: cmdRestore: Use if-else instead of ternary operator virsh: virshVcpuinfoPrintAffinity: Use if-else instead of ternary operator virsh: Use NULLSTR_EMPTY instead of ternary operator virshEventPrint: Use automatic memory clearing virsh: Move 'virshDomainBlockJobToString' to virsh-util virsh: Move 'cmdEvent' and all of it's machinery to virsh-domain-event.c virsh: cmdEvent: Rewrite questionable event registration virsh: cmdDomDisplay: Extract loop body fetching display URIs into 'virshGetOneDisplay' virsh: cmdDomDisplay: Remove unneeded 'cleanup' label virshGetOneDisplay: Automaticaly free extracted data virshGetOneDisplay: Don't reuse 'xpath' variable virshGetOneDisplay: Refactor formatting of URI params virsh: cmdSchedinfo: Add separate variable for holding flags used for query virsh: cmdDesc: Use separate flags variable for getters vsh: Add helper for auto-removing temporary file virsh: cmdDesc: Use 'vshTempFile' type to simplify cleanup virsh: cmdDesc: Automatically free memory virsh: cmdDesc: Remove unneeded 'cleanup' virsh: domain: Don't use ternaries inside vshPrint/vshError functions virsh: cmdDesc: Fix logic when '-edit' is used along with 'desc' argument po/POTFILES.in | 1 + tools/meson.build | 1 + tools/virsh-completer-domain.c | 19 - tools/virsh-completer-domain.h | 5 - tools/virsh-domain-event.c | 1007 ++++++++++++++++++++ tools/virsh-domain-event.h | 23 + tools/virsh-domain.c | 1623 +++++++------------------------- tools/virsh-util.c | 19 + tools/virsh-util.h | 5 + tools/virsh.c | 2 + tools/virsh.h | 1 + tools/vsh.c | 25 +- tools/vsh.h | 3 + 13 files changed, 1412 insertions(+), 1322 deletions(-) create mode 100644 tools/virsh-domain-event.c create mode 100644 tools/virsh-domain-event.h -- 2.35.1

2 26

[PATCH] qemu: segmentation fault in virtqemud executing qemuDomainUndefineFlags
by Boris Fiuczynski 02 Mar '22

02 Mar '22

Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault. Stack trace of thread 664419: #0 0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618 #1 0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519 #2 0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>) at src/remote/remote_daemon_dispatch_stubs.h:13080 #3 remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0) at src/remote/remote_daemon_dispatch_stubs.h:13059 #4 0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010) at ../src/rpc/virnetserverprogram.c:428 #5 virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302 #6 0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140 #7 virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160 #8 0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164 #9 0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256 #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6 #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6 Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- 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 b74b0375a7..18f1156862 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, } } - if (vm->def->os.loader->nvram) { + if (vm->def->os.loader && vm->def->os.loader->nvram) { nvram_path = g_strdup(vm->def->os.loader->nvram); } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); -- 2.33.1

4 3

[PATCH v5 0/8] Implement detach device related APIs for test driver
by Luke Yue 02 Mar '22

02 Mar '22

diff to v4: - Rebase to current master diff to v3: - Add virDomainDeviceDefOperationsCallbacks to xmlopt for de-duplicating purpose - Add virDomainDeviceTypeFlags for de-duplicating purpose - Remove the memballoon helper function - Squash test_driver commits - Move test device xmls to generichotplugdata - Reimplement tests with internal APIs link to v4: https://listman.redhat.com/archives/libvir-list/2021-December/msg00108.html link to v3: https://listman.redhat.com/archives/libvir-list/2021-November/msg00288.html link to CI: https://gitlab.com/lukedyue/libvirt/-/pipelines/464756840 Luke Yue (8): conf: Introduce virDomainInputDefRemove and fix memory leak conf: Introduce virDomainDeviceDefOperationsCallbacks to xmlopt conf: Add virDomainDeviceTypeFlags and use it in various drivers conf: Add tpm helpers for future use domain_driver: extract DetachXXXDeviceConfig related functions and use them test_driver: Implement virDomainDetachDeviceFlags examples: xml: test: add xml for testing devices related APIs tests: Add generichotplugtest examples/xml/test/meson.build | 1 + examples/xml/test/testdomfc5.xml | 54 ++ examples/xml/test/testnodeinline.xml | 54 ++ src/bhyve/bhyve_domain.c | 2 +- src/ch/ch_conf.c | 2 +- src/conf/domain_conf.c | 572 +++++++++++++++++- src/conf/domain_conf.h | 135 ++++- src/conf/virconftypes.h | 2 + src/hyperv/hyperv_driver.c | 3 +- src/libvirt_private.syms | 21 + src/libxl/libxl_conf.c | 3 +- src/libxl/libxl_domain.c | 8 + src/libxl/libxl_domain.h | 1 + src/libxl/libxl_driver.c | 73 +-- src/lxc/lxc_conf.c | 3 +- src/lxc/lxc_domain.c | 7 + src/lxc/lxc_domain.h | 1 + src/lxc/lxc_driver.c | 62 +- src/openvz/openvz_conf.c | 2 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 39 ++ src/qemu/qemu_domain.h | 6 + src/qemu/qemu_driver.c | 206 +------ src/qemu/qemu_process.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 197 +++++- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 2 +- tests/bhyveargv2xmltest.c | 2 +- .../generichotplug-controller.xml | 1 + .../generichotplug-disk-cdrom.xml | 5 + .../generichotplug-filesystem.xml | 6 + .../generichotplug-hostdev.xml | 5 + .../generichotplug-input.xml | 1 + .../generichotplug-interface.xml | 6 + .../generichotplug-lease.xml | 5 + .../generichotplug-memballoon.xml | 3 + .../generichotplug-memory.xml | 6 + .../generichotplugdata/generichotplug-rng.xml | 4 + .../generichotplug-shmem.xml | 4 + .../generichotplug-sound.xml | 3 + .../generichotplugdata/generichotplug-tpm.xml | 5 + .../generichotplug-vsock.xml | 3 + .../generichotplug-watchdog.xml | 1 + tests/generichotplugtest.c | 178 ++++++ tests/meson.build | 1 + tests/testutils.c | 2 +- 49 files changed, 1378 insertions(+), 332 deletions(-) create mode 100644 tests/generichotplugdata/generichotplug-controller.xml create mode 100644 tests/generichotplugdata/generichotplug-disk-cdrom.xml create mode 100644 tests/generichotplugdata/generichotplug-filesystem.xml create mode 100644 tests/generichotplugdata/generichotplug-hostdev.xml create mode 100644 tests/generichotplugdata/generichotplug-input.xml create mode 100644 tests/generichotplugdata/generichotplug-interface.xml create mode 100644 tests/generichotplugdata/generichotplug-lease.xml create mode 100644 tests/generichotplugdata/generichotplug-memballoon.xml create mode 100644 tests/generichotplugdata/generichotplug-memory.xml create mode 100644 tests/generichotplugdata/generichotplug-rng.xml create mode 100644 tests/generichotplugdata/generichotplug-shmem.xml create mode 100644 tests/generichotplugdata/generichotplug-sound.xml create mode 100644 tests/generichotplugdata/generichotplug-tpm.xml create mode 100644 tests/generichotplugdata/generichotplug-vsock.xml create mode 100644 tests/generichotplugdata/generichotplug-watchdog.xml create mode 100644 tests/generichotplugtest.c -- 2.35.1

1 9

[libvirt PATCH][merged][trivial] Fix typo in NEWS
by Tim Wiederhake 02 Mar '22

02 Mar '22

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- NEWS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index 14c4aaf185..a5b6106bc2 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -77,7 +77,7 @@ v8.1.0 (2022-03-01) * Remove unix sockets from filesystem when disabling a '.socket' systemd unit The presence of the socket files is used by our remote driver to determine - which service to access. Since neiter systemd nor the daemons clean up the + which service to access. Since neither systemd nor the daemons clean up the socket file clients were running into problems when a modular deployment was switched to monolithic ``libvirtd``. -- 2.31.1

1 0

[test-fix PATCH] virsh: Require option name for '--pass-fd' argument of 'qemu-monitor-command'
by Peter Krempa 01 Mar '22

01 Mar '22

Require the option name for this argument as otherwise a part of the 'cmd' argument will be claimed. Fixes: 43edde82afb8eb8b808fd985e01898a543a2ffbc Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as a build fix. tools/virsh-domain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2e21219d63..9b1b14cdc2 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9723,6 +9723,7 @@ static const vshCmdOptDef opts_qemu_monitor_command[] = { }, {.name = "pass-fds", .type = VSH_OT_STRING, + .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("pass file descriptors N,M,... along with the command") }, -- 2.35.1

1 0

[PATCH] libxl: remove redundant variable from libxlDomainJobObj
by Kristina Hanicova 01 Mar '22

01 Mar '22

It makes no sense to have 'started' variable in the libxlDomainJobObj as the same one is already in virDomainJobData, but never used. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/libxl/libxl_domain.c | 10 +++++----- src/libxl/libxl_domain.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ee031267ca..205049f98a 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -118,7 +118,7 @@ libxlDomainObjBeginJob(libxlDriverPrivate *driver G_GNUC_UNUSED, VIR_DEBUG("Starting job: %s", libxlDomainJobTypeToString(job)); priv->job.active = job; priv->job.owner = virThreadSelfID(); - priv->job.started = now; + priv->job.current->started = now; priv->job.current->jobType = VIR_DOMAIN_JOB_UNBOUNDED; return 0; @@ -171,18 +171,18 @@ libxlDomainJobUpdateTime(struct libxlDomainJobObj *job) virDomainJobData *jobData = job->current; unsigned long long now; - if (!job->started) + if (!jobData->started) return 0; if (virTimeMillisNow(&now) < 0) return -1; - if (now < job->started) { - job->started = 0; + if (now < jobData->started) { + jobData->started = 0; return 0; } - jobData->timeElapsed = now - job->started; + jobData->timeElapsed = now - jobData->started; return 0; } diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 475e4a6933..157f480b93 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -46,7 +46,6 @@ struct libxlDomainJobObj { virCond cond; /* Use to coordinate jobs */ enum libxlDomainJob active; /* Currently running job */ int owner; /* Thread which set current job */ - unsigned long long started; /* When the job started */ virDomainJobData *current; /* Statistics for the current job */ }; -- 2.35.1

2 1

[libvirt] [PATCH RESEND 1/4] qemu: capablities: detect acpi-pci-hotplug-with-bridge-support
by Ani Sinha 01 Mar '22

01 Mar '22

qemu added support for i440fx specific global boolean flag PIIX4_PM.acpi-pci-hotplug-with-bridge-support around version 2.1. This flag is enabled by default. When disabled, it turns off acpi pci hotplug for cold plugged pci bridges in i440fx machine types. Very recently, in qemu version 6.1, the same global option was also added for q35 machine types as well. ICH9-LPC.acpi-pci-hotplug-with-bridge-support This option turns on or off acpi based hotplug for cold plugged pcie bridges like pcie root ports. This flag is also enabled by default. Please refer to the following qemu changes: c0e427d6eb5fef ("hw/acpi/ich9: Enable ACPI PCI hot-plug") 17858a16950860 ("hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35") This patch adds the corresponding qemu capabilities in libvirt. For i440fx, the capability is detected as QEMU_CAPS_PIIX_ACPI_HOTPLUG_BRIDGE. For q35, the capability is detected as QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE. Please note that the test specific qemu capabilities .replies files has already been updated as a part of regular refreshing them when a new qemu version is released. Hence, no updates to those files are required. Signed-off-by: Ani Sinha <ani(a)anisinha.ca> --- src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_capabilities.h | 3 +++ tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 + 5 files changed, 10 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 529e9ceaf5..08d5d733ce 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -665,6 +665,9 @@ VIR_ENUM_IMPL(virQEMUCaps, "virtio-mem-pci.prealloc", /* QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_PREALLOC */ "calc-dirty-rate", /* QEMU_CAPS_CALC_DIRTY_RATE */ "dirtyrate-param.mode", /* QEMU_CAPS_DIRTYRATE_MODE */ + + /* 425 */ + "ich9.acpi-hotplug-bridge", /* QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE */ ); @@ -1551,6 +1554,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioGpu[] = { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsICH9[] = { { "disable_s3", QEMU_CAPS_ICH9_DISABLE_S3, NULL }, { "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4, NULL }, + { "acpi-pci-hotplug-with-bridge-support", QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBNECXHCI[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f6188b42de..51dc668913 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -641,6 +641,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_CALC_DIRTY_RATE, /* accepts calc-dirty-rate */ QEMU_CAPS_DIRTYRATE_MODE , /* calc-dirty-rate accepts mode parameter */ + /* 425 */ + QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE, /* -M q35 ICH9-LPC.acpi-pci-hotplug-with-bridge-support */ + QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index ba1aecc37e..51e1e07d2f 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -239,6 +239,7 @@ <flag name='rbd-encryption'/> <flag name='sev-inject-launch-secret'/> <flag name='calc-dirty-rate'/> + <flag name='ich9.acpi-hotplug-bridge'/> <version>6001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index d77907af55..7b665c82e8 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -241,6 +241,7 @@ <flag name='sev-inject-launch-secret'/> <flag name='calc-dirty-rate'/> <flag name='dirtyrate-param.mode'/> + <flag name='ich9.acpi-hotplug-bridge'/> <version>6002000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index ae800abcc4..692e2f14da 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -243,6 +243,7 @@ <flag name='virtio-mem-pci.prealloc'/> <flag name='calc-dirty-rate'/> <flag name='dirtyrate-param.mode'/> + <flag name='ich9.acpi-hotplug-bridge'/> <version>6002050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> -- 2.25.1

1 3