[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 14/15] adlib: sort offsets in portio registration
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 14/15] adlib: sort offsets in portio registration |
Date: |
Mon, 2 Sep 2013 15:01:34 +0400 |
From: Hervé Poussineau <address@hidden>
This fixes the following assert when -device adlib is used:
ioport.c:240: portio_list_add: Assertion `pio->offset >= off_last' failed.
Signed-off-by: Hervé Poussineau <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/audio/adlib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 0c79247..bd8e9d9 100644
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -284,9 +284,9 @@ static void Adlib_fini (AdlibState *s)
}
static MemoryRegionPortio adlib_portio_list[] = {
- { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },
{ 0, 4, 1, .read = adlib_read, .write = adlib_write, },
{ 0, 2, 1, .read = adlib_read, .write = adlib_write, },
+ { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },
PORTIO_END_OF_LIST(),
};
--
1.7.10.4
- [Qemu-trivial] [PULL 02/15] misc: Fix some typos in names and comments, (continued)
- [Qemu-trivial] [PULL 02/15] misc: Fix some typos in names and comments, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 04/15] configure: disable clang -Wstring-plus-int warning, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 03/15] rdma: silly ipv6 bugfix, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 08/15] configure: Remove unneeded redirections of stderr (pkg-config --cflags, --libs), Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 11/15] target-arm: Report unimplemented opcodes (LOG_UNIMP), Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 12/15] tci: Remove function tcg_out64 (fix broken build), Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 05/15] slirp/arp_table.c: Avoid shifting into sign bit of signed integers, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 13/15] qmp: fix integer usage in examples, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 07/15] configure: Don't write .pyc files by default (python -B), Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 10/15] pflash_cfi02.c: fix debug macro, Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 14/15] adlib: sort offsets in portio registration,
Michael Tokarev <=
- [Qemu-trivial] [PULL 15/15] aio / timers: use g_usleep() not sleep(), Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 09/15] configure: Remove unneeded redirections of stderr (pkg-config --exists), Michael Tokarev, 2013/09/02
- [Qemu-trivial] [PULL 06/15] curl: qemu_bh_new() can never return NULL, Michael Tokarev, 2013/09/02