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 <da...@gibson.dropbear.id.au> > CC: Dr. David Alan Gilbert <dgilb...@redhat.com> > CC: Thomas Huth <th...@redhat.com> > CC: Greg Kurz <gr...@kaod.org> > CC: Alexey Kardashevskiy <a...@ozlabs.ru> > Signed-off-by: Laurent Vivier <lviv...@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 <da...@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
signature.asc
Description: PGP signature
