This includes pc and pci cleanups and enhancements, and a virtio-net bugfix related to softmac programming. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJSR83kAAoJECgfDbjSjVRpX08H/jKgYBNJaChev1TROIVHEGbu IzvkjfocvKO+6wmhOf5x+xwFmzrijUMa1CPvOkCp8c2A3Iek7rmnedknlhXYh7dM z5mXcvFGjnu7ST38ydF/Emk9+Z6rRg5Y/hkmlDyr+9lNcoiCDLXXcUrKjeIHNoWl e8w3yiPCJ528QyrLwQ890XetJphv67pMlsjMgLQ2betMk++Ac/ctUf1D2p1X4NeQ Q2drbo5Z4yDk0i6QMA3iLq1Bh/AhE10bCDq9rCzfZGIKVyncL6ne2pSi/xDvpLrF dmxoiJ5QrK6xLnagCcn5T6SB9DkwbEPdL7qCqlxZ8USr7cVyPdzYtHtGSBWdeXY= =xF01 -----END PGP SIGNATURE----- Merge remote-tracking branch 'mst/tags/for_anthony' into staging pc,pci,virtio fixes and cleanups This includes pc and pci cleanups and enhancements, and a virtio-net bugfix related to softmac programming. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Sun 29 Sep 2013 01:51:16 AM CDT using RSA key ID D28D5469 # gpg: Can't check signature: public key not found # By Michael S. Tsirkin (8) and others # Via Michael S. Tsirkin * mst/tags/for_anthony: smbios: Factor out smbios_maybe_add_str() smbios: Make multiple -smbios type= accumulate sanely smbios: Improve diagnostics for conflicting entries smbios: Convert to QemuOpts smbios: Normalize smbios_entry_add()'s error handling to exit(1) virtio-net: fix up HMP NIC info string on reset pci: remove explicit check to 64K ioport size piix4: disable io on reset piix: use 64 bit window programmed by guest q35: use 64 bit window programmed by guest pci: add helper to retrieve the 64-bit range range: add min/max operations on ranges range: add Range to typedefs q35: make pci window address/size match guest cfg Message-id: 1380437951-21788-1-git-send-email-mst@redhat.com
205 lines
5.9 KiB
C
205 lines
5.9 KiB
C
#ifndef SYSEMU_H
|
|
#define SYSEMU_H
|
|
/* Misc. things related to the system emulator. */
|
|
|
|
#include "qemu/typedefs.h"
|
|
#include "qemu/option.h"
|
|
#include "qemu/queue.h"
|
|
#include "qemu/timer.h"
|
|
#include "qapi-types.h"
|
|
#include "qemu/notify.h"
|
|
#include "qemu/main-loop.h"
|
|
|
|
/* vl.c */
|
|
|
|
extern const char *bios_name;
|
|
|
|
extern const char *qemu_name;
|
|
extern uint8_t qemu_uuid[];
|
|
extern bool qemu_uuid_set;
|
|
int qemu_uuid_parse(const char *str, uint8_t *uuid);
|
|
|
|
#define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx"
|
|
#define UUID_NONE "00000000-0000-0000-0000-000000000000"
|
|
|
|
bool runstate_check(RunState state);
|
|
void runstate_set(RunState new_state);
|
|
int runstate_is_running(void);
|
|
bool runstate_needs_reset(void);
|
|
typedef struct vm_change_state_entry VMChangeStateEntry;
|
|
typedef void VMChangeStateHandler(void *opaque, int running, RunState state);
|
|
|
|
VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,
|
|
void *opaque);
|
|
void qemu_del_vm_change_state_handler(VMChangeStateEntry *e);
|
|
void vm_state_notify(int running, RunState state);
|
|
|
|
#define VMRESET_SILENT false
|
|
#define VMRESET_REPORT true
|
|
|
|
void vm_start(void);
|
|
int vm_stop(RunState state);
|
|
int vm_stop_force_state(RunState state);
|
|
|
|
typedef enum WakeupReason {
|
|
/* Always keep QEMU_WAKEUP_REASON_NONE = 0 */
|
|
QEMU_WAKEUP_REASON_NONE = 0,
|
|
QEMU_WAKEUP_REASON_RTC,
|
|
QEMU_WAKEUP_REASON_PMTIMER,
|
|
QEMU_WAKEUP_REASON_OTHER,
|
|
} WakeupReason;
|
|
|
|
void qemu_system_reset_request(void);
|
|
void qemu_system_suspend_request(void);
|
|
void qemu_register_suspend_notifier(Notifier *notifier);
|
|
void qemu_system_wakeup_request(WakeupReason reason);
|
|
void qemu_system_wakeup_enable(WakeupReason reason, bool enabled);
|
|
void qemu_register_wakeup_notifier(Notifier *notifier);
|
|
void qemu_system_shutdown_request(void);
|
|
void qemu_system_powerdown_request(void);
|
|
void qemu_register_powerdown_notifier(Notifier *notifier);
|
|
void qemu_system_debug_request(void);
|
|
void qemu_system_vmstop_request(RunState reason);
|
|
int qemu_shutdown_requested_get(void);
|
|
int qemu_reset_requested_get(void);
|
|
void qemu_system_killed(int signal, pid_t pid);
|
|
void qemu_devices_reset(void);
|
|
void qemu_system_reset(bool report);
|
|
|
|
void qemu_add_exit_notifier(Notifier *notify);
|
|
void qemu_remove_exit_notifier(Notifier *notify);
|
|
|
|
void qemu_add_machine_init_done_notifier(Notifier *notify);
|
|
|
|
void do_savevm(Monitor *mon, const QDict *qdict);
|
|
int load_vmstate(const char *name);
|
|
void do_delvm(Monitor *mon, const QDict *qdict);
|
|
void do_info_snapshots(Monitor *mon, const QDict *qdict);
|
|
|
|
void qemu_announce_self(void);
|
|
|
|
bool qemu_savevm_state_blocked(Error **errp);
|
|
void qemu_savevm_state_begin(QEMUFile *f,
|
|
const MigrationParams *params);
|
|
int qemu_savevm_state_iterate(QEMUFile *f);
|
|
void qemu_savevm_state_complete(QEMUFile *f);
|
|
void qemu_savevm_state_cancel(void);
|
|
uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size);
|
|
int qemu_loadvm_state(QEMUFile *f);
|
|
|
|
/* SLIRP */
|
|
void do_info_slirp(Monitor *mon);
|
|
|
|
typedef enum DisplayType
|
|
{
|
|
DT_DEFAULT,
|
|
DT_CURSES,
|
|
DT_SDL,
|
|
DT_GTK,
|
|
DT_NOGRAPHIC,
|
|
DT_NONE,
|
|
} DisplayType;
|
|
|
|
extern int autostart;
|
|
|
|
typedef enum {
|
|
VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL,
|
|
} VGAInterfaceType;
|
|
|
|
extern int vga_interface_type;
|
|
#define xenfb_enabled (vga_interface_type == VGA_XENFB)
|
|
|
|
extern int graphic_width;
|
|
extern int graphic_height;
|
|
extern int graphic_depth;
|
|
extern DisplayType display_type;
|
|
extern const char *keyboard_layout;
|
|
extern int win2k_install_hack;
|
|
extern int alt_grab;
|
|
extern int ctrl_grab;
|
|
extern int smp_cpus;
|
|
extern int max_cpus;
|
|
extern int cursor_hide;
|
|
extern int graphic_rotate;
|
|
extern int no_quit;
|
|
extern int no_shutdown;
|
|
extern int semihosting_enabled;
|
|
extern int old_param;
|
|
extern int boot_menu;
|
|
extern uint8_t *boot_splash_filedata;
|
|
extern size_t boot_splash_filedata_size;
|
|
extern uint8_t qemu_extra_params_fw[2];
|
|
extern QEMUClockType rtc_clock;
|
|
|
|
#define MAX_NODES 64
|
|
#define MAX_CPUMASK_BITS 255
|
|
extern int nb_numa_nodes;
|
|
extern uint64_t node_mem[MAX_NODES];
|
|
extern unsigned long *node_cpumask[MAX_NODES];
|
|
|
|
#define MAX_OPTION_ROMS 16
|
|
typedef struct QEMUOptionRom {
|
|
const char *name;
|
|
int32_t bootindex;
|
|
} QEMUOptionRom;
|
|
extern QEMUOptionRom option_rom[MAX_OPTION_ROMS];
|
|
extern int nb_option_roms;
|
|
|
|
#define MAX_PROM_ENVS 128
|
|
extern const char *prom_envs[MAX_PROM_ENVS];
|
|
extern unsigned int nb_prom_envs;
|
|
|
|
/* pci-hotplug */
|
|
void pci_device_hot_add(Monitor *mon, const QDict *qdict);
|
|
int pci_drive_hot_add(Monitor *mon, const QDict *qdict, DriveInfo *dinfo);
|
|
void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict);
|
|
|
|
/* generic hotplug */
|
|
void drive_hot_add(Monitor *mon, const QDict *qdict);
|
|
|
|
/* CPU hotplug */
|
|
void qemu_register_cpu_added_notifier(Notifier *notifier);
|
|
|
|
/* pcie aer error injection */
|
|
void pcie_aer_inject_error_print(Monitor *mon, const QObject *data);
|
|
int do_pcie_aer_inject_error(Monitor *mon,
|
|
const QDict *qdict, QObject **ret_data);
|
|
|
|
/* serial ports */
|
|
|
|
#define MAX_SERIAL_PORTS 4
|
|
|
|
extern CharDriverState *serial_hds[MAX_SERIAL_PORTS];
|
|
|
|
/* parallel ports */
|
|
|
|
#define MAX_PARALLEL_PORTS 3
|
|
|
|
extern CharDriverState *parallel_hds[MAX_PARALLEL_PORTS];
|
|
|
|
void do_usb_add(Monitor *mon, const QDict *qdict);
|
|
void do_usb_del(Monitor *mon, const QDict *qdict);
|
|
void usb_info(Monitor *mon, const QDict *qdict);
|
|
|
|
void rtc_change_mon_event(struct tm *tm);
|
|
|
|
void add_boot_device_path(int32_t bootindex, DeviceState *dev,
|
|
const char *suffix);
|
|
char *get_boot_devices_list(size_t *size);
|
|
|
|
DeviceState *get_boot_device(uint32_t position);
|
|
|
|
QemuOpts *qemu_get_machine_opts(void);
|
|
|
|
bool usb_enabled(bool default_usb);
|
|
|
|
extern QemuOptsList qemu_drive_opts;
|
|
extern QemuOptsList qemu_chardev_opts;
|
|
extern QemuOptsList qemu_device_opts;
|
|
extern QemuOptsList qemu_netdev_opts;
|
|
extern QemuOptsList qemu_net_opts;
|
|
extern QemuOptsList qemu_global_opts;
|
|
extern QemuOptsList qemu_mon_opts;
|
|
|
|
#endif
|