From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX09o-0007az-UR for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX09i-00006h-F8 for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45463) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX09i-00006Y-7g for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:30 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s373NTQl002591 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:23:29 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:21:24 +0200 Message-Id: <1396840915-10384-67-git-send-email-quintela@redhat.com> In-Reply-To: <1396840915-10384-1-git-send-email-quintela@redhat.com> References: <1396840915-10384-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 66/97] vmstate: Remove version field from VMSTATE_STRUCT_VARRAY_UINT32 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org No user of it. Signed-off-by: Juan Quintela --- hw/dma/pl330.c | 4 ++-- hw/timer/a9gtimer.c | 2 +- hw/timer/arm_mptimer.c | 2 +- hw/usb/hcd-xhci.c | 6 +++--- include/migration/vmstate.h | 3 +-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index e4f8993..9ba3108 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -216,7 +216,7 @@ static const VMStateDescription vmstate_pl330_queue = { .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { - VMSTATE_STRUCT_VARRAY_UINT32(queue, PL330Queue, queue_size, 1, + VMSTATE_STRUCT_VARRAY_UINT32(queue, PL330Queue, queue_size, vmstate_pl330_queue_entry, PL330QueueEntry), VMSTATE_END_OF_LIST() } @@ -277,7 +277,7 @@ static const VMStateDescription vmstate_pl330 = { .minimum_version_id = 1, .fields = (VMStateField[]) { VMSTATE_STRUCT(manager, PL330State, 0, vmstate_pl330_chan, PL330Chan), - VMSTATE_STRUCT_VARRAY_UINT32(chan, PL330State, num_chnls, 0, + VMSTATE_STRUCT_VARRAY_UINT32(chan, PL330State, num_chnls, vmstate_pl330_chan, PL330Chan), VMSTATE_VBUFFER_UINT32(lo_seqn, PL330State, num_chnls), VMSTATE_VBUFFER_UINT32(hi_seqn, PL330State, num_chnls), diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index a0656d5..e4ac695 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -333,7 +333,7 @@ static const VMStateDescription vmstate_a9_gtimer = { VMSTATE_UINT64(ref_counter, A9GTimerState), VMSTATE_UINT64(cpu_ref_time, A9GTimerState), VMSTATE_STRUCT_VARRAY_UINT32(per_cpu, A9GTimerState, num_cpu, - 1, vmstate_a9_gtimer_per_cpu, + vmstate_a9_gtimer_per_cpu, A9GTimerPerCPU), VMSTATE_END_OF_LIST() } diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index 35a0a23..b98a81e 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -257,7 +257,7 @@ static const VMStateDescription vmstate_arm_mptimer = { .minimum_version_id = 2, .fields = (VMStateField[]) { VMSTATE_STRUCT_VARRAY_UINT32(timerblock, ARMMPTimerState, num_cpu, - 2, vmstate_timerblock, TimerBlock), + vmstate_timerblock, TimerBlock), VMSTATE_END_OF_LIST() } }; diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index ef3177a..a95bd30 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3752,11 +3752,11 @@ static const VMStateDescription vmstate_xhci = { VMSTATE_PCIE_DEVICE(parent_obj, XHCIState), VMSTATE_MSIX(parent_obj, XHCIState), - VMSTATE_STRUCT_VARRAY_UINT32(ports, XHCIState, numports, 1, + VMSTATE_STRUCT_VARRAY_UINT32(ports, XHCIState, numports, vmstate_xhci_port, XHCIPort), - VMSTATE_STRUCT_VARRAY_UINT32(slots, XHCIState, numslots, 1, + VMSTATE_STRUCT_VARRAY_UINT32(slots, XHCIState, numslots, vmstate_xhci_slot, XHCISlot), - VMSTATE_STRUCT_VARRAY_UINT32(intr, XHCIState, numintrs, 1, + VMSTATE_STRUCT_VARRAY_UINT32(intr, XHCIState, numintrs, vmstate_xhci_intr, XHCIInterrupter), /* Operational Registers */ diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 95e4e17..6076a35 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -371,10 +371,9 @@ extern const VMStateInfo vmstate_info_bitmap; .offset = offsetof(_state, _field), \ } -#define VMSTATE_STRUCT_VARRAY_UINT32(_field, _state, _field_num, _version, _vmsd, _type) { \ +#define VMSTATE_STRUCT_VARRAY_UINT32(_field, _state, _field_num, _vmsd, _type) { \ .name = (stringify(_field)), \ .num_offset = vmstate_offset_value(_state, _field_num, uint32_t), \ - .version_id = (_version), \ .vmsd = &(_vmsd), \ .size = sizeof(_type), \ .flags = VMS_STRUCT|VMS_VARRAY_UINT32, \ -- 1.9.0