| Message ID | 1315328340-6192-15-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
Am 06.09.2011 18:58, schrieb Markus Armbruster: > While there, make the locked parameter bool. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > block.c | 8 ++++---- > block.h | 2 +- > block/raw-posix.c | 8 ++++---- > block/raw.c | 6 +++--- > block_int.h | 2 +- > hw/ide/atapi.c | 2 +- > hw/scsi-disk.c | 2 +- > trace-events | 1 + > 8 files changed, 16 insertions(+), 15 deletions(-) > > diff --git a/block.c b/block.c > index 1e4be73..7225b15 100644 > --- a/block.c > +++ b/block.c > @@ -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 > * to eject it manually). > */ > -void bdrv_set_locked(BlockDriverState *bs, int locked) > +void bdrv_lock_medium(BlockDriverState *bs, bool locked) > { > BlockDriver *drv = bs->drv; > > - trace_bdrv_set_locked(bs, locked); > + trace_bdrv_lock_medium(bs, locked); > > - if (drv && drv->bdrv_set_locked) { > - drv->bdrv_set_locked(bs, locked); > + if (drv && drv->bdrv_lock_medium) { > + drv->bdrv_lock_medium(bs, locked); > } > } > > diff --git a/block.h b/block.h > index 396ca0e..4691090 100644 > --- a/block.h > +++ b/block.h > @@ -212,7 +212,7 @@ int bdrv_is_sg(BlockDriverState *bs); > int bdrv_enable_write_cache(BlockDriverState *bs); > int bdrv_is_inserted(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_get_format(BlockDriverState *bs, char *buf, int buf_size); > BlockDriverState *bdrv_find(const char *name); > diff --git a/block/raw-posix.c b/block/raw-posix.c > index bcf50b2..a624f56 100644 > --- a/block/raw-posix.c > +++ b/block/raw-posix.c > @@ -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; > > @@ -1400,7 +1400,7 @@ static BlockDriver bdrv_host_cdrom = { > /* removable device support */ > .bdrv_is_inserted = cdrom_is_inserted, > .bdrv_eject = cdrom_eject, > - .bdrv_set_locked = cdrom_set_locked, > + .bdrv_lock_medium = cdrom_lock_medium, > > /* generic scsi device */ > .bdrv_ioctl = hdev_ioctl, > @@ -1481,7 +1481,7 @@ static void cdrom_eject(BlockDriverState *bs, int eject_flag) > 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; > > @@ -1521,7 +1521,7 @@ static BlockDriver bdrv_host_cdrom = { > /* removable device support */ > .bdrv_is_inserted = cdrom_is_inserted, > .bdrv_eject = cdrom_eject, > - .bdrv_set_locked = cdrom_set_locked, > + .bdrv_lock_medium = cdrom_lock_medium, > }; > #endif /* __FreeBSD__ */ > > diff --git a/block/raw.c b/block/raw.c > index f197479..63cf2d3 100644 > --- a/block/raw.c > +++ b/block/raw.c > @@ -85,9 +85,9 @@ static void raw_eject(BlockDriverState *bs, int 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) > @@ -144,7 +144,7 @@ static BlockDriver bdrv_raw = { > .bdrv_is_inserted = raw_is_inserted, > .bdrv_media_changed = raw_media_changed, > .bdrv_eject = raw_eject, > - .bdrv_set_locked = raw_set_locked, > + .bdrv_lock_medium = raw_lock_medium, > > .bdrv_ioctl = raw_ioctl, > .bdrv_aio_ioctl = raw_aio_ioctl, > diff --git a/block_int.h b/block_int.h > index 4f7ff3b..f42af2c 100644 > --- a/block_int.h > +++ b/block_int.h > @@ -120,7 +120,7 @@ struct BlockDriver { > int (*bdrv_is_inserted)(BlockDriverState *bs); > int (*bdrv_media_changed)(BlockDriverState *bs); > 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 */ > int (*bdrv_ioctl)(BlockDriverState *bs, unsigned long int req, void *buf); > diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c > index afb27c6..06778f3 100644 > --- a/hw/ide/atapi.c > +++ b/hw/ide/atapi.c > @@ -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) > { > 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); > } > > diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c > index 42682d0..4e89bb1 100644 > --- a/hw/scsi-disk.c > +++ b/hw/scsi-disk.c > @@ -887,7 +887,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf) > break; > case ALLOW_MEDIUM_REMOVAL: > 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; > case READ_CAPACITY_10: > /* The normal LEN field for this command is zero. */ > diff --git a/trace-events b/trace-events > index 08ffedf..1c0b49b 100644 > --- a/trace-events > +++ b/trace-events > @@ -62,6 +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_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_lock_medium(void *bs, bool locked) "bs %p locked %d" > bdrv_set_locked(void *bs, int locked) "bs %p locked %d" Do we still need trace_bdrv_set_locked() now? v2 did remove it and I can't see any comment that suggested that it was still needed. Kevin
Kevin Wolf <kwolf@redhat.com> writes: > Am 06.09.2011 18:58, schrieb Markus Armbruster: >> While there, make the locked parameter bool. >> >> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> --- >> block.c | 8 ++++---- >> block.h | 2 +- >> block/raw-posix.c | 8 ++++---- >> block/raw.c | 6 +++--- >> block_int.h | 2 +- >> hw/ide/atapi.c | 2 +- >> hw/scsi-disk.c | 2 +- >> trace-events | 1 + >> 8 files changed, 16 insertions(+), 15 deletions(-) >> >> diff --git a/block.c b/block.c >> index 1e4be73..7225b15 100644 >> --- a/block.c >> +++ b/block.c >> @@ -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 >> * to eject it manually). >> */ >> -void bdrv_set_locked(BlockDriverState *bs, int locked) >> +void bdrv_lock_medium(BlockDriverState *bs, bool locked) >> { >> BlockDriver *drv = bs->drv; >> >> - trace_bdrv_set_locked(bs, locked); >> + trace_bdrv_lock_medium(bs, locked); >> >> - if (drv && drv->bdrv_set_locked) { >> - drv->bdrv_set_locked(bs, locked); >> + if (drv && drv->bdrv_lock_medium) { >> + drv->bdrv_lock_medium(bs, locked); >> } >> } >> >> diff --git a/block.h b/block.h >> index 396ca0e..4691090 100644 >> --- a/block.h >> +++ b/block.h >> @@ -212,7 +212,7 @@ int bdrv_is_sg(BlockDriverState *bs); >> int bdrv_enable_write_cache(BlockDriverState *bs); >> int bdrv_is_inserted(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_get_format(BlockDriverState *bs, char *buf, int buf_size); >> BlockDriverState *bdrv_find(const char *name); >> diff --git a/block/raw-posix.c b/block/raw-posix.c >> index bcf50b2..a624f56 100644 >> --- a/block/raw-posix.c >> +++ b/block/raw-posix.c >> @@ -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; >> >> @@ -1400,7 +1400,7 @@ static BlockDriver bdrv_host_cdrom = { >> /* removable device support */ >> .bdrv_is_inserted = cdrom_is_inserted, >> .bdrv_eject = cdrom_eject, >> - .bdrv_set_locked = cdrom_set_locked, >> + .bdrv_lock_medium = cdrom_lock_medium, >> >> /* generic scsi device */ >> .bdrv_ioctl = hdev_ioctl, >> @@ -1481,7 +1481,7 @@ static void cdrom_eject(BlockDriverState *bs, int eject_flag) >> 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; >> >> @@ -1521,7 +1521,7 @@ static BlockDriver bdrv_host_cdrom = { >> /* removable device support */ >> .bdrv_is_inserted = cdrom_is_inserted, >> .bdrv_eject = cdrom_eject, >> - .bdrv_set_locked = cdrom_set_locked, >> + .bdrv_lock_medium = cdrom_lock_medium, >> }; >> #endif /* __FreeBSD__ */ >> >> diff --git a/block/raw.c b/block/raw.c >> index f197479..63cf2d3 100644 >> --- a/block/raw.c >> +++ b/block/raw.c >> @@ -85,9 +85,9 @@ static void raw_eject(BlockDriverState *bs, int 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) >> @@ -144,7 +144,7 @@ static BlockDriver bdrv_raw = { >> .bdrv_is_inserted = raw_is_inserted, >> .bdrv_media_changed = raw_media_changed, >> .bdrv_eject = raw_eject, >> - .bdrv_set_locked = raw_set_locked, >> + .bdrv_lock_medium = raw_lock_medium, >> >> .bdrv_ioctl = raw_ioctl, >> .bdrv_aio_ioctl = raw_aio_ioctl, >> diff --git a/block_int.h b/block_int.h >> index 4f7ff3b..f42af2c 100644 >> --- a/block_int.h >> +++ b/block_int.h >> @@ -120,7 +120,7 @@ struct BlockDriver { >> int (*bdrv_is_inserted)(BlockDriverState *bs); >> int (*bdrv_media_changed)(BlockDriverState *bs); >> 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 */ >> int (*bdrv_ioctl)(BlockDriverState *bs, unsigned long int req, void *buf); >> diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c >> index afb27c6..06778f3 100644 >> --- a/hw/ide/atapi.c >> +++ b/hw/ide/atapi.c >> @@ -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) >> { >> 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); >> } >> >> diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c >> index 42682d0..4e89bb1 100644 >> --- a/hw/scsi-disk.c >> +++ b/hw/scsi-disk.c >> @@ -887,7 +887,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf) >> break; >> case ALLOW_MEDIUM_REMOVAL: >> 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; >> case READ_CAPACITY_10: >> /* The normal LEN field for this command is zero. */ >> diff --git a/trace-events b/trace-events >> index 08ffedf..1c0b49b 100644 >> --- a/trace-events >> +++ b/trace-events >> @@ -62,6 +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_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_lock_medium(void *bs, bool locked) "bs %p locked %d" >> bdrv_set_locked(void *bs, int locked) "bs %p locked %d" > > Do we still need trace_bdrv_set_locked() now? v2 did remove it and I > can't see any comment that suggested that it was still needed. Merge turd, sorry. Want a v4, or want to fix it up yourself?
diff --git a/block.c b/block.c index 1e4be73..7225b15 100644 --- a/block.c +++ b/block.c @@ -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 * to eject it manually). */ -void bdrv_set_locked(BlockDriverState *bs, int locked) +void bdrv_lock_medium(BlockDriverState *bs, bool locked) { BlockDriver *drv = bs->drv; - trace_bdrv_set_locked(bs, locked); + trace_bdrv_lock_medium(bs, locked); - if (drv && drv->bdrv_set_locked) { - drv->bdrv_set_locked(bs, locked); + if (drv && drv->bdrv_lock_medium) { + drv->bdrv_lock_medium(bs, locked); } } diff --git a/block.h b/block.h index 396ca0e..4691090 100644 --- a/block.h +++ b/block.h @@ -212,7 +212,7 @@ int bdrv_is_sg(BlockDriverState *bs); int bdrv_enable_write_cache(BlockDriverState *bs); int bdrv_is_inserted(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_get_format(BlockDriverState *bs, char *buf, int buf_size); BlockDriverState *bdrv_find(const char *name); diff --git a/block/raw-posix.c b/block/raw-posix.c index bcf50b2..a624f56 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -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; @@ -1400,7 +1400,7 @@ static BlockDriver bdrv_host_cdrom = { /* removable device support */ .bdrv_is_inserted = cdrom_is_inserted, .bdrv_eject = cdrom_eject, - .bdrv_set_locked = cdrom_set_locked, + .bdrv_lock_medium = cdrom_lock_medium, /* generic scsi device */ .bdrv_ioctl = hdev_ioctl, @@ -1481,7 +1481,7 @@ static void cdrom_eject(BlockDriverState *bs, int eject_flag) 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; @@ -1521,7 +1521,7 @@ static BlockDriver bdrv_host_cdrom = { /* removable device support */ .bdrv_is_inserted = cdrom_is_inserted, .bdrv_eject = cdrom_eject, - .bdrv_set_locked = cdrom_set_locked, + .bdrv_lock_medium = cdrom_lock_medium, }; #endif /* __FreeBSD__ */ diff --git a/block/raw.c b/block/raw.c index f197479..63cf2d3 100644 --- a/block/raw.c +++ b/block/raw.c @@ -85,9 +85,9 @@ static void raw_eject(BlockDriverState *bs, int 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) @@ -144,7 +144,7 @@ static BlockDriver bdrv_raw = { .bdrv_is_inserted = raw_is_inserted, .bdrv_media_changed = raw_media_changed, .bdrv_eject = raw_eject, - .bdrv_set_locked = raw_set_locked, + .bdrv_lock_medium = raw_lock_medium, .bdrv_ioctl = raw_ioctl, .bdrv_aio_ioctl = raw_aio_ioctl, diff --git a/block_int.h b/block_int.h index 4f7ff3b..f42af2c 100644 --- a/block_int.h +++ b/block_int.h @@ -120,7 +120,7 @@ struct BlockDriver { int (*bdrv_is_inserted)(BlockDriverState *bs); int (*bdrv_media_changed)(BlockDriverState *bs); 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 */ int (*bdrv_ioctl)(BlockDriverState *bs, unsigned long int req, void *buf); diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index afb27c6..06778f3 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -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) { 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); } diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 42682d0..4e89bb1 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -887,7 +887,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf) break; case ALLOW_MEDIUM_REMOVAL: 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; case READ_CAPACITY_10: /* The normal LEN field for this command is zero. */ diff --git a/trace-events b/trace-events index 08ffedf..1c0b49b 100644 --- a/trace-events +++ b/trace-events @@ -62,6 +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_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_lock_medium(void *bs, bool locked) "bs %p locked %d" bdrv_set_locked(void *bs, int 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_writev(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d"
While there, make the locked parameter bool. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- block.c | 8 ++++---- block.h | 2 +- block/raw-posix.c | 8 ++++---- block/raw.c | 6 +++--- block_int.h | 2 +- hw/ide/atapi.c | 2 +- hw/scsi-disk.c | 2 +- trace-events | 1 + 8 files changed, 16 insertions(+), 15 deletions(-)