diff mbox series

[PULL,11/47] hw/scsi: Use the IEC binary prefix definitions

Message ID	20180630061040.6018-12-pbonzini@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:04 +0200 Message-Id: <20180630061040.6018-12-pbonzini@redhat.com> In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 11/47] hw/scsi: Use the IEC binary prefix definitions Precedence: list Cc: =?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	[PULL,01/47] i386/kvm: add support for Hyper-V TLB flush \| expand [PULL,01/47] i386/kvm: add support for Hyper-V TLB flush [PULL,02/47] configure: add sanity check to catch builds from "git archive" [PULL,03/47] include: Add IEC binary prefixes in "qemu/units.h" [PULL,04/47] vdi: Use definitions from "qemu/units.h" [PULL,05/47] x86/cpu: Use definitions from "qemu/units.h" [PULL,07/47] hw: Use IEC binary prefix definitions from "qemu/units.h" [PULL,08/47] hw: Directly use "qemu/units.h" instead of "qemu/cutils.h" [PULL,09/47] hw/ivshmem: Use the IEC binary prefix definitions [PULL,10/47] hw/ipack: Use the IEC binary prefix definitions [PULL,11/47] hw/scsi: Use the IEC binary prefix definitions [PULL,12/47] hw/smbios: Use the IEC binary prefix definitions [PULL,13/47] hw/xen: Use the IEC binary prefix definitions [PULL,14/47] hw/tpm: Use the IEC binary prefix definitions [PULL,15/47] hw/block: Use the IEC binary prefix definitions [PULL,16/47] hw/display: Use the IEC binary prefix definitions [PULL,17/47] hw/misc: Use the IEC binary prefix definitions [PULL,18/47] hw/riscv: Use the IEC binary prefix definitions [PULL,19/47] hw/m68k: Use the IEC binary prefix definitions [PULL,20/47] hw/sparc: Use the IEC binary prefix definitions [PULL,21/47] hw/s390x: Use the IEC binary prefix definitions [PULL,22/47] hw/hppa: Use the IEC binary prefix definitions [PULL,23/47] hw/xtensa: Use the IEC binary prefix definitions [PULL,24/47] hw/alpha: Use the IEC binary prefix definitions [PULL,25/47] hw/tricore: Use the IEC binary prefix definitions [PULL,26/47] hw/microblaze: Use the IEC binary prefix definitions [PULL,27/47] hw/nios2: Use the IEC binary prefix definitions [PULL,28/47] hw/cris: Use the IEC binary prefix definitions [PULL,29/47] hw/lm32: Use the IEC binary prefix definitions [PULL,30/47] hw/sh4: Use the IEC binary prefix definitions [PULL,31/47] hw/mips/r4k: Constify params_size [PULL,32/47] hw/mips: Use the IEC binary prefix definitions [PULL,33/47] hw/ppc: Use the IEC binary prefix definitions [PULL,34/47] hw/i386: Use the IEC binary prefix definitions [PULL,35/47] hw/net: Use the IEC binary prefix definitions [PULL,36/47] hw/usb: Use the IEC binary prefix definitions [PULL,37/47] hw/sd: Use the IEC binary prefix definitions [PULL,38/47] hw/vfio: Use the IEC binary prefix definitions [PULL,39/47] hw/virtio: Use the IEC binary prefix definitions [PULL,40/47] hw/rdma: Use the IEC binary prefix definitions [PULL,41/47] cutils: Do not include "qemu/units.h" directly [PULL,42/47] monitor: Use the IEC binary prefix definitions [PULL,43/47] vl: Use the IEC binary prefix definitions [PULL,44/47] tests/crypto: Use the IEC binary prefix definitions [PULL,45/47] linux-user: Use the IEC binary prefix definitions [PULL,46/47] bsd-user: Use the IEC binary prefix definitions [PULL,47/47] serial: Open non-block

Commit Message

Paolo Bonzini June 30, 2018, 6:10 a.m. UTC

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

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é <f4bug@amsat.org>
Message-Id: <20180625124238.25339-10-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi/scsi-disk.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff mbox series

Patch

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 55a34b3..32f3f96 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -29,6 +29,7 @@  do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
 #endif
 
 #include "qemu/osdep.h"
+#include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/scsi/scsi.h"
@@ -44,13 +45,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 * KiB)
+#define SCSI_DMA_BUF_SIZE           (128 * KiB)
 #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 * KiB)
+#define DEFAULT_MAX_UNMAP_SIZE      (1 * GiB)
 #define DEFAULT_MAX_IO_SIZE         INT_MAX     /* 2 GB - 1 block */
 
 #define TYPE_SCSI_DISK_BASE         "scsi-disk-base"