diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-12-04 00:10:34 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-12-04 00:10:34 +0000 |
| commit | 9d413d1d4902a22059fa0ac6e6b621fe43cf9403 (patch) | |
| tree | 389b83f9091f79833a7aaac238c40e55977f65d8 /vl.c | |
| parent | 6a5bd307023ac14089cbcc9e26790f8747f96af9 (diff) | |
| download | qemu-9d413d1d4902a22059fa0ac6e6b621fe43cf9403.zip qemu-9d413d1d4902a22059fa0ac6e6b621fe43cf9403.tar.gz qemu-9d413d1d4902a22059fa0ac6e6b621fe43cf9403.tar.bz2 | |
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
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -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++) |