Skip to content

Commit

Permalink
vl: extract softmmu/datadir.c
Browse files Browse the repository at this point in the history
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
bonzini committed Dec 10, 2020
1 parent 4cd2927 commit 2c65db5
Showing 48 changed files with 203 additions and 115 deletions.
1 change: 1 addition & 0 deletions hw/alpha/dp264.c
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
#include "hw/dma/i8257.h"
#include "net/net.h"
#include "qemu/cutils.h"
#include "qemu/datadir.h"
#include "net/net.h"

#define MAX_IDE_BUS 2
1 change: 1 addition & 0 deletions hw/arm/boot.c
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include <libfdt.h>
1 change: 1 addition & 0 deletions hw/arm/digic_boards.c
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/boards.h"
#include "exec/address-spaces.h"
1 change: 1 addition & 0 deletions hw/arm/highbank.c
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
1 change: 1 addition & 0 deletions hw/arm/npcm7xx_boards.c
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
#include "hw/qdev-properties.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "sysemu/sysemu.h"

1 change: 1 addition & 0 deletions hw/arm/sbsa-ref.c
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/units.h"
1 change: 1 addition & 0 deletions hw/arm/vexpress.c
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/sysbus.h"
#include "hw/arm/boot.h"
1 change: 1 addition & 0 deletions hw/arm/virt.c
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qemu/option.h"
#include "monitor/qdev.h"
1 change: 1 addition & 0 deletions hw/avr/boot.c
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "hw/loader.h"
#include "elf.h"
#include "boot.h"
1 change: 1 addition & 0 deletions hw/core/loader.c
Original file line number Diff line number Diff line change
@@ -44,6 +44,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "trace.h"
#include "hw/hw.h"
1 change: 1 addition & 0 deletions hw/display/cg3.c
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "ui/console.h"
1 change: 1 addition & 0 deletions hw/display/tcx.c
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
1 change: 1 addition & 0 deletions hw/hppa/machine.c
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "elf.h"
#include "hw/loader.h"
1 change: 1 addition & 0 deletions hw/i386/x86.c
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@
#include "qemu/cutils.h"
#include "qemu/units.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qapi-visit-common.h"
1 change: 1 addition & 0 deletions hw/lm32/milkymist.c
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
#include "qemu/units.h"
#include "qemu/error-report.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/sysbus.h"
#include "hw/irq.h"
1 change: 1 addition & 0 deletions hw/m68k/mcf5208.c
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
#include "qemu/log.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/irq.h"
#include "hw/m68k/mcf.h"
1 change: 1 addition & 0 deletions hw/m68k/q800.c
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "sysemu/sysemu.h"
#include "cpu.h"
#include "hw/hw.h"
1 change: 1 addition & 0 deletions hw/microblaze/boot.c
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
1 change: 1 addition & 0 deletions hw/mips/fuloong2e.c
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qapi/error.h"
#include "cpu.h"
1 change: 1 addition & 0 deletions hw/mips/jazz.c
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "hw/clock.h"
#include "hw/mips/mips.h"
#include "hw/mips/cpudevs.h"
1 change: 1 addition & 0 deletions hw/mips/malta.c
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/clock.h"
#include "hw/southbridge/piix.h"
1 change: 1 addition & 0 deletions hw/mips/mipssim.c
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/clock.h"
#include "hw/mips/mips.h"
1 change: 1 addition & 0 deletions hw/nios2/boot.c
Original file line number Diff line number Diff line change
@@ -31,6 +31,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
1 change: 1 addition & 0 deletions hw/nvram/fw_cfg.c
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
#include "sysemu/reset.h"
1 change: 1 addition & 0 deletions hw/pci-host/prep.c
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qapi/error.h"
#include "hw/pci/pci.h"
1 change: 1 addition & 0 deletions hw/pci/pci.c
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
1 change: 1 addition & 0 deletions hw/ppc/e500.c
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qapi/error.h"
#include "e500.h"
1 change: 1 addition & 0 deletions hw/ppc/mac_newworld.c
Original file line number Diff line number Diff line change
@@ -48,6 +48,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "hw/ppc/ppc.h"
#include "hw/qdev-properties.h"
1 change: 1 addition & 0 deletions hw/ppc/mac_oldworld.c
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qapi/error.h"
#include "hw/ppc/ppc.h"
1 change: 1 addition & 0 deletions hw/ppc/pnv.c
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qapi/error.h"
#include "sysemu/qtest.h"
1 change: 1 addition & 0 deletions hw/ppc/ppc405_boards.c
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/ppc/ppc.h"
#include "hw/qdev-properties.h"
1 change: 1 addition & 0 deletions hw/ppc/ppc440_bamboo.c
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
#include "qemu/units.h"
#include "qemu/error-report.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/error-report.h"
#include "net/net.h"
#include "hw/pci/pci.h"
1 change: 1 addition & 0 deletions hw/ppc/sam460ex.c
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "hw/boards.h"
1 change: 1 addition & 0 deletions hw/ppc/spapr.c
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "sysemu/sysemu.h"
1 change: 1 addition & 0 deletions hw/ppc/virtex_ml507.c
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "cpu.h"
#include "hw/sysbus.h"
1 change: 1 addition & 0 deletions hw/riscv/boot.c
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qemu/error-report.h"
#include "exec/cpu-defs.h"
1 change: 1 addition & 0 deletions hw/s390x/ipl.c
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
1 change: 1 addition & 0 deletions hw/sparc/leon3.c
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/irq.h"
#include "qemu/timer.h"
1 change: 1 addition & 0 deletions hw/sparc/sun4m.c
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
#include "qemu/datadir.h"
#include "qemu-common.h"
#include "cpu.h"
#include "hw/sysbus.h"
1 change: 1 addition & 0 deletions hw/sparc64/sun4u.c
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
21 changes: 0 additions & 21 deletions include/qemu-common.h
Original file line number Diff line number Diff line change
@@ -108,27 +108,6 @@ void qemu_progress_end(void);
void qemu_progress_print(float delta, int max);
const char *qemu_get_vm_name(void);

#define QEMU_FILE_TYPE_BIOS 0
#define QEMU_FILE_TYPE_KEYMAP 1
/**
* qemu_find_file:
* @type: QEMU_FILE_TYPE_BIOS (for BIOS, VGA BIOS)
* or QEMU_FILE_TYPE_KEYMAP (for keymaps).
* @name: Relative or absolute file name
*
* If @name exists on disk as an absolute path, or a path relative
* to the current directory, then returns @name unchanged.
* Otherwise searches for @name file in the data directories, either
* configured at build time (DATADIR) or registered with the -L command
* line option.
*
* The caller must use g_free() to free the returned data when it is
* no longer required.
*
* Returns: a path that can access @name, or NULL if no matching file exists.
*/
char *qemu_find_file(int type, const char *name);

/* OS specific functions */
void os_setup_early_signal_handling(void);
int os_parse_cmd_args(int index, const char *optarg);
28 changes: 28 additions & 0 deletions include/qemu/datadir.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#ifndef QEMU_DATADIR_H
#define QEMU_DATADIR_H

#define QEMU_FILE_TYPE_BIOS 0
#define QEMU_FILE_TYPE_KEYMAP 1
/**
* qemu_find_file:
* @type: QEMU_FILE_TYPE_BIOS (for BIOS, VGA BIOS)
* or QEMU_FILE_TYPE_KEYMAP (for keymaps).
* @name: Relative or absolute file name
*
* If @name exists on disk as an absolute path, or a path relative
* to the current directory, then returns @name unchanged.
* Otherwise searches for @name file in the data directories, either
* configured at build time (DATADIR) or registered with the -L command
* line option.
*
* The caller must use g_free() to free the returned data when it is
* no longer required.
*
* Returns: a path that can access @name, or NULL if no matching file exists.
*/
char *qemu_find_file(int type, const char *name);
void qemu_add_default_firmwarepath(void);
void qemu_add_data_dir(char *path);
void qemu_list_data_dirs(void);

#endif
2 changes: 0 additions & 2 deletions include/sysemu/sysemu.h
Original file line number Diff line number Diff line change
@@ -13,8 +13,6 @@ extern const char *qemu_name;
extern QemuUUID qemu_uuid;
extern bool qemu_uuid_set;

void qemu_add_data_dir(char *path);

void qemu_add_exit_notifier(Notifier *notify);
void qemu_remove_exit_notifier(Notifier *notify);

Loading

0 comments on commit 2c65db5

Please sign in to comment.