diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-12-23 02:54:08 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-01-02 22:31:27 +0100 |
| commit | cb42a1b1461e02efb034582ac5d8f71534723b92 (patch) | |
| tree | 5dbd619671d4591d33834488f1c15690dabf50ba /sysemu.h | |
| parent | ca6a2e034bce665a08d9d748ac11d6a7cfcd7c48 (diff) | |
| download | external_qemu-cb42a1b1461e02efb034582ac5d8f71534723b92.zip external_qemu-cb42a1b1461e02efb034582ac5d8f71534723b92.tar.gz external_qemu-cb42a1b1461e02efb034582ac5d8f71534723b92.tar.bz2 | |
upstream: integrate block changes
This large patch upgrades the block support code to the upstream
version available in ba5e7f82169f32ab8163c707d97c799ca09f8924
dated 2010-08-08
Change-Id: I8b24df0c287e72f6620650a4d6a62e1bb315453e
Diffstat (limited to 'sysemu.h')
| -rw-r--r-- | sysemu.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -114,6 +114,7 @@ int tap_win32_init(VLANState *vlan, const char *model, /* SLIRP */ void do_info_slirp(Monitor *mon); +extern int autostart; extern int bios_size; extern int cirrus_vga_enabled; extern int std_vga_enabled; @@ -157,6 +158,7 @@ extern unsigned int nb_prom_envs; #endif #endif +#if 0 typedef enum { BLOCK_ERR_REPORT, BLOCK_ERR_IGNORE, BLOCK_ERR_STOP_ENOSPC, BLOCK_ERR_STOP_ANY @@ -200,6 +202,8 @@ extern int nb_drives_opt; extern int drive_add(const char *file, const char *fmt, ...); extern int drive_init(struct drive_opt *arg, int snapshot, void *machine); +int add_init_drive(const char *opts); +#endif /* acpi */ void qemu_system_hot_add_init(void); @@ -209,7 +213,6 @@ void qemu_system_device_hot_add(int pcibus, int slot, int state); typedef int (dev_match_fn)(void *dev_private, void *arg); -int add_init_drive(const char *opts); void destroy_nic(dev_match_fn *match_fn, void *arg); void destroy_bdrvs(dev_match_fn *match_fn, void *arg); |