March 2024 - Devel - libvirt List Archives

[PATCH v2] storage: Upgrade default qcow2 verion to 1.1
by Abhiram Tilak 12 Mar '24

12 Mar '24

Change the default to modern qcow2 as it's supported by all qemu versions supported by libvirt and in fact 'qemu-img' already defaults to the new format for a long time. Some Unittests require changes to pass, now that version 1.1 is default. Unittests like `qcow2-1.1.argv` may not be relevant anymore, but this patch doesn't affect them. Signed-off-by: Abhiram Tilak <atp.exp(a)gmail.com> Reviewed-by: Peter Krempa <pkrempa(a)redhat.com> --- src/storage/storage_util.c | 2 +- .../storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv | 2 +- tests/storagevolxml2argvdata/qcow2-compat.argv | 2 +- tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv | 2 +- tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv | 2 +- .../qcow2-luks-convert-encrypt2fileqcow2.argv | 2 +- tests/storagevolxml2argvdata/qcow2-luks.argv | 2 +- .../qcow2-nobacking-convert-prealloc-compat.argv | 2 +- .../storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv | 2 +- .../qcow2-nocapacity-convert-prealloc.argv | 2 +- tests/storagevolxml2argvdata/qcow2-nocapacity.argv | 2 +- tests/storagevolxml2argvdata/qcow2-nocow-compat.argv | 2 +- tests/storagevolxml2argvdata/qcow2-zerocapacity.argv | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7bf815d978..28d5fce4f0 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -765,7 +765,7 @@ storageBackendCreateQemuImgOpts(virStorageEncryptionInfoDef *encinfo, if (info->compat) virBufferAsprintf(&buf, "compat=%s,", info->compat); else if (info->format == VIR_STORAGE_FILE_QCOW2) - virBufferAddLit(&buf, "compat=0.10,"); + virBufferAddLit(&buf, "compat=1.1,"); if (info->clusterSize > 0) virBufferAsprintf(&buf, "cluster_size=%llu,", info->clusterSize); diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv index 4b9ccfe8dc..705604b162 100644 --- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv +++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv @@ -1,7 +1,7 @@ qemu-img \ create \ -f qcow2 \ --o compat=0.10 \ +-o compat=1.1 \ /var/lib/libvirt/images/sparse-qcow2.img \ 1073741824K qemu-img \ diff --git a/tests/storagevolxml2argvdata/qcow2-compat.argv b/tests/storagevolxml2argvdata/qcow2-compat.argv index bf3a50a7f3..40fbe065e0 100644 --- a/tests/storagevolxml2argvdata/qcow2-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-compat.argv @@ -2,6 +2,6 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=raw,compat=0.10 \ +-o backing_fmt=raw,compat=1.1 \ /var/lib/libvirt/images/OtherDemo.img \ 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv index dbc7deb16a..b68da425d9 100644 --- a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv @@ -2,6 +2,6 @@ qemu-img \ convert \ -f raw \ -O qcow2 \ --o compat=0.10 \ +-o compat=1.1 \ /dev/HostVG/Swap \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv index d89622d4a6..3068b4b38d 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv @@ -2,7 +2,7 @@ qemu-img \ create \ -f qcow2 \ --object secret,id=OtherDemoLuks.img_encrypt0,file=/path/to/secretFile \ --o encrypt.format=luks,encrypt.key-secret=OtherDemoLuks.img_encrypt0,compat=0.10 \ +-o encrypt.format=luks,encrypt.key-secret=OtherDemoLuks.img_encrypt0,compat=1.1 \ /var/lib/libvirt/images/OtherDemoLuks.img \ 5242880K qemu-img \ diff --git a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv index 4d910552d0..948e9ac66d 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv @@ -1,7 +1,7 @@ qemu-img \ create \ -f qcow2 \ --o compat=0.10 \ +-o compat=1.1 \ /var/lib/libvirt/images/sparse-qcow2.img \ 1073741824K qemu-img \ diff --git a/tests/storagevolxml2argvdata/qcow2-luks.argv b/tests/storagevolxml2argvdata/qcow2-luks.argv index 308316c90c..a3be41a406 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks.argv @@ -3,6 +3,6 @@ create \ -f qcow2 \ -b /dev/null \ --object secret,id=OtherDemoLuks.img_encrypt0,file=/path/to/secretFile \ --o backing_fmt=raw,encrypt.format=luks,encrypt.key-secret=OtherDemoLuks.img_encrypt0,compat=0.10 \ +-o backing_fmt=raw,encrypt.format=luks,encrypt.key-secret=OtherDemoLuks.img_encrypt0,compat=1.1 \ /var/lib/libvirt/images/OtherDemoLuks.img \ 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv index 463ae26779..a130ed8894 100644 --- a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv @@ -2,6 +2,6 @@ qemu-img \ convert \ -f raw \ -O qcow2 \ --o preallocation=metadata,compat=0.10 \ +-o preallocation=metadata,compat=1.1 \ /var/lib/libvirt/images/sparse.img \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv index 510e0c13f6..440ad8f122 100644 --- a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv @@ -1,6 +1,6 @@ qemu-img \ create \ -f qcow2 \ --o preallocation=metadata,compat=0.10 \ +-o preallocation=metadata,compat=1.1 \ /var/lib/libvirt/images/OtherDemo.img \ 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv index 0152b1efb6..3bf8613d72 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv @@ -2,6 +2,6 @@ qemu-img \ convert \ -f raw \ -O qcow2 \ --o preallocation=falloc,compat=0.10 \ +-o preallocation=falloc,compat=1.1 \ /var/lib/libvirt/images/sparse.img \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv index 047932a559..924c5c6084 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv @@ -2,5 +2,5 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=raw,compat=0.10 \ +-o backing_fmt=raw,compat=1.1 \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv index 4cc7904cfc..ae94e4e588 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv @@ -2,6 +2,6 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=raw,nocow=on,compat=0.10 \ +-o backing_fmt=raw,nocow=on,compat=1.1 \ /var/lib/libvirt/images/OtherDemo.img \ 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv b/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv index 607c642e6f..05e31509cb 100644 --- a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv +++ b/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv @@ -1,6 +1,6 @@ qemu-img \ create \ -f qcow2 \ --o compat=0.10 \ +-o compat=1.1 \ /var/lib/libvirt/images/OtherDemo.img \ 0K -- 2.42.1

4 5

[PATCH 0/4] ch: A couple of cleanups
by Michal Privoznik 12 Mar '24

12 Mar '24

As I rewrote and merged [1] I've broken the build because not chxml2xmltest relies on host having /dev/kvm accessible. Here are some fixes and cleanups I've come up with. And here [2] is the green pipeline (not sure about the x86_64-fedora-rawhide-clang failure, investigating, but seems unrelated). 1: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/OEP6… 2: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/1206477954 Michal Prívozník (4): tests: Introduce chxml2xmlmock ch: Demote error when CH driver fails to init capabilities: Allow suppressing error message from virCapabilitiesDomainDataLookup() capabilities: Allow suppressing error message from virCapabilitiesDomainSupported() src/bhyve/bhyve_domain.c | 3 ++- src/ch/ch_domain.c | 5 ++++- src/ch/ch_driver.c | 9 ++++----- src/ch/ch_process.c | 4 ++-- src/conf/capabilities.c | 23 +++++++++++++++++------ src/conf/capabilities.h | 6 ++++-- src/conf/domain_conf.c | 5 ++++- src/libxl/libxl_domain.c | 3 ++- src/libxl/xen_common.c | 5 ++++- src/lxc/lxc_domain.c | 3 ++- src/openvz/openvz_conf.c | 3 ++- src/qemu/qemu_capabilities.c | 10 +++++----- src/vmware/vmware_driver.c | 3 ++- src/vmx/vmx.c | 3 ++- src/vz/vz_driver.c | 3 ++- tests/chxml2xmlmock.c | 33 +++++++++++++++++++++++++++++++++ tests/chxml2xmltest.c | 2 +- tests/meson.build | 3 +++ 18 files changed, 95 insertions(+), 31 deletions(-) create mode 100644 tests/chxml2xmlmock.c -- 2.43.0

2 10

[PULL 13/13] docs/about/deprecated.rst: Move SMP configurations item to system emulator section
by Philippe Mathieu-Daudé 12 Mar '24

12 Mar '24

From: Zhao Liu <zhao1.liu(a)intel.com> In the commit 54c4ea8f3ae6 ("hw/core/machine-smp: Deprecate unsupported 'parameter=1' SMP configurations"), the SMP related item is put under the section "User-mode emulator command line arguments" instead of "System emulator command line arguments". -smp is a system emulator command, so move SMP configurations item to system emulator section. Signed-off-by: Zhao Liu <zhao1.liu(a)intel.com> Reviewed-by: Thomas Huth <thuth(a)redhat.com> Message-ID: <20240312071512.3283513-1-zhao1.liu(a)linux.intel.com> Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> --- docs/about/deprecated.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index dfd681cd02..2f9277c915 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -47,16 +47,6 @@ as short-form boolean values, and passed to plugins as ``arg_name=on``. However, short-form booleans are deprecated and full explicit ``arg_name=on`` form is preferred. -User-mode emulator command line arguments ------------------------------------------ - -``-p`` (since 9.0) -'''''''''''''''''' - -The ``-p`` option pretends to control the host page size. However, -it is not possible to change the host page size, and using the -option only causes failures. - ``-smp`` (Unsupported "parameter=1" SMP configurations) (since 9.0) ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' @@ -71,6 +61,16 @@ configurations (e.g. -smp drawers=1,books=1,clusters=1 for x86 PC machine) is marked deprecated since 9.0, users have to ensure that all the topology members described with -smp are supported by the target machine. +User-mode emulator command line arguments +----------------------------------------- + +``-p`` (since 9.0) +'''''''''''''''''' + +The ``-p`` option pretends to control the host page size. However, +it is not possible to change the host page size, and using the +option only causes failures. + QEMU Machine Protocol (QMP) commands ------------------------------------ -- 2.41.0

1 0

[PATCH-for-9.0] docs: Deprecate the pseries-2.12 machines
by Philippe Mathieu-Daudé 12 Mar '24

12 Mar '24

pSeries machines before 3.0 have complex migration back compatibility code we'd like to get ride of. The last one is 2.12, which is 6 years old. We just deprecated up to the 2.11 machine in commit 1392617d35 ("spapr: Tag pseries-2.1 - 2.11 machines as deprecated"). Take to opportunity to also deprecate the 2.12 machines. Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> --- In 2025 I'd like to get ride of the code related to: include/hw/ppc/spapr_cpu_core.h:31: bool pre_3_0_migration; /* older machine don't know about SpaprCpuState */ --- docs/about/deprecated.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index dfd681cd02..65111513cc 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -237,13 +237,13 @@ The Nios II architecture is orphan. The machine is no longer in existence and has been long unmaintained in QEMU. This also holds for the TC51828 16MiB flash that it uses. -``pseries-2.1`` up to ``pseries-2.11`` (since 9.0) +``pseries-2.1`` up to ``pseries-2.12`` (since 9.0) '''''''''''''''''''''''''''''''''''''''''''''''''' -Older pseries machines before version 2.12 have undergone many changes +Older pseries machines before version 3.0 have undergone many changes to correct issues, mostly regarding migration compatibility. These are no longer maintained and removing them will make the code easier to -read and maintain. Use versions 2.12 and above as a replacement. +read and maintain. Use versions 3.0 and above as a replacement. Backend options --------------- -- 2.41.0

2 1

[PATCH v2] Remove VIR_FREE in favor of g_autofree in some functions in libvrit-domain.c
by Mostafa 11 Mar '24

11 Mar '24

Signed-off-by: Mostafa <recenum(a)outlook.com> --- src/libvirt-domain.c | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 83abad251e..4ba3563c9e 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -884,7 +884,7 @@ virDomainSave(virDomainPtr domain, const char *to) if (conn->driver->domainSave) { int ret; - char *absolute_to; + g_autofree char *absolute_to = NULL; /* We must absolutize the file path as the save is done out of process */ if (!(absolute_to = g_canonicalize_filename(to, NULL))) { @@ -895,8 +895,6 @@ virDomainSave(virDomainPtr domain, const char *to) ret = conn->driver->domainSave(domain, absolute_to); - VIR_FREE(absolute_to); - if (ret < 0) goto error; return ret; @@ -974,7 +972,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, if (conn->driver->domainSaveFlags) { int ret; - char *absolute_to; + g_autofree char *absolute_to = NULL; /* We must absolutize the file path as the save is done out of process */ if (!(absolute_to = g_canonicalize_filename(to, NULL))) { @@ -985,8 +983,6 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, ret = conn->driver->domainSaveFlags(domain, absolute_to, dxml, flags); - VIR_FREE(absolute_to); - if (ret < 0) goto error; return ret; @@ -1076,7 +1072,7 @@ virDomainRestore(virConnectPtr conn, const char *from) if (conn->driver->domainRestore) { int ret; - char *absolute_from; + g_autofree char *absolute_from = NULL; /* We must absolutize the file path as the restore is done out of process */ if (!(absolute_from = g_canonicalize_filename(from, NULL))) { @@ -1087,8 +1083,6 @@ virDomainRestore(virConnectPtr conn, const char *from) ret = conn->driver->domainRestore(conn, absolute_from); - VIR_FREE(absolute_from); - if (ret < 0) goto error; return ret; @@ -1156,7 +1150,7 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, if (conn->driver->domainRestoreFlags) { int ret; - char *absolute_from; + g_autofree char *absolute_from = NULL; /* We must absolutize the file path as the restore is done out of process */ if (!(absolute_from = g_canonicalize_filename(from, NULL))) { @@ -1168,8 +1162,6 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, ret = conn->driver->domainRestoreFlags(conn, absolute_from, dxml, flags); - VIR_FREE(absolute_from); - if (ret < 0) goto error; return ret; @@ -1263,7 +1255,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, if (conn->driver->domainSaveImageGetXMLDesc) { char *ret; - char *absolute_file; + g_autofree char *absolute_file = NULL; /* We must absolutize the file path as the read is done out of process */ if (!(absolute_file = g_canonicalize_filename(file, NULL))) { @@ -1275,8 +1267,6 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, ret = conn->driver->domainSaveImageGetXMLDesc(conn, absolute_file, flags); - VIR_FREE(absolute_file); - if (!ret) goto error; return ret; @@ -1338,7 +1328,7 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, if (conn->driver->domainSaveImageDefineXML) { int ret; - char *absolute_file; + g_autofree char *absolute_file = NULL; /* We must absolutize the file path as the read is done out of process */ if (!(absolute_file = g_canonicalize_filename(file, NULL))) { @@ -1350,8 +1340,6 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, ret = conn->driver->domainSaveImageDefineXML(conn, absolute_file, dxml, flags); - VIR_FREE(absolute_file); - if (ret < 0) goto error; return ret; @@ -1415,7 +1403,7 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) if (conn->driver->domainCoreDump) { int ret; - char *absolute_to; + g_autofree char *absolute_to = NULL; /* We must absolutize the file path as the save is done out of process */ if (!(absolute_to = g_canonicalize_filename(to, NULL))) { @@ -1426,8 +1414,6 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) ret = conn->driver->domainCoreDump(domain, absolute_to, flags); - VIR_FREE(absolute_to); - if (ret < 0) goto error; return ret; @@ -1501,7 +1487,7 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, if (conn->driver->domainCoreDumpWithFormat) { int ret; - char *absolute_to; + g_autofree char *absolute_to = NULL; /* We must absolutize the file path as the save is done out of process */ if (!(absolute_to = g_canonicalize_filename(to, NULL))) { @@ -1513,8 +1499,6 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, ret = conn->driver->domainCoreDumpWithFormat(domain, absolute_to, dumpformat, flags); - VIR_FREE(absolute_to); - if (ret < 0) goto error; return ret; -- 2.34.1

1 0

Re: [PATCH] Remove VIR_FREE in favor of g_autofree in some functions in libvrit-domain.c
by m kamal 11 Mar '24

11 Mar '24

After seeing a couple of patches in the list, it looks like [PATCH v2] is the usual expected behavior. So, I will proceed with that. Many thanks. Sorry for any inconvenience. ________________________________ From: m kamal <recenum(a)outlook.com> Sent: Monday, March 11, 2024 3:45 PM To: Daniel P. Berrangé <berrange(a)redhat.com> Cc: devel(a)lists.libvirt.org <devel(a)lists.libvirt.org>; pkrempa(a)redhat.com <pkrempa(a)redhat.com> Subject: Re: [PATCH] Remove VIR_FREE in favor of g_autofree in some functions in libvrit-domain.c Hello Daniel, Peter, Apologies for the accidental noreply mail in the CC, it's probably the "supresscc = self" line that I copied blindly into my send-email git config. Also, many apologies for forgetting to at least compile the change. I have read the guidelines before but I forgot. Question: After I amend the commit with the right changes, should I simply call "git publish" again? I tested this in a small repo I made and the behaviour is that "git publish" starts a new email chain with [PATCH v2]. Is this what should happen or is it required for the new PATCH to be a reply to this chain? Cheers, Mostafa ________________________________ From: Daniel P. Berrangé <berrange(a)redhat.com> Sent: Monday, March 11, 2024 9:24 AM To: Mostafa <recenum(a)outlook.com> Cc: devel(a)lists.libvirt.org <devel(a)lists.libvirt.org> Subject: Re: [PATCH] Remove VIR_FREE in favor of g_autofree in some functions in libvrit-domain.c On Mon, Mar 11, 2024 at 02:15:32AM +0200, Mostafa wrote: > From: مصطفي محمود كمال الدين <48567303+moste00(a)users.noreply.github.com> > > --- > src/libvirt-domain.c | 32 ++++++++------------------------ > 1 file changed, 8 insertions(+), 24 deletions(-) > > diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c > index 83abad251e..9b68a7ac95 100644 > --- a/src/libvirt-domain.c > +++ b/src/libvirt-domain.c > @@ -884,7 +884,7 @@ virDomainSave(virDomainPtr domain, const char *to) > > if (conn->driver->domainSave) { > int ret; > - char *absolute_to; > + g_autofree char *absolute_to; All variables declared with 'g_autofree' *must* be initialized at time of declaration, so you need to add ' = NULL' here and to all the other similar changes. > > /* We must absolutize the file path as the save is done out of process */ > if (!(absolute_to = g_canonicalize_filename(to, NULL))) { > @@ -895,8 +895,6 @@ virDomainSave(virDomainPtr domain, const char *to) > > ret = conn->driver->domainSave(domain, absolute_to); > > - VIR_FREE(absolute_to); > - > if (ret < 0) > goto error; > return ret; > @@ -974,7 +972,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, > > if (conn->driver->domainSaveFlags) { > int ret; > - char *absolute_to; > + g_autofree char *absolute_to; > > /* We must absolutize the file path as the save is done out of process */ > if (!(absolute_to = g_canonicalize_filename(to, NULL))) { > @@ -985,8 +983,6 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, > > ret = conn->driver->domainSaveFlags(domain, absolute_to, dxml, flags); > > - VIR_FREE(absolute_to); > - > if (ret < 0) > goto error; > return ret; > @@ -1076,7 +1072,7 @@ virDomainRestore(virConnectPtr conn, const char *from) > > if (conn->driver->domainRestore) { > int ret; > - char *absolute_from; > + g_autofree char *absolute_from; > > /* We must absolutize the file path as the restore is done out of process */ > if (!(absolute_from = g_canonicalize_filename(from, NULL))) { > @@ -1087,8 +1083,6 @@ virDomainRestore(virConnectPtr conn, const char *from) > > ret = conn->driver->domainRestore(conn, absolute_from); > > - VIR_FREE(absolute_from); > - > if (ret < 0) > goto error; > return ret; > @@ -1156,7 +1150,7 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, > > if (conn->driver->domainRestoreFlags) { > int ret; > - char *absolute_from; > + g_autofree char *absolute_from; > > /* We must absolutize the file path as the restore is done out of process */ > if (!(absolute_from = g_canonicalize_filename(from, NULL))) { > @@ -1168,8 +1162,6 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, > ret = conn->driver->domainRestoreFlags(conn, absolute_from, dxml, > flags); > > - VIR_FREE(absolute_from); > - > if (ret < 0) > goto error; > return ret; > @@ -1263,7 +1255,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, > > if (conn->driver->domainSaveImageGetXMLDesc) { > char *ret; > - char *absolute_file; > + g_autofree char *absolute_file; > > /* We must absolutize the file path as the read is done out of process */ > if (!(absolute_file = g_canonicalize_filename(file, NULL))) { > @@ -1275,8 +1267,6 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, > ret = conn->driver->domainSaveImageGetXMLDesc(conn, absolute_file, > flags); > > - VIR_FREE(absolute_file); > - > if (!ret) > goto error; > return ret; > @@ -1338,7 +1328,7 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, > > if (conn->driver->domainSaveImageDefineXML) { > int ret; > - char *absolute_file; > + g_autofree char *absolute_file; > > /* We must absolutize the file path as the read is done out of process */ > if (!(absolute_file = g_canonicalize_filename(file, NULL))) { > @@ -1350,8 +1340,6 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, > ret = conn->driver->domainSaveImageDefineXML(conn, absolute_file, > dxml, flags); > > - VIR_FREE(absolute_file); > - > if (ret < 0) > goto error; > return ret; > @@ -1415,7 +1403,7 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) > > if (conn->driver->domainCoreDump) { > int ret; > - char *absolute_to; > + g_autofree char *absolute_to; > > /* We must absolutize the file path as the save is done out of process */ > if (!(absolute_to = g_canonicalize_filename(to, NULL))) { > @@ -1426,8 +1414,6 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) > > ret = conn->driver->domainCoreDump(domain, absolute_to, flags); > > - VIR_FREE(absolute_to); > - > if (ret < 0) > goto error; > return ret; > @@ -1501,7 +1487,7 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, > > if (conn->driver->domainCoreDumpWithFormat) { > int ret; > - char *absolute_to; > + g_autofree char *absolute_to; > > /* We must absolutize the file path as the save is done out of process */ > if (!(absolute_to = g_canonicalize_filename(to, NULL))) { > @@ -1513,8 +1499,6 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, > ret = conn->driver->domainCoreDumpWithFormat(domain, absolute_to, > dumpformat, flags); > > - VIR_FREE(absolute_to); > - > if (ret < 0) > goto error; > return ret; > -- > 2.34.1 > _______________________________________________ > Devel mailing list -- devel(a)lists.libvirt.org > To unsubscribe send an email to devel-leave(a)lists.libvirt.org With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

Re: [PATCH] Remove VIR_FREE in favor of g_autofree in some functions in libvrit-domain.c
by Daniel P. Berrangé 11 Mar '24

11 Mar '24

On Mon, Mar 11, 2024 at 02:15:32AM +0200, Mostafa wrote: > From: مصطفي محمود كمال الدين <48567303+moste00(a)users.noreply.github.com> > > --- > src/libvirt-domain.c | 32 ++++++++------------------------ > 1 file changed, 8 insertions(+), 24 deletions(-) > > diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c > index 83abad251e..9b68a7ac95 100644 > --- a/src/libvirt-domain.c > +++ b/src/libvirt-domain.c > @@ -884,7 +884,7 @@ virDomainSave(virDomainPtr domain, const char *to) > > if (conn->driver->domainSave) { > int ret; > - char *absolute_to; > + g_autofree char *absolute_to; All variables declared with 'g_autofree' *must* be initialized at time of declaration, so you need to add ' = NULL' here and to all the other similar changes. > > /* We must absolutize the file path as the save is done out of process */ > if (!(absolute_to = g_canonicalize_filename(to, NULL))) { > @@ -895,8 +895,6 @@ virDomainSave(virDomainPtr domain, const char *to) > > ret = conn->driver->domainSave(domain, absolute_to); > > - VIR_FREE(absolute_to); > - > if (ret < 0) > goto error; > return ret; > @@ -974,7 +972,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, > > if (conn->driver->domainSaveFlags) { > int ret; > - char *absolute_to; > + g_autofree char *absolute_to; > > /* We must absolutize the file path as the save is done out of process */ > if (!(absolute_to = g_canonicalize_filename(to, NULL))) { > @@ -985,8 +983,6 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, > > ret = conn->driver->domainSaveFlags(domain, absolute_to, dxml, flags); > > - VIR_FREE(absolute_to); > - > if (ret < 0) > goto error; > return ret; > @@ -1076,7 +1072,7 @@ virDomainRestore(virConnectPtr conn, const char *from) > > if (conn->driver->domainRestore) { > int ret; > - char *absolute_from; > + g_autofree char *absolute_from; > > /* We must absolutize the file path as the restore is done out of process */ > if (!(absolute_from = g_canonicalize_filename(from, NULL))) { > @@ -1087,8 +1083,6 @@ virDomainRestore(virConnectPtr conn, const char *from) > > ret = conn->driver->domainRestore(conn, absolute_from); > > - VIR_FREE(absolute_from); > - > if (ret < 0) > goto error; > return ret; > @@ -1156,7 +1150,7 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, > > if (conn->driver->domainRestoreFlags) { > int ret; > - char *absolute_from; > + g_autofree char *absolute_from; > > /* We must absolutize the file path as the restore is done out of process */ > if (!(absolute_from = g_canonicalize_filename(from, NULL))) { > @@ -1168,8 +1162,6 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, > ret = conn->driver->domainRestoreFlags(conn, absolute_from, dxml, > flags); > > - VIR_FREE(absolute_from); > - > if (ret < 0) > goto error; > return ret; > @@ -1263,7 +1255,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, > > if (conn->driver->domainSaveImageGetXMLDesc) { > char *ret; > - char *absolute_file; > + g_autofree char *absolute_file; > > /* We must absolutize the file path as the read is done out of process */ > if (!(absolute_file = g_canonicalize_filename(file, NULL))) { > @@ -1275,8 +1267,6 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, > ret = conn->driver->domainSaveImageGetXMLDesc(conn, absolute_file, > flags); > > - VIR_FREE(absolute_file); > - > if (!ret) > goto error; > return ret; > @@ -1338,7 +1328,7 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, > > if (conn->driver->domainSaveImageDefineXML) { > int ret; > - char *absolute_file; > + g_autofree char *absolute_file; > > /* We must absolutize the file path as the read is done out of process */ > if (!(absolute_file = g_canonicalize_filename(file, NULL))) { > @@ -1350,8 +1340,6 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, > ret = conn->driver->domainSaveImageDefineXML(conn, absolute_file, > dxml, flags); > > - VIR_FREE(absolute_file); > - > if (ret < 0) > goto error; > return ret; > @@ -1415,7 +1403,7 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) > > if (conn->driver->domainCoreDump) { > int ret; > - char *absolute_to; > + g_autofree char *absolute_to; > > /* We must absolutize the file path as the save is done out of process */ > if (!(absolute_to = g_canonicalize_filename(to, NULL))) { > @@ -1426,8 +1414,6 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) > > ret = conn->driver->domainCoreDump(domain, absolute_to, flags); > > - VIR_FREE(absolute_to); > - > if (ret < 0) > goto error; > return ret; > @@ -1501,7 +1487,7 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, > > if (conn->driver->domainCoreDumpWithFormat) { > int ret; > - char *absolute_to; > + g_autofree char *absolute_to; > > /* We must absolutize the file path as the save is done out of process */ > if (!(absolute_to = g_canonicalize_filename(to, NULL))) { > @@ -1513,8 +1499,6 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, > ret = conn->driver->domainCoreDumpWithFormat(domain, absolute_to, > dumpformat, flags); > > - VIR_FREE(absolute_to); > - > if (ret < 0) > goto error; > return ret; > -- > 2.34.1 > _______________________________________________ > Devel mailing list -- devel(a)lists.libvirt.org > To unsubscribe send an email to devel-leave(a)lists.libvirt.org With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

2 1

Re: [PATCH] Remove VIR_FREE in favor of g_autofree in some functions in libvrit-domain.c
by Peter Krempa 11 Mar '24

11 Mar '24

Note that I had to drop the 'noreply.github.com' email address. Please don't use that as the author credential as it makes hard to reply properly to threads. On Mon, Mar 11, 2024 at 02:15:32 +0200, Mostafa wrote: > From: مصطفي محمود كمال الدين <48567303+moste00(a)users.noreply.github.com> Per contributor guidelines: Contributors to libvirt projects must assert that they are in compliance with the Developer Certificate of Origin 1.1. This is achieved by adding a "Signed-off-by" line containing the contributor's name and e-mail to every commit message. The presence of this line attests that the contributor has read the above lined DCO and agrees with its statements. https://www.libvirt.org/hacking.html#developer-certificate-of-origin Please make sure to follow all points of that document, especially all paragraphs about: https://www.libvirt.org/hacking.html#preparing-patches in future postings. > --- > src/libvirt-domain.c | 32 ++++++++------------------------ > 1 file changed, 8 insertions(+), 24 deletions(-) > > diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c > index 83abad251e..9b68a7ac95 100644 > --- a/src/libvirt-domain.c > +++ b/src/libvirt-domain.c > @@ -884,7 +884,7 @@ virDomainSave(virDomainPtr domain, const char *to) > > if (conn->driver->domainSave) { > int ret; > - char *absolute_to; > + g_autofree char *absolute_to; > > /* We must absolutize the file path as the save is done out of process */ > if (!(absolute_to = g_canonicalize_filename(to, NULL))) { After this patch the code fails to compile: In function ‘g_autoptr_cleanup_generic_gfree’, inlined from ‘virDomainSave’ at ../../../libvirt/src/libvirt-domain.c:887:2 : /usr/include/glib-2.0/glib/glib-autocleanups.h:30:3: error: ‘absolute_to’ may be used uninitialized [-Werror=maybe-uninitialized] 30 | g_free (*pp); | ^~~~~~~~~~~~ ../../../libvirt/src/libvirt-domain.c: In function ‘virDomainSave’: ../../../libvirt/src/libvirt-domain.c:887:26: note: ‘absolute_to’ was declared here 887 | g_autofree char *absolute_to; | ^~~~~~~~~~~ In function ‘g_autoptr_cleanup_generic_gfree’, inlined from ‘virDomainSaveFlags’ at ../../../libvirt/src/libvirt-domain.c:975:26: /usr/include/glib-2.0/glib/glib-autocleanups.h:30:3: error: ‘absolute_to’ may be used uninitialized [-Werror=maybe-uninitialized] 30 | g_free (*pp); | ^~~~~~~~~~~~ When compiling the code by default from a git checkout we enable all errors thus you should be getting this error or the syntax-check error for the same thing if you have an older compiler. Make sure to both compile and run tests as the contributor guidelines state.

1 0

[PATCH] Remove VIR_FREE in favor of g_autofree in some functions in libvrit-domain.c
by Mostafa 11 Mar '24

11 Mar '24

From: مصطفي محمود كمال الدين <48567303+moste00(a)users.noreply.github.com> --- src/libvirt-domain.c | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 83abad251e..9b68a7ac95 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -884,7 +884,7 @@ virDomainSave(virDomainPtr domain, const char *to) if (conn->driver->domainSave) { int ret; - char *absolute_to; + g_autofree char *absolute_to; /* We must absolutize the file path as the save is done out of process */ if (!(absolute_to = g_canonicalize_filename(to, NULL))) { @@ -895,8 +895,6 @@ virDomainSave(virDomainPtr domain, const char *to) ret = conn->driver->domainSave(domain, absolute_to); - VIR_FREE(absolute_to); - if (ret < 0) goto error; return ret; @@ -974,7 +972,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, if (conn->driver->domainSaveFlags) { int ret; - char *absolute_to; + g_autofree char *absolute_to; /* We must absolutize the file path as the save is done out of process */ if (!(absolute_to = g_canonicalize_filename(to, NULL))) { @@ -985,8 +983,6 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, ret = conn->driver->domainSaveFlags(domain, absolute_to, dxml, flags); - VIR_FREE(absolute_to); - if (ret < 0) goto error; return ret; @@ -1076,7 +1072,7 @@ virDomainRestore(virConnectPtr conn, const char *from) if (conn->driver->domainRestore) { int ret; - char *absolute_from; + g_autofree char *absolute_from; /* We must absolutize the file path as the restore is done out of process */ if (!(absolute_from = g_canonicalize_filename(from, NULL))) { @@ -1087,8 +1083,6 @@ virDomainRestore(virConnectPtr conn, const char *from) ret = conn->driver->domainRestore(conn, absolute_from); - VIR_FREE(absolute_from); - if (ret < 0) goto error; return ret; @@ -1156,7 +1150,7 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, if (conn->driver->domainRestoreFlags) { int ret; - char *absolute_from; + g_autofree char *absolute_from; /* We must absolutize the file path as the restore is done out of process */ if (!(absolute_from = g_canonicalize_filename(from, NULL))) { @@ -1168,8 +1162,6 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, ret = conn->driver->domainRestoreFlags(conn, absolute_from, dxml, flags); - VIR_FREE(absolute_from); - if (ret < 0) goto error; return ret; @@ -1263,7 +1255,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, if (conn->driver->domainSaveImageGetXMLDesc) { char *ret; - char *absolute_file; + g_autofree char *absolute_file; /* We must absolutize the file path as the read is done out of process */ if (!(absolute_file = g_canonicalize_filename(file, NULL))) { @@ -1275,8 +1267,6 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, ret = conn->driver->domainSaveImageGetXMLDesc(conn, absolute_file, flags); - VIR_FREE(absolute_file); - if (!ret) goto error; return ret; @@ -1338,7 +1328,7 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, if (conn->driver->domainSaveImageDefineXML) { int ret; - char *absolute_file; + g_autofree char *absolute_file; /* We must absolutize the file path as the read is done out of process */ if (!(absolute_file = g_canonicalize_filename(file, NULL))) { @@ -1350,8 +1340,6 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, ret = conn->driver->domainSaveImageDefineXML(conn, absolute_file, dxml, flags); - VIR_FREE(absolute_file); - if (ret < 0) goto error; return ret; @@ -1415,7 +1403,7 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) if (conn->driver->domainCoreDump) { int ret; - char *absolute_to; + g_autofree char *absolute_to; /* We must absolutize the file path as the save is done out of process */ if (!(absolute_to = g_canonicalize_filename(to, NULL))) { @@ -1426,8 +1414,6 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) ret = conn->driver->domainCoreDump(domain, absolute_to, flags); - VIR_FREE(absolute_to); - if (ret < 0) goto error; return ret; @@ -1501,7 +1487,7 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, if (conn->driver->domainCoreDumpWithFormat) { int ret; - char *absolute_to; + g_autofree char *absolute_to; /* We must absolutize the file path as the save is done out of process */ if (!(absolute_to = g_canonicalize_filename(to, NULL))) { @@ -1513,8 +1499,6 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, ret = conn->driver->domainCoreDumpWithFormat(domain, absolute_to, dumpformat, flags); - VIR_FREE(absolute_to); - if (ret < 0) goto error; return ret; -- 2.34.1

1 0

[PULL 31/43] hw/core/machine-smp: Deprecate unsupported "parameter=1" SMP configurations
by Philippe Mathieu-Daudé 09 Mar '24

09 Mar '24

From: Zhao Liu <zhao1.liu(a)intel.com> Currently, it was allowed for users to specify the unsupported topology parameter as "1". For example, x86 PC machine doesn't support drawer/book/cluster topology levels, but user could specify "-smp drawers=1,books=1,clusters=1". This is meaningless and confusing, so that the support for this kind of configurations is marked deprecated since 9.0. And report warning message for such case like: qemu-system-x86_64: warning: Deprecated CPU topology (considered invalid): Unsupported clusters parameter mustn't be specified as 1 qemu-system-x86_64: warning: Deprecated CPU topology (considered invalid): Unsupported books parameter mustn't be specified as 1 qemu-system-x86_64: warning: Deprecated CPU topology (considered invalid): Unsupported drawers parameter mustn't be specified as 1 Users have to ensure that all the topology members described with -smp are supported by the target machine. Signed-off-by: Zhao Liu <zhao1.liu(a)intel.com> Reviewed-by: Thomas Huth <thuth(a)redhat.com> Message-ID: <20240308160148.3130837-3-zhao1.liu(a)linux.intel.com> Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> --- docs/about/deprecated.rst | 14 +++++++++ hw/core/machine-smp.c | 65 +++++++++++++++++++++++++++++---------- 2 files changed, 62 insertions(+), 17 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 6e2f557682..dfd681cd02 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -57,6 +57,20 @@ The ``-p`` option pretends to control the host page size. However, it is not possible to change the host page size, and using the option only causes failures. +``-smp`` (Unsupported "parameter=1" SMP configurations) (since 9.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Specified CPU topology parameters must be supported by the machine. + +In the SMP configuration, users should provide the CPU topology parameters that +are supported by the target machine. + +However, historically it was allowed for users to specify the unsupported +topology parameter as "1", which is meaningless. So support for this kind of +configurations (e.g. -smp drawers=1,books=1,clusters=1 for x86 PC machine) is +marked deprecated since 9.0, users have to ensure that all the topology members +described with -smp are supported by the target machine. + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c index 96533886b1..50a5a40dbc 100644 --- a/hw/core/machine-smp.c +++ b/hw/core/machine-smp.c @@ -112,30 +112,61 @@ void machine_parse_smp_config(MachineState *ms, /* * If not supported by the machine, a topology parameter must be - * omitted or specified equal to 1. + * omitted. */ - if (!mc->smp_props.dies_supported && dies > 1) { - error_setg(errp, "dies not supported by this machine's CPU topology"); - return; + if (!mc->smp_props.clusters_supported && config->has_clusters) { + if (config->clusters > 1) { + error_setg(errp, "clusters not supported by this " + "machine's CPU topology"); + return; + } else { + /* Here clusters only equals 1 since we've checked zero case. */ + warn_report("Deprecated CPU topology (considered invalid): " + "Unsupported clusters parameter mustn't be " + "specified as 1"); + } } - if (!mc->smp_props.clusters_supported && clusters > 1) { - error_setg(errp, "clusters not supported by this machine's CPU topology"); - return; - } - - dies = dies > 0 ? dies : 1; clusters = clusters > 0 ? clusters : 1; - if (!mc->smp_props.books_supported && books > 1) { - error_setg(errp, "books not supported by this machine's CPU topology"); - return; + if (!mc->smp_props.dies_supported && config->has_dies) { + if (config->dies > 1) { + error_setg(errp, "dies not supported by this " + "machine's CPU topology"); + return; + } else { + /* Here dies only equals 1 since we've checked zero case. */ + warn_report("Deprecated CPU topology (considered invalid): " + "Unsupported dies parameter mustn't be " + "specified as 1"); + } + } + dies = dies > 0 ? dies : 1; + + if (!mc->smp_props.books_supported && config->has_books) { + if (config->books > 1) { + error_setg(errp, "books not supported by this " + "machine's CPU topology"); + return; + } else { + /* Here books only equals 1 since we've checked zero case. */ + warn_report("Deprecated CPU topology (considered invalid): " + "Unsupported books parameter mustn't be " + "specified as 1"); + } } books = books > 0 ? books : 1; - if (!mc->smp_props.drawers_supported && drawers > 1) { - error_setg(errp, - "drawers not supported by this machine's CPU topology"); - return; + if (!mc->smp_props.drawers_supported && config->has_drawers) { + if (config->drawers > 1) { + error_setg(errp, "drawers not supported by this " + "machine's CPU topology"); + return; + } else { + /* Here drawers only equals 1 since we've checked zero case. */ + warn_report("Deprecated CPU topology (considered invalid): " + "Unsupported drawers parameter mustn't be " + "specified as 1"); + } } drawers = drawers > 0 ? drawers : 1; -- 2.41.0

1 0