Commit 64d4a534 authored by David Gibson's avatar David Gibson
Browse files

spapr: Add forgotten capability to migration stream 



spapr machine capabilities are supposed to be sent in the migration stream
so that we can sanity check the source and destination have compatible
configuration.  Unfortunately, when we added the hpt-max-page-size
capability, we forgot to add it to the migration state.  This means that we
can generate spurious warnings when both ends are configured for large
pages, or potentially fail to warn if the source is configured for huge
pages, but the destination is not.

Fixes: 2309832a "spapr: Maximum (HPT) pagesize property"

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
parent 70de0967

hw/ppc/spapr.c

+1 −0
Original line number Diff line number Diff line
@@ -2125,6 +2125,7 @@ static const VMStateDescription vmstate_spapr = { 
        &vmstate_spapr_cap_cfpc,

        &vmstate_spapr_cap_sbbc,

        &vmstate_spapr_cap_ibs,

        &vmstate_spapr_cap_hpt_maxpagesize,

        &vmstate_spapr_irq_map,

        &vmstate_spapr_cap_nested_kvm_hv,

        &vmstate_spapr_dtb,

hw/ppc/spapr_caps.c

+1 −0
Original line number Diff line number Diff line
@@ -703,6 +703,7 @@ 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);

SPAPR_CAP_MIG_STATE(hpt_maxpagesize, SPAPR_CAP_HPT_MAXPAGESIZE);

SPAPR_CAP_MIG_STATE(nested_kvm_hv, SPAPR_CAP_NESTED_KVM_HV);

SPAPR_CAP_MIG_STATE(large_decr, SPAPR_CAP_LARGE_DECREMENTER);

SPAPR_CAP_MIG_STATE(ccf_assist, SPAPR_CAP_CCF_ASSIST);

include/hw/ppc/spapr.h

+1 −0
Original line number Diff line number Diff line
@@ -849,6 +849,7 @@ extern const VMStateDescription vmstate_spapr_cap_dfp; 
extern const VMStateDescription vmstate_spapr_cap_cfpc;

extern const VMStateDescription vmstate_spapr_cap_sbbc;

extern const VMStateDescription vmstate_spapr_cap_ibs;

extern const VMStateDescription vmstate_spapr_cap_hpt_maxpagesize;

extern const VMStateDescription vmstate_spapr_cap_nested_kvm_hv;

extern const VMStateDescription vmstate_spapr_cap_large_decr;

extern const VMStateDescription vmstate_spapr_cap_ccf_assist;