[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 33/49] hw: do not use VMSTATE_*TL
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 33/49] hw: do not use VMSTATE_*TL |
Date: |
Wed, 16 Mar 2016 11:46:43 +0100 |
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 6aa06cc..e08c20e 100644
--- a/hw/net/spapr_llan.c
+++ b/hw/net/spapr_llan.c
@@ -93,9 +93,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;
} VIOsPAPRVLANDevice;
static int spapr_vlan_can_receive(NetClientState *nc)
@@ -522,11 +522,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] [PATCH 31/49] apic: move target-dependent definitions to cpu.h, (continued)
- [Qemu-devel] [PATCH 31/49] apic: move target-dependent definitions to cpu.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 28/49] explicitly include qom/cpu.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 32/49] include: poison symbols in osdep.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 29/49] explicitly include hw/qdev-core.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 30/49] explicitly include linux/kvm.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 36/49] cpu: move endian-dependent load/store functions to cpu-all.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 26/49] ppc: use PowerPCCPU instead of CPUPPCState, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 35/49] hw: cannot include hw/hw.h from user emulation, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 41/49] s390x: move stuff out of cpu.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 42/49] qemu-common: push cpu.h inclusion out of qemu-common.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 33/49] hw: do not use VMSTATE_*TL,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 44/49] mips: move CP0 functions out of cpu.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 46/49] exec: extract exec/tb-context.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 27/49] arm: remove useless cpu.h inclusion, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 34/49] hw: move CPU state serialization to migration/cpu.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 39/49] gdbstub: remove includes from gdbstub-xml.c, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 40/49] dma: do not depend on kvm_enabled(), Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 37/49] qemu-common: stop including qemu/bswap.h from qemu-common.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 38/49] qemu-common: stop including qemu/host-utils.h from qemu-common.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 43/49] arm: move arm_log_exception into .c file, Paolo Bonzini, 2016/03/16