diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-12-23 02:54:08 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-01-02 22:31:27 +0100 |
| commit | cb42a1b1461e02efb034582ac5d8f71534723b92 (patch) | |
| tree | 5dbd619671d4591d33834488f1c15690dabf50ba /hw/android_arm.c | |
| parent | ca6a2e034bce665a08d9d748ac11d6a7cfcd7c48 (diff) | |
| download | external_qemu-cb42a1b1461e02efb034582ac5d8f71534723b92.zip external_qemu-cb42a1b1461e02efb034582ac5d8f71534723b92.tar.gz external_qemu-cb42a1b1461e02efb034582ac5d8f71534723b92.tar.bz2 | |
upstream: integrate block changes
This large patch upgrades the block support code to the upstream
version available in ba5e7f82169f32ab8163c707d97c799ca09f8924
dated 2010-08-08
Change-Id: I8b24df0c287e72f6620650a4d6a62e1bb315453e
Diffstat (limited to 'hw/android_arm.c')
| -rw-r--r-- | hw/android_arm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/android_arm.c b/hw/android_arm.c index d805b0e..6062981 100644 --- a/hw/android_arm.c +++ b/hw/android_arm.c @@ -20,6 +20,7 @@ #include "audio/audio.h" #include "arm-misc.h" #include "console.h" +#include "blockdev.h" #ifdef CONFIG_MEMCHECK #include "memcheck/memcheck_api.h" #endif // CONFIG_MEMCHECK @@ -120,9 +121,10 @@ static void android_arm_init_(ram_addr_t ram_size, goldfish_audio_init(0xff004000, 0, audio_input_source); #endif { - int idx = drive_get_index( IF_IDE, 0, 0 ); - if (idx >= 0) - goldfish_mmc_init(0xff005000, 0, drives_table[idx].bdrv); + DriveInfo* info = drive_get( IF_IDE, 0, 0 ); + if (info != NULL) { + goldfish_mmc_init(0xff005000, 0, info->bdrv); + } } goldfish_memlog_init(0xff006000); |