On 08/12/2016 09:33 AM, Jiri Denemark wrote:
> The ARM CPU driver wrongly reported host CPU model as "host", which made
> host-model to be just an alias for host-passthrough. Let's drop this
> insanity.
>
> Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
> ---
> src/cpu/cpu_arm.c | 34 ++--------------------------------
> 1 file changed, 2 insertions(+), 32 deletions(-)
>
I see cpuNodeData and cpuDecode are generally used together, but not so
in tests/cputest.c, which doesn't test arm anyway, so seemingly not a
problem... Just making a note...
> diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
> index 6090253..a3aed6b 100644
> --- a/src/cpu/cpu_arm.c
> +++ b/src/cpu/cpu_arm.c
> @@ -37,36 +37,6 @@ static const virArch archs[] = {
> VIR_ARCH_AARCH64,
> };
>
> -static virCPUDataPtr
> -armNodeData(virArch arch)
> -{
> - virCPUDataPtr data;
> -
> - if (VIR_ALLOC(data) < 0)
> - return NULL;
> -
> - data->arch = arch;
> -
> - return data;
> -}
> -
> -static int
> -armDecode(virCPUDefPtr cpu,
> - const virCPUData *data ATTRIBUTE_UNUSED,
> - const char **models ATTRIBUTE_UNUSED,
> - unsigned int nmodels ATTRIBUTE_UNUSED,
> - const char *preferred ATTRIBUTE_UNUSED,
> - unsigned int flags)
> -{
> - virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, -1);
> -
> - if (cpu->model == NULL &&
> - VIR_STRDUP(cpu->model, "host") < 0)
> - return -1;
> -
> - return 0;
> -}
> -
> static void
> armDataFree(virCPUDataPtr data)
> {
> @@ -128,10 +98,10 @@ struct cpuArchDriver cpuDriverArm = {
> .arch = archs,
> .narch = ARRAY_CARDINALITY(archs),
> .compare = armCompare,
> - .decode = armDecode,
> + .decode = NULL,
> .encode = NULL,
> .free = armDataFree,
> - .nodeData = armNodeData,
> + .nodeData = NULL,
> .guestData = armGuestData,
> .baseline = armBaseline,
> .update = armUpdate,
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list