ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: Rename bdrv_set_locked() to bdrv_lock_medium() 

While there, make the locked parameter bool.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2011-09-06 18:58:47 +02:00 committed by Kevin Wolf
parent f107639a6f
commit 025e849a50
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block.c
View File

@ -3072,14 +3072,14 @@ void bdrv_eject(BlockDriverState *bs, int eject_flag)
* Lock or unlock the media (if it is locked, the user won't be able * Lock or unlock the media (if it is locked, the user won't be able
* to eject it manually). * to eject it manually).
*/ */
void bdrv_set_locked(BlockDriverState *bs, int locked) void bdrv_lock_medium(BlockDriverState *bs, bool locked)
{ {
BlockDriver *drv = bs->drv; BlockDriver *drv = bs->drv;
trace_bdrv_set_locked(bs, locked); trace_bdrv_lock_medium(bs, locked);
if (drv && drv->bdrv_set_locked) { if (drv && drv->bdrv_lock_medium) {
drv->bdrv_set_locked(bs, locked); drv->bdrv_lock_medium(bs, locked);
} }
} }

2
block.h
View File

@ -212,7 +212,7 @@ int bdrv_is_sg(BlockDriverState *bs);
int bdrv_enable_write_cache(BlockDriverState *bs); 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_set_locked(BlockDriverState *bs, int locked); void bdrv_lock_medium(BlockDriverState *bs, bool locked);
void bdrv_eject(BlockDriverState *bs, int eject_flag); void bdrv_eject(BlockDriverState *bs, int 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);

8
block/raw-posix.c
View File

@ -1362,7 +1362,7 @@ static void cdrom_eject(BlockDriverState *bs, int eject_flag)
} }
} }
static void cdrom_set_locked(BlockDriverState *bs, int locked) static void cdrom_lock_medium(BlockDriverState *bs, bool locked)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
@ -1400,7 +1400,7 @@ static BlockDriver bdrv_host_cdrom = {
/* removable device support */ /* removable device support */
.bdrv_is_inserted = cdrom_is_inserted, .bdrv_is_inserted = cdrom_is_inserted,
.bdrv_eject = cdrom_eject, .bdrv_eject = cdrom_eject,
.bdrv_set_locked = cdrom_set_locked, .bdrv_lock_medium = cdrom_lock_medium,
/* generic scsi device */ /* generic scsi device */
.bdrv_ioctl = hdev_ioctl, .bdrv_ioctl = hdev_ioctl,
@ -1481,7 +1481,7 @@ static void cdrom_eject(BlockDriverState *bs, int eject_flag)
cdrom_reopen(bs); cdrom_reopen(bs);
} }
static void cdrom_set_locked(BlockDriverState *bs, int locked) static void cdrom_lock_medium(BlockDriverState *bs, bool locked)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
@ -1521,7 +1521,7 @@ static BlockDriver bdrv_host_cdrom = {
/* removable device support */ /* removable device support */
.bdrv_is_inserted = cdrom_is_inserted, .bdrv_is_inserted = cdrom_is_inserted,
.bdrv_eject = cdrom_eject, .bdrv_eject = cdrom_eject,
.bdrv_set_locked = cdrom_set_locked, .bdrv_lock_medium = cdrom_lock_medium,
}; };
#endif /* __FreeBSD__ */ #endif /* __FreeBSD__ */

6
block/raw.c
View File

@ -85,9 +85,9 @@ static void raw_eject(BlockDriverState *bs, int eject_flag)
bdrv_eject(bs->file, eject_flag); bdrv_eject(bs->file, eject_flag);
} }
static void raw_set_locked(BlockDriverState *bs, int locked) static void raw_lock_medium(BlockDriverState *bs, bool locked)
{ {
bdrv_set_locked(bs->file, locked); bdrv_lock_medium(bs->file, locked);
} }
static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
@ -144,7 +144,7 @@ static BlockDriver bdrv_raw = {
.bdrv_is_inserted = raw_is_inserted, .bdrv_is_inserted = raw_is_inserted,
.bdrv_media_changed = raw_media_changed, .bdrv_media_changed = raw_media_changed,
.bdrv_eject = raw_eject, .bdrv_eject = raw_eject,
.bdrv_set_locked = raw_set_locked, .bdrv_lock_medium = raw_lock_medium,
.bdrv_ioctl = raw_ioctl, .bdrv_ioctl = raw_ioctl,
.bdrv_aio_ioctl = raw_aio_ioctl, .bdrv_aio_ioctl = raw_aio_ioctl,

2
block_int.h
View File

@ -120,7 +120,7 @@ struct BlockDriver {
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, int eject_flag);
void (*bdrv_set_locked)(BlockDriverState *bs, int locked); void (*bdrv_lock_medium)(BlockDriverState *bs, bool locked);
/* to control generic scsi devices */ /* to control generic scsi devices */
int (*bdrv_ioctl)(BlockDriverState *bs, unsigned long int req, void *buf); int (*bdrv_ioctl)(BlockDriverState *bs, unsigned long int req, void *buf);

2
hw/ide/atapi.c
View File

@ -833,7 +833,7 @@ static void cmd_test_unit_ready(IDEState *s, uint8_t *buf)
static void cmd_prevent_allow_medium_removal(IDEState *s, uint8_t* buf) static void cmd_prevent_allow_medium_removal(IDEState *s, uint8_t* buf)
{ {
s->tray_locked = buf[4] & 1; s->tray_locked = buf[4] & 1;
bdrv_set_locked(s->bs, buf[4] & 1); bdrv_lock_medium(s->bs, buf[4] & 1);
ide_atapi_cmd_ok(s); ide_atapi_cmd_ok(s);
} }

2
hw/scsi-disk.c
View File

@ -887,7 +887,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf)
break; break;
case ALLOW_MEDIUM_REMOVAL: case ALLOW_MEDIUM_REMOVAL:
s->tray_locked = req->cmd.buf[4] & 1; s->tray_locked = req->cmd.buf[4] & 1;
bdrv_set_locked(s->bs, req->cmd.buf[4] & 1); bdrv_lock_medium(s->bs, req->cmd.buf[4] & 1);
break; break;
case READ_CAPACITY_10: case READ_CAPACITY_10:
/* The normal LEN field for this command is zero. */ /* The normal LEN field for this command is zero. */

2
trace-events
View File

@ -62,7 +62,7 @@ bdrv_aio_multiwrite_latefail(void *mcb, int i) "mcb %p i %d"
bdrv_aio_flush(void *bs, void *opaque) "bs %p opaque %p" bdrv_aio_flush(void *bs, void *opaque) "bs %p opaque %p"
bdrv_aio_readv(void *bs, int64_t sector_num, int nb_sectors, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d opaque %p" bdrv_aio_readv(void *bs, int64_t sector_num, int nb_sectors, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d opaque %p"
bdrv_aio_writev(void *bs, int64_t sector_num, int nb_sectors, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d opaque %p" bdrv_aio_writev(void *bs, int64_t sector_num, int nb_sectors, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d opaque %p"
bdrv_set_locked(void *bs, int locked) "bs %p locked %d" bdrv_lock_medium(void *bs, bool locked) "bs %p locked %d"
bdrv_co_readv(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d" bdrv_co_readv(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d"
bdrv_co_writev(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d" bdrv_co_writev(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d"
bdrv_co_io(int is_write, void *acb) "is_write %d acb %p" bdrv_co_io(int is_write, void *acb) "is_write %d acb %p"