serial save load fix

This patch fixes several bugs in serial.c
(1) No support provided in serial_load() for version_id == 1 (should unmarshal a 1 byte s->divider and should provide a default value for s->fcr
(2) Call serial_ioport_write() to initialize s->fcr. It is not sufficient to load its value; other hidden values (such as s->recv_fifo.itl) must be re-initialized.

diff -urp nightly-qemu/hw/serial.c nightly-qemu.mod/hw/serial.c
@@ -338,6 +338,7 @@ static void serial_save(QEMUFile *f, voi

static int serial_load(QEMUFile *f, void *opaque, int version_id) {
SerialState *s = opaque;
+ uint8_t fcr;

if(version_id > 2)

      return -EINVAL;

@@ -354,6 +355,13 @@ static int serial_load(QEMUFile *f, void
qemu_get_8s(f,&s->lsr);
qemu_get_8s(f,&s->msr);
qemu_get_8s(f,&s->scr);
+ if (version_id >= 2)
+ qemu_get_8s(f,&fcr);
+ else
+ fcr = 0; // disable fifos
+
+ /* Initialize fcr via setter to perform essential side-effects */
+ serial_ioport_write(s, 0x02, fcr);

return 0;
}

The patch does apply (other than it has to be de-HTML-ised) but
version 2 of serial_load doesn't save the FCR, at least in the SVN
tree, http://svn.savannah.gnu.org/viewvc/trunk/hw/serial.c?revision=4336&root=qemu&view=markup

Please check.

Cheers

Please do not print this email unless absolutely necessary. Spread
environmental awareness.

Err, of serial_save.