mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/eeprom93xx.c: substitute structure dump with discrete dump in eeprom_save/load

Browse Source 
The EEPROM 93xx device used to dump a C structure to the migration stream.
This structure includes mixed 8 and 16bit variables and is thus subject to
compiler dependent padding. Replace this with discrete dumps of each member
(and add a padding byte to ensure compatibility, a version update is
included in the following patch).

Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6917 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2009-03-28 23:14:41 +00:00
parent e8afa06581
commit d4ae799cd1
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/eeprom93xx.c
View File

@ -95,7 +95,19 @@ static void eeprom_save(QEMUFile *f, void *opaque)
/* Save EEPROM data. */ /* Save EEPROM data. */
unsigned address; unsigned address;
eeprom_t *eeprom = (eeprom_t *)opaque; eeprom_t *eeprom = (eeprom_t *)opaque;
qemu_put_buffer(f, (uint8_t *)eeprom, sizeof(*eeprom) - 2);
qemu_put_byte(f, eeprom->tick);
qemu_put_byte(f, eeprom->address);
qemu_put_byte(f, eeprom->command);
qemu_put_byte(f, eeprom->writeable);
qemu_put_byte(f, eeprom->eecs);
qemu_put_byte(f, eeprom->eesk);
qemu_put_byte(f, eeprom->eedo);
qemu_put_byte(f, eeprom->addrbits);
qemu_put_byte(f, eeprom->size);
qemu_put_byte(f, 0); /* padding for compatiblity */
qemu_put_be16(f, eeprom->data); qemu_put_be16(f, eeprom->data);
for (address = 0; address < eeprom->size; address++) { for (address = 0; address < eeprom->size; address++) {
qemu_put_be16(f, eeprom->contents[address]); qemu_put_be16(f, eeprom->contents[address]);
@ -111,7 +123,20 @@ static int eeprom_load(QEMUFile *f, void *opaque, int version_id)
if (version_id == eeprom_version) { if (version_id == eeprom_version) {
unsigned address; unsigned address;
uint8_t size = eeprom->size; uint8_t size = eeprom->size;
qemu_get_buffer(f, (uint8_t *)eeprom, sizeof(*eeprom) - 2);
eeprom->tick = qemu_get_byte(f);
eeprom->address = qemu_get_byte(f);
eeprom->command = qemu_get_byte(f);
eeprom->writeable = qemu_get_byte(f);
eeprom->eecs = qemu_get_byte(f);
eeprom->eesk = qemu_get_byte(f);
eeprom->eedo = qemu_get_byte(f);
eeprom->addrbits = qemu_get_byte(f);
eeprom->size = qemu_get_byte(f);
qemu_get_byte(f); /* skip padding byte */
if (eeprom->size == size) { if (eeprom->size == size) {
eeprom->data = qemu_get_be16(f); eeprom->data = qemu_get_be16(f);
for (address = 0; address < eeprom->size; address++) { for (address = 0; address < eeprom->size; address++) {