diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-01-28 12:30:30 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-28 12:30:30 +0000 |
| commit | 0bcd12fb1513bad44f05f2d3a8eef2a99b3077b6 (patch) | |
| tree | f3649aab45324e1d448b67a7dc1139edf7919374 /hw/sd/sd.c | |
| parent | 091f255b89e818b84cd003c1da552b6dc3fe3cbd (diff) | |
| parent | a44be0334beae3a9affb4a3a92cc6852993d7a84 (diff) | |
| download | focaccia-qemu-0bcd12fb1513bad44f05f2d3a8eef2a99b3077b6.tar.gz focaccia-qemu-0bcd12fb1513bad44f05f2d3a8eef2a99b3077b6.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches: - Fix crash on write to read-only devices - iotests: Rewrite 'check' in Python, get rid of 'groups' and allow non-numeric test case names # gpg: Signature made Wed 27 Jan 2021 19:56:00 GMT # gpg: using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6 # gpg: issuer "kwolf@redhat.com" # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full] # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: iotests: rename and move 169 and 199 tests iotests: rewrite check into python iotests: add testrunner.py iotests: add testenv.py iotests: add findtests.py iotests: 146: drop extra whitespaces from .out file virtio-scsi-test: Test writing to scsi-cd device block: Separate blk_is_writable() and blk_supports_write_perm() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/sd/sd.c')
| -rw-r--r-- | hw/sd/sd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index b3952514fe..8517dbce8b 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -567,7 +567,7 @@ static void sd_reset(DeviceState *dev) sd_set_sdstatus(sd); g_free(sd->wp_groups); - sd->wp_switch = sd->blk ? blk_is_read_only(sd->blk) : false; + sd->wp_switch = sd->blk ? !blk_is_writable(sd->blk) : false; sd->wpgrps_size = sect; sd->wp_groups = bitmap_new(sd->wpgrps_size); memset(sd->function_group, 0, sizeof(sd->function_group)); @@ -735,7 +735,7 @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert) { sd->readonly_cb = readonly; sd->inserted_cb = insert; - qemu_set_irq(readonly, sd->blk ? blk_is_read_only(sd->blk) : 0); + qemu_set_irq(readonly, sd->blk ? !blk_is_writable(sd->blk) : 0); qemu_set_irq(insert, sd->blk ? blk_is_inserted(sd->blk) : 0); } @@ -2131,7 +2131,7 @@ static void sd_realize(DeviceState *dev, Error **errp) if (sd->blk) { int64_t blk_size; - if (blk_is_read_only(sd->blk)) { + if (!blk_supports_write_perm(sd->blk)) { error_setg(errp, "Cannot use read-only drive as SD card"); return; } |