Commit bab52d4b authored by Peter Maydell's avatar Peter Maydell
Browse files

target/arm: Add "-cpu max" support 



Add support for "-cpu max" for ARM guests. This CPU type behaves
like "-cpu host" when KVM is enabled, and like a system CPU with
the maximum possible feature set otherwise. (Note that this means
it won't be migratable across versions, as we will likely add
features to it in future.)

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-id: 20180308130626.12393-4-peter.maydell@linaro.org
parent 86f0a186

target/arm/cpu-qom.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ struct arm_boot_info; 
#define ARM_CPU_GET_CLASS(obj) \

    OBJECT_GET_CLASS(ARMCPUClass, (obj), TYPE_ARM_CPU)



#define TYPE_ARM_MAX_CPU "max-" TYPE_ARM_CPU



/**

 * ARMCPUClass:

 * @parent_realize: The parent class' realize handler.

target/arm/cpu.c

+24 −0
Original line number Diff line number Diff line
@@ -1702,6 +1702,27 @@ static void pxa270c5_initfn(Object *obj) 
    cpu->reset_sctlr = 0x00000078;

}



#ifndef TARGET_AARCH64

/* -cpu max: if KVM is enabled, like -cpu host (best possible with this host);

 * otherwise, a CPU with as many features enabled as our emulation supports.

 * The version of '-cpu max' for qemu-system-aarch64 is defined in cpu64.c;

 * this only needs to handle 32 bits.

 */

static void arm_max_initfn(Object *obj)

{

    ARMCPU *cpu = ARM_CPU(obj);



    if (kvm_enabled()) {

        kvm_arm_set_cpu_features_from_host(cpu);

    } else {

        cortex_a15_initfn(obj);

        /* In future we might add feature bits here even if the

         * real-world A15 doesn't implement them.

         */

    }

}

#endif



#ifdef CONFIG_USER_ONLY

static void arm_any_initfn(Object *obj)

{
@@ -1769,6 +1790,9 @@ static const ARMCPUInfo arm_cpus[] = { 
    { .name = "pxa270-b1",   .initfn = pxa270b1_initfn },

    { .name = "pxa270-c0",   .initfn = pxa270c0_initfn },

    { .name = "pxa270-c5",   .initfn = pxa270c5_initfn },

#ifndef TARGET_AARCH64

    { .name = "max",         .initfn = arm_max_initfn },

#endif

#ifdef CONFIG_USER_ONLY

    { .name = "any",         .initfn = arm_any_initfn },

#endif

target/arm/cpu64.c

+21 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "hw/arm/arm.h"

#include "sysemu/sysemu.h"

#include "sysemu/kvm.h"

#include "kvm_arm.h"



static inline void set_feature(CPUARMState *env, int feature)

{
@@ -214,6 +215,25 @@ static void aarch64_a53_initfn(Object *obj) 
    define_arm_cp_regs(cpu, cortex_a57_a53_cp_reginfo);

}



/* -cpu max: if KVM is enabled, like -cpu host (best possible with this host);

 * otherwise, a CPU with as many features enabled as our emulation supports.

 * The version of '-cpu max' for qemu-system-arm is defined in cpu.c;

 * this only needs to handle 64 bits.

 */

static void aarch64_max_initfn(Object *obj)

{

    ARMCPU *cpu = ARM_CPU(obj);



    if (kvm_enabled()) {

        kvm_arm_set_cpu_features_from_host(cpu);

    } else {

        aarch64_a57_initfn(obj);

        /* In future we might add feature bits here even if the

         * real-world A57 doesn't implement them.

         */

    }

}



#ifdef CONFIG_USER_ONLY

static void aarch64_any_initfn(Object *obj)

{
@@ -249,6 +269,7 @@ typedef struct ARMCPUInfo { 
static const ARMCPUInfo aarch64_cpus[] = {

    { .name = "cortex-a57",         .initfn = aarch64_a57_initfn },

    { .name = "cortex-a53",         .initfn = aarch64_a53_initfn },

    { .name = "max",                .initfn = aarch64_max_initfn },

#ifdef CONFIG_USER_ONLY

    { .name = "any",         .initfn = aarch64_any_initfn },

#endif