aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2011-09-06 18:58:47 +0200
committerKevin Wolf <kwolf@redhat.com>2011-09-12 15:17:20 +0200
commit025e849a50259447aad49a0b45f0133c6a0f5d16 (patch)
treef8d35912c6c0728d7cac71325eec762afb4a9dc7 /hw
parentf107639a6ff0c8d02f6a2dfdfce3a9d9f1e2eb27 (diff)
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/ide/atapi.c2
-rw-r--r--hw/scsi-disk.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index afb27c60a2..06778f3bca 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 42682d0865..4e89bb1c9a 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. */