ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1474616617-366-4-git-send-email-eric.auger@redhat.com
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Eric Auger 2016-10-04 13:28:08 +01:00 committed by Peter Maydell
parent 386ce3c7fc
commit 1b20616f26
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target-arm/kvm_arm.h
View File

@ -13,6 +13,7 @@
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "exec/memory.h" #include "exec/memory.h"
#include "qemu/error-report.h"
/** /**
* kvm_arm_vcpu_init: * kvm_arm_vcpu_init:
@ -223,7 +224,20 @@ static inline const char *gic_class_name(void)
* *
* Returns: class name to use * 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: * kvm_arm_handle_debug:

15
target-arm/machine.c
View File

@ -331,18 +331,3 @@ const VMStateDescription vmstate_arm_cpu = {
NULL 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";
}
}