From 1a43782e34e148a00a0bb8f5de56f2d93a0f0320 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 28 May 2010 15:38:42 +0200 Subject: blockdev: Belatedly remove MAX_DRIVES Unused since commit 751c6a17. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- sysemu.h | 1 - 1 file changed, 1 deletion(-) (limited to 'sysemu.h') diff --git a/sysemu.h b/sysemu.h index 879446a..063319c 100644 --- a/sysemu.h +++ b/sysemu.h @@ -176,7 +176,6 @@ typedef struct DriveInfo { #define MAX_IDE_DEVS 2 #define MAX_SCSI_DEVS 7 -#define MAX_DRIVES 32 extern QTAILQ_HEAD(drivelist, DriveInfo) drives; extern QTAILQ_HEAD(driveoptlist, DriveOpt) driveopts; -- cgit v1.1 From f274776028ddb026f8891cabaf59bd58dbfc31bd Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 28 May 2010 15:38:43 +0200 Subject: blockdev: Belatedly remove driveopts Unused since commit 9dfd7c7a. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- sysemu.h | 1 - 1 file changed, 1 deletion(-) (limited to 'sysemu.h') diff --git a/sysemu.h b/sysemu.h index 063319c..fd83b7d 100644 --- a/sysemu.h +++ b/sysemu.h @@ -178,7 +178,6 @@ typedef struct DriveInfo { #define MAX_SCSI_DEVS 7 extern QTAILQ_HEAD(drivelist, DriveInfo) drives; -extern QTAILQ_HEAD(driveoptlist, DriveOpt) driveopts; extern DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit); extern DriveInfo *drive_get_by_id(const char *id); -- cgit v1.1 From a803cb8eb8ada1add74f1b393b8a553a7e7f3acf Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 2 Jun 2010 13:31:55 +0200 Subject: blockdev: Hide QEMUMachine from drive_init() To pave the way for moving it out of vl.c. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- sysemu.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sysemu.h') diff --git a/sysemu.h b/sysemu.h index fd83b7d..46a1b2f 100644 --- a/sysemu.h +++ b/sysemu.h @@ -191,7 +191,8 @@ extern BlockInterfaceErrorAction drive_get_on_error( BlockDriverState *qdev_init_bdrv(DeviceState *dev, BlockInterfaceType type); extern QemuOpts *drive_add(const char *file, const char *fmt, ...); -extern DriveInfo *drive_init(QemuOpts *arg, void *machine, int *fatal_error); +extern DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi, + int *fatal_error); /* device-hotplug */ -- cgit v1.1 From 7b370f513002b340a383fac961dc8c6fdf39eddc Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 2 Jun 2010 13:31:56 +0200 Subject: qdev: Move declaration of qdev_init_bdrv() into qdev.h Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- sysemu.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'sysemu.h') diff --git a/sysemu.h b/sysemu.h index 46a1b2f..dce13c1 100644 --- a/sysemu.h +++ b/sysemu.h @@ -188,8 +188,6 @@ extern const char *drive_get_serial(BlockDriverState *bdrv); extern BlockInterfaceErrorAction drive_get_on_error( BlockDriverState *bdrv, int is_read); -BlockDriverState *qdev_init_bdrv(DeviceState *dev, BlockInterfaceType type); - extern QemuOpts *drive_add(const char *file, const char *fmt, ...); extern DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi, int *fatal_error); -- cgit v1.1 From 666daa68234b5b1758652633cab07d5ca6046a5b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 2 Jun 2010 18:48:27 +0200 Subject: blockdev: Collect block device code in new blockdev.c Anything that moves hundreds of lines out of vl.c can't be all bad. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- sysemu.h | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'sysemu.h') diff --git a/sysemu.h b/sysemu.h index dce13c1..5fa45ed 100644 --- a/sysemu.h +++ b/sysemu.h @@ -147,55 +147,6 @@ extern int nb_option_roms; extern const char *prom_envs[MAX_PROM_ENVS]; extern unsigned int nb_prom_envs; -typedef enum { - IF_NONE, - IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN, - IF_COUNT -} BlockInterfaceType; - -typedef enum { - BLOCK_ERR_REPORT, BLOCK_ERR_IGNORE, BLOCK_ERR_STOP_ENOSPC, - BLOCK_ERR_STOP_ANY -} BlockInterfaceErrorAction; - -#define BLOCK_SERIAL_STRLEN 20 - -typedef struct DriveInfo { - BlockDriverState *bdrv; - char *id; - const char *devaddr; - BlockInterfaceType type; - int bus; - int unit; - QemuOpts *opts; - BlockInterfaceErrorAction on_read_error; - BlockInterfaceErrorAction on_write_error; - char serial[BLOCK_SERIAL_STRLEN + 1]; - QTAILQ_ENTRY(DriveInfo) next; -} DriveInfo; - -#define MAX_IDE_DEVS 2 -#define MAX_SCSI_DEVS 7 - -extern QTAILQ_HEAD(drivelist, DriveInfo) drives; - -extern DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit); -extern DriveInfo *drive_get_by_id(const char *id); -extern int drive_get_max_bus(BlockInterfaceType type); -extern void drive_uninit(DriveInfo *dinfo); -extern const char *drive_get_serial(BlockDriverState *bdrv); - -extern BlockInterfaceErrorAction drive_get_on_error( - BlockDriverState *bdrv, int is_read); - -extern QemuOpts *drive_add(const char *file, const char *fmt, ...); -extern DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi, - int *fatal_error); - -/* device-hotplug */ - -DriveInfo *add_init_drive(const char *opts); - /* pci-hotplug */ void pci_device_hot_add(Monitor *mon, const QDict *qdict); void drive_hot_add(Monitor *mon, const QDict *qdict); -- cgit v1.1