Merge remote-tracking branch 'kraxel/migration.2' into staging

diff --cc hw/usb-msd.c
Simple merge

diff --cc hw/usb-serial.c
Simple merge

diff --cc savevm.c
Simple merge