From 025e849a50259447aad49a0b45f0133c6a0f5d16 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 6 Sep 2011 18:58:47 +0200 Subject: block: Rename bdrv_set_locked() to bdrv_lock_medium() While there, make the locked parameter bool. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/ide/atapi.c | 2 +- hw/scsi-disk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'hw') 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. */ -- cgit v1.1