From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Guthro Subject: [PATCH][QEMU] serial save load fix Date: Thu, 15 May 2008 13:01:32 -0400 Message-ID: <482C6C6C.5070206@virtualiron.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1451341893==" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel Cc: Robert Phillips List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --===============1451341893== Content-Type: multipart/alternative; boundary="------------040609070509010000030101" This is a multi-part message in MIME format. --------------040609070509010000030101 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit NOTE: An applicable subset of this patch was also submitted to upstream qemu. SUMMARY: This patch fixes several bugs in serial.c (1) A typo in serial_save() where qemu_get_8s is called (should be qemu_put_8s) (2) 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 (3) 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 -r a81184e1f8ae tools/ioemu/hw/serial.c --- a/tools/ioemu/hw/serial.c +++ b/tools/ioemu/hw/serial.c @@ -708,12 +708,13 @@ static void serial_save(QEMUFile *f, voi qemu_put_8s(f,&s->lsr); qemu_put_8s(f,&s->msr); qemu_put_8s(f,&s->scr); - qemu_get_8s(f,&s->fcr); + qemu_put_8s(f,&s->fcr); } static int serial_load(QEMUFile *f, void *opaque, int version_id) { SerialState *s = opaque; + uint8_t fcr; if(version_id > 2) return -EINVAL; @@ -730,8 +731,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); - qemu_get_8s(f,&s->fcr); - + 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; } --------------040609070509010000030101 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit NOTE: An applicable subset of this patch was also submitted to upstream qemu. SUMMARY: This patch fixes several bugs in serial.c (1) A typo in serial_save() where qemu_get_8s is called (should be qemu_put_8s) (2) 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 (3) 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 -r a81184e1f8ae tools/ioemu/hw/serial.c --- a/tools/ioemu/hw/serial.c +++ b/tools/ioemu/hw/serial.c @@ -708,12 +708,13 @@ static void serial_save(QEMUFile *f, voi qemu_put_8s(f,&s->lsr); qemu_put_8s(f,&s->msr); qemu_put_8s(f,&s->scr); - qemu_get_8s(f,&s->fcr); + qemu_put_8s(f,&s->fcr); } static int serial_load(QEMUFile *f, void *opaque, int version_id) { SerialState *s = opaque; + uint8_t fcr; if(version_id > 2) return -EINVAL; @@ -730,8 +731,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); - qemu_get_8s(f,&s->fcr); - + 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; } --------------040609070509010000030101-- --===============1451341893== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --===============1451341893==--