Patchwork [1/6] pci: add VMSTATE_MSIX

login
register
mail settings
Submitter Gerd Hoffmann
Date May 7, 2013, 1:34 p.m.
Message ID <1367933676-21854-2-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/242205/
State New
Headers show

Comments

Gerd Hoffmann - May 7, 2013, 1:34 p.m.
Using a trick cut+pasted from vmstate_scsi_device
to wind up msix_save and msix_load.
---
 hw/pci/msix.c         |   33 +++++++++++++++++++++++++++++++++
 include/hw/pci/msix.h |   11 +++++++++++
 2 files changed, 44 insertions(+)
Michael S. Tsirkin - May 7, 2013, 2:05 p.m.
On Tue, May 07, 2013 at 03:34:31PM +0200, Gerd Hoffmann wrote:
> Using a trick cut+pasted from vmstate_scsi_device
> to wind up msix_save and msix_load.

Any reason this is not signed-off by you?

> ---
>  hw/pci/msix.c         |   33 +++++++++++++++++++++++++++++++++
>  include/hw/pci/msix.h |   11 +++++++++++
>  2 files changed, 44 insertions(+)
> 
> diff --git a/hw/pci/msix.c b/hw/pci/msix.c
> index e231a0d..6da75ec 100644
> --- a/hw/pci/msix.c
> +++ b/hw/pci/msix.c
> @@ -569,3 +569,36 @@ void msix_unset_vector_notifiers(PCIDevice *dev)
>      dev->msix_vector_release_notifier = NULL;
>      dev->msix_vector_poll_notifier = NULL;
>  }
> +
> +static void put_msix_state(QEMUFile *f, void *pv, size_t size)
> +{
> +    msix_save(pv, f);
> +}
> +
> +static int get_msix_state(QEMUFile *f, void *pv, size_t size)
> +{
> +    msix_load(pv, f);
> +    return 0;
> +}
> +
> +static VMStateInfo vmstate_info_msix = {
> +    .name = "msix state",
> +    .get  = get_msix_state,
> +    .put  = put_msix_state,
> +};
> +
> +const VMStateDescription vmstate_msix = {
> +    .name = "msix",
> +    .fields = (VMStateField[]) {
> +        {
> +            .name         = "msix",
> +            .version_id   = 0,
> +            .field_exists = NULL,
> +            .size         = 0,   /* ouch */
> +            .info         = &vmstate_info_msix,
> +            .flags        = VMS_SINGLE,
> +            .offset       = 0,
> +        },
> +        VMSTATE_END_OF_LIST()
> +    }
> +};
> diff --git a/include/hw/pci/msix.h b/include/hw/pci/msix.h
> index e648410..954d82b 100644
> --- a/include/hw/pci/msix.h
> +++ b/include/hw/pci/msix.h
> @@ -43,4 +43,15 @@ int msix_set_vector_notifiers(PCIDevice *dev,
>                                MSIVectorReleaseNotifier release_notifier,
>                                MSIVectorPollNotifier poll_notifier);
>  void msix_unset_vector_notifiers(PCIDevice *dev);
> +
> +extern const VMStateDescription vmstate_msix;
> +
> +#define VMSTATE_MSIX(_field, _state) {                               \
> +    .name       = (stringify(_field)),                               \
> +    .size       = sizeof(PCIDevice),                                 \
> +    .vmsd       = &vmstate_msix,                                     \
> +    .flags      = VMS_STRUCT,                                        \
> +    .offset     = vmstate_offset_value(_state, _field, PCIDevice),   \
> +}
> +
>  #endif
> -- 
> 1.7.9.7
>
Gerd Hoffmann - May 7, 2013, 2:08 p.m.
On 05/07/13 16:05, Michael S. Tsirkin wrote:
> On Tue, May 07, 2013 at 03:34:31PM +0200, Gerd Hoffmann wrote:
>> > Using a trick cut+pasted from vmstate_scsi_device
>> > to wind up msix_save and msix_load.
> Any reason this is not signed-off by you?
> 
Just forgot it, here we go:

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

cheers,
  Gerd
Michael S. Tsirkin - May 7, 2013, 2:10 p.m.
On Tue, May 07, 2013 at 04:08:46PM +0200, Gerd Hoffmann wrote:
> On 05/07/13 16:05, Michael S. Tsirkin wrote:
> > On Tue, May 07, 2013 at 03:34:31PM +0200, Gerd Hoffmann wrote:
> >> > Using a trick cut+pasted from vmstate_scsi_device
> >> > to wind up msix_save and msix_load.
> > Any reason this is not signed-off by you?
> > 
> Just forgot it, here we go:
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> 
> cheers,
>   Gerd

I'm fine with the patch itself.

Acked-by: Michael S. Tsirkin <mst@redhat.com>

Patch

diff --git a/hw/pci/msix.c b/hw/pci/msix.c
index e231a0d..6da75ec 100644
--- a/hw/pci/msix.c
+++ b/hw/pci/msix.c
@@ -569,3 +569,36 @@  void msix_unset_vector_notifiers(PCIDevice *dev)
     dev->msix_vector_release_notifier = NULL;
     dev->msix_vector_poll_notifier = NULL;
 }
+
+static void put_msix_state(QEMUFile *f, void *pv, size_t size)
+{
+    msix_save(pv, f);
+}
+
+static int get_msix_state(QEMUFile *f, void *pv, size_t size)
+{
+    msix_load(pv, f);
+    return 0;
+}
+
+static VMStateInfo vmstate_info_msix = {
+    .name = "msix state",
+    .get  = get_msix_state,
+    .put  = put_msix_state,
+};
+
+const VMStateDescription vmstate_msix = {
+    .name = "msix",
+    .fields = (VMStateField[]) {
+        {
+            .name         = "msix",
+            .version_id   = 0,
+            .field_exists = NULL,
+            .size         = 0,   /* ouch */
+            .info         = &vmstate_info_msix,
+            .flags        = VMS_SINGLE,
+            .offset       = 0,
+        },
+        VMSTATE_END_OF_LIST()
+    }
+};
diff --git a/include/hw/pci/msix.h b/include/hw/pci/msix.h
index e648410..954d82b 100644
--- a/include/hw/pci/msix.h
+++ b/include/hw/pci/msix.h
@@ -43,4 +43,15 @@  int msix_set_vector_notifiers(PCIDevice *dev,
                               MSIVectorReleaseNotifier release_notifier,
                               MSIVectorPollNotifier poll_notifier);
 void msix_unset_vector_notifiers(PCIDevice *dev);
+
+extern const VMStateDescription vmstate_msix;
+
+#define VMSTATE_MSIX(_field, _state) {                               \
+    .name       = (stringify(_field)),                               \
+    .size       = sizeof(PCIDevice),                                 \
+    .vmsd       = &vmstate_msix,                                     \
+    .flags      = VMS_STRUCT,                                        \
+    .offset     = vmstate_offset_value(_state, _field, PCIDevice),   \
+}
+
 #endif