[Qemu-devel] [PATCH] vmstate-static-checker: update white list with spapr_pci

Laurent Vivier posted 1 patch 7 years, 1 month ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20170214133331.28997-1-lvivier@redhat.com
Test checkpatch passed
Test docker passed
Test s390x passed
scripts/vmstate-static-checker.py | 5 +++++
1 file changed, 5 insertions(+)
[Qemu-devel] [PATCH] vmstate-static-checker: update white list with spapr_pci
Posted by Laurent Vivier 7 years, 1 month ago
To fix migration between 2.7 and 2.8, some fields have
been renamed and managed with the help of a PHB property
(pre_2_8_migration):

    5c4537b spapr: Fix 2.7<->2.8 migration of PCI host bridge

So we need to add them to the white list:

    dma_liobn[0],
    mem_win_addr, mem_win_size,
    io_win_addr, io_win_size

become

    mig_liobn,
    mig_mem_win_addr, mig_mem_win_size,
    mig_io_win_addr, mig_io_win_size

CC: David Gibson <david@gibson.dropbear.id.au>
CC: Dr. David Alan Gilbert <dgilbert@redhat.com>
CC: Thomas Huth <thuth@redhat.com>
CC: Greg Kurz <groug@kaod.org>
CC: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 scripts/vmstate-static-checker.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-checker.py
index 14a27e7..bcef7ee 100755
--- a/scripts/vmstate-static-checker.py
+++ b/scripts/vmstate-static-checker.py
@@ -85,6 +85,11 @@ def check_fields_match(name, s_field, d_field):
         'xio3130-express-upstream-port': ['br.dev', 'parent_obj.parent_obj',
                                           'br.dev.exp.aer_log',
                                           'parent_obj.parent_obj.exp.aer_log'],
+        'spapr_pci': ['dma_liobn[0]', 'mig_liobn',
+                      'mem_win_addr', 'mig_mem_win_addr',
+                      'mem_win_size', 'mig_mem_win_size',
+                      'io_win_addr', 'mig_io_win_addr',
+                      'io_win_size', 'mig_io_win_size'],
     }
 
     if not name in changed_names:
-- 
2.9.3


Re: [Qemu-devel] [PATCH] vmstate-static-checker: update white list with spapr_pci
Posted by Thomas Huth 7 years, 1 month ago
On 14.02.2017 14:33, Laurent Vivier wrote:
> To fix migration between 2.7 and 2.8, some fields have
> been renamed and managed with the help of a PHB property
> (pre_2_8_migration):
> 
>     5c4537b spapr: Fix 2.7<->2.8 migration of PCI host bridge
> 
> So we need to add them to the white list:
> 
>     dma_liobn[0],
>     mem_win_addr, mem_win_size,
>     io_win_addr, io_win_size
> 
> become
> 
>     mig_liobn,
>     mig_mem_win_addr, mig_mem_win_size,
>     mig_io_win_addr, mig_io_win_size
> 
> CC: David Gibson <david@gibson.dropbear.id.au>
> CC: Dr. David Alan Gilbert <dgilbert@redhat.com>
> CC: Thomas Huth <thuth@redhat.com>
> CC: Greg Kurz <groug@kaod.org>
> CC: Alexey Kardashevskiy <aik@ozlabs.ru>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>  scripts/vmstate-static-checker.py | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-checker.py
> index 14a27e7..bcef7ee 100755
> --- a/scripts/vmstate-static-checker.py
> +++ b/scripts/vmstate-static-checker.py
> @@ -85,6 +85,11 @@ def check_fields_match(name, s_field, d_field):
>          'xio3130-express-upstream-port': ['br.dev', 'parent_obj.parent_obj',
>                                            'br.dev.exp.aer_log',
>                                            'parent_obj.parent_obj.exp.aer_log'],
> +        'spapr_pci': ['dma_liobn[0]', 'mig_liobn',
> +                      'mem_win_addr', 'mig_mem_win_addr',
> +                      'mem_win_size', 'mig_mem_win_size',
> +                      'io_win_addr', 'mig_io_win_addr',
> +                      'io_win_size', 'mig_io_win_size'],
>      }
>  
>      if not name in changed_names:
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>


Re: [Qemu-devel] [PATCH] vmstate-static-checker: update white list with spapr_pci
Posted by David Gibson 7 years, 1 month ago
On Tue, Feb 14, 2017 at 02:33:31PM +0100, Laurent Vivier wrote:
> To fix migration between 2.7 and 2.8, some fields have
> been renamed and managed with the help of a PHB property
> (pre_2_8_migration):
> 
>     5c4537b spapr: Fix 2.7<->2.8 migration of PCI host bridge
> 
> So we need to add them to the white list:
> 
>     dma_liobn[0],
>     mem_win_addr, mem_win_size,
>     io_win_addr, io_win_size
> 
> become
> 
>     mig_liobn,
>     mig_mem_win_addr, mig_mem_win_size,
>     mig_io_win_addr, mig_io_win_size
> 
> CC: David Gibson <david@gibson.dropbear.id.au>
> CC: Dr. David Alan Gilbert <dgilbert@redhat.com>
> CC: Thomas Huth <thuth@redhat.com>
> CC: Greg Kurz <groug@kaod.org>
> CC: Alexey Kardashevskiy <aik@ozlabs.ru>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>  scripts/vmstate-static-checker.py | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-checker.py
> index 14a27e7..bcef7ee 100755
> --- a/scripts/vmstate-static-checker.py
> +++ b/scripts/vmstate-static-checker.py
> @@ -85,6 +85,11 @@ def check_fields_match(name, s_field, d_field):
>          'xio3130-express-upstream-port': ['br.dev', 'parent_obj.parent_obj',
>                                            'br.dev.exp.aer_log',
>                                            'parent_obj.parent_obj.exp.aer_log'],
> +        'spapr_pci': ['dma_liobn[0]', 'mig_liobn',
> +                      'mem_win_addr', 'mig_mem_win_addr',
> +                      'mem_win_size', 'mig_mem_win_size',
> +                      'io_win_addr', 'mig_io_win_addr',
> +                      'io_win_size', 'mig_io_win_size'],
>      }
>  
>      if not name in changed_names:

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Re: [Qemu-devel] [PATCH] vmstate-static-checker: update white list with spapr_pci
Posted by Laurent Vivier 7 years, 1 month ago
Ping?

Laurent

On 14/02/2017 14:33, Laurent Vivier wrote:
> To fix migration between 2.7 and 2.8, some fields have
> been renamed and managed with the help of a PHB property
> (pre_2_8_migration):
> 
>     5c4537b spapr: Fix 2.7<->2.8 migration of PCI host bridge
> 
> So we need to add them to the white list:
> 
>     dma_liobn[0],
>     mem_win_addr, mem_win_size,
>     io_win_addr, io_win_size
> 
> become
> 
>     mig_liobn,
>     mig_mem_win_addr, mig_mem_win_size,
>     mig_io_win_addr, mig_io_win_size
> 
> CC: David Gibson <david@gibson.dropbear.id.au>
> CC: Dr. David Alan Gilbert <dgilbert@redhat.com>
> CC: Thomas Huth <thuth@redhat.com>
> CC: Greg Kurz <groug@kaod.org>
> CC: Alexey Kardashevskiy <aik@ozlabs.ru>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>  scripts/vmstate-static-checker.py | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-checker.py
> index 14a27e7..bcef7ee 100755
> --- a/scripts/vmstate-static-checker.py
> +++ b/scripts/vmstate-static-checker.py
> @@ -85,6 +85,11 @@ def check_fields_match(name, s_field, d_field):
>          'xio3130-express-upstream-port': ['br.dev', 'parent_obj.parent_obj',
>                                            'br.dev.exp.aer_log',
>                                            'parent_obj.parent_obj.exp.aer_log'],
> +        'spapr_pci': ['dma_liobn[0]', 'mig_liobn',
> +                      'mem_win_addr', 'mig_mem_win_addr',
> +                      'mem_win_size', 'mig_mem_win_size',
> +                      'io_win_addr', 'mig_io_win_addr',
> +                      'io_win_size', 'mig_io_win_size'],
>      }
>  
>      if not name in changed_names:
> 


Re: [Qemu-devel] [PATCH] vmstate-static-checker: update white list with spapr_pci
Posted by Dr. David Alan Gilbert 7 years ago
* Laurent Vivier (lvivier@redhat.com) wrote:
> To fix migration between 2.7 and 2.8, some fields have
> been renamed and managed with the help of a PHB property
> (pre_2_8_migration):
> 
>     5c4537b spapr: Fix 2.7<->2.8 migration of PCI host bridge
> 
> So we need to add them to the white list:
> 
>     dma_liobn[0],
>     mem_win_addr, mem_win_size,
>     io_win_addr, io_win_size
> 
> become
> 
>     mig_liobn,
>     mig_mem_win_addr, mig_mem_win_size,
>     mig_io_win_addr, mig_io_win_size
> 
> CC: David Gibson <david@gibson.dropbear.id.au>
> CC: Dr. David Alan Gilbert <dgilbert@redhat.com>
> CC: Thomas Huth <thuth@redhat.com>
> CC: Greg Kurz <groug@kaod.org>
> CC: Alexey Kardashevskiy <aik@ozlabs.ru>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Queued.

> ---
>  scripts/vmstate-static-checker.py | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-checker.py
> index 14a27e7..bcef7ee 100755
> --- a/scripts/vmstate-static-checker.py
> +++ b/scripts/vmstate-static-checker.py
> @@ -85,6 +85,11 @@ def check_fields_match(name, s_field, d_field):
>          'xio3130-express-upstream-port': ['br.dev', 'parent_obj.parent_obj',
>                                            'br.dev.exp.aer_log',
>                                            'parent_obj.parent_obj.exp.aer_log'],
> +        'spapr_pci': ['dma_liobn[0]', 'mig_liobn',
> +                      'mem_win_addr', 'mig_mem_win_addr',
> +                      'mem_win_size', 'mig_mem_win_size',
> +                      'io_win_addr', 'mig_io_win_addr',
> +                      'io_win_size', 'mig_io_win_size'],
>      }
>  
>      if not name in changed_names:
> -- 
> 2.9.3
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK