[25/30] hw/scsi: use the BYTE-based definitions

Message ID	20180215042900.16078-26-f4bug@amsat.org
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:55 -0300 Message-Id: <20180215042900.16078-26-f4bug@amsat.org> In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 25/30] hw/scsi: use the BYTE-based definitions Precedence: list Cc: Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <famz@redhat.com>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	hw: use the BYTE-based definitions when useful \| expand [00/30] hw: use the BYTE-based definitions when useful [01/30] util/cutils: extract byte-based definitions into a new header: "qemu/cunits.h" [02/30] hw: include "qemu/cunits.h" and clean unused "qemu/cutils.h" [03/30] hw/block/nvme: include the "qemu/cutils.h" in the source file [04/30] hw/lm32/milkymist: remove unused include [05/30] hw/mips/r4k: constify params_size [06/30] hw/mips: use the BYTE-based definitions [07/30] hw/arm: use the BYTE-based definitions [08/30] hw/i386: use the BYTE-based definitions [09/30] hw/sparc: use the BYTE-based definitions [10/30] hw/ppc: use the BYTE-based definitions [11/30] hw/s390x: use the BYTE-based definitions [12/30] hw/hppa: use the BYTE-based definitions [13/30] hw/xtensa: use the BYTE-based definitions [14/30] hw/alpha: use the BYTE-based definitions [15/30] hw/lm32: use the BYTE-based definitions [16/30] hw/sh4: use the BYTE-based definitions [17/30] hw/tricore: use the BYTE-based definitions [18/30] hw/microblaze: use the BYTE-based definitions [19/30] hw/nios2: use the BYTE-based definitions [20/30] hw/cris: use the BYTE-based definitions [21/30] hw/misc: use the BYTE-based definitions [22/30] hw/display: use the BYTE-based definitions [23/30] hw/net: use the BYTE-based definitions [24/30] hw/ipack: use the BYTE-based definitions [25/30] hw/scsi: use the BYTE-based definitions [26/30] hw/smbios: use the BYTE-based definitions [27/30] vfio/pci: use the BYTE-based definitions [28/30] ivshmem: use the BYTE-based definitions [29/30] tpm: use the BYTE-based definitions [30/30] xen: use the BYTE-based definitions

Message ID

20180215042900.16078-26-f4bug@amsat.org

State

New

Headers

From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Date: Thu, 15 Feb 2018 01:28:55 -0300
Message-Id: <20180215042900.16078-26-f4bug@amsat.org>
In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org>
References: <20180215042900.16078-1-f4bug@amsat.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH 25/30] hw/scsi: use the BYTE-based definitions
Precedence: list
Cc: Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <famz@redhat.com>,
	=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

hw: use the BYTE-based definitions when useful | expand

Commit Message

Philippe Mathieu-Daudé Feb. 15, 2018, 4:28 a.m. UTC

It ease code review, unit is explicit.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/scsi/scsi-disk.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 49d2559d93..bfdb34a71c 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -44,13 +44,13 @@  do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
 #include <scsi/sg.h>
 #endif
 
-#define SCSI_WRITE_SAME_MAX         524288
-#define SCSI_DMA_BUF_SIZE           131072
+#define SCSI_WRITE_SAME_MAX         (512 * K_BYTE)
+#define SCSI_DMA_BUF_SIZE           (128 * K_BYTE)
 #define SCSI_MAX_INQUIRY_LEN        256
 #define SCSI_MAX_MODE_LEN           256
 
-#define DEFAULT_DISCARD_GRANULARITY 4096
-#define DEFAULT_MAX_UNMAP_SIZE      (1 << 30)   /* 1 GB */
+#define DEFAULT_DISCARD_GRANULARITY (4 * K_BYTE)
+#define DEFAULT_MAX_UNMAP_SIZE      (1 * G_BYTE)
 #define DEFAULT_MAX_IO_SIZE         INT_MAX     /* 2 GB - 1 block */
 
 #define TYPE_SCSI_DISK_BASE         "scsi-disk-base"

[25/30] hw/scsi: use the BYTE-based definitions

Commit Message

Patch