qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	qemu-block@nongnu.org
Subject: [PATCH v5 15/15] hw/sd/sdcard: Simplify realize() a bit
Date: Fri, 26 Jun 2020 18:40:26 +0200	[thread overview]
Message-ID: <20200626164026.766-16-f4bug@amsat.org> (raw)
In-Reply-To: <20200626164026.766-1-f4bug@amsat.org>

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 f0b5527eaf..27a7862c98 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



  parent reply	other threads:[~2020-06-26 16:52 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-26 16:40 [PATCH v5 00/15] hw/sd/sdcard: Fix CVE-2020-13253 & cleanups Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 01/15] MAINTAINERS: Cc qemu-block mailing list Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 02/15] hw/sd/sdcard: Update coding style to make checkpatch.pl happy Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 03/15] hw/sd/sdcard: Move some definitions to use them earlier Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 04/15] hw/sd/sdcard: Use the HWBLOCK_SIZE definition Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 05/15] hw/sd/sdcard: Do not switch to ReceivingData if address is invalid Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 06/15] hw/sd/sdcard: Restrict Class 6 commands to SCSD cards Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 07/15] hw/sd/sdcard: Initialize constant values first Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 08/15] hw/sd/sdcard: Check address is in range Philippe Mathieu-Daudé
2020-06-26 17:43   ` Philippe Mathieu-Daudé
2020-06-30 10:00     ` Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 09/15] hw/sd/sdcard: Update the SDState documentation Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 10/15] hw/sd/sdcard: Simplify cmd_valid_while_locked() Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 11/15] hw/sd/sdcard: Constify sd_crc*()'s message argument Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 12/15] hw/sd/sdcard: Make iolen unsigned Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 13/15] hw/sd/sdcard: Correctly display the command name in trace events Philippe Mathieu-Daudé
2020-06-26 16:40 ` [PATCH v5 14/15] hw/sd/sdcard: Display offset in read/write_data() " Philippe Mathieu-Daudé
2020-06-26 16:40 ` Philippe Mathieu-Daudé [this message]
2020-06-26 17:14 ` [PATCH v5 00/15] hw/sd/sdcard: Fix CVE-2020-13253 & cleanups no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200626164026.766-16-f4bug@amsat.org \
    --to=f4bug@amsat.org \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).