From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1InFrq-000415-Qv for qemu-devel@nongnu.org; Wed, 31 Oct 2007 11:52:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1InFrq-00040e-5Z for qemu-devel@nongnu.org; Wed, 31 Oct 2007 11:52:30 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1InFrp-00040Z-Tw for qemu-devel@nongnu.org; Wed, 31 Oct 2007 11:52:30 -0400 Received: from ecfrec.frec.bull.fr ([129.183.4.8]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1InFrp-00046v-3V for qemu-devel@nongnu.org; Wed, 31 Oct 2007 11:52:29 -0400 Received: from localhost (localhost [127.0.0.1]) by ecfrec.frec.bull.fr (Postfix) with ESMTP id D687619D90E for ; Wed, 31 Oct 2007 16:52:21 +0100 (CET) Received: from ecfrec.frec.bull.fr ([127.0.0.1]) by localhost (ecfrec.frec.bull.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 25387-07 for ; Wed, 31 Oct 2007 16:52:18 +0100 (CET) Received: from ecn002.frec.bull.fr (ecn002.frec.bull.fr [129.183.4.6]) by ecfrec.frec.bull.fr (Postfix) with ESMTP id C4EB819D950 for ; Wed, 31 Oct 2007 16:52:14 +0100 (CET) In-Reply-To: <1193845917894@bull.net> Date: Wed, 31 Oct 2007 16:51:58 +0100 Message-Id: <11938459183031@bull.net> Mime-Version: 1.0 From: Laurent Vivier Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="iso-8859-1" Subject: [Qemu-devel] [PATCH 6/7] Add flash support by -disk Reply-To: Laurent Vivier , qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent.Vivier@bull.net This patch allows to define a flash (mtd) using the "-disk" syntax. It adds an interface type "mtd" "-mtdblock file" is an alias for "-disk file,if=3Dmtd" -- vl.c | 39 +++++++++++++++++++++++---------------- vl.h | 5 ++++- 2 files changed, 27 insertions(+), 17 deletions(-) Index: qemu/vl.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/vl.c 2007-10-31 15:01:05.000000000 +0100 +++ qemu/vl.c 2007-10-31 15:05:27.000000000 +0100 @@ -4713,6 +4713,7 @@ =20 #define FD_ALIAS ",index=3D%d,if=3Dfloppy" #define PFLASH_ALIAS ",if=3Dpflash" +#define MTD_ALIAS ",if=3Dmtd" #define HD_ALIAS ",index=3D%d,media=3Ddisk" =20 #ifdef TARGET_PPC @@ -4724,7 +4725,7 @@ static int disk_init(const char *str, int snapshot, QEMUMachine *machine) { char buf[16]; - enum { IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH } interface; + enum { IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD } interface; enum { MEDIA_DISK, MEDIA_CDROM } media; int bus_id, unit_id; int cyls, heads, secs, translation; @@ -4817,6 +4818,8 @@ interface =3D IF_FLOPPY; else if (!strcmp(buf, "pflash")) interface =3D IF_PFLASH; + else if (!strcmp(buf, "mtd")) + interface =3D IF_MTD; else { fprintf(stderr, "unsupported bus type '%s'\n", buf); return -1; @@ -5019,6 +5022,18 @@ } } break; + case IF_MTD: + if (!mtd_bdrv) { + mtd_bdrv =3D bdrv_new ("mtd"); + if (file[0] && bdrv_open(mtd_bdrv, file, + snapshot ? BDRV_O_SNAPSHOT : 0) < 0 + || qemu_key_check(mtd_bdrv, file)) { + fprintf(stderr, "qemu: could not open Flash image %s\n", + file); + return -1; + } + } + break; } return 0; } @@ -7902,7 +7917,6 @@ int snapshot, linux_boot; const char *initrd_filename; const char *sd_filename; - const char *mtd_filename; const char *kernel_filename, *kernel_cmdline; DisplayState *ds =3D &display_state; int cyls, heads, secs, translation; @@ -7964,7 +7978,6 @@ cpu_model =3D NULL; initrd_filename =3D NULL; sd_filename =3D NULL; - mtd_filename =3D NULL; ram_size =3D DEFAULT_RAM_SIZE * 1024 * 1024; vga_ram_size =3D VGA_RAM_SIZE; #ifdef CONFIG_GDBSTUB @@ -8113,7 +8126,13 @@ nb_disks++; break; case QEMU_OPTION_mtdblock: - mtd_filename =3D optarg; + if (nb_disks >=3D MAX_DISKS) { + fprintf(stderr, "qemu: too many disks\n"); + exit(1); + } + snprintf(disks[nb_disks], sizeof(disks[0]), + "%s" MTD_ALIAS, optarg); + nb_disks++; break; case QEMU_OPTION_sd: sd_filename =3D optarg; @@ -8676,18 +8695,6 @@ qemu_key_check(sd_bdrv, sd_filename); } =20 - if (mtd_filename) { - mtd_bdrv =3D bdrv_new ("mtd"); - if (bdrv_open(mtd_bdrv, mtd_filename, - snapshot ? BDRV_O_SNAPSHOT : 0) < 0 || - qemu_key_check(mtd_bdrv, mtd_filename)) { - fprintf(stderr, "qemu: could not open Flash image %s\n", - mtd_filename); - bdrv_delete(mtd_bdrv); - mtd_bdrv =3D 0; - } - } - register_savevm("timer", 0, 2, timer_save, timer_load, NULL); register_savevm("ram", 0, 2, ram_save, ram_load, NULL); =20 Index: qemu/vl.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/vl.h 2007-10-31 15:01:05.000000000 +0100 +++ qemu/vl.h 2007-10-31 15:05:27.000000000 +0100 @@ -994,7 +994,10 @@ #define MAX_IDE_DEVS 2 #define MAX_IDE_DISKS (MAX_IDE_BUS * MAX_IDE_DEVS) =20 -#define MAX_DISKS (MAX_IDE_DISKS + MAX_SCSI_DISKS + MAX_FD + MAX_PFLASH) +#define MAX_MTD 1 + +#define MAX_DISKS (MAX_IDE_DISKS + MAX_SCSI_DISKS + MAX_FD + MAX_PFLASH + \ + MAX_MTD) =20 extern BlockDriverState *bs_table[MAX_IDE_DISKS + 1]; extern BlockDriverState *sd_table[MAX_SCSI_DISKS + 1];