Commit ba63ec85 authored by Leonid Bloch's avatar Leonid Bloch Committed by Jason Wang
Browse files

e1000: Introducing backward compatibility command line parameter 



This follows the previous patches, where support for migrating the
entire MAC registers' array, and some new MAC registers were introduced.

This patch introduces the e1000-specific boolean parameter
"extra_mac_registers", which is on by default. Setting it to off will
enable migration to older versions of QEMU, but will disable the read
and write access to the new registers, that were introduced since adding
the ability to migrate the entire MAC array.

Example for usage to enable backward compatibility and to disable the
new MAC registers:

    qemu-system-x86_64 -device e1000,extra_mac_registers=off,... ...

As mentioned above, the default value is "on".

Signed-off-by: default avatarLeonid Bloch <leonid.bloch@ravellosystems.com>
Signed-off-by: default avatarDmitry Fleytman <dmitry.fleytman@ravellosystems.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 3b274301

hw/net/e1000.c

+2 −0
Original line number Diff line number Diff line
@@ -1854,6 +1854,8 @@ static Property e1000_properties[] = { 
                    compat_flags, E1000_FLAG_AUTONEG_BIT, true),

    DEFINE_PROP_BIT("mitigation", E1000State,

                    compat_flags, E1000_FLAG_MIT_BIT, true),

    DEFINE_PROP_BIT("extra_mac_registers", E1000State,

                    compat_flags, E1000_FLAG_MAC_BIT, true),

    DEFINE_PROP_END_OF_LIST(),

};

include/hw/compat.h

+5 −1
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 
            .driver   = "virtio-blk-device",\

            .property = "scsi",\

            .value    = "true",\

        },{\

            .driver   = "e1000",\

            .property = "extra_mac_registers",\

            .value    = "off",\

         },



#define HW_COMPAT_2_3 \