[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/52] hw: do not use VMSTATE_*TL
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 35/52] hw: do not use VMSTATE_*TL |
Date: |
Thu, 19 May 2016 13:18:29 +0200 |
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: Paolo Bonzini <address@hidden>
---
hw/net/spapr_llan.c | 8 ++++----
hw/ppc/spapr_vio.c | 2 +-
include/hw/ppc/spapr_vio.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
index a647f25..db97da3 100644
--- a/hw/net/spapr_llan.c
+++ b/hw/net/spapr_llan.c
@@ -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()
},
diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 8aa021f..6b20b40 100644
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -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),
diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
index c9733e7..5f8b042 100644
--- a/include/hw/ppc/spapr_vio.h
+++ b/include/hw/ppc/spapr_vio.h
@@ -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;
--
1.8.3.1
- [Qemu-devel] [PULL 15/52] target-ppc: do not make PowerPCCPUClass depend on target-specific symbols, (continued)
- [Qemu-devel] [PULL 15/52] target-ppc: do not make PowerPCCPUClass depend on target-specific symbols, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 17/52] target-s390x: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 25/52] sh4: include cpu-qom.h in files that require SuperHCPU, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 24/52] m68k: include cpu-qom.h in files that require M68KCPU, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 23/52] arm: include cpu-qom.h in files that require ARMCPU, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 16/52] target-ppc: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 11/52] target-m68k: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 26/52] alpha: include cpu-qom.h in files that require AlphaCPU, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 34/52] include: poison symbols in osdep.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 32/52] explicitly include linux/kvm.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 35/52] hw: do not use VMSTATE_*TL,
Paolo Bonzini <=
- [Qemu-devel] [PULL 28/52] ppc: use PowerPCCPU instead of CPUPPCState, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 22/52] target-xtensa: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 21/52] target-unicore32: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 19/52] target-sparc: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 37/52] hw: cannot include hw/hw.h from user emulation, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 20/52] target-tricore: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 27/52] mips: use MIPSCPU instead of CPUMIPSState, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 33/52] apic: move target-dependent definitions to cpu.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 36/52] hw: move CPU state serialization to migration/cpu.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 30/52] explicitly include qom/cpu.h, Paolo Bonzini, 2016/05/19