- Devel - libvirt List Archives

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

15 Mar '24

Please advise on what actions (if any) should be taken so that the changes in the patch is merged into main. Cheers, Mostafa Mahmoud. ________________________________ From: m kamal <recenum(a)outlook.com> Sent: Tuesday, March 12, 2024 5:58 PM To: Peter Krempa <pkrempa(a)redhat.com> Cc: devel(a)lists.libvirt.org <devel(a)lists.libvirt.org> Subject: Re: [PATCH v2] Remove VIR_FREE in favor of g_autofree in some functions in libvrit-domain.c Thanks a lot for the review, Peter. The first name I used was by mistake, it's the name of my Github profile, Github desktop probably auto-configured it as the global user name for git on my machine. It's in Arabic so it could confuse many non-Unicode-aware programs or protocols. The other name "m kamal" is just a contraction I wrote when I was subscribing to the mailing list from the web UI, I didn't realize it's important. I will change my configured name in the .gitpublish config to be the longer name "Mostafa Mahmoud", that's the first 2 names of my legal name, it appears that most names here are also 2 names. If there is also a way to change my forum name "m kamal" please let me know. Sorry for any inconvenience. One last question: After the patch got your approval, is there something on my end to do so that it gets merged? Will it automatically gets picked up by the Gitlab CI pipeline somehow? Cheers, Mostafa Mahmoud. ________________________________ From: Peter Krempa <pkrempa(a)redhat.com> Sent: Tuesday, March 12, 2024 9:57 AM To: Mostafa <recenum(a)outlook.com> Cc: devel(a)lists.libvirt.org <devel(a)lists.libvirt.org> Subject: Re: [PATCH v2] Remove VIR_FREE in favor of g_autofree in some functions in libvrit-domain.c On Tue, Mar 12, 2024 at 00:11:28 +0200, Mostafa wrote: The patch looks good now, but you've used multiple names in various fields over the two postings and the preference in terms of both authorship and sign-off is to use a full real name Used previously: > From: مصطفي محمود كمال الدين <48567303+moste00(a)users.noreply.github.com> > From: m kamal <recenum(a)outlook.com> The one in this patch: > Signed-off-by: Mostafa <recenum(a)outlook.com> I don't want to assume anything about foreign names, but the last one looks more like a nickname or given name only. > --- > src/libvirt-domain.c | 32 ++++++++------------------------ > 1 file changed, 8 insertions(+), 24 deletions(-) For the code: Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>

1 0

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

15 Mar '24

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

3 19

[PATCH 00/22] qemu: Fix migration from libvirt older than 9.10.0 when vmx is enabled
by Jiri Denemark 14 Mar '24

14 Mar '24

This series fixes a migration regression introduced in 9.10.0 release which added support for a bunch of vmx-* CPU features. Domains with vmx feature enabled started by libvirt 9.9.0 or older cannot be migrated to current releases 9.10.0 and newer. After this series migration works again with libvirt 9.9.0 and older in both directions. Migration from the affected releases to the fixed version works as well, but the other direction remains broken unless the fix is backported. See patches 1/22 and 4/22 for more details about the issue and the fix. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/568 Jiri Denemark (22): cpu: x86: Add support for adding features to existing CPU models qemu: domain: Check arch in qemuDomainMakeCPUMigratable conf: cpu: Introduce virCPUDefListFeatures qemu: domain: Drop added features from migratable CPU cpu_map: Do not ignore VMX features in sync_qemu_models script Add vmx-* features to Broadwell* Add vmx-* features to Cascadelake* Add vmx-* features to Conroe Add vmx-* features to Cooperlake Add vmx-* features to core{,2}duo Add vmx-* features to Haswell* Add vmx-* features to Icelake* Add vmx-* features to IvyBridge* Add vmx-* features to kvm* Add vmx-* features to Nehalem* Add vmx-* features to Penryn Add vmx-* features to SandyBridge* Add vmx-* features to SapphireRapids Add vmx-* features to Skylake* Add vmx-* features to Snowridge Add vmx-* features to Westmere* NEWS: Document the fix for migration or vmx enabled domains NEWS.rst | 12 ++ src/conf/cpu_conf.c | 24 ++++ src/conf/cpu_conf.h | 3 + src/cpu/cpu_x86.c | 69 ++++++++++- src/cpu/cpu_x86.h | 3 + src/cpu_map/sync_qemu_models_i386.py | 114 +++++++++++++++++- src/cpu_map/x86_Broadwell-IBRS.xml | 75 ++++++++++++ src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 75 ++++++++++++ src/cpu_map/x86_Broadwell-noTSX.xml | 75 ++++++++++++ src/cpu_map/x86_Broadwell.xml | 75 ++++++++++++ src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 76 ++++++++++++ src/cpu_map/x86_Cascadelake-Server.xml | 74 ++++++++++++ src/cpu_map/x86_Conroe.xml | 26 ++++ src/cpu_map/x86_Cooperlake.xml | 76 ++++++++++++ src/cpu_map/x86_Haswell-IBRS.xml | 73 +++++++++++ src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 73 +++++++++++ src/cpu_map/x86_Haswell-noTSX.xml | 73 +++++++++++ src/cpu_map/x86_Haswell.xml | 73 +++++++++++ src/cpu_map/x86_Icelake-Server-noTSX.xml | 77 ++++++++++++ src/cpu_map/x86_Icelake-Server.xml | 72 +++++++++++ src/cpu_map/x86_IvyBridge-IBRS.xml | 67 ++++++++++ src/cpu_map/x86_IvyBridge.xml | 67 ++++++++++ src/cpu_map/x86_Nehalem-IBRS.xml | 61 ++++++++++ src/cpu_map/x86_Nehalem.xml | 61 ++++++++++ src/cpu_map/x86_Penryn.xml | 29 +++++ src/cpu_map/x86_SandyBridge-IBRS.xml | 63 ++++++++++ src/cpu_map/x86_SandyBridge.xml | 63 ++++++++++ src/cpu_map/x86_SapphireRapids.xml | 77 ++++++++++++ src/cpu_map/x86_Skylake-Client-IBRS.xml | 71 +++++++++++ src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 72 +++++++++++ src/cpu_map/x86_Skylake-Client.xml | 71 +++++++++++ src/cpu_map/x86_Skylake-Server-IBRS.xml | 74 ++++++++++++ src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 76 ++++++++++++ src/cpu_map/x86_Skylake-Server.xml | 74 ++++++++++++ src/cpu_map/x86_Snowridge.xml | 76 ++++++++++++ src/cpu_map/x86_Westmere-IBRS.xml | 63 ++++++++++ src/cpu_map/x86_Westmere.xml | 63 ++++++++++ src/cpu_map/x86_core2duo.xml | 26 ++++ src/cpu_map/x86_coreduo.xml | 18 +++ src/cpu_map/x86_kvm32.xml | 18 +++ src/cpu_map/x86_kvm64.xml | 20 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_domain.c | 60 ++++++++- src/qemu/qemu_domain.h | 4 +- src/qemu/qemu_migration_cookie.c | 5 +- 45 files changed, 2487 insertions(+), 12 deletions(-) -- 2.44.0

3 30

[PATCH] openvz_conf: Use g_autofree
by Rayhan Faizel 14 Mar '24

14 Mar '24

--- src/openvz/openvz_conf.c | 60 ++++++++++++---------------------------- 1 file changed, 17 insertions(+), 43 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index eab3f748d0..4dbaef356c 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -163,7 +163,7 @@ openvzReadNetworkConf(virDomainDef *def, { int ret; virDomainNetDef *net = NULL; - char *temp = NULL; + g_autofree char *temp = NULL; char *token, *saveptr = NULL; /*parse routing network configuration* @@ -258,12 +258,9 @@ openvzReadNetworkConf(virDomainDef *def, } } - VIR_FREE(temp); - return 0; error: - VIR_FREE(temp); virDomainNetDefFree(net); return -1; } @@ -276,7 +273,7 @@ openvzReadFSConf(virDomainDef *def, int ret; virDomainFSDef *fs = NULL; g_autofree char *veid_str = NULL; - char *temp = NULL; + g_autofree char *temp = NULL; const char *param; unsigned long long barrier, limit; @@ -337,11 +334,8 @@ openvzReadFSConf(virDomainDef *def, VIR_APPEND_ELEMENT(def->fss, def->nfss, fs); - VIR_FREE(temp); - return 0; error: - VIR_FREE(temp); virDomainFSDefFree(fs); return -1; } @@ -351,7 +345,7 @@ static int openvzReadMemConf(virDomainDef *def, int veid) { int ret = -1; - char *temp = NULL; + g_autofree char *temp = NULL; unsigned long long barrier, limit; const char *param; long kb_per_pages; @@ -411,7 +405,6 @@ openvzReadMemConf(virDomainDef *def, int veid) ret = 0; error: - VIR_FREE(temp); return ret; } @@ -549,7 +542,7 @@ openvzWriteConfigParam(const char * conf_file, const char *param, const char *va g_autofree char *temp_file = NULL; int temp_fd = -1; FILE *fp; - char *line = NULL; + g_autofree char *line = NULL; size_t line_size = 0; temp_file = g_strdup_printf("%s.tmp", conf_file); @@ -586,12 +579,9 @@ openvzWriteConfigParam(const char * conf_file, const char *param, const char *va if (rename(temp_file, conf_file) < 0) goto error; - VIR_FREE(line); - return 0; error: - VIR_FREE(line); VIR_FORCE_FCLOSE(fp); VIR_FORCE_CLOSE(temp_fd); if (temp_file) @@ -602,14 +592,13 @@ openvzWriteConfigParam(const char * conf_file, const char *param, const char *va int openvzWriteVPSConfigParam(int vpsid, const char *param, const char *value) { - char *conf_file; + g_autofree char *conf_file = NULL; int ret; if (openvzLocateConfFile(vpsid, &conf_file, "conf") < 0) return -1; ret = openvzWriteConfigParam(conf_file, param, value); - VIR_FREE(conf_file); return ret; } @@ -622,7 +611,7 @@ openvzWriteVPSConfigParam(int vpsid, const char *param, const char *value) int openvzReadConfigParam(const char *conf_file, const char *param, char **value) { - char *line = NULL; + g_autofree char *line = NULL; size_t line_size = 0; FILE *fp; int err = 0; @@ -652,7 +641,6 @@ openvzReadConfigParam(const char *conf_file, const char *param, char **value) /* keep going - last entry wins */ } } - VIR_FREE(line); VIR_FORCE_FCLOSE(fp); return err ? -1 : *value ? 1 : 0; @@ -672,21 +660,20 @@ openvzReadConfigParam(const char *conf_file, const char *param, char **value) int openvzReadVPSConfigParam(int vpsid, const char *param, char **value) { - char *conf_file; + g_autofree char *conf_file = NULL; int ret; if (openvzLocateConfFile(vpsid, &conf_file, "conf") < 0) return -1; ret = openvzReadConfigParam(conf_file, param, value); - VIR_FREE(conf_file); return ret; } static int openvz_copyfile(char* from_path, char* to_path) { - char *line = NULL; + g_autofree char *line = NULL; size_t line_size = 0; FILE *fp; int copy_fd; @@ -715,12 +702,9 @@ openvz_copyfile(char* from_path, char* to_path) if (VIR_CLOSE(copy_fd) < 0) goto error; - VIR_FREE(line); - return 0; error: - VIR_FREE(line); VIR_FORCE_FCLOSE(fp); VIR_FORCE_CLOSE(copy_fd); return -1; @@ -734,10 +718,10 @@ openvz_copyfile(char* from_path, char* to_path) int openvzCopyDefaultConfig(int vpsid) { - char *confdir = NULL; - char *default_conf_file = NULL; - char *configfile_value = NULL; - char *conf_file = NULL; + g_autofree char *confdir = NULL; + g_autofree char *default_conf_file = NULL; + g_autofree char *configfile_value = NULL; + g_autofree char *conf_file = NULL; int ret = -1; if (openvzReadConfigParam(VZ_CONF_FILE, "CONFIGFILE", &configfile_value) < 0) @@ -758,10 +742,6 @@ openvzCopyDefaultConfig(int vpsid) ret = 0; cleanup: - VIR_FREE(confdir); - VIR_FREE(default_conf_file); - VIR_FREE(configfile_value); - VIR_FREE(conf_file); return ret; } @@ -771,7 +751,7 @@ openvzCopyDefaultConfig(int vpsid) static int openvzLocateConfFileDefault(int vpsid, char **conffile, const char *ext) { - char *confdir; + g_autofree char *confdir = NULL; int ret = 0; confdir = openvzLocateConfDir(); @@ -780,7 +760,6 @@ openvzLocateConfFileDefault(int vpsid, char **conffile, const char *ext) *conffile = g_strdup_printf("%s/%d.%s", confdir, vpsid, ext ? ext : "conf"); - VIR_FREE(confdir); return ret; } @@ -828,8 +807,8 @@ openvz_readline(int fd, char *ptr, int maxlen) static int openvzGetVPSUUID(int vpsid, char *uuidstr, size_t len) { - char *conf_file; - char *line = NULL; + g_autofree char *conf_file = NULL; + g_autofree char *line = NULL; size_t line_size = 0; char *saveptr = NULL; char *uuidbuf; @@ -868,9 +847,7 @@ openvzGetVPSUUID(int vpsid, char *uuidstr, size_t len) } retval = 0; cleanup: - VIR_FREE(line); VIR_FORCE_FCLOSE(fp); - VIR_FREE(conf_file); return retval; } @@ -881,7 +858,7 @@ openvzGetVPSUUID(int vpsid, char *uuidstr, size_t len) int openvzSetDefinedUUID(int vpsid, unsigned char *uuid) { - char *conf_file; + g_autofree char *conf_file = NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; FILE *fp = NULL; int ret = -1; @@ -912,7 +889,6 @@ openvzSetDefinedUUID(int vpsid, unsigned char *uuid) ret = 0; cleanup: VIR_FORCE_FCLOSE(fp); - VIR_FREE(conf_file); return ret; } @@ -941,7 +917,7 @@ static int openvzAssignUUIDs(void) { g_autoptr(DIR) dp = NULL; struct dirent *dent; - char *conf_dir; + g_autofree char *conf_dir = NULL; int vpsid; char *ext; int ret = 0; @@ -951,7 +927,6 @@ static int openvzAssignUUIDs(void) return -1; if (virDirOpenQuiet(&dp, conf_dir) < 0) { - VIR_FREE(conf_dir); return 0; } @@ -964,7 +939,6 @@ static int openvzAssignUUIDs(void) openvzSetUUID(vpsid); } - VIR_FREE(conf_dir); return ret; } -- 2.34.1

2 1

[PATCH 0/2] Mock another version of open()
by Michal Privoznik 14 Mar '24

14 Mar '24

Since rawhide has the most recent packages (glibc in this case) it is usually the first where a problematic change shows. This time there's a problem with glibc and the way it calls open() -> in some cases it calls __open_2() instead. Since we are not mocking the latter our test cases are not redirected to stay inside the repo. For instance, nsstest tries to open "/var/lib/libvirt/dnsmasq//virbr1.status". Green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/1213064943 Michal Prívozník (2): virusbmock: Switch to VIR_MOCK_REAL_INIT() tests: mock __open_2() meson.build | 13 +++++++++++++ tests/nssmock.c | 26 +++++++++++++++++++++++++ tests/qemusecuritymock.c | 24 +++++++++++++++++++++++ tests/vircgroupmock.c | 42 ++++++++++++++++++++++++++++++++++++++++ tests/virfilewrapper.c | 18 +++++++++++++++++ tests/virmock.h | 4 ++++ tests/virpcimock.c | 17 ++++++---------- tests/virtestmock.c | 20 +++++++++++++++++++ tests/virusbmock.c | 42 ++++++++++++++++++++++++++++------------ 9 files changed, 183 insertions(+), 23 deletions(-) -- 2.43.2

3 7

[PATCH 00/23] vsh: Fix handling of commands and help - part 1 (help text formatter and flags)
by Peter Krempa 13 Mar '24

13 Mar '24

This series refactors the cruft in the virsh command and argument handling so that handling of options and the flags for them make actually sense. Except for the 'timeout' parameter of 'daemon-timeout' 'virt-admin' command the behaviour is supposed to be identical. Peter Krempa (23): vsh: Always assume that command groups are used vsh: Don't translate error messages for 'self-test' vsh: Add VSH_OT_NONE option type to catch programming errors vsh: Remove VSH_CMD_FLAG_ALIAS vshCmddefCheckInternals: Fix listing of missing completers for 'VSH_OT_ARGV' virsh: Remove uncommon redundant descriptions of virsh commands virt-admin: Drop trailing whitespaces from description of some commands virsh-domain: Don't explicitly break lines in help vsh: Add '--dump-help' option for 'self-test' command vsh: Refactor store of command help and description vshCmddefHelp: Refactor printing of help (list of arguments) vshCmddefHelp: Refactor printing of help (argument description) vshCmddefGetOption: Improve readability virsh: Inline only use of VIRSH_COMMON_OPT_DOMAIN_OT_ARGV macro vsh: Annotate 'required' and 'positional' arguments explicitly vsh: Fix broken assumption that required VSH_OT_INT must be positional vsh: Require that positional non-argv arguments are required vshCmddefCheckInternals: Remove refactoring safety checks vshCmdGrpHelp: Refactor formatting of help for VSH_OT_ARGV vshCmddefHelp: Refactor and fix printing of help for _STRING/_INT arguments vsh: Replace VSH_OT_DATA by VSH_OT_STRING vsh: remove VSH_OFLAG_REQ vsh: Automatically calculate VSH_OFLAG_REQ_OPT tools/virsh-backup.c | 29 +- tools/virsh-checkpoint.c | 109 +-- tools/virsh-domain-event.c | 13 +- tools/virsh-domain-monitor.c | 207 ++-- tools/virsh-domain.c | 1783 ++++++++++++---------------------- tools/virsh-host.c | 311 ++---- tools/virsh-interface.c | 217 ++--- tools/virsh-network.c | 312 ++---- tools/virsh-nodedev.c | 242 ++--- tools/virsh-nwfilter.c | 144 +-- tools/virsh-pool.c | 296 ++---- tools/virsh-secret.c | 113 +-- tools/virsh-snapshot.c | 137 +-- tools/virsh-volume.c | 241 ++--- tools/virsh.c | 22 +- tools/virsh.h | 29 +- tools/virt-admin.c | 275 ++---- tools/vsh.c | 474 +++++---- tools/vsh.h | 49 +- 19 files changed, 1798 insertions(+), 3205 deletions(-) -- 2.44.0

3 29

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

12 Mar '24

On Tue, Mar 12, 2024 at 00:11:28 +0200, Mostafa wrote: The patch looks good now, but you've used multiple names in various fields over the two postings and the preference in terms of both authorship and sign-off is to use a full real name Used previously: > From: مصطفي محمود كمال الدين <48567303+moste00(a)users.noreply.github.com> > From: m kamal <recenum(a)outlook.com> The one in this patch: > Signed-off-by: Mostafa <recenum(a)outlook.com> I don't want to assume anything about foreign names, but the last one looks more like a nickname or given name only. > --- > src/libvirt-domain.c | 32 ++++++++------------------------ > 1 file changed, 8 insertions(+), 24 deletions(-) For the code: Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>

2 1

[PATCH v2] ch: Enable hyperv hypervisor
by Praveen K Paladugu 12 Mar '24

12 Mar '24

From: Praveen K Paladugu <prapal(a)linux.microsoft.com> Cloud-Hypervisor is capable of running VMs with kvm or mshv as the hypervisor on Linux Host. Guest to hypevisor ABI with mshv hypervisor is the same as in the case of VIR_DOMAIN_VIRT_HYPERV. So, VIR_DOMAIN_VIRT_HYPERV type will be reused to represent the config with Linux Host and mshv as the hypervisor. While initializing ch driver, check if either of /dev/kvm or /dev/mshv device is present on the host. Before starting ch domains, check if the requested hypervisor device is present on the host. Users can specify hypervisor in ch guests's domain definitions like below: <domain type='kvm'> _or_ <domain type='hyperv'> Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com> Signed-off-by: Praveen K Paladugu <praveenkpaladugu(a)gmail.com> --- src/ch/ch_conf.c | 2 ++ src/ch/ch_driver.c | 7 +++++++ src/ch/ch_process.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index f421af5121..1911ae8f8b 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -69,6 +69,8 @@ virCaps *virCHDriverCapsInit(void) virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, NULL, NULL, 0, NULL); + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HYPERV, + NULL, NULL, 0, NULL); return g_steal_pointer(&caps); } diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 96de5044ac..d6294c76ee 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -32,6 +32,7 @@ #include "viraccessapicheck.h" #include "virchrdev.h" #include "virerror.h" +#include "virfile.h" #include "virlog.h" #include "virobject.h" #include "virtypedparam.h" @@ -876,6 +877,12 @@ static int chStateInitialize(bool privileged, return -1; } + if (!(virFileExists("/dev/kvm") || virFileExists("/dev/mshv"))) { + virReportError(VIR_ERR_DEVICE_MISSING, "%s", + _("/dev/kvm and /dev/mshv. ch driver failed to initialize.")); + return VIR_DRV_STATE_INIT_ERROR; + } + ch_driver = g_new0(virCHDriver, 1); if (virMutexInit(&ch_driver->lock) < 0) { diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c index 3bde9d9dcf..640f72a9ca 100644 --- a/src/ch/ch_process.c +++ b/src/ch/ch_process.c @@ -637,6 +637,37 @@ chProcessAddNetworkDevices(virCHDriver *driver, return 0; } +/** + * virCHProcessStartValidate: + * @vm: domain object + * + * Checks done before starting a VM. + * + * Returns 0 on success or -1 in case of error + */ +static int virCHProcessStartValidate(virDomainObj *vm) +{ + if (vm->def->virtType == VIR_DOMAIN_VIRT_KVM) { + VIR_DEBUG("Checking for KVM availability"); + if (!virFileExists("/dev/kvm")) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Domain requires KVM, but it is not available. Check that virtualization is enabled in the host BIOS, and host configuration is setup to load the kvm modules.")); + return -1; + } + } else if (vm->def->virtType == VIR_DOMAIN_VIRT_HYPERV) { + VIR_DEBUG("Checking for mshv availability"); + if (!virFileExists("/dev/mshv")) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Domain requires MSHV device, but it is not available. Check that virtualization is enabled in the host BIOS, and host configuration is setup to load the mshv modules.")); + return -1; + } + } else { + return -1; + } + return 0; + +} + /** * virCHProcessStart: * @driver: pointer to driver structure @@ -664,6 +695,10 @@ virCHProcessStart(virCHDriver *driver, return -1; } + if (virCHProcessStartValidate(vm) < 0) { + return -1; + } + if (!priv->monitor) { /* And we can get the first monitor connection now too */ if (!(priv->monitor = virCHProcessConnectMonitor(driver, vm))) { -- 2.43.0

3 6

[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

[PULL 30/43] hw/core/machine-smp: Remove deprecated "parameter=0" SMP configurations
by Philippe Mathieu-Daudé 09 Mar '24

09 Mar '24

From: Zhao Liu <zhao1.liu(a)intel.com> The "parameter=0" SMP configurations have been marked as deprecated since v6.2. For these cases, -smp currently returns the warning and adjusts the zeroed parameters to 1 by default. Remove the above compatibility logic in v9.0, and return error directly if any -smp parameter is set as 0. Signed-off-by: Zhao Liu <zhao1.liu(a)intel.com> Reviewed-by: Thomas Huth <thuth(a)redhat.com> Reviewed-by: Prasad Pandit <pjp(a)fedoraproject.org> Message-ID: <20240308160148.3130837-2-zhao1.liu(a)linux.intel.com> Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> --- docs/about/deprecated.rst | 16 ---------------- docs/about/removed-features.rst | 15 +++++++++++++++ hw/core/machine-smp.c | 5 +++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 8565644da6..6e2f557682 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -36,22 +36,6 @@ and will cause a warning. The replacement for the ``nodelay`` short-form boolean option is ``nodelay=on`` rather than ``delay=off``. -``-smp`` ("parameter=0" SMP configurations) (since 6.2) -''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -Specified CPU topology parameters must be greater than zero. - -In the SMP configuration, users should either provide a CPU topology -parameter with a reasonable value (greater than zero) or just omit it -and QEMU will compute the missing value. - -However, historically it was implicitly allowed for users to provide -a parameter with zero value, which is meaningless and could also possibly -cause unexpected results in the -smp parsing. So support for this kind of -configurations (e.g. -smp 8,sockets=0) is deprecated since 6.2 and will -be removed in the near future, users have to ensure that all the topology -members described with -smp are greater than zero. - Plugin argument passing through ``arg=<string>`` (since 6.1) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 417a0e4fa1..f9cf874f7b 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -489,6 +489,21 @@ The ``-singlestep`` option has been turned into an accelerator property, and given a name that better reflects what it actually does. Use ``-accel tcg,one-insn-per-tb=on`` instead. +``-smp`` ("parameter=0" SMP configurations) (removed in 9.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Specified CPU topology parameters must be greater than zero. + +In the SMP configuration, users should either provide a CPU topology +parameter with a reasonable value (greater than zero) or just omit it +and QEMU will compute the missing value. + +However, historically it was implicitly allowed for users to provide +a parameter with zero value, which is meaningless and could also possibly +cause unexpected results in the -smp parsing. So support for this kind of +configurations (e.g. -smp 8,sockets=0) is removed since 9.0, users have +to ensure that all the topology members described with -smp are greater +than zero. User-mode emulator command line arguments ----------------------------------------- diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c index 25019c91ee..96533886b1 100644 --- a/hw/core/machine-smp.c +++ b/hw/core/machine-smp.c @@ -105,8 +105,9 @@ void machine_parse_smp_config(MachineState *ms, (config->has_cores && config->cores == 0) || (config->has_threads && config->threads == 0) || (config->has_maxcpus && config->maxcpus == 0)) { - warn_report("Deprecated CPU topology (considered invalid): " - "CPU topology parameters must be greater than zero"); + error_setg(errp, "Invalid CPU topology: " + "CPU topology parameters must be greater than zero"); + return; } /* -- 2.41.0

1 0

RE: join running core dump job
by Thanos Makatos 08 Mar '24

08 Mar '24

> -----Original Message----- > From: Thanos Makatos <thanos.makatos(a)nutanix.com> > Sent: Monday, March 4, 2024 9:45 PM > To: Thanos Makatos <thanos.makatos(a)nutanix.com>; devel(a)lists.libvirt.org > Subject: RE: join running core dump job > > > -----Original Message----- > > From: Thanos Makatos <thanos.makatos(a)nutanix.com> > > Sent: Monday, March 4, 2024 5:24 PM > > To: devel(a)lists.libvirt.org > > Subject: join running core dump job > > > > Is there a way to programmatically wait for a previously initiated > > virDomainCoreDumpWithFormat() where the process that started it died? > I'm > > looking at the API and don't seem to find anything relevant. I suppose I > could > > poll via virDomainGetJobStats(), but, ideally, I'd like a function that would > join > > the dump job and return when the dump job finishes. > > _______________________________________________ > > Devel mailing list -- devel(a)lists.libvirt.org > > To unsubscribe send an email to devel-leave(a)lists.libvirt.org > > I see there's qemuDumpWaitForCompletion(), looks promising. I've made some progress (added a virHypervisorDriver.domainCoreDumpWait and the relevant scaffolding to make 'virsh dump --wait' work), calling qemuDumpWaitForCompletion() is all that's needed. However, it doesn't seem trivial to implement this in the test_driver. First, IIUC testDomainCoreDumpWithFormat() gets an exclusive lock on the domain (haven't tested anything yet), so calling domainCoreDumpWait() would block for the wrong reason. Is making testDomainCoreDumpWithFormat() using asynchronous jobs internally unavoidable? Second, I want to test behaviour in my application where (1) it calls domainCoreDump(), (2) crashes before domainCoreDump() finishes, (3) then my application starts again and looks for a pending dump job and (4) joins it using domainCoreDumpWait(). I can't see an easy wait of faking a dump job in the test_driver when it starts. How about adding persistent tasks, which I can pre-populate before starting my application, or fake jobs via an environment variable, so that when the test_driver starts it can internally continue them? E.g. we can specify how long to run the job for and domainCoreDumpWait() add a sleep for that long. I'm open to suggestions.

1 0

[PATCH 0/2] ch_driver: add basic save and restore functionalities
by Purna Pavan Chandra Aekkaladevi 08 Mar '24

08 Mar '24

Purna Pavan Chandra Aekkaladevi (2): ch_driver: Add basic domain save & restore support NEWS: Mention save & restore support for ch driver NEWS.rst | 6 + src/ch/ch_conf.c | 6 + src/ch/ch_conf.h | 12 ++ src/ch/ch_driver.c | 511 +++++++++++++++++++++++++++++++++++++++++++- src/ch/ch_monitor.c | 97 ++++++++- src/ch/ch_monitor.h | 6 +- src/ch/ch_process.c | 101 +++++++-- src/ch/ch_process.h | 4 + 8 files changed, 721 insertions(+), 22 deletions(-) -- 2.34.1

2 4

[libvirt PATCH 0/3] acouple of net-metadata fixes
by Ján Tomko 08 Mar '24

08 Mar '24

Ján Tomko (3): remote: add VIR_ERR_NO_NETWORK_METADATA to daemonErrorLogFilter virsh: remove trailing whitespace even when editing the description vsh: introduce vshEditString src/remote/remote_daemon.c | 1 + tools/virsh-domain.c | 21 +-------------------- tools/virsh-network.c | 20 +------------------- tools/vsh.c | 27 +++++++++++++++++++++++++++ tools/vsh.h | 1 + 5 files changed, 31 insertions(+), 39 deletions(-) -- 2.43.2

2 6

[libvirt PATCH V3 0/4] add loongarch support for libvirt
by Xianglai Li 07 Mar '24

07 Mar '24

Hello, Everyone: This patch series adds libvirt support for loongarch.Although the bios path and name has not been officially integrated into qemu and we think there are still many shortcomings, we try to push a version of patch to the community according to the opinions of the community, hoping to listen to everyone's opinions. Anyway we have a version of libvirt that supports loongarch. You can also get libvirt's patch from the link below: https://gitlab.com/lixianglai/libvirt branch: loongarch Since the patch associated with loongarch has not yet been submitted to the virt-manager community, we are providing a temporary patch with loongarch for the time being patch's virt-manager, the open source work of virt-manager adding loongarch will be followed up later or synchronized with the open source libvirt. You can get the virt-manager code with loongarch patch from the link below: https://github.com/lixianglai/virt-manager branch: loongarch loongarch's virtual machine bios is not yet available in qemu,So you need to compile loongarch UEFI yourself, you can refer to the following link to compile UEFI: https://github.com/tianocore/edk2-platforms/blob/master/Platform/Loongson/L… Here we provide compiled UEFI for ease of testing,you can get it from the following link: https://github.com/lixianglai/LoongarchVirtFirmware (Note: You should clone the repository using git instead of downloading the file via wget or you'll get xml) We named the bios QEMU_EFI.fd, QEMU_VARS.fd is used to store pflash images of non-volatile variables. After installing qemu-system-loongarch64,You can install the loongarch bios by executing the script install-loongarch-virt-firmware.sh Since there is no fedora operating system that supports the loongarch architecture, you can find an iso that supports loongarch at the link below for testing purposes: https://github.com/fedora-remix-loongarch/releases-info The operating system provided above may have minor problems of one kind or another, but you can also find out from the following link that openEuler's operating system supports loongarch: https://muug.ca/mirror/openeuler/openEuler-22.03-LTS/ISO/loongarch64/ Well, if you have completed the above steps I think you can now install loongarch virtual machine, you can install it through the virt-manager graphical interface, or install it through vrit-install, here is an example of installing it using virt-install: virt-install \ --virt-type=qemu \ --name loongarch-test \ --memory 4096 \ --vcpus=4 \ --arch=loongarch64 \ --boot cdrom \ --disk device=cdrom,bus=scsi,path=/root/livecd-fedora-mate-4.loongarch64.iso \ --disk path=/var/lib/libvirt/images/debian12-loongarch64.qcow2,size=10,format=qcow2,bus=scsi \ --network network=default \ --osinfo archlinux \ --video=virtio \ --graphics=vnc,listen=0.0.0.0 CHANGES V2->V3: 1.Delete redundant header files in cpu_loongarch.c 2.Fixed code formatting issues 3.Modify the commit message of [PATCH 2/4] 4.Remove useless test cases for loongarch, Rebuild loongarch's test case based on the latest code. V1->V2: 1.Modify the link addresses of virtu-manager and firmeware in the cover letter. Please obtain the code and firmware from the latest link address. 2.Rename the bios name. Delete the loongarch bios name from libvirt and use the json file to obtain the bios path. 3.Refer to riscv64 to simplify the implementation of loongarch cpu driver.And fix some code style errors. 4.Delete unnecessary or redundant device enablement.Such as USB NEC. 5.Add some test cases for loongarch. Xianglai Li (4): Add loongarch cpu support Support for loongarch64 in the QEMU driver Implement the method of getting host info for loongarch Add test script for loongarch src/conf/schemas/basictypes.rng | 1 + src/cpu/cpu.c | 2 + src/cpu/cpu_loongarch.c | 58 + src/cpu/cpu_loongarch.h | 25 + src/cpu/meson.build | 1 + src/qemu/qemu_capabilities.c | 16 +- src/qemu/qemu_command.c | 7 +- src/qemu/qemu_domain.c | 40 +- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_validate.c | 1 + src/util/virarch.c | 13 +- src/util/virarch.h | 13 +- src/util/virhostcpu.c | 7 +- src/util/virsysinfo.c | 3 +- .../qemu_8.2.0-tcg-virt.loongarch64.xml | 163 + .../qemu_8.2.0-virt.loongarch64.xml | 167 + tests/domaincapstest.c | 4 +- .../caps_8.2.0_loongarch64.replies | 30121 ++++++++++++++++ .../caps_8.2.0_loongarch64.xml | 175 + .../qemucaps2xmloutdata/caps.loongarch64.xml | 28 + ...o-type-loongarch64.loongarch64-latest.args | 34 + ...eo-type-loongarch64.loongarch64-latest.xml | 45 + .../default-video-type-loongarch64.xml | 18 + ...-models.loongarch64-latest.abi-update.args | 44 + ...t-models.loongarch64-latest.abi-update.xml | 79 + ...irt-default-models.loongarch64-latest.args | 44 + ...virt-default-models.loongarch64-latest.xml | 79 + .../loongarch64-virt-default-models.xml | 24 + ...ch64-virt-graphics.loongarch64-latest.args | 56 + ...rch64-virt-graphics.loongarch64-latest.xml | 116 + .../loongarch64-virt-graphics.xml | 48 + ...ch64-virt-headless.loongarch64-latest.args | 52 + ...rch64-virt-headless.loongarch64-latest.xml | 102 + .../loongarch64-virt-headless.xml | 42 + ...minimal.loongarch64-latest.abi-update.args | 31 + ...-minimal.loongarch64-latest.abi-update.xml | 26 + ...rch64-virt-minimal.loongarch64-latest.args | 31 + ...arch64-virt-minimal.loongarch64-latest.xml | 26 + .../loongarch64-virt-minimal.xml | 15 + tests/qemuxmlconftest.c | 7 + tests/testutilshostcpus.h | 10 + 41 files changed, 31749 insertions(+), 26 deletions(-) create mode 100644 src/cpu/cpu_loongarch.c create mode 100644 src/cpu/cpu_loongarch.h create mode 100644 tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml create mode 100644 tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml create mode 100644 tests/qemucaps2xmloutdata/caps.loongarch64.xml create mode 100644 tests/qemuxmlconfdata/default-video-type-loongarch64.loongarch64-latest.args create mode 100644 tests/qemuxmlconfdata/default-video-type-loongarch64.loongarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/default-video-type-loongarch64.xml create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-latest.abi-update.args create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-latest.abi-update.xml create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-latest.args create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-default-models.xml create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.args create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-graphics.xml create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-latest.args create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-headless.xml create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.abi-update.args create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.abi-update.xml create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.args create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-minimal.xml -- 2.39.1

4 11

[PATCH 0/2] Add support for Unix mode to serial port dev
by Praveen K Paladugu 07 Mar '24

07 Mar '24

This patchset adds support for Unix mode to serial port device in ch guests. Praveen K Paladugu (2): ch: Add Cap checks for unix backend of serial port ch: Add support for `Unix` mode to serial port dev src/ch/ch_capabilities.c | 6 ++++++ src/ch/ch_capabilities.h | 1 + src/ch/ch_domain.c | 21 +++++++++++++++------ src/ch/ch_monitor.c | 35 ++++++++++++++++++++++++----------- src/ch/ch_process.c | 7 +++++++ 5 files changed, 53 insertions(+), 17 deletions(-) -- 2.43.0

2 3

[PATCH] tests: Don't advertise features for edk2-loongarch64
by Andrea Bolognani 07 Mar '24

07 Mar '24

The "acpi" feature is not part of the specification[1], so it will just get ignored. [1] https://gitlab.com/qemu-project/qemu/-/blob/master/docs/interop/firmware.js… Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .../usr/share/qemu/firmware/50-edk2-loongarch64.json | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-loongarch64.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-loongarch64.json index 8251137ba9..c5a7ec5f7b 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-loongarch64.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-loongarch64.json @@ -24,6 +24,5 @@ } ], "features": [ - "acpi" ] } -- 2.44.0

2 1