|
From: | Ben Guthro |
Subject: | [Qemu-devel] [PATCH] serial save load fix |
Date: | Thu, 15 May 2008 13:01:44 -0400 |
User-agent: | Thunderbird 2.0.0.5 (X11/20070719) |
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. Signed-off-by: Ben Guthro <address@hidden> Signed-off-by: Robert Phillips <address@hidden> diff -urp nightly-qemu/hw/serial.c nightly-qemu.mod/hw/serial.c --- nightly-qemu/hw/serial.c 2008-03-25 18:28:25.000000000 -0400 +++ nightly-qemu.mod/hw/serial.c 2008-05-15 11:42:49.000000000 -0400 @@ -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; } |
[Prev in Thread] | Current Thread | [Next in Thread] |