From 7b5de347e3786f6c2ade136cb4029344969b34ac Mon Sep 17 00:00:00 2001

From: Cornelia Huck <cohuck@redhat.com>

Date: Wed, 17 Apr 2019 13:57:20 +0100

Subject: [PATCH 03/24] hw/s390x: Use the IEC binary prefix definitions

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Cornelia Huck <cohuck@redhat.com>

Message-id: <20190417135741.25297-4-cohuck@redhat.com>

Patchwork-id: 85782

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 03/24] hw/s390x: Use the IEC binary prefix definitions

Bugzilla: 1699070

RH-Acked-by: David Hildenbrand <david@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

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>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Acked-by: Cornelia Huck <cohuck@redhat.com>

Message-Id: <20180625124238.25339-20-f4bug@amsat.org>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit 393fc4c740d8d83d45bdbcd5f6a4cbc6be09b600)

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/s390x/s390-skeys.c    | 3 ++-

 hw/s390x/s390-stattrib.c | 3 ++-

 hw/s390x/sclp.c          | 3 ++-

 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c

index 76241c2..15f7ab0 100644

--- a/hw/s390x/s390-skeys.c

+++ b/hw/s390x/s390-skeys.c

@@ -10,6 +10,7 @@

  */

 #include "qemu/osdep.h"

+#include "qemu/units.h"

 #include "hw/boards.h"

 #include "hw/s390x/storage-keys.h"

 #include "qapi/error.h"

@@ -19,7 +20,7 @@

 #include "sysemu/kvm.h"

 #include "migration/register.h"

-#define S390_SKEYS_BUFFER_SIZE 131072  /* Room for 128k storage keys */

+#define S390_SKEYS_BUFFER_SIZE (128 * KiB)  /* Room for 128k storage keys */

 #define S390_SKEYS_SAVE_FLAG_EOS 0x01

 #define S390_SKEYS_SAVE_FLAG_SKEYS 0x02

 #define S390_SKEYS_SAVE_FLAG_ERROR 0x04

diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c

index 70b9555..5161a16 100644

--- a/hw/s390x/s390-stattrib.c

+++ b/hw/s390x/s390-stattrib.c

@@ -10,6 +10,7 @@

  */

 #include "qemu/osdep.h"

+#include "qemu/units.h"

 #include "hw/boards.h"

 #include "cpu.h"

 #include "migration/qemu-file.h"

@@ -20,7 +21,7 @@

 #include "qapi/error.h"

 #include "qapi/qmp/qdict.h"

-#define CMMA_BLOCK_SIZE  (1 << 10)

+#define CMMA_BLOCK_SIZE  (1 * KiB)

 #define STATTR_FLAG_EOS     0x01ULL

 #define STATTR_FLAG_MORE    0x02ULL

diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c

index 2abdb62..4510a80 100644

--- a/hw/s390x/sclp.c

+++ b/hw/s390x/sclp.c

@@ -13,6 +13,7 @@

  */

 #include "qemu/osdep.h"

+#include "qemu/units.h"

 #include "qapi/error.h"

 #include "cpu.h"

 #include "sysemu/sysemu.h"

@@ -289,7 +290,7 @@ static void sclp_realize(DeviceState *dev, Error **errp)

     ret = s390_set_memory_limit(machine->maxram_size, &hw_limit);

     if (ret == -E2BIG) {

         error_setg(&err, "host supports a maximum of %" PRIu64 " GB",

-                   hw_limit >> 30);

+                   hw_limit / GiB);

     } else if (ret) {

         error_setg(&err, "setting the guest size failed");

     }

-- 

1.8.3.1