[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 08/17] hw/sd/sdcard: Call sd_addr_to_wpnum where it is used, c
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v7 08/17] hw/sd/sdcard: Call sd_addr_to_wpnum where it is used, consider zero size |
Date: |
Tue, 30 Jun 2020 15:39:02 +0200 |
Avoid setting 'sect' variable just once (its name is confuse
anyway). Directly set 'sd->wpgrps_size'. Special case when
size is zero.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/sd/sd.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 078b0e81ee..e5adcc8055 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -556,8 +556,6 @@ static void sd_reset(DeviceState *dev)
}
size = sect << 9;
- sect = sd_addr_to_wpnum(size) + 1;
-
sd->size = size;
sd->state = sd_idle_state;
sd->rca = 0x0000;
@@ -570,7 +568,11 @@ static void sd_reset(DeviceState *dev)
g_free(sd->wp_groups);
sd->wp_switch = sd->blk ? blk_is_read_only(sd->blk) : false;
- sd->wpgrps_size = sect;
+ if (sd->size) {
+ sd->wpgrps_size = sd_addr_to_wpnum(sd, sd->size) + 1;
+ } else {
+ sd->wpgrps_size = 1;
+ }
sd->wp_groups = bitmap_new(sd->wpgrps_size);
memset(sd->function_group, 0, sizeof(sd->function_group));
sd->erase_start = 0;
--
2.21.3
- [PATCH v7 00/17] hw/sd/sdcard: Fix CVE-2020-13253 & cleanups, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 02/17] hw/sd/sdcard: Update coding style to make checkpatch.pl happy, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 03/17] hw/sd/sdcard: Move some definitions to use them earlier, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 01/17] MAINTAINERS: Cc qemu-block mailing list, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 04/17] hw/sd/sdcard: Use the HWBLOCK_SIZE definition, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 05/17] hw/sd/sdcard: Do not switch to ReceivingData if address is invalid, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 06/17] hw/sd/sdcard: Restrict Class 6 commands to SCSD cards, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 07/17] hw/sd/sdcard: Move sd->size initialization, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 08/17] hw/sd/sdcard: Call sd_addr_to_wpnum where it is used, consider zero size,
Philippe Mathieu-Daudé <=
- [PATCH v7 09/17] hw/sd/sdcard: Special case the -ENOMEDIUM error, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 13/17] hw/sd/sdcard: Constify sd_crc*()'s message argument, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 14/17] hw/sd/sdcard: Make iolen unsigned, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 11/17] hw/sd/sdcard: Update the SDState documentation, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 10/17] hw/sd/sdcard: Check address is in range, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 12/17] hw/sd/sdcard: Simplify cmd_valid_while_locked(), Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 15/17] hw/sd/sdcard: Correctly display the command name in trace events, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 16/17] hw/sd/sdcard: Display offset in read/write_data() trace events, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v7 17/17] hw/sd/sdcard: Simplify realize() a bit, Philippe Mathieu-Daudé, 2020/06/30