@@ -120,11 +120,8 @@ static const VMStateInfo vmstate_info_avr = {
.put = put_avr,
};
-#define VMSTATE_AVR_ARRAY_V(_f, _s, _n, _v) \
- VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_avr, ppc_avr_t)
-
-#define VMSTATE_AVR_ARRAY(_f, _s, _n) \
- VMSTATE_AVR_ARRAY_V(_f, _s, _n, 0)
+#define VMSTATE_AVR_ARRAY(_f, _s, _n) \
+ VMSTATE_ARRAY_TEST(_f, _s, _n, NULL, vmstate_info_avr, ppc_avr_t)
static void cpu_pre_save(void *opaque)
{
@@ -290,11 +287,8 @@ static const VMStateInfo vmstate_info_slbe = {
.put = put_slbe,
};
-#define VMSTATE_SLB_ARRAY_V(_f, _s, _n, _v) \
- VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_slbe, ppc_slb_t)
-
-#define VMSTATE_SLB_ARRAY(_f, _s, _n) \
- VMSTATE_SLB_ARRAY_V(_f, _s, _n, 0)
+#define VMSTATE_SLB_ARRAY(_f, _s, _n) \
+ VMSTATE_ARRAY_TEST(_f, _s, _n, NULL, vmstate_info_slbe, ppc_slb_t)
static bool slb_needed(void *opaque)
{
Signed-off-by: Juan Quintela <quintela@redhat.com> --- target-ppc/machine.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)