From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JwhBr-0007pM-Lb for qemu-devel@nongnu.org; Thu, 15 May 2008 13:24:27 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JwhBq-0007nk-TI for qemu-devel@nongnu.org; Thu, 15 May 2008 13:24:27 -0400 Received: from [199.232.76.173] (port=53869 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JwhBq-0007nc-RB for qemu-devel@nongnu.org; Thu, 15 May 2008 13:24:26 -0400 Received: from mail.virtualiron.com ([209.213.88.114]:3161) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JwhBq-0003ju-8Y for qemu-devel@nongnu.org; Thu, 15 May 2008 13:24:26 -0400 Message-ID: <482C6C78.6050708@virtualiron.com> Date: Thu, 15 May 2008 13:01:44 -0400 From: Ben Guthro MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="------------050605070201050403050001" Subject: [Qemu-devel] [PATCH] serial save load fix Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Robert Phillips This is a multi-part message in MIME format. --------------050605070201050403050001 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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 > Signed-off-by: Robert Phillips > 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; } --------------050605070201050403050001 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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 <bguthro@virtualiron.com> Signed-off-by: Robert Phillips <rphillips@virtualiron.com> 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; } --------------050605070201050403050001--