]> xenbits.xensource.com Git - qemu-xen-4.1-testing.git/commitdiff
Do not kill ioemu if undefined LSI-SCI registers are read.
authorIan Jackson <iwj@mariner.uk.xensource.com>
Wed, 14 May 2008 15:55:37 +0000 (16:55 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 14 May 2008 15:55:37 +0000 (16:55 +0100)
Imported changeset from xen-unstable:

    changeset:   14902:a7bd11fd5b1b6f4a82135db09dfe654e8966fabe
    user:        kfraser@localhost.localdomain
    date:        Tue Apr 24 12:12:48 2007 +0100
    files:       tools/ioemu/hw/lsi53c895a.c
    description:
    qemu: Do not kill ioemu if undefined LSI-SCI registers are read. Just
    return zeroes. This path is triggered by ASPI8DOS.SYS in DRDOS.
Signed-off-by: Keir Fraser <keir@xensource.com>
However, this behaviour change was inexplicably made conditional on
CONFIG_DM.  I have removed the conditionality.

hw/lsi53c895a.c

index a08cfd9e3e11cc3ffa065a7a7236ca80c585e138..24a43b11ae75e21bb48bc2f2434697d8d92f8e29 100644 (file)
@@ -1369,8 +1369,8 @@ static uint8_t lsi_reg_readb(LSIState *s, int offset)
         shift = (offset & 3) * 8;
         return (s->scratch[n] >> shift) & 0xff;
     }
-    BADF("readb 0x%x\n", offset);
-    exit(1);
+    /* XEN: This path can be triggered (e.g. ASPI8DOS.SYS reads 0x8). */
+    return 0;
 #undef CASE_GET_REG32
 }