From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48854 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OfxxK-0007c0-0K for qemu-devel@nongnu.org; Mon, 02 Aug 2010 12:33:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OfxxI-0007Vn-S7 for qemu-devel@nongnu.org; Mon, 02 Aug 2010 12:33:37 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:48829) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OfxxI-0007Vb-Ol for qemu-devel@nongnu.org; Mon, 02 Aug 2010 12:33:36 -0400 Received: by qwi4 with SMTP id 4so1791956qwi.4 for ; Mon, 02 Aug 2010 09:33:36 -0700 (PDT) Message-ID: <4C56F35D.6020708@codemonkey.ws> Date: Mon, 02 Aug 2010 11:33:33 -0500 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCHv3] Load "bootsplash.jpg" if present References: <20100802161157.GA11743@morn.localdomain> In-Reply-To: <20100802161157.GA11743@morn.localdomain> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin O'Connor Cc: qemu-devel@nongnu.org On 08/02/2010 11:11 AM, Kevin O'Connor wrote: > Load the "bootsplash.jpg" file into fw_cfg if it is found in the roms > directory. > Sorry, I should have provided this in the first response. Does the bootsplash cause a delay in startup time? If so, we'll want to be able to disable this at boot time via the -boot option. If it doesn't, this patch is probably fine as is. Regards, Anthony Liguori > Signed-off-by: Kevin O'Connor > --- > Changes v2->v3: > Fix coding style (missing braces). > Changes v1->v2: > Add signed-off-by line. > --- > hw/fw_cfg.c | 9 +++++++-- > hw/pc.c | 8 ++++++++ > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c > index 72866ae..5a2c0aa 100644 > --- a/hw/fw_cfg.c > +++ b/hw/fw_cfg.c > @@ -304,8 +304,13 @@ int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename, > basename = filename; > } > > - snprintf(s->files->f[index].name, sizeof(s->files->f[index].name), > - "%s/%s", dir, basename); > + if (dir&& dir[0]) { > + snprintf(s->files->f[index].name, sizeof(s->files->f[index].name), > + "%s/%s", dir, basename); > + } else { > + strncpy(s->files->f[index].name, basename, > + sizeof(s->files->f[index].name)); > + } > for (i = 0; i< index; i++) { > if (strcmp(s->files->f[index].name, s->files->f[i].name) == 0) { > FW_CFG_DPRINTF("%s: skip duplicate: %s\n", __FUNCTION__, > diff --git a/hw/pc.c b/hw/pc.c > index 58dea57..6893799 100644 > --- a/hw/pc.c > +++ b/hw/pc.c > @@ -54,6 +54,7 @@ > #endif > > #define BIOS_FILENAME "bios.bin" > +#define BOOTSPLASH_FILENAME "bootsplash.jpg" > > #define PC_MAX_BIOS_SIZE (4 * 1024 * 1024) > > @@ -963,6 +964,13 @@ void pc_memory_init(ram_addr_t ram_size, > fw_cfg = bochs_bios_init(); > rom_set_fw(fw_cfg); > > + /* Optional bootsplash file */ > + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BOOTSPLASH_FILENAME); > + if (filename) { > + qemu_free(filename); > + rom_add_file(BOOTSPLASH_FILENAME, "", 0); > + } > + > if (linux_boot) { > load_linux(fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size); > } >