projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use relative path for bios
[qemu]
/
sysemu.h
diff --git
a/sysemu.h
b/sysemu.h
index
25a7c32
..
658aeec
100644
(file)
--- a/
sysemu.h
+++ b/
sysemu.h
@@
-10,7
+10,10
@@
/* vl.c */
extern const char *bios_name;
/* 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;
extern int vm_running;
extern const char *qemu_name;
@@
-28,6
+31,10
@@
void qemu_del_vm_change_state_handler(VMChangeStateEntry *e);
void vm_start(void);
void vm_stop(int reason);
void vm_start(void);
void vm_stop(int reason);
+uint64_t ram_bytes_remaining(void);
+uint64_t ram_bytes_transferred(void);
+uint64_t ram_bytes_total(void);
+
int64_t cpu_get_ticks(void);
void cpu_enable_ticks(void);
void cpu_disable_ticks(void);
int64_t cpu_get_ticks(void);
void cpu_enable_ticks(void);
void cpu_disable_ticks(void);
@@
-38,12
+45,14
@@
void qemu_system_powerdown_request(void);
int qemu_shutdown_requested(void);
int qemu_reset_requested(void);
int qemu_powerdown_requested(void);
int qemu_shutdown_requested(void);
int qemu_reset_requested(void);
int qemu_powerdown_requested(void);
+#ifdef NEED_CPU_H
#if !defined(TARGET_SPARC) && !defined(TARGET_I386)
// Please implement a power failure function to signal the OS
#define qemu_system_powerdown() do{}while(0)
#else
void qemu_system_powerdown(void);
#endif
#if !defined(TARGET_SPARC) && !defined(TARGET_I386)
// Please implement a power failure function to signal the OS
#define qemu_system_powerdown() do{}while(0)
#else
void qemu_system_powerdown(void);
#endif
+#endif
void qemu_system_reset(void);
void do_savevm(Monitor *mon, const char *name);
void qemu_system_reset(void);
void do_savevm(Monitor *mon, const char *name);
@@
-84,6
+93,15
@@
int tap_win32_init(VLANState *vlan, const char *model,
/* SLIRP */
void do_info_slirp(Monitor *mon);
/* SLIRP */
void do_info_slirp(Monitor *mon);
+typedef enum DisplayType
+{
+ DT_DEFAULT,
+ DT_CURSES,
+ DT_SDL,
+ DT_VNC,
+ DT_NOGRAPHIC,
+} DisplayType;
+
extern int bios_size;
extern int cirrus_vga_enabled;
extern int std_vga_enabled;
extern int bios_size;
extern int cirrus_vga_enabled;
extern int std_vga_enabled;
@@
-92,7
+110,7
@@
extern int xenfb_enabled;
extern int graphic_width;
extern int graphic_height;
extern int graphic_depth;
extern int graphic_width;
extern int graphic_height;
extern int graphic_depth;
-extern int nographic;
+extern DisplayType display_type;
extern const char *keyboard_layout;
extern int win2k_install_hack;
extern int rtc_td_hack;
extern const char *keyboard_layout;
extern int win2k_install_hack;
extern int rtc_td_hack;
@@
-117,22
+135,17
@@
extern uint64_t node_mem[MAX_NODES];
extern const char *option_rom[MAX_OPTION_ROMS];
extern int nb_option_roms;
extern const char *option_rom[MAX_OPTION_ROMS];
extern int nb_option_roms;
+#ifdef NEED_CPU_H
#if defined(TARGET_SPARC) || defined(TARGET_PPC)
#define MAX_PROM_ENVS 128
extern const char *prom_envs[MAX_PROM_ENVS];
extern unsigned int nb_prom_envs;
#endif
#if defined(TARGET_SPARC) || defined(TARGET_PPC)
#define MAX_PROM_ENVS 128
extern const char *prom_envs[MAX_PROM_ENVS];
extern unsigned int nb_prom_envs;
#endif
-
-#if defined (TARGET_PPC)
-#define BIOS_SIZE (1024 * 1024)
-#elif defined (TARGET_SPARC64)
-#define BIOS_SIZE ((512 + 32) * 1024)
-#elif defined(TARGET_MIPS)
-#define BIOS_SIZE (4 * 1024 * 1024)
#endif
typedef enum {
#endif
typedef enum {
- IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN
+ IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN,
+ IF_COUNT
} BlockInterfaceType;
typedef enum {
} BlockInterfaceType;
typedef enum {
@@
-165,6
+178,8
@@
extern void drive_remove(int index);
extern const char *drive_get_serial(BlockDriverState *bdrv);
extern BlockInterfaceErrorAction drive_get_onerror(BlockDriverState *bdrv);
extern const char *drive_get_serial(BlockDriverState *bdrv);
extern BlockInterfaceErrorAction drive_get_onerror(BlockDriverState *bdrv);
+BlockDriverState *qdev_init_bdrv(DeviceState *dev, BlockInterfaceType type);
+
struct drive_opt {
const char *file;
char opt[1024];
struct drive_opt {
const char *file;
char opt[1024];
@@
-253,10
+268,10
@@
void do_usb_add(Monitor *mon, const char *devname);
void do_usb_del(Monitor *mon, const char *devname);
void usb_info(Monitor *mon);
void do_usb_del(Monitor *mon, const char *devname);
void usb_info(Monitor *mon);
-const char *get_opt_name(char *buf, int buf_size, const char *p, char delim);
-const char *get_opt_value(char *buf, int buf_size, const char *p);
int get_param_value(char *buf, int buf_size,
const char *tag, const char *str);
int check_params(const char * const *params, const char *str);
int get_param_value(char *buf, int buf_size,
const char *tag, const char *str);
int check_params(const char * const *params, const char *str);
+void register_devices(void);
+
#endif
#endif