mirror of https://github.com/xemu-project/xemu.git
block: bdrv_eject(): Make eject_flag a real bool
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Acked-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
329c0a48a9
commit
f36f394952
2
block.c
2
block.c
|
@ -3609,7 +3609,7 @@ int bdrv_media_changed(BlockDriverState *bs)
|
||||||
/**
|
/**
|
||||||
* If eject_flag is TRUE, eject the media. Otherwise, close the tray
|
* If eject_flag is TRUE, eject the media. Otherwise, close the tray
|
||||||
*/
|
*/
|
||||||
void bdrv_eject(BlockDriverState *bs, int eject_flag)
|
void bdrv_eject(BlockDriverState *bs, bool eject_flag)
|
||||||
{
|
{
|
||||||
BlockDriver *drv = bs->drv;
|
BlockDriver *drv = bs->drv;
|
||||||
|
|
||||||
|
|
2
block.h
2
block.h
|
@ -265,7 +265,7 @@ int bdrv_enable_write_cache(BlockDriverState *bs);
|
||||||
int bdrv_is_inserted(BlockDriverState *bs);
|
int bdrv_is_inserted(BlockDriverState *bs);
|
||||||
int bdrv_media_changed(BlockDriverState *bs);
|
int bdrv_media_changed(BlockDriverState *bs);
|
||||||
void bdrv_lock_medium(BlockDriverState *bs, bool locked);
|
void bdrv_lock_medium(BlockDriverState *bs, bool locked);
|
||||||
void bdrv_eject(BlockDriverState *bs, int eject_flag);
|
void bdrv_eject(BlockDriverState *bs, bool eject_flag);
|
||||||
void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size);
|
void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size);
|
||||||
BlockDriverState *bdrv_find(const char *name);
|
BlockDriverState *bdrv_find(const char *name);
|
||||||
BlockDriverState *bdrv_next(BlockDriverState *bs);
|
BlockDriverState *bdrv_next(BlockDriverState *bs);
|
||||||
|
|
|
@ -994,7 +994,7 @@ static int floppy_media_changed(BlockDriverState *bs)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void floppy_eject(BlockDriverState *bs, int eject_flag)
|
static void floppy_eject(BlockDriverState *bs, bool eject_flag)
|
||||||
{
|
{
|
||||||
BDRVRawState *s = bs->opaque;
|
BDRVRawState *s = bs->opaque;
|
||||||
int fd;
|
int fd;
|
||||||
|
@ -1084,7 +1084,7 @@ static int cdrom_is_inserted(BlockDriverState *bs)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void cdrom_eject(BlockDriverState *bs, int eject_flag)
|
static void cdrom_eject(BlockDriverState *bs, bool eject_flag)
|
||||||
{
|
{
|
||||||
BDRVRawState *s = bs->opaque;
|
BDRVRawState *s = bs->opaque;
|
||||||
|
|
||||||
|
@ -1194,7 +1194,7 @@ static int cdrom_is_inserted(BlockDriverState *bs)
|
||||||
return raw_getlength(bs) > 0;
|
return raw_getlength(bs) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void cdrom_eject(BlockDriverState *bs, int eject_flag)
|
static void cdrom_eject(BlockDriverState *bs, bool eject_flag)
|
||||||
{
|
{
|
||||||
BDRVRawState *s = bs->opaque;
|
BDRVRawState *s = bs->opaque;
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@ static int raw_media_changed(BlockDriverState *bs)
|
||||||
return bdrv_media_changed(bs->file);
|
return bdrv_media_changed(bs->file);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void raw_eject(BlockDriverState *bs, int eject_flag)
|
static void raw_eject(BlockDriverState *bs, bool eject_flag)
|
||||||
{
|
{
|
||||||
bdrv_eject(bs->file, eject_flag);
|
bdrv_eject(bs->file, eject_flag);
|
||||||
}
|
}
|
||||||
|
|
|
@ -197,7 +197,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);
|
||||||
void (*bdrv_eject)(BlockDriverState *bs, int eject_flag);
|
void (*bdrv_eject)(BlockDriverState *bs, bool eject_flag);
|
||||||
void (*bdrv_lock_medium)(BlockDriverState *bs, bool locked);
|
void (*bdrv_lock_medium)(BlockDriverState *bs, bool locked);
|
||||||
|
|
||||||
/* to control generic scsi devices */
|
/* to control generic scsi devices */
|
||||||
|
|
Loading…
Reference in New Issue