Message ID | 20180119045438.28582-8-richard.henderson@linaro.org |
---|---|
State | Accepted |
Commit | a006f1229d57c1925b445f026dbfeaff47fe6026 |
Headers | show |
Series | target/arm: Prepatory work for SVE | expand |
Richard Henderson <richard.henderson@linaro.org> writes: > At the same time, move VMSTATE_UINT32_SUB_ARRAY > beside the other UINT32 definitions. > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > include/migration/vmstate.h | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h > index 88b55df5ae..8c3889433c 100644 > --- a/include/migration/vmstate.h > +++ b/include/migration/vmstate.h > @@ -905,6 +905,9 @@ extern const VMStateInfo vmstate_info_qtailq; > #define VMSTATE_UINT32_ARRAY(_f, _s, _n) \ > VMSTATE_UINT32_ARRAY_V(_f, _s, _n, 0) > > +#define VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) \ > + VMSTATE_SUB_ARRAY(_f, _s, _start, _num, 0, vmstate_info_uint32, uint32_t) > + > #define VMSTATE_UINT32_2DARRAY(_f, _s, _n1, _n2) \ > VMSTATE_UINT32_2DARRAY_V(_f, _s, _n1, _n2, 0) > > @@ -914,6 +917,9 @@ extern const VMStateInfo vmstate_info_qtailq; > #define VMSTATE_UINT64_ARRAY(_f, _s, _n) \ > VMSTATE_UINT64_ARRAY_V(_f, _s, _n, 0) > > +#define VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) \ > + VMSTATE_SUB_ARRAY(_f, _s, _start, _num, 0, vmstate_info_uint64, uint64_t) > + > #define VMSTATE_UINT64_2DARRAY(_f, _s, _n1, _n2) \ > VMSTATE_UINT64_2DARRAY_V(_f, _s, _n1, _n2, 0) > > @@ -932,9 +938,6 @@ extern const VMStateInfo vmstate_info_qtailq; > #define VMSTATE_INT32_ARRAY(_f, _s, _n) \ > VMSTATE_INT32_ARRAY_V(_f, _s, _n, 0) > > -#define VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) \ > - VMSTATE_SUB_ARRAY(_f, _s, _start, _num, 0, vmstate_info_uint32, uint32_t) > - > #define VMSTATE_INT64_ARRAY_V(_f, _s, _n, _v) \ > VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_int64, int64_t) -- Alex Bennée
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 88b55df5ae..8c3889433c 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -905,6 +905,9 @@ extern const VMStateInfo vmstate_info_qtailq; #define VMSTATE_UINT32_ARRAY(_f, _s, _n) \ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, 0) +#define VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) \ + VMSTATE_SUB_ARRAY(_f, _s, _start, _num, 0, vmstate_info_uint32, uint32_t) + #define VMSTATE_UINT32_2DARRAY(_f, _s, _n1, _n2) \ VMSTATE_UINT32_2DARRAY_V(_f, _s, _n1, _n2, 0) @@ -914,6 +917,9 @@ extern const VMStateInfo vmstate_info_qtailq; #define VMSTATE_UINT64_ARRAY(_f, _s, _n) \ VMSTATE_UINT64_ARRAY_V(_f, _s, _n, 0) +#define VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) \ + VMSTATE_SUB_ARRAY(_f, _s, _start, _num, 0, vmstate_info_uint64, uint64_t) + #define VMSTATE_UINT64_2DARRAY(_f, _s, _n1, _n2) \ VMSTATE_UINT64_2DARRAY_V(_f, _s, _n1, _n2, 0) @@ -932,9 +938,6 @@ extern const VMStateInfo vmstate_info_qtailq; #define VMSTATE_INT32_ARRAY(_f, _s, _n) \ VMSTATE_INT32_ARRAY_V(_f, _s, _n, 0) -#define VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) \ - VMSTATE_SUB_ARRAY(_f, _s, _start, _num, 0, vmstate_info_uint32, uint32_t) - #define VMSTATE_INT64_ARRAY_V(_f, _s, _n, _v) \ VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_int64, int64_t)