From 9d413d1d4902a22059fa0ac6e6b621fe43cf9403 Mon Sep 17 00:00:00 2001 From: balrog Date: Tue, 4 Dec 2007 00:10:34 +0000 Subject: Always create an SD bdrv, so that PXA and OMAP boards can boot with no card inserted again. Eventually SD, CDROM and floppy should all be registered conditionally depending on machine. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3771 c046a42c-6fe2-441c-8c8c-71466251a162 --- vl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'vl.c') diff --git a/vl.c b/vl.c index 70f250ebed..6614bbdae1 100644 --- a/vl.c +++ b/vl.c @@ -4793,7 +4793,7 @@ void do_info_network(void) #define FD_ALIAS "index=%d,if=floppy" #define PFLASH_ALIAS "file=\"%s\",if=pflash" #define MTD_ALIAS "file=\"%s\",if=mtd" -#define SD_ALIAS "file=\"%s\",if=sd" +#define SD_ALIAS "index=0,if=sd" static int drive_add(const char *fmt, ...) { @@ -8179,7 +8179,7 @@ int main(int argc, char **argv) drive_add(MTD_ALIAS, optarg); break; case QEMU_OPTION_sd: - drive_add(SD_ALIAS, optarg); + drive_add("file=\"%s\"," SD_ALIAS, optarg); break; case QEMU_OPTION_pflash: drive_add(PFLASH_ALIAS, optarg); @@ -8756,11 +8756,16 @@ int main(int argc, char **argv) if (nb_drives_opt < MAX_DRIVES) drive_add(CDROM_ALIAS); - /* we always create at least on floppy */ + /* we always create at least one floppy */ if (nb_drives_opt < MAX_DRIVES) drive_add(FD_ALIAS, 0); + /* we always create one sd slot, even if no card is in it */ + + if (nb_drives_opt < MAX_DRIVES) + drive_add(SD_ALIAS); + /* open the virtual block devices */ for(i = 0; i < nb_drives_opt; i++) -- cgit v1.2.3