ppc/spapr-caps: Change migration macro to take full spapr-cap name
PATCH v2 1/3 ppc/spapr-caps: Change migration macro to take full spapr-cap name
Change the macro that generates the vmstate migration field and the needed function for the spapr-caps to take the full spapr-cap name. This has the benefit of meaning this instance will be picked up when greping for the spapr-caps and making it more obvious what this macro is doing.
--- hw/ppc/spapr_caps.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
hw/ppc/spapr_caps.c +15 -15
@@ -350,34 +350,34 @@ int spapr_caps_post_migration(sPAPRMachineState *spapr) }/* Used to generate the migration field and needed function for a spapr cap */ -#define SPAPR_CAP_MIG_STATE (cap, ccap) \ -static bool spapr_cap_##cap##_needed(void *opaque) \ +#define SPAPR_CAP_MIG_STATE (sname, cap) \ +static bool spapr_cap_##sname##_needed(void *opaque) \ { \ sPAPRMachineState *spapr = opaque; \ \ - return spapr->cmd_line_caps[SPAPR_CAP_##ccap] && \ - (spapr->eff.caps[SPAPR_CAP_##ccap] != \ - spapr->def.caps[SPAPR_CAP_##ccap]); \ + return spapr->cmd_line_caps[cap] && \ + (spapr->eff.caps[cap] != \ + spapr->def.caps[cap]); \ } \ \ -const VMStateDescription vmstate_spapr_cap_##cap = { \ - .name = "spapr/cap/" #cap, \ +const VMStateDescription vmstate_spapr_cap_##sname = { \ + .name = "spapr/cap/" #sname, \ .version_id = 1, \ .minimum_version_id = 1, \ - .needed = spapr_cap_##cap##_needed, \ + .needed = spapr_cap_##sname##_needed, \ .fields = (VMStateField[]) { \ - VMSTATE_UINT8(mig.caps[SPAPR_CAP_##ccap], \ + VMSTATE_UINT8(mig.caps[cap], \ sPAPRMachineState), \ VMSTATE_END_OF_LIST() \ }, \ } -SPAPR_CAP_MIG_STATE (htm,HTM ); -SPAPR_CAP_MIG_STATE (vsx,VSX ); -SPAPR_CAP_MIG_STATE (dfp,DFP ); -SPAPR_CAP_MIG_STATE (cfpc,CFPC ); -SPAPR_CAP_MIG_STATE (sbbc,SBBC ); -SPAPR_CAP_MIG_STATE (ibs,IBS ); +SPAPR_CAP_MIG_STATE (htm,SPAPR_CAP_HTM ); +SPAPR_CAP_MIG_STATE (vsx,SPAPR_CAP_VSX ); +SPAPR_CAP_MIG_STATE (dfp,SPAPR_CAP_DFP ); +SPAPR_CAP_MIG_STATE (cfpc,SPAPR_CAP_CFPC ); +SPAPR_CAP_MIG_STATE (sbbc,SPAPR_CAP_SBBC ); +SPAPR_CAP_MIG_STATE (ibs,SPAPR_CAP_IBS );void spapr_caps_reset (sPAPRMachineState *spapr) {
Signature · 1 line
2.13.6
PATCH v2 2/3 ppc/spapr-caps: Convert spapr-cap-ibs to be a boolean
The spapr-cap cap-ibs can only have values broken or fixed as there is no workaround. Currently setting the value workaround will hit an assert if the guest makes the hcall h_get_cpu_characteristics.
Thus this capability is better suited to being represented as a boolean. Setting this to OFF corresponds to the old BROKEN, that is no indirect branch serialisation. Setting this to ON corresponds to the old FIXED, that is indirect branches are serialised.
--- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_caps.c | 12 ++++++------ target/ppc/kvm.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
hw/ppc/spapr.c +1 -1
@@ -3886,7 +3886,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) smc->default_caps.caps[SPAPR_CAP_DFP ] =SPAPR_CAP_ON ; smc->default_caps.caps[SPAPR_CAP_CFPC ] =SPAPR_CAP_BROKEN ; smc->default_caps.caps[SPAPR_CAP_SBBC ] =SPAPR_CAP_BROKEN ; - smc->default_caps.caps[SPAPR_CAP_IBS ] =SPAPR_CAP_BROKEN ; + smc->default_caps.caps[SPAPR_CAP_IBS ] =SPAPR_CAP_OFF ;spapr_caps_add_properties (smc, &error_abort); }
hw/ppc/spapr_caps.c +6 -6
@@ -207,9 +207,9 @@ static void cap_safe_indirect_branch_apply(sPAPRMachineState *spapr, {if (tcg_enabled () && val) {/* TODO - for now only allow broken for TCG */ -error_setg (errp,"Requested safe indirect branch capability level not supported by tcg, try a different value for cap-ibs" ); +error_setg (errp,"Indirect Branch Serialisation support not available, try cap-ibs=off" ); }else if (kvm_enabled () && (val >kvmppc_get_cap_safe_indirect_branch ())) { -error_setg (errp,"Requested safe indirect branch capability level not supported by kvm, try a different value for cap-ibs" ); +error_setg (errp,"Indirect Branch Serialisation support not available, try cap-ibs=off" ); } }
@@ -263,11 +263,11 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = { }, [SPAPR_CAP_IBS ] = { .name ="ibs" , - .description ="Indirect Branch Serialisation" VALUE_DESC_TRISTATE , + .description ="Indirect Branch Serialisation" , .index =SPAPR_CAP_IBS , - .get = spapr_cap_get_tristate, - .set = spapr_cap_set_tristate, - .type ="string" , + .get = spapr_cap_get_bool, + .set = spapr_cap_set_bool, + .type ="bool" , .apply = cap_safe_indirect_branch_apply, }, };
target/ppc/kvm.c +1 -1
@@ -2495,7 +2495,7 @@ static void kvmppc_get_cpu_characteristics(KVMState *s) }/* Parse and set cap_ppc_safe_indirect_branch */ if (c.character &H_CPU_CHAR_BCCTRL_SERIALISED ) { - cap_ppc_safe_indirect_branch =2 ; + cap_ppc_safe_indirect_branch =1 ; } }
Signature · 1 line
2.13.6
Re: [Qemu-devel] [Qemu-ppc] [QEMU-PPC] [PATCH V2 2/3] ppc/spapr-caps: Convert spapr-cap-ibs to be a boolean
Quoted 4 lines · On Wed, 14 Feb 2018 17:51:34 +1100 Suraj Jitindar Singh…
The spapr-cap cap-ibs can only have values broken or fixed as there is no workaround. Currently setting the value workaround will hit an assert if the guest makes the hcall
h_get_cpu_characteristics.
Quoted 8 lines
Thus this capability is better suited to being represented as a boolean. Setting this to OFF corresponds to the old BROKEN, that is no indirect branch serialisation. Setting this to ON corresponds to the old FIXED, that is indirect branches are serialised.
Reported-by Satheesh Rajendran <[email protected]>Signed-off-by Suraj Jitindar Singh <[email protected]>---
Quoted 63 lines
hw/ppc/spapr.c | 2 +- hw/ppc/spapr_caps.c | 12 ++++++------ target/ppc/kvm.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)hw/ppc/spapr.c +1
-1@@ -3886,7 +3886,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) smc->default_caps.caps[SPAPR_CAP_DFP ] =SPAPR_CAP_ON ; smc->default_caps.caps[SPAPR_CAP_CFPC ] =SPAPR_CAP_BROKEN ; smc->default_caps.caps[SPAPR_CAP_SBBC ] =SPAPR_CAP_BROKEN ; - smc->default_caps.caps[SPAPR_CAP_IBS ] =SPAPR_CAP_BROKEN ; + smc->default_caps.caps[SPAPR_CAP_IBS ] =SPAPR_CAP_OFF ;spapr_caps_add_properties (smc, &error_abort); }hw/ppc/spapr_caps.c +6
-6@@ -207,9 +207,9 @@ static void cap_safe_indirect_branch_apply(sPAPRMachineState *spapr, {if (tcg_enabled () && val) {/* TODO - for now only allow broken for TCG */ -error_setg (errp,"Requested safe indirect branch capability level not supported by tcg, try a different value for cap-ibs" ); +error_setg (errp,"Indirect Branch Serialisation support not available, try cap-ibs=off" ); }else if (kvm_enabled () && (val >kvmppc_get_cap_safe_indirect_branch ())) { -error_setg (errp,"Requested safe indirect branch capability level not supported by kvm, try a different value for cap-ibs" ); +error_setg (errp,"Indirect Branch Serialisation support not available, try cap-ibs=off" ); } }@@ -263,11 +263,11 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = { }, [SPAPR_CAP_IBS ] = { .name ="ibs" , - .description ="Indirect Branch Serialisation" VALUE_DESC_TRISTATE , + .description ="Indirect Branch Serialisation" , .index =SPAPR_CAP_IBS , - .get = spapr_cap_get_tristate, - .set = spapr_cap_set_tristate, - .type ="string" , + .get = spapr_cap_get_bool, + .set = spapr_cap_set_bool, + .type ="bool" , .apply = cap_safe_indirect_branch_apply, }, };target/ppc/kvm.c +1
-1@@ -2495,7 +2495,7 @@ static void kvmppc_get_cpu_characteristics(KVMState *s) }/* Parse and set cap_ppc_safe_indirect_branch */ if (c.character &H_CPU_CHAR_BCCTRL_SERIALISED ) { - cap_ppc_safe_indirect_branch =2 ; + cap_ppc_safe_indirect_branch =1 ; } }
PATCH v2 3/3 ppc/spapr-caps: For pseries-2.12 change spapr-cap defaults
In reply to Suraj Jitindar SinghFor the pseries-2.12 machine type, make the spapr-caps SPAPR_CAP_CFPC and SPAPR_CAP_SBBC default to workaround. Thus if the host is capable the guest will be able to take advantage of these workarounds by default. Otherwise if the host doesn't have these capabilities qemu will fail to start and they will have to be explicitly disabled on the command line with:
-machine pseries,cap-cfpc=broken,cap-sbbc=broken
--- hw/ppc/spapr.c | 11 ++++++++++- hw/ppc/spapr_caps.c | 10 ++++++++++ include/hw/compat.h | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-)
hw/ppc/spapr.c +10 -1
@@ -3941,13 +3941,20 @@ static const TypeInfo spapr_machine_info = {/* * pseries-2.12 */ +#define SPAPR_COMPAT_2_12 \ + HW_COMPAT_2_12 +static void spapr_machine_2_12_instance_options (MachineState *machine) { }static void spapr_machine_2_12_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +sPAPRMachineClass *smc =SPAPR_MACHINE_CLASS (mc); + + smc->default_caps.caps[SPAPR_CAP_CFPC ] =SPAPR_CAP_WORKAROUND ; + smc->default_caps.caps[SPAPR_CAP_SBBC ] =SPAPR_CAP_WORKAROUND ; +SET_MACHINE_COMPAT (mc,SPAPR_COMPAT_2_12 ); } DEFINE_SPAPR_MACHINE(2_12, "2.12", true);
@@ -3969,6 +3976,8 @@ static void spapr_machine_2_11_class_options(MachineClass *mc)spapr_machine_2_12_class_options (mc); smc->default_caps.caps[SPAPR_CAP_HTM ] =SPAPR_CAP_ON ; + smc->default_caps.caps[SPAPR_CAP_CFPC ] =SPAPR_CAP_BROKEN ; + smc->default_caps.caps[SPAPR_CAP_SBBC ] =SPAPR_CAP_BROKEN ;SET_MACHINE_COMPAT (mc,SPAPR_COMPAT_2_11 ); }
hw/ppc/spapr_caps.c +10 -0
@@ -281,11 +281,21 @@ static sPAPRCapabilities default_caps_with_cpu(sPAPRMachineState *spapr, caps = smc->default_caps; +if (!ppc_check_compat (cpu,CPU_POWERPC_LOGICAL_3_00 , +0 , spapr->max_compat_pvr)) { + caps.caps[SPAPR_CAP_CFPC ] =SPAPR_CAP_BROKEN ; + } +if (!ppc_check_compat (cpu,CPU_POWERPC_LOGICAL_2_07 ,0 , spapr->max_compat_pvr)) { caps.caps[SPAPR_CAP_HTM ] =SPAPR_CAP_OFF ; } +if (!ppc_check_compat (cpu,CPU_POWERPC_LOGICAL_2_06_PLUS , +0 , spapr->max_compat_pvr)) { + caps.caps[SPAPR_CAP_SBBC ] =SPAPR_CAP_BROKEN ; + } +if (!ppc_check_compat (cpu,CPU_POWERPC_LOGICAL_2_06 ,0 , spapr->max_compat_pvr)) { caps.caps[SPAPR_CAP_VSX ] =SPAPR_CAP_OFF ;
include/hw/compat.h +2 -0
@@ -1,6 +1,8 @@#ifndef HW_COMPAT_H #define HW_COMPAT_H +#define HW_COMPAT_2_12 +#define HW_COMPAT_2_11 \ {\ .driver = "hpet",\
Signature · 1 line
2.13.6
Re: [Qemu-devel] [Qemu-ppc] [QEMU-PPC] [PATCH V2 3/3] ppc/spapr-caps: For pseries-2.12 change spapr-cap defaults
Quoted 27 lines · On Wed, 14 Feb 2018 17:51:35 +1100 Suraj Jitindar Singh…
For the pseries-2.12 machine type, make the spapr-caps
SPAPR_CAP_CFPCandSPAPR_CAP_SBBCdefault to workaround. Thus if the host is capable the guest will be able to take advantage of these workarounds by default. Otherwise if the host doesn't have these capabilities qemu will fail to start and they will have to be explicitly disabled on the command line with:
-machine pseries,cap-cfpc=broken,cap-sbbc=brokenSigned-off-by Suraj Jitindar Singh <[email protected]>--- hw/ppc/spapr.c | 11 ++++++++++- hw/ppc/spapr_caps.c | 10 ++++++++++ include/hw/compat.h | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-)hw/ppc/spapr.c +3
-0@@ -3941,13 +3941,20 @@ static const TypeInfo spapr_machine_info = {/* * pseries-2.12 */ +#define SPAPR_COMPAT_2_12 \ + HW_COMPAT_2_12 +static void spapr_machine_2_12_instance_options (MachineState *machine)
hw/ppc/spapr.c static const TypeInfo spapr_machine_info = { · line 3956
Quoted 10 lines
hw/ppc/spapr.c +4
-1{ }static void spapr_machine_2_12_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +sPAPRMachineClass *smc =SPAPR_MACHINE_CLASS (mc); + + smc->default_caps.caps[SPAPR_CAP_CFPC ] =SPAPR_CAP_WORKAROUND ; + smc->default_caps.caps[SPAPR_CAP_SBBC ] =SPAPR_CAP_WORKAROUND ;
As written in the comment, the default for the latest machine type should be set at the base class level, in spapr_machine_class_init()... not sure to understand why you set it here...
hw/ppc/spapr.c static const TypeInfo spapr_machine_info = { · line 3957
Quoted 1 line
hw/ppc/spapr.c +1
-0+SET_MACHINE_COMPAT (mc,SPAPR_COMPAT_2_12 );
And so, you shouldn't need to setup 2.12 compat mode before 2.12 was even released :)
Quoted 51 lines
hw/ppc/spapr.c +2
-0} DEFINE_SPAPR_MACHINE(2_12, "2.12", true);@@ -3969,6 +3976,8 @@ static void spapr_machine_2_11_class_options(MachineClass *mc)spapr_machine_2_12_class_options (mc); smc->default_caps.caps[SPAPR_CAP_HTM ] =SPAPR_CAP_ON ; + smc->default_caps.caps[SPAPR_CAP_CFPC ] =SPAPR_CAP_BROKEN ; + smc->default_caps.caps[SPAPR_CAP_SBBC ] =SPAPR_CAP_BROKEN ;SET_MACHINE_COMPAT (mc,SPAPR_COMPAT_2_11 ); }hw/ppc/spapr_caps.c +10
-0@@ -281,11 +281,21 @@ static sPAPRCapabilities default_caps_with_cpu(sPAPRMachineState *spapr, caps = smc->default_caps; +if (!ppc_check_compat (cpu,CPU_POWERPC_LOGICAL_3_00 , +0 , spapr->max_compat_pvr)) { + caps.caps[SPAPR_CAP_CFPC ] =SPAPR_CAP_BROKEN ; + } +if (!ppc_check_compat (cpu,CPU_POWERPC_LOGICAL_2_07 ,0 , spapr->max_compat_pvr)) { caps.caps[SPAPR_CAP_HTM ] =SPAPR_CAP_OFF ; } +if (!ppc_check_compat (cpu,CPU_POWERPC_LOGICAL_2_06_PLUS , +0 , spapr->max_compat_pvr)) { + caps.caps[SPAPR_CAP_SBBC ] =SPAPR_CAP_BROKEN ; + } +if (!ppc_check_compat (cpu,CPU_POWERPC_LOGICAL_2_06 ,0 , spapr->max_compat_pvr)) { caps.caps[SPAPR_CAP_VSX ] =SPAPR_CAP_OFF ;include/hw/compat.h +2
-0@@ -1,6 +1,8 @@#ifndef HW_COMPAT_H #define HW_COMPAT_H +#define HW_COMPAT_2_12 +#define HW_COMPAT_2_11 \ {\ .driver = "hpet",\
Re: [Qemu-devel] [Qemu-ppc] [QEMU-PPC] [PATCH V2 3/3] ppc/spapr-caps: For pseries-2.12 change spapr-cap defaults
Quoted 41 lines · Greg Kurz
Quoted 38 lines · On Wed, 14 Feb 2018 17:51:35 +1100 Suraj Jitindar Singh…
For the pseries-2.12 machine type, make the spapr-caps
SPAPR_CAP_CFPC
andSPAPR_CAP_SBBCdefault to workaround. Thus if the host is capable
the guest will be able to take advantage of these workarounds by default.
Otherwise if the host doesn't have these capabilities qemu will fail to
start and they will have to be explicitly disabled on the command line
with:
-machine pseries,cap-cfpc=broken,cap-sbbc=brokenSigned-off-by Suraj Jitindar Singh <[email protected]>--- hw/ppc/spapr.c | 11 ++++++++++- hw/ppc/spapr_caps.c | 10 ++++++++++ include/hw/compat.h | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-)hw/ppc/spapr.c +3
-0@@ -3941,13 +3941,20 @@ static const TypeInfo spapr_machine_info = {/* * pseries-2.12 */ +#define SPAPR_COMPAT_2_12 \ + HW_COMPAT_2_12 +static void spapr_machine_2_12_instance_options (MachineState *machine) { }
Quoted 14 lines
hw/ppc/spapr.c static const TypeInfo spapr_machine_info = { · line 3956
Quoted 8 lines
hw/ppc/spapr.c +0
-1static void spapr_machine_2_12_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */
hw/ppc/spapr.c +4
-0+sPAPRMachineClass *smc =SPAPR_MACHINE_CLASS (mc); + + smc->default_caps.caps[SPAPR_CAP_CFPC ] =SPAPR_CAP_WORKAROUND ; + smc->default_caps.caps[SPAPR_CAP_SBBC ] =SPAPR_CAP_WORKAROUND ;As written in the comment, the default for the latest machine type should
be set at the base class level, inspapr_machine_class_init()... not sure
to understand why you set it here...
Ah yes, my bad.
Quoted 6 lines
Quoted 2 lines
+
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_12);And so, you shouldn't need to setup 2.12 compat mode before 2.12 was even
released :)
Fair enough :)
Quoted 56 lines
Quoted 54 lines
}
DEFINE_SPAPR_MACHINE(2_12, "2.12", true);hw/ppc/spapr.c +2
-0@@ -3969,6 +3976,8 @@ static void spapr_machine_2_11_class_options(MachineClass *mc)spapr_machine_2_12_class_options (mc); smc->default_caps.caps[SPAPR_CAP_HTM ] =SPAPR_CAP_ON ; + smc->default_caps.caps[SPAPR_CAP_CFPC ] =SPAPR_CAP_BROKEN ; + smc->default_caps.caps[SPAPR_CAP_SBBC ] =SPAPR_CAP_BROKEN ;SET_MACHINE_COMPAT (mc,SPAPR_COMPAT_2_11 ); }hw/ppc/spapr_caps.c +10
-0@@ -281,11 +281,21 @@ static sPAPRCapabilitiesdefault_caps_with_cpu (sPAPRMachineState *spapr, caps = smc->default_caps; +if (!ppc_check_compat (cpu,CPU_POWERPC_LOGICAL_3_00 , +0 , spapr->max_compat_pvr)) { + caps.caps[SPAPR_CAP_CFPC ] =SPAPR_CAP_BROKEN ; + } +if (!ppc_check_compat (cpu,CPU_POWERPC_LOGICAL_2_07 ,0 , spapr->max_compat_pvr)) { caps.caps[SPAPR_CAP_HTM ] =SPAPR_CAP_OFF ; } +if (!ppc_check_compat (cpu,CPU_POWERPC_LOGICAL_2_06_PLUS , +0 , spapr->max_compat_pvr)) { + caps.caps[SPAPR_CAP_SBBC ] =SPAPR_CAP_BROKEN ; + } +if (!ppc_check_compat (cpu,CPU_POWERPC_LOGICAL_2_06 ,0 , spapr->max_compat_pvr)) {caps.caps[SPAPR_CAP_VSX] = SPAPR_CAP_OFF;include/hw/compat.h +2
-0@@ -1,6 +1,8 @@#ifndef HW_COMPAT_H #define HW_COMPAT_H +#define HW_COMPAT_2_12 +#define HW_COMPAT_2_11 \ {\ .driver = "hpet",\
Quoted 7 lines · On Wed, 14 Feb 2018 17:51:33 +1100 Suraj Jitindar Singh…
Change the macro that generates the vmstate migration field and the needed function for the spapr-caps to take the full spapr-cap name. This has the benefit of meaning this instance will be picked up when greping for the spapr-caps and making it more obvious what this macro is doing.
Signed-off-by Suraj Jitindar Singh <[email protected]>---
Quoted 57 lines
hw/ppc/spapr_caps.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)hw/ppc/spapr_caps.c +15
-15@@ -350,34 +350,34 @@ int spapr_caps_post_migration(sPAPRMachineState *spapr) }/* Used to generate the migration field and needed function for a spapr cap */ -#define SPAPR_CAP_MIG_STATE (cap, ccap) \ -static bool spapr_cap_##cap##_needed(void *opaque) \ +#define SPAPR_CAP_MIG_STATE (sname, cap) \ +static bool spapr_cap_##sname##_needed(void *opaque) \ { \ sPAPRMachineState *spapr = opaque; \ \ - return spapr->cmd_line_caps[SPAPR_CAP_##ccap] && \ - (spapr->eff.caps[SPAPR_CAP_##ccap] != \ - spapr->def.caps[SPAPR_CAP_##ccap]); \ + return spapr->cmd_line_caps[cap] && \ + (spapr->eff.caps[cap] != \ + spapr->def.caps[cap]); \ } \ \ -const VMStateDescription vmstate_spapr_cap_##cap = { \ - .name = "spapr/cap/" #cap, \ +const VMStateDescription vmstate_spapr_cap_##sname = { \ + .name = "spapr/cap/" #sname, \ .version_id = 1, \ .minimum_version_id = 1, \ - .needed = spapr_cap_##cap##_needed, \ + .needed = spapr_cap_##sname##_needed, \ .fields = (VMStateField[]) { \ - VMSTATE_UINT8(mig.caps[SPAPR_CAP_##ccap], \ + VMSTATE_UINT8(mig.caps[cap], \ sPAPRMachineState), \ VMSTATE_END_OF_LIST() \ }, \ } -SPAPR_CAP_MIG_STATE (htm,HTM ); -SPAPR_CAP_MIG_STATE (vsx,VSX ); -SPAPR_CAP_MIG_STATE (dfp,DFP ); -SPAPR_CAP_MIG_STATE (cfpc,CFPC ); -SPAPR_CAP_MIG_STATE (sbbc,SBBC ); -SPAPR_CAP_MIG_STATE (ibs,IBS ); +SPAPR_CAP_MIG_STATE (htm,SPAPR_CAP_HTM ); +SPAPR_CAP_MIG_STATE (vsx,SPAPR_CAP_VSX ); +SPAPR_CAP_MIG_STATE (dfp,SPAPR_CAP_DFP ); +SPAPR_CAP_MIG_STATE (cfpc,SPAPR_CAP_CFPC ); +SPAPR_CAP_MIG_STATE (sbbc,SPAPR_CAP_SBBC ); +SPAPR_CAP_MIG_STATE (ibs,SPAPR_CAP_IBS );void spapr_caps_reset (sPAPRMachineState *spapr) {