Commit 1b20616f authored by Eric Auger's avatar Eric Auger Committed by Peter Maydell
Browse files

target-arm: move gicv3_class_name from machine to kvm_arm.h 



Machine.c contains code related to migration. Let's move
gicv3_class_name to kvm_arm.h instead.

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 1474616617-366-4-git-send-email-eric.auger@redhat.com
Suggested-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 386ce3c7

target-arm/kvm_arm.h

+15 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include "sysemu/kvm.h"

#include "exec/memory.h"

#include "qemu/error-report.h"



/**

 * kvm_arm_vcpu_init:
@@ -223,7 +224,20 @@ static inline const char *gic_class_name(void) 
 *

 * Returns: class name to use

 */

const char *gicv3_class_name(void);

static inline const char *gicv3_class_name(void)

{

    if (kvm_irqchip_in_kernel()) {

#ifdef TARGET_AARCH64

        return "kvm-arm-gicv3";

#else

        error_report("KVM GICv3 acceleration is not supported on this "

                     "platform");

        exit(1);

#endif

    } else {

        return "arm-gicv3";

    }

}



/**

 * kvm_arm_handle_debug:

target-arm/machine.c

+0 −15
Original line number Diff line number Diff line
@@ -331,18 +331,3 @@ const VMStateDescription vmstate_arm_cpu = { 
        NULL

    }

};
 


const char *gicv3_class_name(void)

{

    if (kvm_irqchip_in_kernel()) {

#ifdef TARGET_AARCH64

        return "kvm-arm-gicv3";

#else

        error_report("KVM GICv3 acceleration is not supported on this "

                     "platform");

        exit(1);

#endif

    } else {

        return "arm-gicv3";

    }

}