[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put u
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use |
Date: |
Fri, 15 Jan 2016 12:01:44 +0000 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
Hi Sascha,
Can you try this and let me know if it fixes it for you; I've
still not managed to persuade x86-64 to fail.
Dave
From f300fa0dd902b28417744d364986c71dd8357a88 Mon Sep 17 00:00:00 2001
From: "Dr. David Alan Gilbert" <address@hidden>
Date: Fri, 15 Jan 2016 11:02:02 +0000
Subject: [PATCH] Fix virito migration
I misunderstood the vmstate macro definition when
I reworked the virtio .get/.put - but I can't
get it to break for me, which suggests I'm perhaps
not managing to get that structure into being
sent in my tests.
Fixes as per Sascha's suggestions/debug.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reported-by: Sascha Silbe <address@hidden>
Fixes: 50e5ae4dc3e4f21e874512f9e87b93b5472d26e0
Fixes: 2cf0148674430b6693c60d42b7eef721bfa9509f
---
hw/virtio/virtio.c | 8 ++++----
include/migration/vmstate.h | 26 +++++++++++++-------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index bd6b4df..41a8a8a 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -1143,8 +1143,8 @@ static const VMStateDescription vmstate_virtio_virtqueues
= {
.minimum_version_id = 1,
.needed = &virtio_virtqueue_needed,
.fields = (VMStateField[]) {
- VMSTATE_STRUCT_VARRAY_KNOWN(vq, struct VirtIODevice, VIRTIO_QUEUE_MAX,
- 0, vmstate_virtqueue, VirtQueue),
+ VMSTATE_STRUCT_VARRAY_POINTER_KNOWN(vq, struct VirtIODevice,
+ VIRTIO_QUEUE_MAX, 0, vmstate_virtqueue, VirtQueue),
VMSTATE_END_OF_LIST()
}
};
@@ -1165,8 +1165,8 @@ static const VMStateDescription vmstate_virtio_ringsize =
{
.minimum_version_id = 1,
.needed = &virtio_ringsize_needed,
.fields = (VMStateField[]) {
- VMSTATE_STRUCT_VARRAY_KNOWN(vq, struct VirtIODevice, VIRTIO_QUEUE_MAX,
- 0, vmstate_ringsize, VirtQueue),
+ VMSTATE_STRUCT_VARRAY_POINTER_KNOWN(vq, struct VirtIODevice,
+ VIRTIO_QUEUE_MAX, 0, vmstate_ringsize, VirtQueue),
VMSTATE_END_OF_LIST()
}
};
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 97d44d3..4a5d1dd 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -374,19 +374,6 @@ extern const VMStateInfo vmstate_info_bitmap;
.offset = vmstate_offset_array(_state, _field, _type, _num),\
}
-/* a variable length array (i.e. _type *_field) but we know the
- * length
- */
-#define VMSTATE_STRUCT_VARRAY_KNOWN(_field, _state, _num, _version, _vmsd,
_type) { \
- .name = (stringify(_field)), \
- .num = (_num), \
- .version_id = (_version), \
- .vmsd = &(_vmsd), \
- .size = sizeof(_type), \
- .flags = VMS_STRUCT|VMS_ARRAY, \
- .offset = offsetof(_state, _field), \
-}
-
#define VMSTATE_STRUCT_VARRAY_UINT8(_field, _state, _field_num, _version,
_vmsd, _type) { \
.name = (stringify(_field)), \
.num_offset = vmstate_offset_value(_state, _field_num, uint8_t), \
@@ -397,6 +384,19 @@ extern const VMStateInfo vmstate_info_bitmap;
.offset = offsetof(_state, _field), \
}
+/* a variable length array (i.e. _type *_field) but we know the
+ * length
+ */
+#define VMSTATE_STRUCT_VARRAY_POINTER_KNOWN(_field, _state, _num, _version,
_vmsd, _type) { \
+ .name = (stringify(_field)), \
+ .num = (_num), \
+ .version_id = (_version), \
+ .vmsd = &(_vmsd), \
+ .size = sizeof(_type), \
+ .flags = VMS_STRUCT|VMS_ARRAY|VMS_POINTER, \
+ .offset = offsetof(_state, _field), \
+}
+
#define VMSTATE_STRUCT_VARRAY_POINTER_INT32(_field, _state, _field_num, _vmsd,
_type) { \
.name = (stringify(_field)), \
.version_id = 0, \
--
2.5.0
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK
- [Qemu-devel] [PATCH 1/2] Add VMSTATE_STRUCT_VARRAY_KNOWN, Dr. David Alan Gilbert (git), 2016/01/06
- [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Dr. David Alan Gilbert (git), 2016/01/06
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Michael S. Tsirkin, 2016/01/07
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Amit Shah, 2016/01/08
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Sascha Silbe, 2016/01/14
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Dr. David Alan Gilbert, 2016/01/15
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use,
Dr. David Alan Gilbert <=
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Cornelia Huck, 2016/01/18
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Sascha Silbe, 2016/01/18
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Dr. David Alan Gilbert, 2016/01/19
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Sascha Silbe, 2016/01/21
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Cornelia Huck, 2016/01/29
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Dr. David Alan Gilbert, 2016/01/29
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Sascha Silbe, 2016/01/18
- Re: [Qemu-devel] [PATCH 2/2] migration/virtio: Remove simple .get/.put use, Dr. David Alan Gilbert, 2016/01/19
- [Qemu-devel] [PATCH qemu] migration/vmstate: document VMStateFlags, Sascha Silbe, 2016/01/21
Re: [Qemu-devel] [PATCH 1/2] Add VMSTATE_STRUCT_VARRAY_KNOWN, Amit Shah, 2016/01/08