From abd7f68d081ef5adb425f659c7449149987bf89e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 2 Jun 2010 18:55:17 +0200 Subject: block: Move error actions from DriveInfo to BlockDriverState That's where they belong semantically (block device host part), even though the actions are actually executed by guest device code. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- blockdev.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'blockdev.h') diff --git a/blockdev.h b/blockdev.h index dfc9de19ae..9e8a7fca27 100644 --- a/blockdev.h +++ b/blockdev.h @@ -19,11 +19,6 @@ typedef enum { 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 { @@ -34,8 +29,6 @@ typedef struct DriveInfo { 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; @@ -51,9 +44,6 @@ 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); -- cgit v1.2.1