Introduce get_datafile_dir() to replace bios_dir
PATCH 1/1 Introduce get_datafile_dir() to replace bios_dir
bios_dir really is $(PREFIX)/share/qemu/ (or the dir. specified by -L). It currently stores some firmware images and keymaps, so the name bios_dir is really a misnomer.
Replace it with a helper, get_datafile_dir().
--- hw/mips_jazz.c | 2 +- hw/mips_malta.c | 2 +- hw/mips_mipssim.c | 2 +- hw/mips_r4k.c | 2 +- hw/pc.c | 8 +++++--- hw/ppc405_boards.c | 4 ++-- hw/ppc440_bamboo.c | 6 ++++-- hw/ppc_newworld.c | 4 ++-- hw/ppc_oldworld.c | 4 ++-- hw/ppc_prep.c | 2 +- hw/sun4m.c | 6 +++--- hw/sun4u.c | 2 +- keymaps.c | 2 +- sysemu.h | 2 +- vl.c | 19 ++++++++++++++++--- 15 files changed, 42 insertions(+), 25 deletions(-)
hw/mips_jazz.c +1 -1
@@ -165,7 +165,7 @@ void mips_jazz_init (ram_addr_t ram_size, int vga_ram_size, bios_offset = ram_size + vga_ram_size;if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name); bios_size =load_image (buf, phys_ram_base + bios_offset);if (bios_size <0 || bios_size >MAGNUM_BIOS_SIZE ) { fprintf(stderr, "qemu: Could not load MIPS bios '%s'\n",
hw/mips_malta.c +1 -1
@@ -850,7 +850,7 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size,/* Load a BIOS image. */ if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name); bios_size =load_image (buf, phys_ram_base + bios_offset);if ((bios_size <0 || bios_size >BIOS_SIZE ) && !kernel_filename) { fprintf(stderr,
hw/mips_mipssim.c +1 -1
@@ -139,7 +139,7 @@ mips_mipssim_init (ram_addr_t ram_size, int vga_ram_size, bios_offset = ram_size + vga_ram_size;if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name); bios_size =load_image (buf, phys_ram_base + bios_offset);if ((bios_size <0 || bios_size >BIOS_SIZE ) && !kernel_filename) {/* Bail out if we have neither a kernel image nor boot vector code. */
hw/mips_r4k.c +1 -1
@@ -199,7 +199,7 @@ void mips_r4k_init (ram_addr_t ram_size, int vga_ram_size, bios_offset = ram_size + vga_ram_size;if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name); bios_size =load_image (buf, phys_ram_base + bios_offset);if ((bios_size >0 ) && (bios_size <=BIOS_SIZE )) { cpu_register_physical_memory(0x1fc00000,
hw/pc.c +5 -3
@@ -838,7 +838,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,/* BIOS load */ if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name); bios_size =get_image_size (buf);if (bios_size <=0 || (bios_size %65536 ) !=0 ) {
@@ -855,9 +855,11 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,if (cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled) {/* VGA BIOS load */ if (cirrus_vga_enabled) { -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir,VGABIOS_CIRRUS_FILENAME ); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), +VGABIOS_CIRRUS_FILENAME ); }else { -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir,VGABIOS_FILENAME ); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), +VGABIOS_FILENAME ); } vga_bios_size =get_image_size (buf);if (vga_bios_size <=0 || vga_bios_size >65536 )
hw/ppc405_boards.c +2 -2
@@ -238,7 +238,7 @@ static void ref405ep_init (ram_addr_t ram_size, int vga_ram_size,#endif if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name); bios_size =load_image (buf, phys_ram_base + bios_offset);if (bios_size <0 || bios_size >BIOS_SIZE ) {fprintf (stderr,"qemu: could not load PowerPC bios '%s'\n" , buf);
@@ -550,7 +550,7 @@ static void taihu_405ep_init(ram_addr_t ram_size, int vga_ram_size,#endif if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name); bios_size =load_image (buf, phys_ram_base + bios_offset);if (bios_size <0 || bios_size >BIOS_SIZE ) {fprintf (stderr,"qemu: could not load PowerPC bios '%s'\n" , buf);
hw/ppc440_bamboo.c +4 -2
@@ -40,10 +40,12 @@ static void *bamboo_load_device_tree(void *addr,int pathlen;int ret; - pathlen =snprintf (NULL ,0 ,"%s/%s" , bios_dir,BINARY_DEVICE_TREE_FILE ) +1 ; + pathlen =snprintf (NULL ,0 ,"%s/%s" ,get_datafile_dir (), +BINARY_DEVICE_TREE_FILE ) +1 ; path =qemu_malloc (pathlen); -snprintf (path, pathlen,"%s/%s" , bios_dir,BINARY_DEVICE_TREE_FILE ); +snprintf (path, pathlen,"%s/%s" ,get_datafile_dir (), +BINARY_DEVICE_TREE_FILE ); fdt =load_device_tree (path, addr);free (path);
hw/ppc_newworld.c +2 -2
@@ -135,7 +135,7 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, bios_offset =qemu_ram_alloc (BIOS_SIZE );if (bios_name ==NULL ) bios_name =PROM_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name);cpu_register_physical_memory (PROM_ADDR ,BIOS_SIZE , bios_offset |IO_MEM_ROM );/* Load OpenBIOS (ELF) */
@@ -147,7 +147,7 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size,/* allocate and load VGA BIOS */ vga_bios_offset =qemu_ram_alloc (VGA_BIOS_SIZE ); -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir,VGABIOS_FILENAME ); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (),VGABIOS_FILENAME ); vga_bios_size =load_image (buf, phys_ram_base + vga_bios_offset +8 );if (vga_bios_size <0 ) {/* if no bios is present, we can still work */
hw/ppc_oldworld.c +2 -2
@@ -171,7 +171,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, bios_offset =qemu_ram_alloc (BIOS_SIZE );if (bios_name ==NULL ) bios_name =PROM_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name);cpu_register_physical_memory (PROM_ADDR ,BIOS_SIZE , bios_offset |IO_MEM_ROM );/* Load OpenBIOS (ELF) */
@@ -183,7 +183,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size,/* allocate and load VGA BIOS */ vga_bios_offset =qemu_ram_alloc (VGA_BIOS_SIZE ); -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir,VGABIOS_FILENAME ); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (),VGABIOS_FILENAME ); vga_bios_size =load_image (buf, phys_ram_base + vga_bios_offset +8 );if (vga_bios_size <0 ) {/* if no bios is present, we can still work */
hw/ppc_prep.c +1 -1
@@ -587,7 +587,7 @@ static void ppc_prep_init (ram_addr_t ram_size, int vga_ram_size, bios_offset =qemu_ram_alloc (BIOS_SIZE );if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name); bios_size =load_image (buf, phys_ram_base + bios_offset);if (bios_size <0 || bios_size >BIOS_SIZE ) {cpu_abort (env,"qemu: could not load PPC PREP bios '%s'\n" , buf);
hw/sun4m.c +3 -3
@@ -490,7 +490,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,if (bios_name ==NULL ) bios_name =PROM_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name); ret =load_elf (buf, hwdef->slavio_base -PROM_VADDR ,NULL ,NULL ,NULL );if (ret <0 || ret >PROM_SIZE_MAX ) ret =load_image_targphys (buf, hwdef->slavio_base,PROM_SIZE_MAX );
@@ -1286,7 +1286,7 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size,if (bios_name ==NULL ) bios_name =PROM_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name); ret =load_elf (buf, hwdef->slavio_base -PROM_VADDR ,NULL ,NULL ,NULL );if (ret <0 || ret >PROM_SIZE_MAX ) ret =load_image_targphys (buf, hwdef->slavio_base,PROM_SIZE_MAX );
@@ -1493,7 +1493,7 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size,if (bios_name ==NULL ) bios_name =PROM_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name); ret =load_elf (buf, hwdef->slavio_base -PROM_VADDR ,NULL ,NULL ,NULL );if (ret <0 || ret >PROM_SIZE_MAX ) ret =load_image_targphys (buf, hwdef->slavio_base,PROM_SIZE_MAX );
hw/sun4u.c +1 -1
@@ -449,7 +449,7 @@ static void sun4uv_init(ram_addr_t RAM_size, int vga_ram_size,if (bios_name ==NULL ) bios_name =PROM_FILENAME ; -snprintf (buf,sizeof (buf),"%s/%s" , bios_dir, bios_name); +snprintf (buf,sizeof (buf),"%s/%s" ,get_datafile_dir (), bios_name); ret =load_elf (buf, hwdef->prom_addr -PROM_VADDR ,NULL ,NULL ,NULL );if (ret <0 ) { ret = load_image_targphys(buf, hwdef->prom_addr,
keymaps.c +1 -1
@@ -82,7 +82,7 @@ static kbd_layout_t *parse_keyboard_layout(const char *language,int len;snprintf (file_name,sizeof (file_name), -"%s/keymaps/%s" , bios_dir, language); +"%s/keymaps/%s" ,get_datafile_dir (), language);if (!k) k =qemu_mallocz (sizeof (kbd_layout_t));
sysemu.h +1 -1
@@ -4,7 +4,7 @@/* vl.c */ extern const char *bios_name; -extern const char *bios_dir; +extern char *get_datafile_dir (void );extern int vm_running;extern const char *qemu_name;
vl.c +16 -3
@@ -172,7 +172,7 @@/* XXX: use a two level table to limit memory usage */ #define MAX_IOPORTS 65536 -const char *bios_dir =CONFIG_QEMU_SHAREDIR ; +static char datafile_dir[512 ];const char *bios_name =NULL ;static void *ioport_opaque[MAX_IOPORTS ];static IOPortReadFunc *ioport_read_table[3 ][MAX_IOPORTS ];
@@ -4581,6 +4581,17 @@ static void termsig_setup(void)#endif +static void set_datafile_dir (const char *dir) +{ +strncpy (datafile_dir, dir,sizeof (datafile_dir) -1 ); + datafile_dir[sizeof (datafile_dir) -1 ] =0 ; +} + +char *get_datafile_dir (void ) +{ +return datafile_dir; +} +int main (int argc,char **argv,char **envp) {#ifdef CONFIG_GDBSTUB
@@ -4655,6 +4666,7 @@ int main(int argc, char **argv, char **envp) }#endif +set_datafile_dir (CONFIG_QEMU_SHAREDIR );register_machines (); machine = first_machine; cpu_model =NULL ;
@@ -5005,7 +5017,7 @@ int main(int argc, char **argv, char **envp)break ;#endif case QEMU_OPTION_L : - bios_dir = optarg; +set_datafile_dir (optarg);break ;case QEMU_OPTION_bios: bios_name = optarg;
@@ -5425,7 +5437,8 @@ int main(int argc, char **argv, char **envp)if (net_boot & (1 << i)) {if (model ==NULL ) model ="ne2k_pci" ; -snprintf (buf,sizeof (buf),"%s/pxe-%s.bin" , bios_dir, model); +snprintf (buf,sizeof (buf),"%s/pxe-%s.bin" ,get_datafile_dir (), + model);if (get_image_size (buf) >0 ) {if (nb_option_roms >=MAX_OPTION_ROMS ) {fprintf (stderr,"Too many option ROMs\n" );
Signature · 1 line
1.6.0.6
vl.c static void termsig_setup(void) · line 4588
Quoted 13 lines · Amit Shah
bios_dirreally is $(PREFIX)/share/qemu/ (or the dir. specified by -L). It currently stores some firmware images and keymaps, so the namebios_diris really a misnomer.Replace it with a helper,
get_datafile_dir().vl.c +5
-0+static void set_datafile_dir (const char *dir) +{ +strncpy (datafile_dir, dir,sizeof (datafile_dir) -1 ); + datafile_dir[sizeof (datafile_dir) -1 ] =0 ; +}
While this is a safe usage of strncpy(), strncpy() has such weird semantics that it would be better to just use snprintf().
Regards,
Anthony Liguori
In message: <[email protected]>
Anthony Liguori <[email protected]> writes:
: Amit Shah wrote:
: > bios_dir really is $(PREFIX)/share/qemu/ (or the dir. specified by : > -L). It currently stores some firmware images and keymaps, so the : > name bios_dir is really a misnomer.
: >
: > Replace it with a helper, get_datafile_dir().
: >
: >
: > +static void set_datafile_dir(const char *dir)
: > +{
: > + strncpy(datafile_dir, dir, sizeof(datafile_dir) - 1);
: > + datafile_dir[sizeof(datafile_dir) - 1] = 0;
: > +}
: >
:
: While this is a safe usage of strncpy(), strncpy() has such weird : semantics that it would be better to just use snprintf().
Better performance to, but I doubt that would matter here...
Warner