xl: properly dispose of libxl_dominfo struct instances

The ssid_label field requires separate freeing; make sure to call
libxl_dominfo_dispose() as well as libxl_dominfo_init(). Since vcpuset()
calls only the former, add a call to the latter there at the same time.

Coverity-ID: 1638727
Coverity-ID: 1638728
Fixes: c458c404da ("xl: use libxl_domain_info to get the uuid in printf_info")
Fixes: 48dab9767d ("tools/xl: use libxl_domain_info to get domain type for vcpu-pin")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Anthony PERARD <anthony.perard@vates.tech>
Release-Acked-by: Oleksii Kurochko<oleksii.kurochko@gmail.com>
This commit is contained in:
Jan Beulich committed 2025-01-17 08:54:03 +01:00
1 parent 737e8cc91b
commit 274c509162
2 files changed
+7

No files matched your search

+2
View File
@@ -45,8 +45,10 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config, FILE *fh)
/* retrieve the UUID from dominfo, since it is probably generated
* during parsing and thus does not match the real one
*/
libxl_dominfo_init(&info);
if (libxl_domain_info(ctx, &info, domid) == 0) {
fprintf(fh, "\t(uuid " LIBXL_UUID_FMT ")\n", LIBXL_UUID_BYTES(info.uuid));
libxl_dominfo_dispose(&info);
} else {
fprintf(fh, "\t(uuid <unknown>)\n");
}
+5
View File
@@ -286,6 +286,8 @@ int main_vcpupin(int argc, char **argv)
if (!ignore_masks && hard) {
libxl_dominfo dominfo;
libxl_dominfo_init(&dominfo);
if (libxl_domain_info(ctx, &dominfo, domid)) {
fprintf(stderr, "Could not get domain info\n");
goto out;
@@ -293,6 +295,8 @@ int main_vcpupin(int argc, char **argv)
/* HVM and PVH domains use the same global affinity mask */
apply_global_affinity_masks(dominfo.domain_type, hard, 1);
libxl_dominfo_dispose(&dominfo);
}
if (force) {
@@ -348,6 +352,7 @@ static int vcpuset(uint32_t domid, const char* nr_vcpus, int check_host)
unsigned int online_vcpus, host_cpu = libxl_get_max_cpus(ctx);
libxl_dominfo dominfo;
libxl_dominfo_init(&dominfo);
if (libxl_domain_info(ctx, &dominfo, domid))
return 1;
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.