[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/11] hw/sd/sdcard: Simplify realize() a bit
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 11/11] hw/sd/sdcard: Simplify realize() a bit |
Date: |
Fri, 5 Jun 2020 12:22:30 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
We don't need to check if sd->blk is set twice.
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 a1b25ed36f..060ca9d993 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -2123,12 +2123,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
- Re: [PATCH v3 05/11] hw/sd/sdcard: Update the SDState documentation, (continued)
- [PATCH v3 06/11] hw/sd/sdcard: Simplify cmd_valid_while_locked(), Philippe Mathieu-Daudé, 2020/06/05
- [PATCH v3 07/11] hw/sd/sdcard: Constify sd_crc*()'s message argument, Philippe Mathieu-Daudé, 2020/06/05
- [PATCH v3 08/11] hw/sd/sdcard: Make iolen unsigned, Philippe Mathieu-Daudé, 2020/06/05
- [PATCH v3 09/11] hw/sd/sdcard: Correctly display the command name in trace events, Philippe Mathieu-Daudé, 2020/06/05
- [PATCH v3 10/11] hw/sd/sdcard: Display offset in read/write_data() trace events, Philippe Mathieu-Daudé, 2020/06/05
- [PATCH v3 11/11] hw/sd/sdcard: Simplify realize() a bit,
Philippe Mathieu-Daudé <=
- Re: [PATCH v3 00/11] hw/sd/sdcard: Fix CVE-2020-13253 & cleanups, Philippe Mathieu-Daudé, 2020/06/08
- Re: [PATCH v3 00/11] hw/sd/sdcard: Fix CVE-2020-13253 & cleanups, Philippe Mathieu-Daudé, 2020/06/15