Commit d58f5598 authored by David Gibson's avatar David Gibson Committed by Juan Quintela
Browse files

savevm: Add VMSTATE_UINTTL_EQUAL helper 



This adds an _EQUAL VMSTATE helper for target_ulongs, defined in terms of
VMSTATE_UINT32_EQUAL or VMSTATE_UINT64_EQUAL as appropriate.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent e344b8a1

hw/hw.h

+6 −0
Original line number Diff line number Diff line
@@ -52,16 +52,22 @@ int qemu_boot_set(const char *boot_devices); 
#if TARGET_LONG_BITS == 64

#define VMSTATE_UINTTL_V(_f, _s, _v)                                  \

    VMSTATE_UINT64_V(_f, _s, _v)

#define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \

    VMSTATE_UINT64_EQUAL_V(_f, _s, _v)

#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v)                        \

    VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v)

#else

#define VMSTATE_UINTTL_V(_f, _s, _v)                                  \

    VMSTATE_UINT32_V(_f, _s, _v)

#define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \

    VMSTATE_UINT32_EQUAL_V(_f, _s, _v)

#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v)                        \

    VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v)

#endif

#define VMSTATE_UINTTL(_f, _s)                                        \

    VMSTATE_UINTTL_V(_f, _s, 0)

#define VMSTATE_UINTTL_EQUAL(_f, _s)                                  \

    VMSTATE_UINTTL_EQUAL_V(_f, _s, 0)

#define VMSTATE_UINTTL_ARRAY(_f, _s, _n)                              \

    VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0)

include/migration/vmstate.h

+5 −2
Original line number Diff line number Diff line
@@ -519,8 +519,11 @@ extern const VMStateInfo vmstate_info_bitmap; 
#define VMSTATE_INT32_EQUAL(_f, _s)                                   \

    VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_equal, int32_t)



#define VMSTATE_UINT32_EQUAL_V(_f, _s, _v)                            \

    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint32_equal, uint32_t)



#define VMSTATE_UINT32_EQUAL(_f, _s)                                  \

    VMSTATE_SINGLE(_f, _s, 0, vmstate_info_uint32_equal, uint32_t)

    VMSTATE_UINT32_EQUAL_V(_f, _s, 0)



#define VMSTATE_UINT64_EQUAL_V(_f, _s, _v)                            \

    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64_equal, uint64_t)