Commit cbd62f86 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bdd90227

hw/net/spapr_llan.c

+4 −4
Original line number Diff line number Diff line
@@ -106,9 +106,9 @@ typedef struct VIOsPAPRVLANDevice { 
    NICConf nicconf;

    NICState *nic;

    bool isopen;

    target_ulong buf_list;

    hwaddr buf_list;

    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 */

    RxBufPool *rx_pool[RX_MAX_POOLS];  /* Receive buffer descriptor pools */

} VIOsPAPRVLANDevice;
@@ -765,11 +765,11 @@ static const VMStateDescription vmstate_spapr_llan = { 
        VMSTATE_SPAPR_VIO(sdev, VIOsPAPRVLANDevice),

        /* LLAN state */

        VMSTATE_BOOL(isopen, VIOsPAPRVLANDevice),

        VMSTATE_UINTTL(buf_list, VIOsPAPRVLANDevice),

        VMSTATE_UINT64(buf_list, VIOsPAPRVLANDevice),

        VMSTATE_UINT32(add_buf_ptr, VIOsPAPRVLANDevice),

        VMSTATE_UINT32(use_buf_ptr, VIOsPAPRVLANDevice),

        VMSTATE_UINT32(rx_bufs, VIOsPAPRVLANDevice),

        VMSTATE_UINTTL(rxq_ptr, VIOsPAPRVLANDevice),

        VMSTATE_UINT64(rxq_ptr, VIOsPAPRVLANDevice),



        VMSTATE_END_OF_LIST()

    },

hw/ppc/spapr_vio.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ const VMStateDescription vmstate_spapr_vio = { 
        VMSTATE_UINT32_EQUAL(irq, VIOsPAPRDevice),



        /* General VIO device state */

        VMSTATE_UINTTL(signal_state, VIOsPAPRDevice),

        VMSTATE_UINT64(signal_state, VIOsPAPRDevice),

        VMSTATE_UINT64(crq.qladdr, VIOsPAPRDevice),

        VMSTATE_UINT32(crq.qsize, VIOsPAPRDevice),

        VMSTATE_UINT32(crq.qnext, VIOsPAPRDevice),

include/hw/ppc/spapr_vio.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct VIOsPAPRDevice { 
    DeviceState qdev;

    uint32_t reg;

    uint32_t irq;

    target_ulong signal_state;

    uint64_t signal_state;

    VIOsPAPR_CRQ crq;

    AddressSpace as;

    MemoryRegion mrroot;