[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 15/15] hw/sd/sdcard: Simplify realize() a bit
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v6 15/15] hw/sd/sdcard: Simplify realize() a bit |
Date: |
Tue, 30 Jun 2020 12:03:42 +0200 |
We don't need to check if sd->blk is set twice.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/sd/sd.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 7f973f6763..e1bba887b2 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -2140,12 +2140,12 @@ static void sd_realize(DeviceState *dev, Error **errp)
return;
}
- if (sd->blk && blk_is_read_only(sd->blk)) {
- error_setg(errp, "Cannot use read-only drive as SD card");
- return;
- }
-
if (sd->blk) {
+ if (blk_is_read_only(sd->blk)) {
+ error_setg(errp, "Cannot use read-only drive as SD card");
+ return;
+ }
+
ret = blk_set_perm(sd->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE,
BLK_PERM_ALL, errp);
if (ret < 0) {
--
2.21.3
- [PATCH v6 05/15] hw/sd/sdcard: Do not switch to ReceivingData if address is invalid, (continued)
- [PATCH v6 05/15] hw/sd/sdcard: Do not switch to ReceivingData if address is invalid, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v6 06/15] hw/sd/sdcard: Restrict Class 6 commands to SCSD cards, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v6 07/15] hw/sd/sdcard: Initialize constant values first, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v6 08/15] hw/sd/sdcard: Check address is in range, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v6 09/15] hw/sd/sdcard: Update the SDState documentation, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v6 10/15] hw/sd/sdcard: Simplify cmd_valid_while_locked(), Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v6 11/15] hw/sd/sdcard: Constify sd_crc*()'s message argument, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v6 12/15] hw/sd/sdcard: Make iolen unsigned, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v6 13/15] hw/sd/sdcard: Correctly display the command name in trace events, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v6 14/15] hw/sd/sdcard: Display offset in read/write_data() trace events, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v6 15/15] hw/sd/sdcard: Simplify realize() a bit,
Philippe Mathieu-Daudé <=
- Re: [PATCH v6 00/15] hw/sd/sdcard: Fix CVE-2020-13253 & cleanups, no-reply, 2020/06/30