Message ID | 20190619162140.133674-8-liran.alon@oracle.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | : target/i386: kvm: Add support for save and restore of nested state | expand |
* Liran Alon (liran.alon@oracle.com) wrote: > Reviewed-by: Nikita Leshenko <nikita.leshchenko@oracle.com> > Reviewed-by: Maran Wilson <maran.wilson@oracle.com> > Signed-off-by: Liran Alon <liran.alon@oracle.com> > --- > include/migration/vmstate.h | 26 ++++++++++++++++++++++++++ > 1 file changed, 26 insertions(+) > > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h > index 9224370ed59a..ca68584eba4d 100644 > --- a/include/migration/vmstate.h > +++ b/include/migration/vmstate.h > @@ -797,6 +797,19 @@ extern const VMStateInfo vmstate_info_qtailq; > #define VMSTATE_UINT64_V(_f, _s, _v) \ > VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64, uint64_t) > > +#ifdef CONFIG_LINUX > + > +#define VMSTATE_U8_V(_f, _s, _v) \ > + VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint8, __u8) > +#define VMSTATE_U16_V(_f, _s, _v) \ > + VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint16, __u16) > +#define VMSTATE_U32_V(_f, _s, _v) \ > + VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint32, __u32) > +#define VMSTATE_U64_V(_f, _s, _v) \ > + VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64, __u64) > + > +#endif > + Right, and that works as well as the comment I suggested, so Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > #define VMSTATE_BOOL(_f, _s) \ > VMSTATE_BOOL_V(_f, _s, 0) > > @@ -818,6 +831,19 @@ extern const VMStateInfo vmstate_info_qtailq; > #define VMSTATE_UINT64(_f, _s) \ > VMSTATE_UINT64_V(_f, _s, 0) > > +#ifdef CONFIG_LINUX > + > +#define VMSTATE_U8(_f, _s) \ > + VMSTATE_U8_V(_f, _s, 0) > +#define VMSTATE_U16(_f, _s) \ > + VMSTATE_U16_V(_f, _s, 0) > +#define VMSTATE_U32(_f, _s) \ > + VMSTATE_U32_V(_f, _s, 0) > +#define VMSTATE_U64(_f, _s) \ > + VMSTATE_U64_V(_f, _s, 0) > + > +#endif > + > #define VMSTATE_UINT8_EQUAL(_f, _s, _err_hint) \ > VMSTATE_SINGLE_FULL(_f, _s, 0, 0, \ > vmstate_info_uint8_equal, uint8_t, _err_hint) > -- > 2.20.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 9224370ed59a..ca68584eba4d 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -797,6 +797,19 @@ extern const VMStateInfo vmstate_info_qtailq; #define VMSTATE_UINT64_V(_f, _s, _v) \ VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64, uint64_t) +#ifdef CONFIG_LINUX + +#define VMSTATE_U8_V(_f, _s, _v) \ + VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint8, __u8) +#define VMSTATE_U16_V(_f, _s, _v) \ + VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint16, __u16) +#define VMSTATE_U32_V(_f, _s, _v) \ + VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint32, __u32) +#define VMSTATE_U64_V(_f, _s, _v) \ + VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64, __u64) + +#endif + #define VMSTATE_BOOL(_f, _s) \ VMSTATE_BOOL_V(_f, _s, 0) @@ -818,6 +831,19 @@ extern const VMStateInfo vmstate_info_qtailq; #define VMSTATE_UINT64(_f, _s) \ VMSTATE_UINT64_V(_f, _s, 0) +#ifdef CONFIG_LINUX + +#define VMSTATE_U8(_f, _s) \ + VMSTATE_U8_V(_f, _s, 0) +#define VMSTATE_U16(_f, _s) \ + VMSTATE_U16_V(_f, _s, 0) +#define VMSTATE_U32(_f, _s) \ + VMSTATE_U32_V(_f, _s, 0) +#define VMSTATE_U64(_f, _s) \ + VMSTATE_U64_V(_f, _s, 0) + +#endif + #define VMSTATE_UINT8_EQUAL(_f, _s, _err_hint) \ VMSTATE_SINGLE_FULL(_f, _s, 0, 0, \ vmstate_info_uint8_equal, uint8_t, _err_hint)