On Di, 2013-10-01 at 19:55 +0900, Peter Maydell wrote: > On 1 October 2013 18:39, Gerd Hoffmann <kra...@redhat.com> wrote: > > Signed-off-by: Gerd Hoffmann <kra...@redhat.com> > > --- > > hw/alpha/dp264.c | 2 +- > > hw/arm/highbank.c | 8 ++++---- > > hw/i386/pc.c | 6 ++++-- > > hw/i386/pc_piix.c | 3 ++- > > hw/i386/pc_q35.c | 3 ++- > > hw/i386/pc_sysfw.c | 8 +++++--- > > hw/lm32/milkymist.c | 8 ++++---- > > hw/mips/mips_fulong2e.c | 8 ++++---- > > hw/mips/mips_jazz.c | 9 ++++++--- > > hw/mips/mips_malta.c | 8 ++++---- > > hw/mips/mips_mipssim.c | 7 ++++--- > > hw/mips/mips_r4k.c | 9 +++++---- > > hw/ppc/mac_newworld.c | 9 +++++---- > > hw/ppc/mac_oldworld.c | 9 +++++---- > > hw/ppc/ppc405_boards.c | 24 ++++++++++++++---------- > > hw/ppc/prep.c | 11 ++++++----- > > hw/ppc/spapr.c | 6 +++--- > > hw/s390x/ipl.c | 1 + > > hw/sh4/shix.c | 11 ++++++----- > > hw/sparc/leon3.c | 6 +++--- > > hw/sparc/sun4m.c | 2 +- > > hw/sparc64/sun4u.c | 2 +- > > include/hw/boards.h | 1 + > > include/hw/i386/pc.h | 6 ++++-- > > include/sysemu/sysemu.h | 2 -- > > vl.c | 12 +++++++++--- > > No documentation or definition of what the semantics of > specifying a "firmware image" filename are?
"-machine firmware=$file" has the same effect as "-bios $file", which is simliar to '-machine kernel=$file' and '-kernel $file'. With this patch the firmware/bios filename goes into QemuOpts and thus can be set via -readconfig $file. It's also possible to set the default firmware image per machine type (via QEMUMachine->default_machine_opts = "firmware=$filename"). [ I'll make the commit message more verbose for v2 ] > Why is this a machine option rather than a property of > the ROM/flash device? Not all machines have a flash device. Also flash drives don't want a simple (readonly) image file but a (writable) blockdev as backing storage, at least the pflash device emulation I've briefly looked at. cheers, Gerd