OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: Make BlockDriver method bdrv_eject() return void 

Callees always return 0, except for FreeBSD's cdrom_eject(), which
returns -ENOTSUP when the device is in a terminally wedged state.

The only caller is bdrv_eject(), and it maps -ENOTSUP to 0 since
commit 4be9762a.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2011-07-20 18:23:42 +02:00 committed by Kevin Wolf
parent 7bf37feddc
commit 822e1cd17e
4 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block.c
View File

@ -2770,25 +2770,16 @@ int bdrv_media_changed(BlockDriverState *bs)
int bdrv_eject(BlockDriverState *bs, int eject_flag) int bdrv_eject(BlockDriverState *bs, int eject_flag)
{ {
BlockDriver *drv = bs->drv; BlockDriver *drv = bs->drv;
int ret;
if (bs->locked) { if (bs->locked) {
return -EBUSY; return -EBUSY;
} }
if (!drv || !drv->bdrv_eject) { if (drv && drv->bdrv_eject) {
ret = -ENOTSUP; drv->bdrv_eject(bs, eject_flag);
} else {
ret = drv->bdrv_eject(bs, eject_flag);
} }
if (ret == -ENOTSUP) { bs->tray_open = eject_flag;
ret = 0; return 0;
}
if (ret >= 0) {
bs->tray_open = eject_flag;
}
return ret;
} }
int bdrv_is_locked(BlockDriverState *bs) int bdrv_is_locked(BlockDriverState *bs)

16
block/raw-posix.c
View File

@ -1254,7 +1254,7 @@ static int floppy_media_changed(BlockDriverState *bs)
return ret; return ret;
} }
static int floppy_eject(BlockDriverState *bs, int eject_flag) static void floppy_eject(BlockDriverState *bs, int eject_flag)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
int fd; int fd;
@ -1269,8 +1269,6 @@ static int floppy_eject(BlockDriverState *bs, int eject_flag)
perror("FDEJECT"); perror("FDEJECT");
close(fd); close(fd);
} }
return 0;
} }
static BlockDriver bdrv_host_floppy = { static BlockDriver bdrv_host_floppy = {
@ -1348,7 +1346,7 @@ static int cdrom_is_inserted(BlockDriverState *bs)
return 0; return 0;
} }
static int cdrom_eject(BlockDriverState *bs, int eject_flag) static void cdrom_eject(BlockDriverState *bs, int eject_flag)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
@ -1359,8 +1357,6 @@ static int cdrom_eject(BlockDriverState *bs, int eject_flag)
if (ioctl(s->fd, CDROMCLOSETRAY, NULL) < 0) if (ioctl(s->fd, CDROMCLOSETRAY, NULL) < 0)
perror("CDROMEJECT"); perror("CDROMEJECT");
} }
return 0;
} }
static void cdrom_set_locked(BlockDriverState *bs, int locked) static void cdrom_set_locked(BlockDriverState *bs, int locked)
@ -1462,12 +1458,12 @@ static int cdrom_is_inserted(BlockDriverState *bs)
return raw_getlength(bs) > 0; return raw_getlength(bs) > 0;
} }
static int cdrom_eject(BlockDriverState *bs, int eject_flag) static void cdrom_eject(BlockDriverState *bs, int eject_flag)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
if (s->fd < 0) if (s->fd < 0)
return -ENOTSUP; return;
(void) ioctl(s->fd, CDIOCALLOW); (void) ioctl(s->fd, CDIOCALLOW);
@ -1479,9 +1475,7 @@ static int cdrom_eject(BlockDriverState *bs, int eject_flag)
perror("CDIOCCLOSE"); perror("CDIOCCLOSE");
} }
if (cdrom_reopen(bs) < 0) cdrom_reopen(bs);
return -ENOTSUP;
return 0;
} }
static void cdrom_set_locked(BlockDriverState *bs, int locked) static void cdrom_set_locked(BlockDriverState *bs, int locked)

4
block/raw.c
View File

@ -75,9 +75,9 @@ static int raw_is_inserted(BlockDriverState *bs)
return bdrv_is_inserted(bs->file); return bdrv_is_inserted(bs->file);
} }
static int raw_eject(BlockDriverState *bs, int eject_flag) static void raw_eject(BlockDriverState *bs, int eject_flag)
{ {
return bdrv_eject(bs->file, eject_flag); bdrv_eject(bs->file, eject_flag);
} }
static void raw_set_locked(BlockDriverState *bs, int locked) static void raw_set_locked(BlockDriverState *bs, int locked)

2
block_int.h
View File

@ -112,7 +112,7 @@ struct BlockDriver {
/* removable device specific */ /* removable device specific */
int (*bdrv_is_inserted)(BlockDriverState *bs); int (*bdrv_is_inserted)(BlockDriverState *bs);
int (*bdrv_media_changed)(BlockDriverState *bs); int (*bdrv_media_changed)(BlockDriverState *bs);
int (*bdrv_eject)(BlockDriverState *bs, int eject_flag); void (*bdrv_eject)(BlockDriverState *bs, int eject_flag);
void (*bdrv_set_locked)(BlockDriverState *bs, int locked); void (*bdrv_set_locked)(BlockDriverState *bs, int locked);
/* to control generic scsi devices */ /* to control generic scsi devices */