提交 cbd62f86 编写于 作者: P Paolo Bonzini

hw: do not use VMSTATE_*TL

Reserve this to CPU state serialization.

Luckily, they were only used by sPAPR devices and these are ppc64
only.  So there is no change to migration format.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
上级 bdd90227
...@@ -106,9 +106,9 @@ typedef struct VIOsPAPRVLANDevice { ...@@ -106,9 +106,9 @@ typedef struct VIOsPAPRVLANDevice {
NICConf nicconf; NICConf nicconf;
NICState *nic; NICState *nic;
bool isopen; bool isopen;
target_ulong buf_list; hwaddr buf_list;
uint32_t add_buf_ptr, use_buf_ptr, rx_bufs; uint32_t add_buf_ptr, use_buf_ptr, rx_bufs;
target_ulong rxq_ptr; hwaddr rxq_ptr;
uint32_t compat_flags; /* Compatability flags for migration */ uint32_t compat_flags; /* Compatability flags for migration */
RxBufPool *rx_pool[RX_MAX_POOLS]; /* Receive buffer descriptor pools */ RxBufPool *rx_pool[RX_MAX_POOLS]; /* Receive buffer descriptor pools */
} VIOsPAPRVLANDevice; } VIOsPAPRVLANDevice;
...@@ -765,11 +765,11 @@ static const VMStateDescription vmstate_spapr_llan = { ...@@ -765,11 +765,11 @@ static const VMStateDescription vmstate_spapr_llan = {
VMSTATE_SPAPR_VIO(sdev, VIOsPAPRVLANDevice), VMSTATE_SPAPR_VIO(sdev, VIOsPAPRVLANDevice),
/* LLAN state */ /* LLAN state */
VMSTATE_BOOL(isopen, VIOsPAPRVLANDevice), VMSTATE_BOOL(isopen, VIOsPAPRVLANDevice),
VMSTATE_UINTTL(buf_list, VIOsPAPRVLANDevice), VMSTATE_UINT64(buf_list, VIOsPAPRVLANDevice),
VMSTATE_UINT32(add_buf_ptr, VIOsPAPRVLANDevice), VMSTATE_UINT32(add_buf_ptr, VIOsPAPRVLANDevice),
VMSTATE_UINT32(use_buf_ptr, VIOsPAPRVLANDevice), VMSTATE_UINT32(use_buf_ptr, VIOsPAPRVLANDevice),
VMSTATE_UINT32(rx_bufs, VIOsPAPRVLANDevice), VMSTATE_UINT32(rx_bufs, VIOsPAPRVLANDevice),
VMSTATE_UINTTL(rxq_ptr, VIOsPAPRVLANDevice), VMSTATE_UINT64(rxq_ptr, VIOsPAPRVLANDevice),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
}, },
......
...@@ -584,7 +584,7 @@ const VMStateDescription vmstate_spapr_vio = { ...@@ -584,7 +584,7 @@ const VMStateDescription vmstate_spapr_vio = {
VMSTATE_UINT32_EQUAL(irq, VIOsPAPRDevice), VMSTATE_UINT32_EQUAL(irq, VIOsPAPRDevice),
/* General VIO device state */ /* General VIO device state */
VMSTATE_UINTTL(signal_state, VIOsPAPRDevice), VMSTATE_UINT64(signal_state, VIOsPAPRDevice),
VMSTATE_UINT64(crq.qladdr, VIOsPAPRDevice), VMSTATE_UINT64(crq.qladdr, VIOsPAPRDevice),
VMSTATE_UINT32(crq.qsize, VIOsPAPRDevice), VMSTATE_UINT32(crq.qsize, VIOsPAPRDevice),
VMSTATE_UINT32(crq.qnext, VIOsPAPRDevice), VMSTATE_UINT32(crq.qnext, VIOsPAPRDevice),
......
...@@ -61,7 +61,7 @@ struct VIOsPAPRDevice { ...@@ -61,7 +61,7 @@ struct VIOsPAPRDevice {
DeviceState qdev; DeviceState qdev;
uint32_t reg; uint32_t reg;
uint32_t irq; uint32_t irq;
target_ulong signal_state; uint64_t signal_state;
VIOsPAPR_CRQ crq; VIOsPAPR_CRQ crq;
AddressSpace as; AddressSpace as;
MemoryRegion mrroot; MemoryRegion mrroot;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册