qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [5719] ETRAX-FS: Fix a segfault if pflash drive not found.


From: Edgar E. Iglesias
Subject: [Qemu-devel] [5719] ETRAX-FS: Fix a segfault if pflash drive not found.
Date: Thu, 13 Nov 2008 21:10:26 +0000

Revision: 5719
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5719
Author:   edgar_igl
Date:     2008-11-13 21:10:25 +0000 (Thu, 13 Nov 2008)

Log Message:
-----------
ETRAX-FS: Fix a segfault if pflash drive not found.

drive_get_index() returns -1 if a drive isn't found; don't
use -1 to index drives_table.

Signed-off-by: Mark McLoughlin <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>

Modified Paths:
--------------
    trunk/hw/etraxfs.c

Modified: trunk/hw/etraxfs.c
===================================================================
--- trunk/hw/etraxfs.c  2008-11-13 19:37:46 UTC (rev 5718)
+++ trunk/hw/etraxfs.c  2008-11-13 21:10:25 UTC (rev 5719)
@@ -83,7 +83,7 @@
     phys_flash = qemu_ram_alloc(FLASH_SIZE);
     i = drive_get_index(IF_PFLASH, 0, 0);
     pflash_cfi02_register(0x0, phys_flash,
-                          drives_table[i].bdrv, (64 * 1024),
+                          i != -1 ? drives_table[i].bdrv : NULL, (64 * 1024),
                           FLASH_SIZE >> 16,
                           1, 2, 0x0000, 0x0000, 0x0000, 0x0000,
                           0x555, 0x2aa);






reply via email to

[Prev in Thread] Current Thread [Next in Thread]