Skip to contentSkip to conversation

arm: add kvm-psci-version vcpu property

PATCH Superseded Sebastian Ott 3 participants 9 messages Nov 12, 2025 – Nov 20, 2025

Subsystems (2)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v3 cover arm: add kvm-psci-version vcpu property

This series adds a vcpu knob to request a specific PSCI version from KVM via the KVM_REG_ARM_PSCI_VERSION FW register.

The use case for this is to support migration between host kernels that differ in their default (a.k.a. most recent) PSCI version.

Note: in order to support PSCI v0.1 we need to drop vcpu initialization with KVM_CAP_ARM_PSCI_0_2 in that case. Alternatively we could limit support to versions >=0.2 .

Changes since V2 [2]:
* fix kvm_get_psci_version() when the prop is not specified - thanks Eric!
* removed the assertion in kvm_get_psci_version() so that this also works with a future kernel/psci version
* added R-B
Changes since V1 [1]:
* incorporated feedback from Peter and Eric

[1] https://lore.kernel.org/kvmarm/[email protected]/
[2] https://lore.kernel.org/kvmarm/[email protected]/

Sebastian Ott (2):
target/arm/kvm: add constants for new PSCI versions target/arm/kvm: add kvm-psci-version vcpu property

 docs/system/arm/cpu-features.rst |  5 +++
 target/arm/cpu.h                 |  6 +++
 target/arm/kvm-consts.h          |  2 +
 target/arm/kvm.c                 | 64 +++++++++++++++++++++++++++++++-
 4 files changed, 76 insertions(+), 1 deletion(-)
Signature · 1 line
2.42.0
#1 lore raw

PATCH v3 1/2 target/arm/kvm: add constants for new PSCI versions

Add constants for PSCI version 1_2 and 1_3.

---
 target/arm/kvm-consts.h | 2 ++
 1 file changed, 2 insertions(+)
target/arm/kvm-consts.h +2 -0
index 54ae5da7ce..9fba3e886d 100644
@@ -97,6 +97,8 @@ MISMATCH_CHECK(QEMU_PSCI_1_0_FN_PSCI_FEATURES, PSCI_1_0_FN_PSCI_FEATURES);
 #define QEMU_PSCI_VERSION_0_2                     0x00002
 #define QEMU_PSCI_VERSION_1_0                     0x10000
 #define QEMU_PSCI_VERSION_1_1                     0x10001
+#define QEMU_PSCI_VERSION_1_2                     0x10002
+#define QEMU_PSCI_VERSION_1_3                     0x10003
 
 MISMATCH_CHECK(QEMU_PSCI_0_2_RET_TOS_MIGRATION_NOT_REQUIRED, PSCI_0_2_TOS_MP);
 /* We don't bother to check every possible version value */
Signature · 1 line
2.42.0
#2 lore raw

PATCH v3 2/2 target/arm/kvm: add kvm-psci-version vcpu property

In reply to Sebastian Ott

Provide a kvm specific vcpu property to override the default (as of kernel v6.13 that would be PSCI v1.3) PSCI version emulated by kvm. Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3

Note: in order to support PSCI v0.1 we need to drop vcpu initialization with KVM_CAP_ARM_PSCI_0_2 in that case.

---
 docs/system/arm/cpu-features.rst |  5 +++
 target/arm/cpu.h                 |  6 +++
 target/arm/kvm.c                 | 64 +++++++++++++++++++++++++++++++-
 3 files changed, 74 insertions(+), 1 deletion(-)
docs/system/arm/cpu-features.rst +5 -0
index 37d5dfd15b..1d32ce0fee 100644
@@ -204,6 +204,11 @@ the list of KVM VCPU features and their descriptions.
   the guest scheduler behavior and/or be exposed to the guest
   userspace.
 
+``kvm-psci-version``
+  Override the default (as of kernel v6.13 that would be PSCI v1.3)
+  PSCI version emulated by the kernel. Current valid values are:
+  0.1, 0.2, 1.0, 1.1, 1.2, and 1.3
+
 TCG VCPU Features
 =================
 
target/arm/cpu.h +6 -0
index 39f2b2e54d..c2032070b7 100644
@@ -981,6 +981,12 @@ struct ArchCPU {
      */
     uint32_t psci_version;
 
+    /*
+     * Intermediate value used during property parsing.
+     * Once finalized, the value should be read from psci_version.
+     */
+    uint32_t prop_psci_version;
+
     /* Current power state, access guarded by BQL */
     ARMPSCIState power_state;
 
target/arm/kvm.c +63 -1

88 lines not on this page · raw message

Signature · 1 line
2.42.0
#3 lore raw

Re: [PATCH v3 2/2] target/arm/kvm: add kvm-psci-version vcpu property

Hi Sebastian,

Quoted 40 lines · Sebastian Ott

Provide a kvm specific vcpu property to override the default (as of kernel v6.13 that would be PSCI v1.3) PSCI version emulated by kvm. Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3

Note: in order to support PSCI v0.1 we need to drop vcpu initialization with KVM_CAP_ARM_PSCI_0_2 in that case.

---
  docs/system/arm/cpu-features.rst |  5 +++
  target/arm/cpu.h                 |  6 +++
  target/arm/kvm.c                 | 64 +++++++++++++++++++++++++++++++-
  3 files changed, 74 insertions(+), 1 deletion(-)
target/arm/kvm.c +14 -0
index 0d57081e69..e91b1abfb8 100644
@@ -484,6 +484,49 @@ static void kvm_steal_time_set(Object *obj, bool value, Error **errp)
      ARM_CPU(obj)->kvm_steal_time = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
  }
 
+struct psci_version {
+    uint32_t number;
+    const char *str;
+};
+
+static const struct psci_version psci_versions[] = {
+    { QEMU_PSCI_VERSION_0_1, "0.1" },
+    { QEMU_PSCI_VERSION_0_2, "0.2" },
+    { QEMU_PSCI_VERSION_1_0, "1.0" },
+    { QEMU_PSCI_VERSION_1_1, "1.1" },
+    { QEMU_PSCI_VERSION_1_2, "1.2" },
+    { QEMU_PSCI_VERSION_1_3, "1.3" },
+    { -1, NULL },
+};
 
 

target/arm/kvm.c void kvm_arm_add_vcpu_properties(ARMCPU *cpu) · line 556

Quoted 9 lines
target/arm/kvm.c +6 -0
@@ -505,6 +548,12 @@ void kvm_arm_add_vcpu_properties(ARMCPU *cpu)
                               kvm_steal_time_set);
      object_property_set_description(obj, "kvm-steal-time",
                                      "Set off to disable KVM steal time.");
+
+    object_property_add_str(obj, "kvm-psci-version", kvm_get_psci_version,
+                            kvm_set_psci_version);
+    object_property_set_description(obj, "kvm-psci-version",
+                                    "Set PSCI version. "
+                                    "Valid values are 0.1, 0.2, 1.0, 1.1, 1.2, 1.3");

Could we enumerate from psci_versions[] here?

target/arm/kvm.c void kvm_arm_add_vcpu_properties(ARMCPU *cpu) · line 557

Quoted 1 line
target/arm/kvm.c +0 -0
  }

Thanks,

Phil.

#4 lore raw

Re: [PATCH v3 2/2] target/arm/kvm: add kvm-psci-version vcpu property

Hi Philippe,

Quoted 56 lines · Philippe Mathieu-Daudé
Quoted 41 lines · Sebastian Ott

Provide a kvm specific vcpu property to override the default (as of kernel v6.13 that would be PSCI v1.3) PSCI version emulated by kvm. Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3

Note: in order to support PSCI v0.1 we need to drop vcpu initialization with KVM_CAP_ARM_PSCI_0_2 in that case.

---

   docs/system/arm/cpu-features.rst |  5 +++
   target/arm/cpu.h                 |  6 +++
   target/arm/kvm.c                 | 64 +++++++++++++++++++++++++++++++-
   3 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 0d57081e69..e91b1abfb8 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -484,6 +484,49 @@ static void kvm_steal_time_set(Object *obj, bool value, Error **errp)

       ARM_CPU(obj)->kvm_steal_time = value ? ON_OFF_AUTO_ON :
   ON_OFF_AUTO_OFF;
   }

+struct psci_version {
+ uint32_t number;
+ const char *str;
+};
+
+static const struct psci_version psci_versions[] = {

 +    { QEMU_PSCI_VERSION_0_1, "0.1" },
 +    { QEMU_PSCI_VERSION_0_2, "0.2" },
 +    { QEMU_PSCI_VERSION_1_0, "1.0" },
 +    { QEMU_PSCI_VERSION_1_1, "1.1" },
 +    { QEMU_PSCI_VERSION_1_2, "1.2" },
 +    { QEMU_PSCI_VERSION_1_3, "1.3" },
 +    { -1, NULL },

+};

Quoted 13 lines

@@ -505,6 +548,12 @@ void kvm_arm_add_vcpu_properties(ARMCPU *cpu)
kvm_steal_time_set);
object_property_set_description(obj, "kvm-steal-time",
"Set off to disable KVM steal
time.");
+
+ object_property_add_str(obj, "kvm-psci-version",
kvm_get_psci_version,
+ kvm_set_psci_version);
+ object_property_set_description(obj, "kvm-psci-version",
+ "Set PSCI version. "
+ "Valid values are 0.1, 0.2, 1.0, 1.1,
1.2, 1.3");

Quoted 2 lines

Could we enumerate from psci_versions[] here?

Hm, we'd need to concatenate these. Either manually:
"Valid values are " psci_versions[0].str ", " psci_versions[1].str ", " ... which is not pretty and still needs to be touched for a new version.

Or by a helper function that puts these in a new array and uses smth like g_strjoinv(", ", array);
But that's quite a bit of extra code that needs to be maintained without much gain.

Or we shy away from the issue and rephrase that to:
"Valid values include 1.0, 1.1, 1.2, 1.3"

Since the intended use case is via machine types and I don't expect a lot of users setting the psci version manually - I vote for option 3.

Opinions?

Sebastian

#5 lore raw

Re: [PATCH v3 2/2] target/arm/kvm: add kvm-psci-version vcpu property

Quoted 69 lines · Sebastian Ott

Hi Philippe,

Quoted 58 lines · Philippe Mathieu-Daudé
Quoted 42 lines · Sebastian Ott

 Provide a kvm specific vcpu property to override the default (as of kernel v6.13 that would be PSCI v1.3) PSCI version emulated by kvm. Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3

 Note: in order to support PSCI v0.1 we need to drop vcpu initialization with KVM_CAP_ARM_PSCI_0_2 in that case.

 ---
   docs/system/arm/cpu-features.rst |  5 +++
   target/arm/cpu.h                 |  6 +++
   target/arm/kvm.c                 | 64
+++++++++++++++++++++++++++++++-

   3 files changed, 74 insertions(+), 1 deletion(-)

 diff --git a/target/arm/kvm.c b/target/arm/kvm.c
 index 0d57081e69..e91b1abfb8 100644
 --- a/target/arm/kvm.c
 +++ b/target/arm/kvm.c
 @@ -484,6 +484,49 @@ static void kvm_steal_time_set(Object *obj, bool value, Error **errp)
       ARM_CPU(obj)->kvm_steal_time = value ? ON_OFF_AUTO_ON :
   ON_OFF_AUTO_OFF;
   }

 +struct psci_version {
 +    uint32_t number;
 +    const char *str;
 +};
 +
 +static const struct psci_version psci_versions[] = { +    { QEMU_PSCI_VERSION_0_1, "0.1" },
 +    { QEMU_PSCI_VERSION_0_2, "0.2" },
 +    { QEMU_PSCI_VERSION_1_0, "1.0" },
 +    { QEMU_PSCI_VERSION_1_1, "1.1" },
 +    { QEMU_PSCI_VERSION_1_2, "1.2" },
 +    { QEMU_PSCI_VERSION_1_3, "1.3" },
 +    { -1, NULL },
 +};

Quoted 14 lines

 @@ -505,6 +548,12 @@ void kvm_arm_add_vcpu_properties(ARMCPU *cpu) kvm_steal_time_set); object_property_set_description(obj, "kvm-steal-time", "Set off to disable KVM steal time.");
 +
 +    object_property_add_str(obj, "kvm-psci-version", kvm_get_psci_version,
 +                            kvm_set_psci_version);
 +    object_property_set_description(obj, "kvm-psci-version", +                                    "Set PSCI version. " +                                    "Valid values are 0.1, 0.2, 1.0, 1.1,
 1.2, 1.3");

Quoted 2 lines

Could we enumerate from psci_versions[] here?

Hm, we'd need to concatenate these. Either manually:
"Valid values are " psci_versions[0].str ", " psci_versions[1].str ", " ... which is not pretty and still needs to be touched for a new version.

Quoted 7 lines

Or by a helper function that puts these in a new array and uses smth like g_strjoinv(", ", array);
But that's quite a bit of extra code that needs to be maintained without much gain.

Or we shy away from the issue and rephrase that to:
"Valid values include 1.0, 1.1, 1.2, 1.3"

Personally I would vote for keeping it as is (by the way why did you moit 0.1 and 0.2 above?)

Eric

Quoted 7 lines

Since the intended use case is via machine types and I don't expect a lot of users setting the psci version manually - I vote for option 3.

Opinions?

Sebastian

#6 lore raw

Re: [PATCH v3 2/2] target/arm/kvm: add kvm-psci-version vcpu property

Quoted 72 lines · Eric Auger
Quoted 69 lines · Sebastian Ott

Hi Philippe,

Quoted 58 lines · Philippe Mathieu-Daudé
Quoted 42 lines · Sebastian Ott

 Provide a kvm specific vcpu property to override the default (as of kernel v6.13 that would be PSCI v1.3) PSCI version emulated by kvm. Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3

 Note: in order to support PSCI v0.1 we need to drop vcpu initialization with KVM_CAP_ARM_PSCI_0_2 in that case.

 ---

    docs/system/arm/cpu-features.rst |  5 +++
    target/arm/cpu.h                 |  6 +++
    target/arm/kvm.c                 | 64
+++++++++++++++++++++++++++++++-
    3 files changed, 74 insertions(+), 1 deletion(-)

 diff --git a/target/arm/kvm.c b/target/arm/kvm.c
 index 0d57081e69..e91b1abfb8 100644
 --- a/target/arm/kvm.c
 +++ b/target/arm/kvm.c
 @@ -484,6 +484,49 @@ static void kvm_steal_time_set(Object *obj, bool value, Error **errp)
       ARM_CPU(obj)->kvm_steal_time = value ? ON_OFF_AUTO_ON :
   ON_OFF_AUTO_OFF;
   }

 +struct psci_version {
 +    uint32_t number;
 +    const char *str;
 +};
 +
 +static const struct psci_version psci_versions[] = { +    { QEMU_PSCI_VERSION_0_1, "0.1" },
 +    { QEMU_PSCI_VERSION_0_2, "0.2" },
 +    { QEMU_PSCI_VERSION_1_0, "1.0" },
 +    { QEMU_PSCI_VERSION_1_1, "1.1" },
 +    { QEMU_PSCI_VERSION_1_2, "1.2" },
 +    { QEMU_PSCI_VERSION_1_3, "1.3" },
 +    { -1, NULL },
 +};

Quoted 14 lines

 @@ -505,6 +548,12 @@ void kvm_arm_add_vcpu_properties(ARMCPU *cpu) kvm_steal_time_set); object_property_set_description(obj, "kvm-steal-time", "Set off to disable KVM steal time.");
 +
 +    object_property_add_str(obj, "kvm-psci-version", kvm_get_psci_version,
 +                            kvm_set_psci_version);
 +    object_property_set_description(obj, "kvm-psci-version", +                                    "Set PSCI version. " +                                    "Valid values are 0.1, 0.2,
1.0, 1.1,
 1.2, 1.3");

Quoted 2 lines

Could we enumerate from psci_versions[] here?

Hm, we'd need to concatenate these. Either manually:
"Valid values are " psci_versions[0].str ", " psci_versions[1].str ", " ... which is not pretty and still needs to be touched for a new version.

Quoted 8 lines
Quoted 7 lines

Or by a helper function that puts these in a new array and uses smth like g_strjoinv(", ", array);
But that's quite a bit of extra code that needs to be maintained without much gain.

Or we shy away from the issue and rephrase that to:
"Valid values include 1.0, 1.1, 1.2, 1.3"

Personally I would vote for keeping it as is

OK.

Quoted 12 lines

(by the way why did you
moit 0.1 and 0.2 above?)

Eric

Quoted 7 lines

Since the intended use case is via machine types and I don't expect a lot of users setting the psci version manually - I vote for option 3.

Opinions?

Sebastian

#7 lore raw

Re: [PATCH v3 2/2] target/arm/kvm: add kvm-psci-version vcpu property

In reply to Eric Auger
Quoted 70 lines · Eric Auger
Quoted 69 lines · Sebastian Ott

Hi Philippe,

Quoted 58 lines · Philippe Mathieu-Daudé
Quoted 42 lines · Sebastian Ott

 Provide a kvm specific vcpu property to override the default (as of kernel v6.13 that would be PSCI v1.3) PSCI version emulated by kvm. Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3

 Note: in order to support PSCI v0.1 we need to drop vcpu initialization with KVM_CAP_ARM_PSCI_0_2 in that case.

 ---
   docs/system/arm/cpu-features.rst |  5 +++
   target/arm/cpu.h                 |  6 +++
   target/arm/kvm.c                 | 64
+++++++++++++++++++++++++++++++-

   3 files changed, 74 insertions(+), 1 deletion(-)

 diff --git a/target/arm/kvm.c b/target/arm/kvm.c
 index 0d57081e69..e91b1abfb8 100644
 --- a/target/arm/kvm.c
 +++ b/target/arm/kvm.c
 @@ -484,6 +484,49 @@ static void kvm_steal_time_set(Object *obj, bool value, Error **errp)
       ARM_CPU(obj)->kvm_steal_time = value ? ON_OFF_AUTO_ON :
   ON_OFF_AUTO_OFF;
   }

 +struct psci_version {
 +    uint32_t number;
 +    const char *str;
 +};
 +
 +static const struct psci_version psci_versions[] = { +    { QEMU_PSCI_VERSION_0_1, "0.1" },
 +    { QEMU_PSCI_VERSION_0_2, "0.2" },
 +    { QEMU_PSCI_VERSION_1_0, "1.0" },
 +    { QEMU_PSCI_VERSION_1_1, "1.1" },
 +    { QEMU_PSCI_VERSION_1_2, "1.2" },
 +    { QEMU_PSCI_VERSION_1_3, "1.3" },
 +    { -1, NULL },
 +};

Quoted 14 lines

 @@ -505,6 +548,12 @@ void kvm_arm_add_vcpu_properties(ARMCPU *cpu) kvm_steal_time_set); object_property_set_description(obj, "kvm-steal-time", "Set off to disable KVM steal time.");
 +
 +    object_property_add_str(obj, "kvm-psci-version", kvm_get_psci_version,
 +                            kvm_set_psci_version);
 +    object_property_set_description(obj, "kvm-psci-version", +                                    "Set PSCI version. " +                                    "Valid values are 0.1, 0.2, 1.0, 1.1,
 1.2, 1.3");

Quoted 2 lines

Could we enumerate from psci_versions[] here?

Hm, we'd need to concatenate these. Either manually:
"Valid values are " psci_versions[0].str ", " psci_versions[1].str ", " ... which is not pretty and still needs to be touched for a new version.

Quoted 8 lines
Quoted 7 lines

Or by a helper function that puts these in a new array and uses smth like g_strjoinv(", ", array);
But that's quite a bit of extra code that needs to be maintained without much gain.

Or we shy away from the issue and rephrase that to:
"Valid values include 1.0, 1.1, 1.2, 1.3"

Personally I would vote for keeping it as is

OK, thanks!

Quoted 2 lines

(by the way why did you
moit 0.1 and 0.2 above?)

Just to clarify that this is an incomplete list of possible values that we don't have to change when a new psci version is introduced.

Sebastian

Reviewed-by on v3 2/2
#8 lore raw

Re: [PATCH v3 2/2] target/arm/kvm: add kvm-psci-version vcpu property

In reply to Sebastian Ott

Hi Sebastian,

Quoted 35 lines · Sebastian Ott

Provide a kvm specific vcpu property to override the default (as of kernel v6.13 that would be PSCI v1.3) PSCI version emulated by kvm. Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3

Note: in order to support PSCI v0.1 we need to drop vcpu initialization with KVM_CAP_ARM_PSCI_0_2 in that case.

---
 docs/system/arm/cpu-features.rst |  5 +++
 target/arm/cpu.h                 |  6 +++
 target/arm/kvm.c                 | 64 +++++++++++++++++++++++++++++++-
 3 files changed, 74 insertions(+), 1 deletion(-)
docs/system/arm/cpu-features.rst +5 -0
index 37d5dfd15b..1d32ce0fee 100644
@@ -204,6 +204,11 @@ the list of KVM VCPU features and their descriptions.
   the guest scheduler behavior and/or be exposed to the guest
   userspace.
 
+``kvm-psci-version``
+  Override the default (as of kernel v6.13 that would be PSCI v1.3)
+  PSCI version emulated by the kernel. Current valid values are:
+  0.1, 0.2, 1.0, 1.1, 1.2, and 1.3
+
 TCG VCPU Features
 =================
 
target/arm/cpu.h +0 -0
index 39f2b2e54d..c2032070b7 100644

target/arm/cpu.h struct ArchCPU { · line 988

Quoted 8 lines
target/arm/cpu.h +5 -0
@@ -981,6 +981,12 @@ struct ArchCPU {
      */
     uint32_t psci_version;
 
+    /*
+     * Intermediate value used during property parsing.
+     * Once finalized, the value should be read from psci_version.
+     */
+    uint32_t prop_psci_version;

nit: as it is a kvm only thingy, could could rename it with kvm_ prefix and move this along with the other kvm_* elements

Quoted 90 lines
target/arm/cpu.h +1 -0
+
     /* Current power state, access guarded by BQL */
     ARMPSCIState power_state;
 
target/arm/kvm.c +56 -1
index 0d57081e69..e91b1abfb8 100644
@@ -484,6 +484,49 @@ static void kvm_steal_time_set(Object *obj, bool value, Error **errp)
     ARM_CPU(obj)->kvm_steal_time = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
 }
 
+struct psci_version {
+    uint32_t number;
+    const char *str;
+};
+
+static const struct psci_version psci_versions[] = {
+    { QEMU_PSCI_VERSION_0_1, "0.1" },
+    { QEMU_PSCI_VERSION_0_2, "0.2" },
+    { QEMU_PSCI_VERSION_1_0, "1.0" },
+    { QEMU_PSCI_VERSION_1_1, "1.1" },
+    { QEMU_PSCI_VERSION_1_2, "1.2" },
+    { QEMU_PSCI_VERSION_1_3, "1.3" },
+    { -1, NULL },
+};
+
+static char *kvm_get_psci_version(Object *obj, Error **errp)
+{
+    ARMCPU *cpu = ARM_CPU(obj);
+    const struct psci_version *ver;
+
+    for (ver = psci_versions; ver->number != -1; ver++) {
+        if (ver->number == cpu->psci_version)
+            return g_strdup(ver->str);
+    }
+
+    return g_strdup_printf("Unknown PSCI-version: %x", cpu->psci_version);
+}
+
+static void kvm_set_psci_version(Object *obj, const char *value, Error **errp)
+{
+    ARMCPU *cpu = ARM_CPU(obj);
+    const struct psci_version *ver;
+
+    for (ver = psci_versions; ver->number != -1; ver++) {
+        if (!strcmp(value, ver->str)) {
+            cpu->prop_psci_version = ver->number;
+            return;
+        }
+    }
+
+    error_setg(errp, "Invalid PSCI-version value");
+}
+
 /* KVM VCPU properties should be prefixed with "kvm-". */
 void kvm_arm_add_vcpu_properties(ARMCPU *cpu)
 {
@@ -505,6 +548,12 @@ void kvm_arm_add_vcpu_properties(ARMCPU *cpu)
                              kvm_steal_time_set);
     object_property_set_description(obj, "kvm-steal-time",
                                     "Set off to disable KVM steal time.");
+
+    object_property_add_str(obj, "kvm-psci-version", kvm_get_psci_version,
+                            kvm_set_psci_version);
+    object_property_set_description(obj, "kvm-psci-version",
+                                    "Set PSCI version. "
+                                    "Valid values are 0.1, 0.2, 1.0, 1.1, 1.2, 1.3");
 }
 
 bool kvm_arm_pmu_supported(void)
@@ -1959,7 +2008,12 @@ int kvm_arch_init_vcpu(CPUState *cs)
     if (cs->start_powered_off) {
         cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_POWER_OFF;
     }
-    if (kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) {
+    if (cpu->prop_psci_version != QEMU_PSCI_VERSION_0_1 &&
+        kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) {
+        /*
+         * Versions >= v0.2 are backward compatible with v0.2
+         * omit the feature flag for v0.1 .
+         */
         cpu->psci_version = QEMU_PSCI_VERSION_0_2;
         cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_PSCI_0_2;
     }
@@ -1998,6 +2052,14 @@ int kvm_arch_init_vcpu(CPUState *cs)
         }
     }
 
+    if (cpu->prop_psci_version) {

target/arm/kvm.c int kvm_arch_init_vcpu(CPUState *cs) · line 2065

Quoted 10 lines
target/arm/kvm.c +7 -0
+        psciver = cpu->prop_psci_version;
+        ret = kvm_set_one_reg(cs, KVM_REG_ARM_PSCI_VERSION, &psciver);
+        if (ret) {
+            error_report("PSCI version %"PRIx64" is not supported by KVM", psciver);
+            return ret;
+        }
+    }
     /*
      * KVM reports the exact PSCI version it is implementing via a
      * special sysreg. If it is present, use its contents to determine

Besides it looks good to me.

Eric