[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 11/11] hw/sd/sdcard: Simplify realize() a bit
From: |
Peter Maydell |
Subject: |
Re: [PATCH v3 11/11] hw/sd/sdcard: Simplify realize() a bit |
Date: |
Mon, 15 Jun 2020 15:24:46 +0100 |
On Fri, 5 Jun 2020 at 11:28, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> 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) {
Originally written with the pattern of "check all the error cases
first; then do actual work". But if you prefer this way around
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM
- [PATCH v3 06/11] hw/sd/sdcard: Simplify cmd_valid_while_locked(), (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é, 2020/06/05
- Re: [PATCH v3 11/11] hw/sd/sdcard: Simplify realize() a bit,
Peter Maydell <=
- 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