This patch allows to define SecureDigital disk using "-disk" syntax"
It adds an interface type "sd"
"-sd file" becomes the alias of "-disk file,if=sd"
--
vl.c | 43 ++++++++++++++++++++++++++-----------------
vl.h | 3 ++-
2 files changed, 28 insertions(+), 18 deletions(-)
Index: qemu/vl.c
===================================================================
--- qemu.orig/vl.c 2007-10-31 15:05:44.000000000 +0100
+++ qemu/vl.c 2007-10-31 15:10:48.000000000 +0100
@@ -4714,6 +4714,7 @@
#define FD_ALIAS ",index=%d,if=floppy"
#define PFLASH_ALIAS ",if=pflash"
#define MTD_ALIAS ",if=mtd"
+#define SD_ALIAS ",if=sd"
#define HD_ALIAS ",index=%d,media=disk"
#ifdef TARGET_PPC
@@ -4725,7 +4726,7 @@
static int disk_init(const char *str, int snapshot, QEMUMachine *machine)
{
char buf[16];
- enum { IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD } interface;
+ enum { IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD } interface;
enum { MEDIA_DISK, MEDIA_CDROM } media;
int bus_id, unit_id;
int cyls, heads, secs, translation;
@@ -4820,6 +4821,8 @@
interface = IF_PFLASH;
else if (!strcmp(buf, "mtd"))
interface = IF_MTD;
+ else if (!strcmp(buf, "sd"))
+ interface = IF_SD;
else {
fprintf(stderr, "unsupported bus type '%s'\n", buf);
return -1;
@@ -5034,6 +5037,21 @@
}
}
break;
+ case IF_SD:
+ if (!sd_bdrv) {
+ sd_bdrv = bdrv_new ("sd");
+ /* FIXME: This isn't really a floppy, but it's a reasonable
+ approximation. */
+ bdrv_set_type_hint(sd_bdrv, BDRV_TYPE_FLOPPY);
+ if (file[0] && bdrv_open(sd_bdrv, file,
+ snapshot ? BDRV_O_SNAPSHOT : 0) < 0
+ || qemu_key_check(sd_bdrv, file)) {
+ fprintf(stderr, "qemu: could not open SD card image %s\n",
+ file);
+ return -1;
+ }
+ }
+ break;
}
return 0;
}
@@ -7916,7 +7934,6 @@
int i;
int snapshot, linux_boot;
const char *initrd_filename;
- const char *sd_filename;
const char *kernel_filename, *kernel_cmdline;
DisplayState *ds = &display_state;
int cyls, heads, secs, translation;
@@ -7977,7 +7994,6 @@
machine = first_machine;
cpu_model = NULL;
initrd_filename = NULL;
- sd_filename = NULL;
ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
vga_ram_size = VGA_RAM_SIZE;
#ifdef CONFIG_GDBSTUB
@@ -8135,7 +8151,13 @@
nb_disks++;
break;
case QEMU_OPTION_sd:
- sd_filename = optarg;
+ if (nb_disks >= MAX_DISKS) {
+ fprintf(stderr, "qemu: too many disks\n");
+ exit(1);
+ }
+ snprintf(disks[nb_disks], sizeof(disks[0]),
+ "%s" SD_ALIAS, optarg);
+ nb_disks++;
break;
case QEMU_OPTION_pflash:
if (nb_disks >= MAX_DISKS) {
@@ -8682,19 +8704,6 @@
if (disk_init(disks[i], snapshot, machine) == -1)
exit(1);
- sd_bdrv = bdrv_new ("sd");
- /* FIXME: This isn't really a floppy, but it's a reasonable
- approximation. */
- bdrv_set_type_hint(sd_bdrv, BDRV_TYPE_FLOPPY);
- if (sd_filename) {
- if (bdrv_open(sd_bdrv, sd_filename,
- snapshot ? BDRV_O_SNAPSHOT : 0) < 0) {
- fprintf(stderr, "qemu: could not open SD card image %s\n",
- sd_filename);
- } else
- qemu_key_check(sd_bdrv, sd_filename);
- }
-
register_savevm("timer", 0, 2, timer_save, timer_load, NULL);
register_savevm("ram", 0, 2, ram_save, ram_load, NULL);
Index: qemu/vl.h
===================================================================
--- qemu.orig/vl.h 2007-10-31 15:05:44.000000000 +0100
+++ qemu/vl.h 2007-10-31 15:10:48.000000000 +0100
@@ -995,9 +995,10 @@
#define MAX_IDE_DISKS (MAX_IDE_BUS * MAX_IDE_DEVS)
#define MAX_MTD 1
+#define MAX_SD 1
#define MAX_DISKS (MAX_IDE_DISKS + MAX_SCSI_DISKS + MAX_FD + MAX_PFLASH + \
- MAX_MTD)
+ MAX_MTD + MAX_SD)
extern BlockDriverState *bs_table[MAX_IDE_DISKS + 1];
extern BlockDriverState *sd_table[MAX_SCSI_DISKS + 1];
