diff options
| author |   Mark McLoughlin <markmc@redhat.com> | 2009-06-11 09:53:19 +0100 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2009-06-11 10:22:11 +0100 |
| commit | 09f2ab1bd148ace3ddc594e72dd998db581d91f4 (patch) | |
| tree | 3fc4a90bd4ff668c328d09ee6b09ad794056a1bf /sysemu.h | |
| parent | Regenerate bios for MADT/RSDT fixes (diff) | |
| parent | Use relative path for bios (diff) | |
| download | qemu-kvm-09f2ab1bd148ace3ddc594e72dd998db581d91f4.tar.gz qemu-kvm-09f2ab1bd148ace3ddc594e72dd998db581d91f4.tar.bz2 qemu-kvm-09f2ab1bd148ace3ddc594e72dd998db581d91f4.zip | |
Merge branch 'master' of git://git.sv.gnu.org/qemu
* 'master' of git://git.sv.gnu.org/qemu: (1 commit)
Use relative path for bios
Conflicts:
hw/pc.c
vl.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'sysemu.h')
| -rw-r--r-- | sysemu.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -10,7 +10,10 @@ /* vl.c */ extern const char *bios_name; -extern const char *bios_dir; + +#define QEMU_FILE_TYPE_BIOS 0 +#define QEMU_FILE_TYPE_KEYMAP 1 +char *qemu_find_file(int type, const char *name); extern int vm_running; extern const char *qemu_name; |