Commit bb9c3636 authored by Amit Shah's avatar Amit Shah
Browse files

vmstate static checker: whitelist additions 



Comparing json outputs from qemu-1.0 with qemu-2.1 turned up a few
description name changes; whitelist them here.

Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
parent 35858955

scripts/vmstate-static-checker.py

+15 −1
Original line number Diff line number Diff line
@@ -42,30 +42,44 @@ def check_fields_match(name, s_field, d_field): 
    # Some fields changed names between qemu versions.  This list

    # is used to whitelist such changes in each section / description.

    changed_names = {

        'apic': ['timer', 'timer_expiry'],

        'e1000': ['dev', 'parent_obj'],

        'ehci': ['dev', 'pcidev'],

        'I440FX': ['dev', 'parent_obj'],

        'ich9_ahci': ['card', 'parent_obj'],

        'ich9-ahci': ['ahci', 'ich9_ahci'],

        'ioh3420': ['PCIDevice', 'PCIEDevice'],

        'ioh-3240-express-root-port': ['port.br.dev',

                                       'parent_obj.parent_obj.parent_obj',

                                       'port.br.dev.exp.aer_log',

                                'parent_obj.parent_obj.parent_obj.exp.aer_log'],

        'lsiscsi': ['dev', 'parent_obj'],

        'mch': ['d', 'parent_obj'],

        'pci_bridge': ['bridge.dev', 'parent_obj', 'bridge.dev.shpc', 'shpc'],

        'pcnet': ['pci_dev', 'parent_obj'],

        'PIIX3': ['pci_irq_levels', 'pci_irq_levels_vmstate'],

        'piix4_pm': ['dev', 'parent_obj', 'pci0_status',

                     'acpi_pci_hotplug.acpi_pcihp_pci_status[0x0]'],

                     'acpi_pci_hotplug.acpi_pcihp_pci_status[0x0]',

                     'pm1a.sts', 'ar.pm1.evt.sts', 'pm1a.en', 'ar.pm1.evt.en',

                     'pm1_cnt.cnt', 'ar.pm1.cnt.cnt',

                     'tmr.timer', 'ar.tmr.timer',

                     'tmr.overflow_time', 'ar.tmr.overflow_time',

                     'gpe', 'ar.gpe'],

        'rtl8139': ['dev', 'parent_obj'],

        'qxl': ['num_surfaces', 'ssd.num_surfaces'],

        'usb-ccid': ['abProtocolDataStructure', 'abProtocolDataStructure.data'],

        'usb-host': ['dev', 'parent_obj'],

        'usb-mouse': ['usb-ptr-queue', 'HIDPointerEventQueue'],

        'usb-tablet': ['usb-ptr-queue', 'HIDPointerEventQueue'],

        'vmware_vga': ['card', 'parent_obj'],

        'vmware_vga_internal': ['depth', 'new_depth'],

        'xhci': ['pci_dev', 'parent_obj'],

        'x3130-upstream': ['PCIDevice', 'PCIEDevice'],

        'xio3130-express-downstream-port': ['port.br.dev',

                                            'parent_obj.parent_obj.parent_obj',

                                            'port.br.dev.exp.aer_log',

                                'parent_obj.parent_obj.parent_obj.exp.aer_log'],

        'xio3130-downstream': ['PCIDevice', 'PCIEDevice'],

        'xio3130-express-upstream-port': ['br.dev', 'parent_obj.parent_obj',

                                          'br.dev.exp.aer_log',

                                          'parent_obj.parent_obj.exp.aer_log'],