Re: Re: [PATCH 03/11] conf: Allow specifying CPU clusters

On Mon, Jan 08, 2024 at 20:26:02 +0100, Andrea Bolognani wrote: > diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h > index 3e4c53675c..2694022fed 100644 > --- a/src/conf/cpu_conf.h > +++ b/src/conf/cpu_conf.h > @@ -148,6 +148,7 @@ struct _virCPUDef { > unsigned int microcodeVersion; > unsigned int sockets; > unsigned int dies; > + unsigned int clusters; > unsigned int cores; > unsigned int threads; > unsigned int sigFamily; git grep 'cpu->dies' shows that in src/libxl/libxl_capabilities.c libxlCapsInitCPU 'dies' is assigned to '1' but not in this patch. With the logic to format the cpu element this could cause problems.

> diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c > index dfb602ca2f..522256777d 100644 > --- a/src/libxl/libxl_capabilities.c > +++ b/src/libxl/libxl_capabilities.c > @@ -152,6 +152,7 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_info) > cpu->cores = phy_info->cores_per_socket; > cpu->threads = phy_info->threads_per_core; > cpu->dies = 1; > + cpu->clusters = 1; > cpu->sockets = phy_info->nr_cpus / (cpu->cores * cpu->threads);