[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/48] add multi-sd support
From: |
Riku Voipio |
Subject: |
[Qemu-devel] [PATCH 17/48] add multi-sd support |
Date: |
Fri, 26 Mar 2010 16:06:37 +0000 |
From: Riku Voipio <address@hidden>
N900 and other devices can have more than one sd/mmc card, and thus
the -sd command line option needs to be read multiple times.
Signed-Off-By: Riku Voipio <address@hidden>
---
vl.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/vl.c b/vl.c
index d69250c..b4dfb2e 100644
--- a/vl.c
+++ b/vl.c
@@ -752,7 +752,7 @@ static int bt_parse(const char *opt)
#define FD_ALIAS "index=%d,if=floppy"
#define PFLASH_ALIAS "if=pflash"
#define MTD_ALIAS "if=mtd"
-#define SD_ALIAS "index=0,if=sd"
+#define SD_ALIAS "index=%d,if=sd"
QemuOpts *drive_add(const char *file, const char *fmt, ...)
{
@@ -3738,6 +3738,7 @@ int main(int argc, char **argv, char **envp)
CPUState *env;
int show_vnc_port = 0;
int defconfig = 1;
+ int sd_device_index = 0;
error_set_progname(argv[0]);
@@ -3920,7 +3921,7 @@ int main(int argc, char **argv, char **envp)
drive_add(optarg, MTD_ALIAS);
break;
case QEMU_OPTION_sd:
- drive_add(optarg, SD_ALIAS);
+ drive_add(optarg, SD_ALIAS, sd_device_index++);
break;
case QEMU_OPTION_pflash:
drive_add(optarg, PFLASH_ALIAS);
@@ -4762,7 +4763,7 @@ int main(int argc, char **argv, char **envp)
if (default_sdcard) {
/* we always create one sd slot, even if no card is in it */
- drive_add(NULL, SD_ALIAS);
+ drive_add(NULL, SD_ALIAS, 0);
}
/* open the virtual block devices */
--
1.6.5
- [Qemu-devel] [PATCH 00/48] RFC: omap3 patch collection, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 14/48] multikeyboard support merge, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 16/48] sdl: multitouch and window close suppport, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 13/48] multitouch and window close handler, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 28/48] prepare smc driver support for omap, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 15/48] fix function signature of qemu_chr_open_pty on !linux, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 08/48] Cortex-A8 R2 support and trustzone, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 06/48] Get rid of AREG1 and AREG2., Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 07/48] Shrink tb_jmp_offset to two entries, the other two are never used., Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 17/48] add multi-sd support,
Riku Voipio <=
- [Qemu-devel] [PATCH 23/48] multi-mmc support in init call, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 01/48] arm-dis debug helper, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 18/48] make cursor grab optional, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 47/48] target-arm: fix neon vshll (shift < max), Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 38/48] target-arm: fix neon vrshl instruction, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 40/48] target-arm: fix neon v(r)sra instructions, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 39/48] target-arm: fix neon vrshr instruction, Riku Voipio, 2010/03/26
- [Qemu-devel] [PATCH 25/48] blizzard: fix for non-32bpp host displays, Riku Voipio, 2010/03/26