* [Qemu-devel] [PATCH 0/1] VMState conversion for virtio-pci 'modern state'
@ 2017-09-25 16:05 Dr. David Alan Gilbert (git)
2017-09-25 16:05 ` [Qemu-devel] [PATCH 1/1] virtio/pci/migration: Convert to VMState Dr. David Alan Gilbert (git)
0 siblings, 1 reply; 3+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2017-09-25 16:05 UTC (permalink / raw)
To: qemu-devel, jasowang, mst; +Cc: quintela
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
This is lightly tested migrating a:
./x86_64-softmmu/qemu-system-x86_64 -M pc,accel=kvm -m 1G -device virtio-net -monitor stdio -drive if=virtio,file=blah,cache=none
with and without the patch; the stream looks like it includes the
subsection. Suggestions for better tests are welcome.
Dave
Dr. David Alan Gilbert (1):
virtio/pci/migration: Convert to VMState
hw/virtio/virtio-pci.c | 108 +++++++++++++------------------------------------
1 file changed, 27 insertions(+), 81 deletions(-)
--
2.13.5
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Qemu-devel] [PATCH 1/1] virtio/pci/migration: Convert to VMState
2017-09-25 16:05 [Qemu-devel] [PATCH 0/1] VMState conversion for virtio-pci 'modern state' Dr. David Alan Gilbert (git)
@ 2017-09-25 16:05 ` Dr. David Alan Gilbert (git)
2017-10-05 19:09 ` Dr. David Alan Gilbert
0 siblings, 1 reply; 3+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2017-09-25 16:05 UTC (permalink / raw)
To: qemu-devel, jasowang, mst; +Cc: quintela
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Convert the 'modern_state' part of virtio-pci to modern migration
macros.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
hw/virtio/virtio-pci.c | 108 +++++++++++++------------------------------------
1 file changed, 27 insertions(+), 81 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 8b0d6b69cd..f825a68a84 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -88,77 +88,19 @@ static void virtio_pci_save_config(DeviceState *d, QEMUFile *f)
qemu_put_be16(f, vdev->config_vector);
}
-static void virtio_pci_load_modern_queue_state(VirtIOPCIQueue *vq,
- QEMUFile *f)
-{
- vq->num = qemu_get_be16(f);
- vq->enabled = qemu_get_be16(f);
- vq->desc[0] = qemu_get_be32(f);
- vq->desc[1] = qemu_get_be32(f);
- vq->avail[0] = qemu_get_be32(f);
- vq->avail[1] = qemu_get_be32(f);
- vq->used[0] = qemu_get_be32(f);
- vq->used[1] = qemu_get_be32(f);
-}
-
-static bool virtio_pci_has_extra_state(DeviceState *d)
-{
- VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d);
-
- return proxy->flags & VIRTIO_PCI_FLAG_MIGRATE_EXTRA;
-}
-
-static int get_virtio_pci_modern_state(QEMUFile *f, void *pv, size_t size,
- VMStateField *field)
-{
- VirtIOPCIProxy *proxy = pv;
- int i;
-
- proxy->dfselect = qemu_get_be32(f);
- proxy->gfselect = qemu_get_be32(f);
- proxy->guest_features[0] = qemu_get_be32(f);
- proxy->guest_features[1] = qemu_get_be32(f);
- for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
- virtio_pci_load_modern_queue_state(&proxy->vqs[i], f);
- }
-
- return 0;
-}
-
-static void virtio_pci_save_modern_queue_state(VirtIOPCIQueue *vq,
- QEMUFile *f)
-{
- qemu_put_be16(f, vq->num);
- qemu_put_be16(f, vq->enabled);
- qemu_put_be32(f, vq->desc[0]);
- qemu_put_be32(f, vq->desc[1]);
- qemu_put_be32(f, vq->avail[0]);
- qemu_put_be32(f, vq->avail[1]);
- qemu_put_be32(f, vq->used[0]);
- qemu_put_be32(f, vq->used[1]);
-}
-
-static int put_virtio_pci_modern_state(QEMUFile *f, void *pv, size_t size,
- VMStateField *field, QJSON *vmdesc)
-{
- VirtIOPCIProxy *proxy = pv;
- int i;
-
- qemu_put_be32(f, proxy->dfselect);
- qemu_put_be32(f, proxy->gfselect);
- qemu_put_be32(f, proxy->guest_features[0]);
- qemu_put_be32(f, proxy->guest_features[1]);
- for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
- virtio_pci_save_modern_queue_state(&proxy->vqs[i], f);
+static const VMStateDescription vmstate_virtio_pci_modern_queue_state = {
+ .name = "virtio_pci/modern_queue_state",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT16(num, VirtIOPCIQueue),
+ VMSTATE_UNUSED(1), /* enabled was stored as be16 */
+ VMSTATE_BOOL(enabled, VirtIOPCIQueue),
+ VMSTATE_UINT32_ARRAY(desc, VirtIOPCIQueue, 2),
+ VMSTATE_UINT32_ARRAY(avail, VirtIOPCIQueue, 2),
+ VMSTATE_UINT32_ARRAY(used, VirtIOPCIQueue, 2),
+ VMSTATE_END_OF_LIST()
}
-
- return 0;
-}
-
-static const VMStateInfo vmstate_info_virtio_pci_modern_state = {
- .name = "virtqueue_state",
- .get = get_virtio_pci_modern_state,
- .put = put_virtio_pci_modern_state,
};
static bool virtio_pci_modern_state_needed(void *opaque)
@@ -168,21 +110,18 @@ static bool virtio_pci_modern_state_needed(void *opaque)
return virtio_pci_modern(proxy);
}
-static const VMStateDescription vmstate_virtio_pci_modern_state = {
+static const VMStateDescription vmstate_virtio_pci_modern_state_sub = {
.name = "virtio_pci/modern_state",
.version_id = 1,
.minimum_version_id = 1,
.needed = &virtio_pci_modern_state_needed,
.fields = (VMStateField[]) {
- {
- .name = "modern_state",
- .version_id = 0,
- .field_exists = NULL,
- .size = 0,
- .info = &vmstate_info_virtio_pci_modern_state,
- .flags = VMS_SINGLE,
- .offset = 0,
- },
+ VMSTATE_UINT32(dfselect, VirtIOPCIProxy),
+ VMSTATE_UINT32(gfselect, VirtIOPCIProxy),
+ VMSTATE_UINT32_ARRAY(guest_features, VirtIOPCIProxy, 2),
+ VMSTATE_STRUCT_ARRAY(vqs, VirtIOPCIProxy, VIRTIO_QUEUE_MAX, 0,
+ vmstate_virtio_pci_modern_queue_state,
+ VirtIOPCIQueue),
VMSTATE_END_OF_LIST()
}
};
@@ -196,11 +135,18 @@ static const VMStateDescription vmstate_virtio_pci = {
VMSTATE_END_OF_LIST()
},
.subsections = (const VMStateDescription*[]) {
- &vmstate_virtio_pci_modern_state,
+ &vmstate_virtio_pci_modern_state_sub,
NULL
}
};
+static bool virtio_pci_has_extra_state(DeviceState *d)
+{
+ VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d);
+
+ return proxy->flags & VIRTIO_PCI_FLAG_MIGRATE_EXTRA;
+}
+
static void virtio_pci_save_extra_state(DeviceState *d, QEMUFile *f)
{
VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d);
--
2.13.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH 1/1] virtio/pci/migration: Convert to VMState
2017-09-25 16:05 ` [Qemu-devel] [PATCH 1/1] virtio/pci/migration: Convert to VMState Dr. David Alan Gilbert (git)
@ 2017-10-05 19:09 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Dr. David Alan Gilbert @ 2017-10-05 19:09 UTC (permalink / raw)
To: qemu-devel, jasowang, mst; +Cc: quintela
* Dr. David Alan Gilbert (git) (dgilbert@redhat.com) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> Convert the 'modern_state' part of virtio-pci to modern migration
> macros.
Ping.
Dave
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> hw/virtio/virtio-pci.c | 108 +++++++++++++------------------------------------
> 1 file changed, 27 insertions(+), 81 deletions(-)
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index 8b0d6b69cd..f825a68a84 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -88,77 +88,19 @@ static void virtio_pci_save_config(DeviceState *d, QEMUFile *f)
> qemu_put_be16(f, vdev->config_vector);
> }
>
> -static void virtio_pci_load_modern_queue_state(VirtIOPCIQueue *vq,
> - QEMUFile *f)
> -{
> - vq->num = qemu_get_be16(f);
> - vq->enabled = qemu_get_be16(f);
> - vq->desc[0] = qemu_get_be32(f);
> - vq->desc[1] = qemu_get_be32(f);
> - vq->avail[0] = qemu_get_be32(f);
> - vq->avail[1] = qemu_get_be32(f);
> - vq->used[0] = qemu_get_be32(f);
> - vq->used[1] = qemu_get_be32(f);
> -}
> -
> -static bool virtio_pci_has_extra_state(DeviceState *d)
> -{
> - VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d);
> -
> - return proxy->flags & VIRTIO_PCI_FLAG_MIGRATE_EXTRA;
> -}
> -
> -static int get_virtio_pci_modern_state(QEMUFile *f, void *pv, size_t size,
> - VMStateField *field)
> -{
> - VirtIOPCIProxy *proxy = pv;
> - int i;
> -
> - proxy->dfselect = qemu_get_be32(f);
> - proxy->gfselect = qemu_get_be32(f);
> - proxy->guest_features[0] = qemu_get_be32(f);
> - proxy->guest_features[1] = qemu_get_be32(f);
> - for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
> - virtio_pci_load_modern_queue_state(&proxy->vqs[i], f);
> - }
> -
> - return 0;
> -}
> -
> -static void virtio_pci_save_modern_queue_state(VirtIOPCIQueue *vq,
> - QEMUFile *f)
> -{
> - qemu_put_be16(f, vq->num);
> - qemu_put_be16(f, vq->enabled);
> - qemu_put_be32(f, vq->desc[0]);
> - qemu_put_be32(f, vq->desc[1]);
> - qemu_put_be32(f, vq->avail[0]);
> - qemu_put_be32(f, vq->avail[1]);
> - qemu_put_be32(f, vq->used[0]);
> - qemu_put_be32(f, vq->used[1]);
> -}
> -
> -static int put_virtio_pci_modern_state(QEMUFile *f, void *pv, size_t size,
> - VMStateField *field, QJSON *vmdesc)
> -{
> - VirtIOPCIProxy *proxy = pv;
> - int i;
> -
> - qemu_put_be32(f, proxy->dfselect);
> - qemu_put_be32(f, proxy->gfselect);
> - qemu_put_be32(f, proxy->guest_features[0]);
> - qemu_put_be32(f, proxy->guest_features[1]);
> - for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
> - virtio_pci_save_modern_queue_state(&proxy->vqs[i], f);
> +static const VMStateDescription vmstate_virtio_pci_modern_queue_state = {
> + .name = "virtio_pci/modern_queue_state",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .fields = (VMStateField[]) {
> + VMSTATE_UINT16(num, VirtIOPCIQueue),
> + VMSTATE_UNUSED(1), /* enabled was stored as be16 */
> + VMSTATE_BOOL(enabled, VirtIOPCIQueue),
> + VMSTATE_UINT32_ARRAY(desc, VirtIOPCIQueue, 2),
> + VMSTATE_UINT32_ARRAY(avail, VirtIOPCIQueue, 2),
> + VMSTATE_UINT32_ARRAY(used, VirtIOPCIQueue, 2),
> + VMSTATE_END_OF_LIST()
> }
> -
> - return 0;
> -}
> -
> -static const VMStateInfo vmstate_info_virtio_pci_modern_state = {
> - .name = "virtqueue_state",
> - .get = get_virtio_pci_modern_state,
> - .put = put_virtio_pci_modern_state,
> };
>
> static bool virtio_pci_modern_state_needed(void *opaque)
> @@ -168,21 +110,18 @@ static bool virtio_pci_modern_state_needed(void *opaque)
> return virtio_pci_modern(proxy);
> }
>
> -static const VMStateDescription vmstate_virtio_pci_modern_state = {
> +static const VMStateDescription vmstate_virtio_pci_modern_state_sub = {
> .name = "virtio_pci/modern_state",
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = &virtio_pci_modern_state_needed,
> .fields = (VMStateField[]) {
> - {
> - .name = "modern_state",
> - .version_id = 0,
> - .field_exists = NULL,
> - .size = 0,
> - .info = &vmstate_info_virtio_pci_modern_state,
> - .flags = VMS_SINGLE,
> - .offset = 0,
> - },
> + VMSTATE_UINT32(dfselect, VirtIOPCIProxy),
> + VMSTATE_UINT32(gfselect, VirtIOPCIProxy),
> + VMSTATE_UINT32_ARRAY(guest_features, VirtIOPCIProxy, 2),
> + VMSTATE_STRUCT_ARRAY(vqs, VirtIOPCIProxy, VIRTIO_QUEUE_MAX, 0,
> + vmstate_virtio_pci_modern_queue_state,
> + VirtIOPCIQueue),
> VMSTATE_END_OF_LIST()
> }
> };
> @@ -196,11 +135,18 @@ static const VMStateDescription vmstate_virtio_pci = {
> VMSTATE_END_OF_LIST()
> },
> .subsections = (const VMStateDescription*[]) {
> - &vmstate_virtio_pci_modern_state,
> + &vmstate_virtio_pci_modern_state_sub,
> NULL
> }
> };
>
> +static bool virtio_pci_has_extra_state(DeviceState *d)
> +{
> + VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d);
> +
> + return proxy->flags & VIRTIO_PCI_FLAG_MIGRATE_EXTRA;
> +}
> +
> static void virtio_pci_save_extra_state(DeviceState *d, QEMUFile *f)
> {
> VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d);
> --
> 2.13.5
>
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-05 19:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-25 16:05 [Qemu-devel] [PATCH 0/1] VMState conversion for virtio-pci 'modern state' Dr. David Alan Gilbert (git)
2017-09-25 16:05 ` [Qemu-devel] [PATCH 1/1] virtio/pci/migration: Convert to VMState Dr. David Alan Gilbert (git)
2017-10-05 19:09 ` Dr. David Alan Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).