[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 13/41] hw/block: Use the BYTE-based definitions
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v3 13/41] hw/block: Use the BYTE-based definitions |
Date: |
Sun, 15 Apr 2018 20:42:39 -0300 |
It eases code review, unit is explicit.
Patch generated using:
$ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/
and modified manually.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/block/nvme.c | 3 ++-
hw/block/tc58128.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 811084b6a7..273d36de76 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -25,6 +25,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/units.h"
#include "hw/block/block.h"
#include "hw/hw.h"
#include "hw/pci/msix.h"
@@ -648,7 +649,7 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify
*c)
static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c)
{
- static const int data_len = 4096;
+ static const int data_len = 4 * K_BYTE;
uint32_t min_nsid = le32_to_cpu(c->nsid);
uint64_t prp1 = le64_to_cpu(c->prp1);
uint64_t prp2 = le64_to_cpu(c->prp2);
diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c
index 1d9f7ee000..42e1269546 100644
--- a/hw/block/tc58128.c
+++ b/hw/block/tc58128.c
@@ -1,4 +1,5 @@
#include "qemu/osdep.h"
+#include "qemu/units.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "hw/loader.h"
@@ -26,7 +27,7 @@ typedef struct {
static tc58128_dev tc58128_devs[2];
-#define FLASH_SIZE (16*1024*1024)
+#define FLASH_SIZE (16 * M_BYTE)
static void init_dev(tc58128_dev * dev, const char *filename)
{
--
2.17.0
- [Qemu-devel] [PATCH v3 04/41] hw/misc/mips_itu: Sort includes, (continued)
- [Qemu-devel] [PATCH v3 04/41] hw/misc/mips_itu: Sort includes, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 03/41] hw/block/nvme: Include the "qemu/cutils.h" in the source file, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 05/41] hw/mips/r4k: Constify params_size, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 07/41] hw/ivshmem: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 06/41] cutils: Extract byte-based definitions into a new header: "qemu/units.h", Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 08/41] hw/ipack: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 09/41] hw/scsi: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 10/41] hw/smbios: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 11/41] hw/xen: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 12/41] hw/tpm: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 13/41] hw/block: Use the BYTE-based definitions,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v3 15/41] hw/misc: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 16/41] hw/riscv: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 17/41] hw/m68k: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 18/41] hw/sparc: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 19/41] hw/s390x: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 20/41] hw/hppa: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 21/41] hw/xtensa: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 22/41] hw/alpha: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 23/41] hw/tricore: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15