Attachment 618241 Details for Bug 849223 – [2/2] qemu-dm: fix unregister_iomem()

[patch] [2/2] qemu-dm: fix unregister_iomem()

2-qemu-dm-fix-unregister_iomem-.patch (text/plain), 1.13 KB, created by Laszlo Ersek on 2012-09-27 19:01:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laszlo Ersek

Created: 2012-09-27 19:01:19 UTC

Size: 1.13 KB

patch

obsolete

>fd4f68bd2def02eae2c19f2898686ebe01948834
>diff --git a/tools/ioemu/target-i386-dm/exec-dm.c b/tools/ioemu/target-i386-dm/exec-dm.c
>index d112271..ba43d25 100644
>--- a/tools/ioemu/target-i386-dm/exec-dm.c
>+++ b/tools/ioemu/target-i386-dm/exec-dm.c
>@@ -369,7 +369,7 @@ void cpu_unregister_io_memory(int io_table_address)
>     int io_index = io_table_address >> IO_MEM_SHIFT;
> 
>     for (i = 0; i < mmio_cnt; i++) {
>-	if (mmio[i].size && mmio[i].io_index == io_index) {
>+	if (mmio[i].io_index == io_index) {
> 	   mmio[i].start = mmio[i].size = 0;
> 	   break;
> 	}
>@@ -461,12 +461,16 @@ int iomem_index(target_phys_addr_t addr)
> 
> void unregister_iomem(target_phys_addr_t start)
> {
>-    int index = iomem_index(start);
>-    if (index) {
>+    unsigned int index;
>+
>+    for (index = 0; index < mmio_cnt; index++)
>+        if (start == mmio[index].start)
>+            break;
>+    if (index < mmio_cnt) {
>         fprintf(logfile, "squash iomem [%lx, %lx).\n",
> 		(unsigned long)(mmio[index].start),
>                 (unsigned long)(mmio[index].start + mmio[index].size));
>-        mmio[index].start = mmio[index].size = 0;
>+        mmio[index].size = 0;
>     }
> }
>

Actions: View | Diff

Attachments on bug 849223: 606043 | 606044 | 606045 | 606046 | 606050 | 606051 | 606365 | 606370 | 606639 | 610520 | 611505 | 613668 | 614372 | 614373 | 614374 | 614596 | 615391 | 615392 | 615482 | 616740 | 617217 | 617218 | 617260 | 617261 | 617528 | 617541 | 617718 | 618009 | 618145 | 618240 | 618241 | 618312