mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ppc/spapr-caps: Change migration macro to take full spapr-cap name

Browse Source 
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 <sjitindarsingh@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Suraj Jitindar Singh 2018-02-15 11:44:41 +11:00 committed by David Gibson
parent 2cc75c32e6
commit 8c5909c419
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/ppc/spapr_caps.c
View File

@ -350,34 +350,34 @@ int spapr_caps_post_migration(sPAPRMachineState *spapr)
} }
/* Used to generate the migration field and needed function for a spapr cap */ /* Used to generate the migration field and needed function for a spapr cap */
#define SPAPR_CAP_MIG_STATE(cap, ccap) \ #define SPAPR_CAP_MIG_STATE(sname, cap) \
static bool spapr_cap_##cap##_needed(void *opaque) \ static bool spapr_cap_##sname##_needed(void *opaque) \
{ \ { \
sPAPRMachineState *spapr = opaque; \ sPAPRMachineState *spapr = opaque; \
\ \
return spapr->cmd_line_caps[SPAPR_CAP_##ccap] && \ return spapr->cmd_line_caps[cap] && \
(spapr->eff.caps[SPAPR_CAP_##ccap] != \ (spapr->eff.caps[cap] != \
spapr->def.caps[SPAPR_CAP_##ccap]); \ spapr->def.caps[cap]); \
} \ } \
\ \
const VMStateDescription vmstate_spapr_cap_##cap = { \ const VMStateDescription vmstate_spapr_cap_##sname = { \
.name = "spapr/cap/" #cap, \ .name = "spapr/cap/" #sname, \
.version_id = 1, \ .version_id = 1, \
.minimum_version_id = 1, \ .minimum_version_id = 1, \
.needed = spapr_cap_##cap##_needed, \ .needed = spapr_cap_##sname##_needed, \
.fields = (VMStateField[]) { \ .fields = (VMStateField[]) { \
VMSTATE_UINT8(mig.caps[SPAPR_CAP_##ccap], \ VMSTATE_UINT8(mig.caps[cap], \
sPAPRMachineState), \ sPAPRMachineState), \
VMSTATE_END_OF_LIST() \ VMSTATE_END_OF_LIST() \
}, \ }, \
} }
SPAPR_CAP_MIG_STATE(htm, HTM); SPAPR_CAP_MIG_STATE(htm, SPAPR_CAP_HTM);
SPAPR_CAP_MIG_STATE(vsx, VSX); SPAPR_CAP_MIG_STATE(vsx, SPAPR_CAP_VSX);
SPAPR_CAP_MIG_STATE(dfp, DFP); SPAPR_CAP_MIG_STATE(dfp, SPAPR_CAP_DFP);
SPAPR_CAP_MIG_STATE(cfpc, CFPC); SPAPR_CAP_MIG_STATE(cfpc, SPAPR_CAP_CFPC);
SPAPR_CAP_MIG_STATE(sbbc, SBBC); SPAPR_CAP_MIG_STATE(sbbc, SPAPR_CAP_SBBC);
SPAPR_CAP_MIG_STATE(ibs, IBS); SPAPR_CAP_MIG_STATE(ibs, SPAPR_CAP_IBS);
void spapr_caps_reset(sPAPRMachineState *spapr) void spapr_caps_reset(sPAPRMachineState *spapr)
{ {