Message ID | 1399898246-4831-5-git-send-email-pranavkumar@linaro.org |
---|---|
State | New |
Headers | show |
On 12 May 2014 13:37, Pranavkumar Sawargaonkar <pranavkumar@linaro.org> wrote: > We require to check whether PSCI v0.2 capability is available or > not in hw/arm/virt.c such that it compiles for both KVM and TCG QEMU. > > This patch adds PSCI v0.2 capability #define in target-arm/kvm-const.h > so that it is available for both KVM and TCG QEMU. > > Signed-off-by: Pranavkumar Sawargaonkar <pranavkumar@linaro.org> > Signed-off-by: Anup Patel <anup.patel@linaro.org> > --- > target-arm/kvm-consts.h | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/target-arm/kvm-consts.h b/target-arm/kvm-consts.h > index 6009a33..b5f9a20 100644 > --- a/target-arm/kvm-consts.h > +++ b/target-arm/kvm-consts.h > @@ -110,6 +110,11 @@ MISMATCH_CHECK(CP_REG_ARM64_SYSREG_OP2_MASK, KVM_REG_ARM64_SYSREG_OP2_MASK) > MISMATCH_CHECK(CP_REG_ARM64_SYSREG_OP2_SHIFT, KVM_REG_ARM64_SYSREG_OP2_SHIFT) > #endif > > +/* KVM ARM/ARM64 specific capabilities */ > +#define QEMU_KVM_CAP_ARM_PSCI_0_2 102 > + > +MISMATCH_CHECK(QEMU_KVM_CAP_ARM_PSCI_0_2, KVM_CAP_ARM_PSCI_0_2) > + > #undef MISMATCH_CHECK > > #endif > -- > 1.7.9.5 If you follow my suggestion for how to determine which PSCI DT node to emit in my review comments on patch 8, you'll find that this patch is now unnecessary. thanks -- PMM
diff --git a/target-arm/kvm-consts.h b/target-arm/kvm-consts.h index 6009a33..b5f9a20 100644 --- a/target-arm/kvm-consts.h +++ b/target-arm/kvm-consts.h @@ -110,6 +110,11 @@ MISMATCH_CHECK(CP_REG_ARM64_SYSREG_OP2_MASK, KVM_REG_ARM64_SYSREG_OP2_MASK) MISMATCH_CHECK(CP_REG_ARM64_SYSREG_OP2_SHIFT, KVM_REG_ARM64_SYSREG_OP2_SHIFT) #endif +/* KVM ARM/ARM64 specific capabilities */ +#define QEMU_KVM_CAP_ARM_PSCI_0_2 102 + +MISMATCH_CHECK(QEMU_KVM_CAP_ARM_PSCI_0_2, KVM_CAP_ARM_PSCI_0_2) + #undef MISMATCH_CHECK #endif