I haven't received any other comments on this except for the one below. I think this is ready for inclusion.
Changes since v4: Fixed the stupid thinko I did in "boards.h: Ignore migration for SMBus devices on older machines", Put it in the 3.1 function so it's actually an older machine. Changes since v3: Change I2C to "I2C and SMBus" in the MAINTAINERS file. Added a comment to the smbus_eeprom reset to make the reasoning for the choice clear. Fix a logic error introduced in "i2c: Don't check return value from i2c_recv()". Fix a debug problem in "i2c: Simplify and correct the SMBus state machine", a removed variable was still being used in a debug statement. Split up "i2c: Simplify and correct the SMBus state machine" into smaller logical chunks. Updated "boards.h: Ignore migration for SMBus devices on older machines" to ignore migration for 4.0 and earlier. No other comments received on "i2c:smbus_eeprom: Add vmstate handling to the smbus eeprom", not sure what to make of that. I think that Dave's response to my question was that it could be modified to support different sizes in the future without issue. Dropped "hw/i2c/smbus_eeprom: Create at most SMBUS_EEPROM_MAX EEPROMs on a SMBus and instead added a patch to assert if the number of eeproms is > 8. Changes since v2: Added proper license headers for the newly created files. Removed unneeded code in several places pointed out by Peter Maydell since i2c_recv() returns a uint8_t instead of an int. These are in two separate patches. Added a patch from Philippe Mathieu-Daudé <phi...@redhat.com> to replace a magic number with a constant in the smbus_eeprom code and verify the count so there is no overflow. Updated the pm_smbus migration to not update the version numbers in the existing vmstate structures. The needed field didn't accomplish what was needed because it is only called on the save side, not the load side of the migration. So I'm using VMSTATE_STRUCT_TEST() to transfer the pm_smbus data now, that should be all that is required for backwards compatibility, and will be safer for falling back to an older version. I found the problem with the SMBus being broken on piix4 after a migration, but I sent it out as a separate patch since it has nothing to do with this series, and should probably go into the current release being worked on.