diff options
| author | Markus Armbruster <armbru@redhat.com> | 2011-07-20 18:23:41 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-08-01 12:10:28 +0200 |
| commit | 7bf37feddcfa527304cfdc02bd2db8912ee9bf8c (patch) | |
| tree | 2e7084c75e2a1cbd4a512d80db5638ab80b8bcf7 /block | |
| parent | 02266d547a6c7b10e1ac1574ec69b92f4e28f817 (diff) | |
| download | qemu-7bf37feddcfa527304cfdc02bd2db8912ee9bf8c.zip qemu-7bf37feddcfa527304cfdc02bd2db8912ee9bf8c.tar.gz qemu-7bf37feddcfa527304cfdc02bd2db8912ee9bf8c.tar.bz2 | |
block: Make BlockDriver method bdrv_set_locked() return void
The only caller is bdrv_set_locked(), and it ignores the value.
Callees always return 0, except for FreeBSD's cdrom_set_locked(),
which returns -ENOTSUP when the device is in a terminally wedged
state.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/raw-posix.c | 10 | ||||
| -rw-r--r-- | block/raw.c | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/block/raw-posix.c b/block/raw-posix.c index cd89c83..5241308 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1363,7 +1363,7 @@ static int cdrom_eject(BlockDriverState *bs, int eject_flag) return 0; } -static int cdrom_set_locked(BlockDriverState *bs, int locked) +static void cdrom_set_locked(BlockDriverState *bs, int locked) { BDRVRawState *s = bs->opaque; @@ -1374,8 +1374,6 @@ static int cdrom_set_locked(BlockDriverState *bs, int locked) */ /* perror("CDROM_LOCKDOOR"); */ } - - return 0; } static BlockDriver bdrv_host_cdrom = { @@ -1486,12 +1484,12 @@ static int cdrom_eject(BlockDriverState *bs, int eject_flag) return 0; } -static int cdrom_set_locked(BlockDriverState *bs, int locked) +static void cdrom_set_locked(BlockDriverState *bs, int locked) { BDRVRawState *s = bs->opaque; if (s->fd < 0) - return -ENOTSUP; + return; if (ioctl(s->fd, (locked ? CDIOCPREVENT : CDIOCALLOW)) < 0) { /* * Note: an error can happen if the distribution automatically @@ -1499,8 +1497,6 @@ static int cdrom_set_locked(BlockDriverState *bs, int locked) */ /* perror("CDROM_LOCKDOOR"); */ } - - return 0; } static BlockDriver bdrv_host_cdrom = { diff --git a/block/raw.c b/block/raw.c index b0f72d6..1398a9c 100644 --- a/block/raw.c +++ b/block/raw.c @@ -80,10 +80,9 @@ static int raw_eject(BlockDriverState *bs, int eject_flag) return bdrv_eject(bs->file, eject_flag); } -static int raw_set_locked(BlockDriverState *bs, int locked) +static void raw_set_locked(BlockDriverState *bs, int locked) { bdrv_set_locked(bs->file, locked); - return 0; } static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) |