From patchwork Thu Feb 15 04:28:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873614 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LiLgHZTa"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhk1B526Gz9t2l for ; Thu, 15 Feb 2018 15:33:34 +1100 (AEDT) Received: from localhost ([::1]:37502 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBEi-0001Qk-O5 for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:33:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBAa-0007NL-AI for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBAX-0003qH-UN for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:16 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:46694) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBAX-0003qA-QT for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:13 -0500 Received: by mail-qt0-x243.google.com with SMTP id u6so10462965qtg.13 for ; Wed, 14 Feb 2018 20:29:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2WLlaPw5irf0Tz51tlK45POz6WpIXb2ILrOLcy2gcPM=; b=LiLgHZTadR3BnoJndxr0c0Rc6J7AgI8c4vEBEWbqcrsrQJ21Evb6wE3qA8jWjKp7mA rZDqJzrwFTkhIrU4NJ3/V+EB3ybi1J3Pz616v6jLZJWiViaXGoVT9NAg9BoWMYh1olAz SQSF2yREk93WfnBP48wGfT7YI6/CkNKK0FEofdAU1Hqtq7fWVvQm1ytowL6NWaQGSTBv d3FeAUuF/2F4ObNv1oVcAVXXDf7wrmy3qQxtcwSyV2sD97kjNSMcLKrDrxq/5sFthuka vp6J+wiTu4EUS5PabX9IRoQ6zi1dklOBKbBsB/DQ4di+m3zHL82v192dEDwJditIwfBt Zx/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2WLlaPw5irf0Tz51tlK45POz6WpIXb2ILrOLcy2gcPM=; b=qoeGpfhVnn0BvMlUUHW/5JV+imQiR0F7Vz/uuLsIKUKLmIG88M6N0KYNnlj3yJW0pq ooXQUyaFdfxZLkdfP6ciqJJT4QK171Et0f8I1cIq4DzZ0752xIQ5BMTlFdrpuPZHXs9Z d/ZjYZla68bCA7FhcRkkhhd3bY9ZVnk99i3/+6al/zjLfkvGUMD6XmulZ6vjI8ePH8YG ADsaWp0n7eKsEL1pyG4icXm0MwqgYNaCFQhIm/gn+Fg1gAKHmW6DxEUfCVsOCUkC2+2t MKDN9e5qu2j5ehiOLFZwRQmlwXYVtZPAFywWjB7cZNZ+9bKg7qkiZCDEOsFHH+OXqZAl 7AYA== X-Gm-Message-State: APf1xPD4W6F4JvVplKsfsOM5GhkmDr9aEefnlJk3EsPWv9VBSHQ8yEEE RDpBzRqsQOXkScRXkf0qf9N+NPaH X-Google-Smtp-Source: AH8x226u1na6ySIud6P985vtNb7qzzghUpNUI+UbVFPhIUTLMv4agG9RzPCkl2gdzwKFcG7ADXdJiw== X-Received: by 10.200.4.159 with SMTP id s31mr2308905qtg.144.1518668953212; Wed, 14 Feb 2018 20:29:13 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:12 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:31 -0300 Message-Id: <20180215042900.16078-2-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 01/30] util/cutils: extract byte-based definitions into a new header: "qemu/cunits.h" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" (added in 076b35b5a56) Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau --- include/qemu/cunits.h | 11 +++++++++++ include/qemu/cutils.h | 8 +------- 2 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 include/qemu/cunits.h diff --git a/include/qemu/cunits.h b/include/qemu/cunits.h new file mode 100644 index 0000000000..c0207b7611 --- /dev/null +++ b/include/qemu/cunits.h @@ -0,0 +1,11 @@ +#ifndef QEMU_CUNITS_H +#define QEMU_CUNITS_H + +#define K_BYTE (1ULL << 10) +#define M_BYTE (1ULL << 20) +#define G_BYTE (1ULL << 30) +#define T_BYTE (1ULL << 40) +#define P_BYTE (1ULL << 50) +#define E_BYTE (1ULL << 60) + +#endif diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index f0878eaafa..01184a70b3 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -2,6 +2,7 @@ #define QEMU_CUTILS_H #include "qemu/fprintf-fn.h" +#include "qemu/cunits.h" /** * pstrcpy: @@ -143,13 +144,6 @@ int qemu_strtosz(const char *nptr, char **end, uint64_t *result); int qemu_strtosz_MiB(const char *nptr, char **end, uint64_t *result); int qemu_strtosz_metric(const char *nptr, char **end, uint64_t *result); -#define K_BYTE (1ULL << 10) -#define M_BYTE (1ULL << 20) -#define G_BYTE (1ULL << 30) -#define T_BYTE (1ULL << 40) -#define P_BYTE (1ULL << 50) -#define E_BYTE (1ULL << 60) - /* used to print char* safely */ #define STR_OR_NULL(str) ((str) ? (str) : "null") From patchwork Thu Feb 15 04:28:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oHD4izyi"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhjz515Kcz9t2l for ; Thu, 15 Feb 2018 15:31:45 +1100 (AEDT) Received: from localhost ([::1]:37496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBCx-0008WE-4k for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:31:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBAg-0007Qb-El for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBAf-0003sG-0i for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:22 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:45267) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBAe-0003s5-Rn; Wed, 14 Feb 2018 23:29:20 -0500 Received: by mail-qt0-x244.google.com with SMTP id x27so10461764qtm.12; Wed, 14 Feb 2018 20:29:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DFPgGTTb0Eqq7D02FqFtfb9z6gi/xMA0DbkR3ZI1lmA=; b=oHD4izyiGQeyFS42dzKUrmkMYODq9RBX6I3Lcum36NWNOHf49SRs8inYJrF/5Ew1Li NRZmUlp+lKm8Q5lTHUD8IWohx7ZD4/z9jvdEcxoatZqHF0H653LuU9WfbZqXC8KKlk1d q45i6lCQo/R4pd9f03rLgZrqGmzCQzysr/19F4KQBhig4cNQcZWZzq0ZbiCdrPgPSihx 37KHcId31F/Spp4v6nRBdkygB3Avg8aY13v7CWYiVgsunVYIUPxeIlPHbgyYJtaefkBi AIAM7/zAM/YAolHRzl4vlGlqg9HZOvlIUklL6tZV3s7fvl5Sucz+2pxKmQcMxHGLjMgh Lc6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DFPgGTTb0Eqq7D02FqFtfb9z6gi/xMA0DbkR3ZI1lmA=; b=ikLO7kIcEuRUuUBoYnC67aSZoDZGs2ISFlmS0vQ2f/CrkOEWuFqw0M3W5+t/wE0d3z dZYwxCgqrqmiFQzaLwPhd0kKgq+JB9HkdBWyEgZQI0FZmHQTaksy60Bz0ABxH3VAb1nY Qps49F5kIte31Vkh+0cgf1u3X1O31C7QBYqi8OnuAXlWWG0E9BQUZn5dBtJzaQE9nB33 9MnqN4Rk7NdXVlzoiz5YbMVOMRs/BY6zrFCrGm2xq/FciPUiqOA3hqnthjdn3dKdT0+9 /fH9S3+ZWokQ3VUntxwtyMPd0//4joN9knhfyQbrAwujwRlBy3SePpKBNNFIQ3quI2Yq eFMg== X-Gm-Message-State: APf1xPCbtyorAjG9LViMCBYaz/B7Ym8aOG9DbmEpl7F4wIdun/i0637O dTovMlP8ryuKlCcZ5pW7zYYU9csR X-Google-Smtp-Source: AH8x225nVYQVJSTt3b7t5LTY7oORJ3x8GplswGSwx9y2i6Z8BiXKdHYhtLwFbVYwMSdpYkQBR+v8OQ== X-Received: by 10.200.44.116 with SMTP id e49mr2331702qta.183.1518668960115; Wed, 14 Feb 2018 20:29:20 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:19 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:32 -0300 Message-Id: <20180215042900.16078-3-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH 02/30] hw: include "qemu/cunits.h" and clean unused "qemu/cutils.h" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Michael Walle , Mark Cave-Ayland , Gerd Hoffmann , "Edgar E. Iglesias" , Yongbok Kim , Marek Vasut , Alexander Graf , =?utf-8?q?Herv=C3=A9_Poussineau?= , Marcel Apfelbaum , Samuel Thibault , Richard Henderson , Artyom Tarasenko , Eduardo Habkost , "open list:ARM" , David Gibson , Chris Wulff , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Subbaraya Sundeep , Paul Burton , "open list:New World" , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" These files were including "qemu/cutils.h" to use the byte-based size definitions, now available in "qemu/cunits.h". Signed-off-by: Philippe Mathieu-Daudé --- include/hw/hw.h | 1 + hw/arm/msf2-soc.c | 1 - hw/arm/msf2-som.c | 1 - hw/core/loader-fit.c | 1 - hw/core/loader.c | 1 - hw/core/machine.c | 1 - hw/cris/boot.c | 1 - hw/display/sm501.c | 1 - hw/hppa/machine.c | 1 - hw/lm32/milkymist.c | 1 - hw/microblaze/boot.c | 1 - hw/mips/boston.c | 1 - hw/misc/mos6522.c | 1 - hw/nios2/boot.c | 1 - hw/ppc/mac_newworld.c | 1 - hw/ppc/mac_oldworld.c | 1 - hw/ppc/pnv.c | 1 - hw/ppc/prep.c | 1 - hw/ppc/spapr_rtas.c | 1 - hw/sd/sdhci.c | 1 - hw/sparc/sun4m.c | 1 - hw/sparc64/sun4u.c | 1 - hw/usb/dev-serial.c | 1 - hw/usb/dev-storage.c | 1 - 24 files changed, 1 insertion(+), 23 deletions(-) diff --git a/include/hw/hw.h b/include/hw/hw.h index ab4950c312..8249448cac 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -14,6 +14,7 @@ #include "migration/qemu-file-types.h" #include "qemu/module.h" #include "sysemu/reset.h" +#include "qemu/cunits.h" void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index a8ec2cdf36..952cda45ed 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -30,7 +30,6 @@ #include "hw/char/serial.h" #include "hw/boards.h" #include "sysemu/block-backend.h" -#include "qemu/cutils.h" #include "hw/arm/msf2-soc.h" #include "hw/misc/unimp.h" diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 0795a3a3a1..d3e6ed00fe 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -28,7 +28,6 @@ #include "hw/boards.h" #include "hw/arm/arm.h" #include "exec/address-spaces.h" -#include "qemu/cutils.h" #include "hw/arm/msf2-soc.h" #include "cpu.h" diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c index 0c4a7207f4..0208e5b357 100644 --- a/hw/core/loader-fit.c +++ b/hw/core/loader-fit.c @@ -22,7 +22,6 @@ #include "exec/memory.h" #include "hw/loader.h" #include "hw/loader-fit.h" -#include "qemu/cutils.h" #include "qemu/error-report.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" diff --git a/hw/core/loader.c b/hw/core/loader.c index 91669d65aa..aa9050c65e 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -54,7 +54,6 @@ #include "exec/memory.h" #include "exec/address-spaces.h" #include "hw/boards.h" -#include "qemu/cutils.h" #include diff --git a/hw/core/machine.c b/hw/core/machine.c index 5d445839e8..7a7ec0c1e1 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -19,7 +19,6 @@ #include "sysemu/sysemu.h" #include "sysemu/numa.h" #include "qemu/error-report.h" -#include "qemu/cutils.h" #include "sysemu/qtest.h" static char *machine_get_accel(Object *obj, Error **errp) diff --git a/hw/cris/boot.c b/hw/cris/boot.c index f896ed7f86..7d423ed92f 100644 --- a/hw/cris/boot.c +++ b/hw/cris/boot.c @@ -29,7 +29,6 @@ #include "hw/loader.h" #include "elf.h" #include "boot.h" -#include "qemu/cutils.h" static void main_cpu_reset(void *opaque) { diff --git a/hw/display/sm501.c b/hw/display/sm501.c index f4bb33c279..00cf8358e2 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "qemu/cutils.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 19033e268d..22a15112df 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -17,7 +17,6 @@ #include "hw/timer/i8254.h" #include "hw/char/serial.h" #include "hw/hppa/hppa_sys.h" -#include "qemu/cutils.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 85d64fe58d..471a74eaa1 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -34,7 +34,6 @@ #include "milkymist-hw.h" #include "lm32.h" #include "exec/address-spaces.h" -#include "qemu/cutils.h" #define BIOS_FILENAME "mmone-bios.bin" #define BIOS_OFFSET 0x00860000 diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 35bfeda7aa..5b30d63c17 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -34,7 +34,6 @@ #include "sysemu/sysemu.h" #include "hw/loader.h" #include "elf.h" -#include "qemu/cutils.h" #include "boot.h" diff --git a/hw/mips/boston.c b/hw/mips/boston.c index fb23161b33..e99f3638cf 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -32,7 +32,6 @@ #include "hw/mips/cpudevs.h" #include "hw/pci-host/xilinx-pcie.h" #include "qapi/error.h" -#include "qemu/cutils.h" #include "qemu/error-report.h" #include "qemu/log.h" #include "chardev/char.h" diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index 8ad9fc831e..b55e6acbe2 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -29,7 +29,6 @@ #include "hw/misc/mos6522.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "qemu/cutils.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 94f436e7fb..771e00267b 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -38,7 +38,6 @@ #include "sysemu/sysemu.h" #include "hw/loader.h" #include "elf.h" -#include "qemu/cutils.h" #include "boot.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index b832417a56..90496f5a48 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -71,7 +71,6 @@ #include "sysemu/block-backend.h" #include "exec/address-spaces.h" #include "hw/sysbus.h" -#include "qemu/cutils.h" #include "trace.h" #define MAX_IDE_BUS 2 diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index d1f4546613..9b19551f56 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -45,7 +45,6 @@ #include "kvm_ppc.h" #include "sysemu/block-backend.h" #include "exec/address-spaces.h" -#include "qemu/cutils.h" #define MAX_IDE_BUS 2 #define CFG_ADDR 0xf0000510 diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 98ee3c607a..3d943dd71b 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -31,7 +31,6 @@ #include "hw/ppc/pnv_core.h" #include "hw/loader.h" #include "exec/address-spaces.h" -#include "qemu/cutils.h" #include "qapi/visitor.h" #include "monitor/monitor.h" #include "hw/intc/intc.h" diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 096d4d4cfb..f7c0a48558 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -50,7 +50,6 @@ #include "exec/address-spaces.h" #include "trace.h" #include "elf.h" -#include "qemu/cutils.h" #include "kvm_ppc.h" /* SMP is not enabled, for now */ diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 4bb939d3d1..7e26a9fb5a 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -43,7 +43,6 @@ #include #include "hw/ppc/spapr_drc.h" -#include "qemu/cutils.h" #include "trace.h" #include "hw/ppc/fdt.h" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 97b4a473c8..cf935c2008 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -34,7 +34,6 @@ #include "hw/sd/sdhci.h" #include "sdhci-internal.h" #include "qemu/log.h" -#include "qemu/cutils.h" #include "trace.h" #define TYPE_SDHCI_BUS "sdhci-bus" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index f9892e38c3..0008b90b04 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -46,7 +46,6 @@ #include "elf.h" #include "sysemu/block-backend.h" #include "trace.h" -#include "qemu/cutils.h" /* * Sun4m architecture was used in the following machines: diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index da28ab9413..b84589e0b6 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -50,7 +50,6 @@ #include "hw/loader.h" #include "elf.h" #include "trace.h" -#include "qemu/cutils.h" #define KERNEL_LOAD_ADDR 0x00404000 #define CMDLINE_ADDR 0x003ff000 diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 2829dda391..5e610722ee 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" -#include "qemu/cutils.h" #include "qemu/error-report.h" #include "hw/usb.h" #include "hw/usb/desc.h" diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index b56c75a73a..d02c5d76c6 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -22,7 +22,6 @@ #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "qapi/visitor.h" -#include "qemu/cutils.h" //#define DEBUG_MSD From patchwork Thu Feb 15 04:28:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dXu3l1mc"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhjxV6SlGz9t2l for ; Thu, 15 Feb 2018 15:30:22 +1100 (AEDT) Received: from localhost ([::1]:37490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBc-0007VC-Tw for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:30:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBAj-0007TL-Nb for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBAh-0003t6-Lt for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:25 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:45265) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBAh-0003sx-HS; Wed, 14 Feb 2018 23:29:23 -0500 Received: by mail-qt0-x241.google.com with SMTP id x27so10461828qtm.12; Wed, 14 Feb 2018 20:29:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aTD6E+55NtEoFckzfMpw2LD16L23fKPNrYPcrQ1IJ74=; b=dXu3l1mcXFoCWu8Ed3FLbZGNR1p/eRTEknY6hMll9tRZoa0XgortnmXgPpTepzfwAE xKMrYZkdDayZliTqQ8g9s+BO1yUcqfVA1Z54fF1hj7iYGd9tkXS9gGkPs5oUulsTu0Kp Lo2Sl6SrG7/VH4POvI5FUAZCVvwiN6nINfyQlmAJ2B6/BCbP0Fy7f7BN0DGi6s8Ol2Ke Z99CVoAN1G0ax8JyYMn3E2REVpBXo1vzLGb2yNXs7vTrqrECJqjvTI1uy7cvfV+BrPjV FIIcnk2yWHzbvDMwCf/0Pb7xuJl2jhwTh+m2kO47lN9/8cwA2rWu//7mOZxBNuSlxV/o Wfmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=aTD6E+55NtEoFckzfMpw2LD16L23fKPNrYPcrQ1IJ74=; b=EercXal6uY8IwLsVE4y/FJSepo2twEmfCeZwY9vv9uojIDWF7kW6PwdJJxBHAeCSmE kpMslR/7CDh/gL6AnlPXr6IYIC42Q6+8oVfPEjgWm9irZwDB8AexGjujjQMtPiJZP3tF zHnwWHdpCY2uxeOO4EZL/TzwMMU09sZiOIcQPDaz5hHPrYJpfZR9Zo/HhzPcpEnjsLZm GxofogdsE2GtetwX+6O+OEMgHVble3Gp2H2VQAHmWGNXDLY6jDaYv6QWxNpX6RTDl5n4 xSYvKQfSKtFAuPBxIfFB6UuTT8GjhsXKvEZAPHcVSuuQSMRoP7aFJPgKKIPkjZ29kSuF AWCA== X-Gm-Message-State: APf1xPDwkhvwW1GG+RuLuHyHuXDgj7at7z1J8hRmCbDjvEyVUdxEoeky IvBqr5pG1yxPEAsm7aVqOBhB7llX X-Google-Smtp-Source: AH8x227iqoFB0Ax5MWTWuSuBwuM8/p30PjoHDy+QQwAxLja37NSk/SnjLK8etxCiGQyACVaPXHUwFA== X-Received: by 10.237.60.36 with SMTP id t33mr2347587qte.228.1518668962890; Wed, 14 Feb 2018 20:29:22 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:22 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:33 -0300 Message-Id: <20180215042900.16078-4-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH 03/30] hw/block/nvme: include the "qemu/cutils.h" in the source file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Keith Busch , Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "open list:nvme" , Max Reitz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" where it is used. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/block/nvme.h | 1 - hw/block/nvme.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/block/nvme.h b/hw/block/nvme.h index 8f3981121d..cabcf20c32 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -1,6 +1,5 @@ #ifndef HW_NVME_H #define HW_NVME_H -#include "qemu/cutils.h" #include "block/nvme.h" typedef struct NvmeAsyncEvent { diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 85d2406400..811084b6a7 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -35,6 +35,7 @@ #include "sysemu/block-backend.h" #include "qemu/log.h" +#include "qemu/cutils.h" #include "trace.h" #include "nvme.h" From patchwork Thu Feb 15 04:28:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873616 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SE8AM+3i"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhk1f524Bz9t2l for ; Thu, 15 Feb 2018 15:33:58 +1100 (AEDT) Received: from localhost ([::1]:37508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBF6-0001j1-OG for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:33:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBAk-0007Tu-Bb for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBAj-0003v0-NV for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:26 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:35194) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBAj-0003ud-JC for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:25 -0500 Received: by mail-qt0-x242.google.com with SMTP id g14so10489339qti.2 for ; Wed, 14 Feb 2018 20:29:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9k60yQxdff0ymHavZCuxlUhLLMk0W09lrzgtqfKn508=; b=SE8AM+3i5TuPc+QE9R3xXzknQdRdDORBvt16T+9KLoOe38pvdIemZSdqj62AmsU1FI VhuqMFe2GvLf5rNIAW7C6P9v4JowXZL+M8Ymc7qvu/ZUs+x8iKNDYfJzADz2pMs3j+gv 79OOLT87MSpGhR3EFj0e+92F8QXO+fo2lQrTiDNRvS7rZBtO9ELBKyrM8WoKvv/KCMUT 2NInfseQy36WjbAAtP6CPLOHIXshVa7/BCA3hIH9+o6f9neM+PYNbXaUztWOswlFr2b4 wpP3gp95AHrgyvLdfIsQvUyClJ5i/oLRaRIz6YTav7J9MfnvF/kUSqeNvEHa0EZh6RU2 18/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9k60yQxdff0ymHavZCuxlUhLLMk0W09lrzgtqfKn508=; b=njdaFO9PMLgYkNqC4s7oJs/+d7usjHRi4cJBVj1IZWr1GKtxmdIhP2xcofsyDRTw5s VQO7k4JoXwow6AiJQPaf/oKS/vgATrrSCn2eLpDAe0nHoUSy/sR9l8rXZgu3+nFYN8CW 3fnm7EKa/Kl7fKygUnlOfwGy7TG9BioKs5nGIxbLktiofcFyEtTvazm1eMhYmXM1jQUE fODtZh+OzmimQX4MwMG46o1c38vVg6UhEjj6TMiiL41UZyQYrAFb9UNHYddUG8fyQdKh LIcf9eSD/y+wc80w5B8yd4tL9USnusEMrZa+c1jj3bkxN2xhbg+SyEeF6HriPSR7f0JI UwVg== X-Gm-Message-State: APf1xPDFAljQ4SzDT3xZVzQ/hTqOPG/9Ppgn/O8ebmszSbUm3qzItj9N Ku7z5FNXX2pg5ofAEM5QIcQJWbg2 X-Google-Smtp-Source: AH8x2246zCknVhS7I7J6qrvLLxWATQAjE2v7t5/rSQvLPd1HKaOWcPma3c48nCCLxPyEqebPFrKKRw== X-Received: by 10.200.49.28 with SMTP id g28mr2202313qtb.279.1518668965007; Wed, 14 Feb 2018 20:29:25 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:24 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:34 -0300 Message-Id: <20180215042900.16078-5-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH 04/30] hw/lm32/milkymist: remove unused include X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Walle , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Tested-by: Thomas Huth --- hw/lm32/milkymist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 471a74eaa1..c28379399f 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -30,7 +30,6 @@ #include "hw/boards.h" #include "hw/loader.h" #include "elf.h" -#include "sysemu/block-backend.h" #include "milkymist-hw.h" #include "lm32.h" #include "exec/address-spaces.h" From patchwork Thu Feb 15 04:28:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873617 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DUxL/UV/"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhk3H3zcrz9t2l for ; Thu, 15 Feb 2018 15:35:22 +1100 (AEDT) Received: from localhost ([::1]:37512 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBGR-0002nQ-KZ for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:35:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBAm-0007WT-RF for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBAm-0003wF-3L for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:28 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:45465) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBAl-0003w9-V6 for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:28 -0500 Received: by mail-qk0-x244.google.com with SMTP id g2so8416536qkd.12 for ; Wed, 14 Feb 2018 20:29:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ocW3RQ0XQqPT2TMsNw4J4nFD9E9TT226lkZ5ok2pzNM=; b=DUxL/UV/WEP6Lu8agRxfyMYH9dlzkZXpnJvQte8UQC75lOQ0/y2KBpHOmcQwjGKbHD BRjmmsara/2vA5Q6a75wlz23IzqmdUUSoYQ6930Gs7gKqVw8vyp2v73kYb+tISX9fvrq ZqbrbVOqbQMZXEs3PhXxKDPj/Lpv+pEsEM46o+WACiLp9bBKNtTfinEOf0NcT/OwD/Vo uygYhu3dR3bOW+MlXawVMZxViWkwUBDhd3tfyLsouTQc3kUZrO0uhlYzTZrteYyRzDaF 9EgFZ2kRu4wpEgIRfHcwgh3BgIBNxgRbE/2ZVE11jTCx+fUgSbYFvBfPf7nfs9sIHDGb Dy1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ocW3RQ0XQqPT2TMsNw4J4nFD9E9TT226lkZ5ok2pzNM=; b=hel7+fpqwOADQoOI74KIYb7JfehTNWKkxAu0lxiq+i1HCT34IPtbCBqlrrD0NXOhQx PoNPxrgBxEVFFzE06rdffhv/Rn0OE5u4ZQfSArZUqI5HzUNhVCBrEV2Ci3Jgj3fgUG5q Legqko9eaLpBlXu+kNKXtPrVzMMBZBOU+sTNo8x92bV0Wzl2+3aefCZFm4glh3Yta5vo ciKgYO6FEOtlv5MB1Xihgb9NUkeZRlYGnrXycn4u5nxc8w6vjktJaTiX4ljjZWggJMY8 NGpj/CHee3iYpWrAIytawFq5RN02dW++pghJfFfyePbYf3goc2Wbpybm4q1NQFg/KY/q r25A== X-Gm-Message-State: APf1xPC4a3f9nyUaXunYtGyCrZ8q0+dwm4jcryBRCj/LaDV5fG3ciBjm /SWaPRAUaZxdZd+VzQzJmqZvpVUC X-Google-Smtp-Source: AH8x227zwHnRnk7Puf5V2jqQDBd5ybxsFYsqi0yoAwNzym/JKMmpzkytCKkz8t8bktcoryBFR2LZ/w== X-Received: by 10.55.102.134 with SMTP id a128mr2253511qkc.122.1518668967375; Wed, 14 Feb 2018 20:29:27 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:26 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:35 -0300 Message-Id: <20180215042900.16078-6-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH 05/30] hw/mips/r4k: constify params_size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yongbok Kim , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/mips_r4k.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 830ee7732c..5a74c44b9a 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -79,8 +79,9 @@ typedef struct ResetData { static int64_t load_kernel(void) { + const size_t params_size = 264; int64_t entry, kernel_high; - long kernel_size, initrd_size, params_size; + long kernel_size, initrd_size; ram_addr_t initrd_offset; uint32_t *params_buf; int big_endian; @@ -128,7 +129,6 @@ static int64_t load_kernel(void) } /* Store command line. */ - params_size = 264; params_buf = g_malloc(params_size); params_buf[0] = tswap32(ram_size); @@ -144,7 +144,6 @@ static int64_t load_kernel(void) rom_add_blob_fixed("params", params_buf, params_size, (16 << 20) - 264); - g_free(params_buf); return entry; } From patchwork Thu Feb 15 04:28:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873615 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SzCbgsAF"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhk1V5335z9t2l for ; Thu, 15 Feb 2018 15:33:50 +1100 (AEDT) Received: from localhost ([::1]:37506 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBEy-0001cM-Nr for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:33:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBAq-0007Xv-8T for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBAo-0003xX-SP for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:32 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:44987) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBAo-0003xC-Mk for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:30 -0500 Received: by mail-qk0-x242.google.com with SMTP id l23so5676522qkk.11 for ; Wed, 14 Feb 2018 20:29:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=86GnShG4IKgp81+b/18PI7uYP7amnZd51UDqCTkIo3U=; b=SzCbgsAFAfhSZPDOCzZw49xO42WT+1cZZEUF7UolPrproB5lunxB9GU8pIAbdTwJLF JEmxNoZyiXOtKvRD3QYzb3NDlYrRXw6qWYO4fzr+x/xA9QxnMqpycjmdy9SfU74uCw/y 6ztA9q4ZO/v2YIdh+DZPT6MfVcnUvTZjbUQ0sviw+BsjiZYQPWkwHw8gIYcq2t88urL6 rgdP2JXyT8ixmKrjrZtTedOKDhMbst/dSCLk2edaCMP7bRE9W0RZ3xls2bpfBI+jHdAY 8qqk3RYekTCBy/SH0GZx+hcMj5wk8Ly53YLruLBARXG2xGcdyTh/pMyW9sknpwAqKKj7 n/Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=86GnShG4IKgp81+b/18PI7uYP7amnZd51UDqCTkIo3U=; b=rvydFknjHLEy+kfV6SyW0FqxpnQOT/1a65++cNFK2bDtfzT7aFw22jprTiSHdLdZsh 8MHoRN1Wy4nMZQXrU5Ti98ccjscupgDJ7hAMSbBqURiqai4p/v7I/43v1Q1aQDIzk59k 9n6KXG8ueazkx5Zu6fPc+5DJKrR3HGr13AYPulKSFvW2wGllfO6NhYcCWrKXCxjxtmCU HP0xQGPZDkI7JD76W9CT8VMJ8WkcR2b7nQR7fBme1qld77INW0jEwZrWKfwSUOM9l9T2 aH+Ry4FgXgCeaFsiGHUg1kt4ORKszKCe/QkvEh/5tbO5IyCHSF+BTl4JWbU2PtXFSyZ8 aLvQ== X-Gm-Message-State: APf1xPCsGqd1N32Xy2/EnO7uBohlYSJzvpwrZF1oRGWQ3XD/pqyP9gwA UBd6l8W+VxxSB8mbLXm7VDhm30IA X-Google-Smtp-Source: AH8x226Y1cyOBsVnC0vx28cDs10Ia2epJsDaQOPNBv6+UDB7XlZSBoBjOOq4R3qm/kZPeMohbINlEQ== X-Received: by 10.55.19.232 with SMTP id 101mr2205526qkt.198.1518668970009; Wed, 14 Feb 2018 20:29:30 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:29 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:36 -0300 Message-Id: <20180215042900.16078-7-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH 06/30] hw/mips: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Burton , Yongbok Kim , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/intc/mips_gic.h | 2 +- include/hw/mips/bios.h | 2 +- hw/mips/boston.c | 2 +- hw/mips/mips_fulong2e.c | 6 +++--- hw/mips/mips_malta.c | 19 ++++++++++--------- hw/mips/mips_r4k.c | 10 +++++----- hw/misc/mips_itu.c | 2 +- hw/pci-host/xilinx-pcie.c | 4 ++-- 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/include/hw/intc/mips_gic.h b/include/hw/intc/mips_gic.h index b98d50094a..5ae5a74249 100644 --- a/include/hw/intc/mips_gic.h +++ b/include/hw/intc/mips_gic.h @@ -19,7 +19,7 @@ /* The MIPS default location */ #define GIC_BASE_ADDR 0x1bdc0000ULL -#define GIC_ADDRSPACE_SZ (128 * 1024) +#define GIC_ADDRSPACE_SZ (128 * K_BYTE) /* Constants */ #define GIC_POL_POS 1 diff --git a/include/hw/mips/bios.h b/include/hw/mips/bios.h index b4b88ac43d..c70fab193a 100644 --- a/include/hw/mips/bios.h +++ b/include/hw/mips/bios.h @@ -1,6 +1,6 @@ #include "cpu.h" -#define BIOS_SIZE (4 * 1024 * 1024) +#define BIOS_SIZE (4 * M_BYTE) #ifdef TARGET_WORDS_BIGENDIAN #define BIOS_FILENAME "mips_bios.bin" #else diff --git a/hw/mips/boston.c b/hw/mips/boston.c index e99f3638cf..1a1be57ba0 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -436,7 +436,7 @@ static void boston_mach_init(MachineState *machine) bool is_64b; if ((machine->ram_size % G_BYTE) || - (machine->ram_size > (2 * G_BYTE))) { + (machine->ram_size > 2 * G_BYTE)) { error_report("Memory size must be 1GB or 2GB"); exit(1); } diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index f68c625666..428bf11fb4 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -164,7 +164,7 @@ static int64_t load_kernel (CPUMIPSState *env) /* Setup minimum environment variables */ prom_set(prom_buf, index++, "busclock=33000000"); prom_set(prom_buf, index++, "cpuclock=100000000"); - prom_set(prom_buf, index++, "memsize=%i", loaderparams.ram_size/1024/1024); + prom_set(prom_buf, index++, "memsize=%llu", loaderparams.ram_size / M_BYTE); prom_set(prom_buf, index++, "modetty0=38400n8r"); prom_set(prom_buf, index++, NULL); @@ -281,10 +281,10 @@ static void mips_fulong2e_init(MachineState *machine) qemu_register_reset(main_cpu_reset, cpu); /* fulong 2e has 256M ram. */ - ram_size = 256 * 1024 * 1024; + ram_size = 256 * M_BYTE; /* fulong 2e has a 1M flash.Winbond W39L040AP70Z */ - bios_size = 1024 * 1024; + bios_size = 1 * M_BYTE; /* allocate RAM */ memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram", ram_size); diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 6f0deb99e7..7d27502b1a 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1033,9 +1033,9 @@ void mips_malta_init(MachineState *machine) mips_create_cpu(s, machine->cpu_type, &cbus_irq, &i8259_irq); /* allocate RAM */ - if (ram_size > (2048u << 20)) { - error_report("Too much memory for this machine: %dMB, maximum 2048MB", - ((unsigned int)ram_size / (1 << 20))); + if (ram_size > 2 * G_BYTE) { + error_report("Too much memory for this machine: %lluMB, maximum 2048MB", + ram_size / M_BYTE); exit(1); } @@ -1046,17 +1046,18 @@ void mips_malta_init(MachineState *machine) /* alias for pre IO hole access */ memory_region_init_alias(ram_low_preio, NULL, "mips_malta_low_preio.ram", - ram_high, 0, MIN(ram_size, (256 << 20))); + ram_high, 0, MIN(ram_size, 256 * M_BYTE)); memory_region_add_subregion(system_memory, 0, ram_low_preio); /* alias for post IO hole access, if there is enough RAM */ - if (ram_size > (512 << 20)) { + if (ram_size > 512 * M_BYTE) { ram_low_postio = g_new(MemoryRegion, 1); memory_region_init_alias(ram_low_postio, NULL, "mips_malta_low_postio.ram", - ram_high, 512 << 20, - ram_size - (512 << 20)); - memory_region_add_subregion(system_memory, 512 << 20, ram_low_postio); + ram_high, 512 * M_BYTE, + ram_size - 512 * M_BYTE); + memory_region_add_subregion(system_memory, 512 * M_BYTE, + ram_low_postio); } /* generate SPD EEPROM data */ @@ -1090,7 +1091,7 @@ void mips_malta_init(MachineState *machine) bios = pflash_cfi01_get_memory(fl); fl_idx++; if (kernel_filename) { - ram_low_size = MIN(ram_size, 256 << 20); + ram_low_size = MIN(ram_size, 256 * M_BYTE); /* For KVM we reserve 1MB of RAM for running bootloader */ if (kvm_enabled()) { ram_low_size -= 0x100000; diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 5a74c44b9a..d814045c27 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -143,7 +143,7 @@ static int64_t load_kernel(void) } rom_add_blob_fixed("params", params_buf, params_size, - (16 << 20) - 264); + 16 * M_BYTE - params_size); g_free(params_buf); return entry; } @@ -157,7 +157,7 @@ static void main_cpu_reset(void *opaque) env->active_tc.PC = s->vector; } -static const int sector_len = 32 * 1024; +static const int sector_len = 32 * K_BYTE; static void mips_r4k_init(MachineState *machine) { @@ -193,9 +193,9 @@ void mips_r4k_init(MachineState *machine) qemu_register_reset(main_cpu_reset, reset_info); /* allocate RAM */ - if (ram_size > (256 << 20)) { - error_report("Too much memory for this machine: %dMB, maximum 256MB", - ((unsigned int)ram_size / (1 << 20))); + if (ram_size > 256 * M_BYTE) { + error_report("Too much memory for this machine: %lluMB, maximum 256MB", + ram_size / M_BYTE); exit(1); } memory_region_allocate_system_memory(ram, NULL, "mips_r4k.ram", ram_size); diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c index ef935b51a8..fc72d376e4 100644 --- a/hw/misc/mips_itu.c +++ b/hw/misc/mips_itu.c @@ -83,7 +83,7 @@ static void itc_reconfigure(MIPSITUState *tag) uint64_t *am = &tag->ITCAddressMap[0]; MemoryRegion *mr = &tag->storage_io; hwaddr address = am[0] & ITC_AM0_BASE_ADDRESS_MASK; - uint64_t size = (1 << 10) + (am[1] & ITC_AM1_ADDR_MASK_MASK); + uint64_t size = (1 * K_BYTE) + (am[1] & ITC_AM1_ADDR_MASK_MASK); bool is_enabled = (am[0] & ITC_AM0_EN_MASK) != 0; memory_region_transaction_begin(); diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index 044e312dc1..b7272d173a 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -158,9 +158,9 @@ static void xilinx_pcie_host_init(Object *obj) static Property xilinx_pcie_host_props[] = { DEFINE_PROP_UINT32("bus_nr", XilinxPCIEHost, bus_nr, 0), DEFINE_PROP_SIZE("cfg_base", XilinxPCIEHost, cfg_base, 0), - DEFINE_PROP_SIZE("cfg_size", XilinxPCIEHost, cfg_size, 32 << 20), + DEFINE_PROP_SIZE("cfg_size", XilinxPCIEHost, cfg_size, 32 * M_BYTE), DEFINE_PROP_SIZE("mmio_base", XilinxPCIEHost, mmio_base, 0), - DEFINE_PROP_SIZE("mmio_size", XilinxPCIEHost, mmio_size, 1 << 20), + DEFINE_PROP_SIZE("mmio_size", XilinxPCIEHost, mmio_size, 1 * M_BYTE), DEFINE_PROP_BOOL("link_up", XilinxPCIEHost, link_up, true), DEFINE_PROP_END_OF_LIST(), }; From patchwork Thu Feb 15 04:28:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873620 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Oj8dP8iO"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhk5x4xLgz9t2l for ; Thu, 15 Feb 2018 15:37:41 +1100 (AEDT) Received: from localhost ([::1]:37550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBIh-0004wj-ND for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:37:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBAv-0007dw-JQ for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBAt-0003yb-Cq for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:37 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:46473) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBAt-0003yV-7E; Wed, 14 Feb 2018 23:29:35 -0500 Received: by mail-qk0-x244.google.com with SMTP id g129so14905665qkb.13; Wed, 14 Feb 2018 20:29:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xv6NLQHHg7oWugDlvihLJj8LZs5NoqmoM+AjvxfoJR4=; b=Oj8dP8iOhHx2GXs5DZASMhg5K/9jk1x+ztSj1OBF6YiLWg3ISbWcGGgidJFCd0RPwl Z4bHuTgtkLc5RPPWHczw966zSEELxVvrlIhpvTxIvbVq8JNXfg1dEglY57Ml63wPTMSX fWdE3Cjt0YyIe2IFtkTfbyE2pr52ZnWITIhJf3Q2/SP+cYcS0A+hOeyVA6rtquqER0Yq phhvtuM38DTcdNtGinsxDXh+bgpXGFDoYjGqyj7iFh3RBgqEwV2cRkY+Y1B3ZsR17CMb ZtQteSNeiSi0ekQRSKQaHR/J5CYBZDsUAk7s87/0dJBYDJfD0UqXvlA1akVKaGFS8Ivj WYHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Xv6NLQHHg7oWugDlvihLJj8LZs5NoqmoM+AjvxfoJR4=; b=GyzyJc7WLPhnIRqF7sd9IqTewe6EQgF1AqBIwrGLms9W4IWSN0BNE1/1kbiHNnG8GR 3k5SP2Ax3LiE5/YLiG6Urn5wVZ8HxBkWbf7Q/ZMhYZ0PrortWPle1mnzNfhrGTlWs35X GvAHGGJRToCKwE7c+UjjdrQag3/dDKHEHZcHP1pJsQEwK96jvR8dZGBfSqEExnSHGuPO myOd+srHkzuHjfb6oy4DcbIX5e1EHlvtWSzEd4sofgeY/GnijI3Lg7s8O65nMMfu5IsK RAoLopJqvFMG6+PxqEf5VqPjSIEuMRLlXw1gZZgDpf5hUJcI5sk7KcJgvjuwq9RBDOc1 EbQw== X-Gm-Message-State: APf1xPAIw0xxHtAOWb6THLjSWh4qk5rfeO7SMpmJTwyuN03wj7gumceU cgereCBnHpaK0e2dwYxC53UXxsfC X-Google-Smtp-Source: AH8x225iEEQ1lM5sDJ1DUT3vgBuMbmsI/GVlr8AP2Z/wft/lHtByRV351tlh0M4nB5INRKrn0IPdhw== X-Received: by 10.55.24.160 with SMTP id 32mr2161050qky.214.1518668974417; Wed, 14 Feb 2018 20:29:34 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:33 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:37 -0300 Message-Id: <20180215042900.16078-8-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH 07/30] hw/arm: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Peter Crosthwaite , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alistair Francis , "open list:ARM" , Jan Kiszka , Antony Pavlov , "Edgar E. Iglesias" , Peter Chubb Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- include/hw/arm/stm32f205_soc.h | 4 ++-- hw/arm/boot.c | 6 +++--- hw/arm/collie.c | 4 ++-- hw/arm/digic_boards.c | 6 +++--- hw/arm/gumstix.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 8 ++++---- hw/arm/omap_sx1.c | 8 ++++---- hw/arm/raspi.c | 2 +- hw/arm/stellaris.c | 4 ++-- hw/arm/versatilepb.c | 4 ++-- hw/arm/vexpress.c | 6 +++--- hw/arm/virt.c | 4 ++-- hw/arm/xilinx_zynq.c | 4 ++-- hw/misc/aspeed_sdmc.c | 8 ++++---- hw/misc/imx7_gpr.c | 2 +- hw/misc/omap_gpmc.c | 4 ++-- hw/ssi/aspeed_smc.c | 28 ++++++++++++++-------------- 19 files changed, 54 insertions(+), 54 deletions(-) diff --git a/include/hw/arm/stm32f205_soc.h b/include/hw/arm/stm32f205_soc.h index 922a733f88..e30ae33c65 100644 --- a/include/hw/arm/stm32f205_soc.h +++ b/include/hw/arm/stm32f205_soc.h @@ -43,9 +43,9 @@ #define STM_NUM_SPIS 3 #define FLASH_BASE_ADDRESS 0x08000000 -#define FLASH_SIZE (1024 * 1024) +#define FLASH_SIZE (1 * M_BYTE) #define SRAM_BASE_ADDRESS 0x20000000 -#define SRAM_SIZE (128 * 1024) +#define SRAM_SIZE (128 * K_BYTE) typedef struct STM32F205State { /*< private >*/ diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 05108bc42f..0552284d57 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -984,7 +984,7 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data) * the initrd at 128MB. */ info->initrd_start = info->loader_start + - MIN(info->ram_size / 2, 128 * 1024 * 1024); + MIN(info->ram_size / 2, 128 * M_BYTE); /* Assume that raw images are linux kernels, and ELF images are not. */ kernel_size = arm_load_elf(info, &elf_entry, &elf_low_addr, @@ -1069,13 +1069,13 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data) * * Let's play safe and prealign it to 2MB to give us some space. */ - align = 2 * 1024 * 1024; + align = 2 * M_BYTE; } else { /* * Some 32bit kernels will trash anything in the 4K page the * initrd ends in, so make sure the DTB isn't caught up in that. */ - align = 4096; + align = 4 * K_BYTE; } /* Place the DTB after the initrd in memory with alignment. */ diff --git a/hw/arm/collie.c b/hw/arm/collie.c index f8c566e2e5..1695863629 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -39,12 +39,12 @@ static void collie_init(MachineState *machine) dinfo = drive_get(IF_PFLASH, 0, 0); pflash_cfi01_register(SA_CS0, NULL, "collie.fl1", 0x02000000, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - (64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0); + 64 * K_BYTE, 512, 4, 0x00, 0x00, 0x00, 0x00, 0); dinfo = drive_get(IF_PFLASH, 0, 1); pflash_cfi01_register(SA_CS1, NULL, "collie.fl2", 0x02000000, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - (64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0); + 64 * K_BYTE, 512, 4, 0x00, 0x00, 0x00, 0x00, 0); sysbus_create_simple("scoop", 0x40800000, NULL); diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 9f11dcd11f..04e52e776f 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -126,8 +126,8 @@ static void digic_load_rom(DigicBoardState *s, hwaddr addr, static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr, const char *def_filename) { -#define FLASH_K8P3215UQB_SIZE (4 * 1024 * 1024) -#define FLASH_K8P3215UQB_SECTOR_SIZE (64 * 1024) +#define FLASH_K8P3215UQB_SIZE (4 * M_BYTE) +#define FLASH_K8P3215UQB_SECTOR_SIZE (64 * K_BYTE) pflash_cfi02_register(addr, NULL, "pflash", FLASH_K8P3215UQB_SIZE, NULL, FLASH_K8P3215UQB_SECTOR_SIZE, @@ -141,7 +141,7 @@ static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr, } static DigicBoard digic4_board_canon_a1100 = { - .ram_size = 64 * 1024 * 1024, + .ram_size = 64 * M_BYTE, .add_rom1 = digic4_add_k8p3215uqb_rom, .rom1_def_filename = "canon-a1100-rom1.bin", }; diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c index ea2a3c532d..fc15df1d12 100644 --- a/hw/arm/gumstix.c +++ b/hw/arm/gumstix.c @@ -47,7 +47,7 @@ #include "sysemu/qtest.h" #include "cpu.h" -static const int sector_len = 128 * 1024; +static const int sector_len = 128 * K_BYTE; static void connex_init(MachineState *machine) { diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index e8303b83be..4e711194ef 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -609,7 +609,7 @@ static void integratorcp_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0x80000000, ram_alias); dev = qdev_create(NULL, TYPE_INTEGRATOR_CM); - qdev_prop_set_uint32(dev, "memsz", ram_size >> 20); + qdev_prop_set_uint32(dev, "memsz", ram_size / M_BYTE); qdev_init_nofail(dev); sysbus_mmio_map((SysBusDevice *)dev, 0, 0x10000000); diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c index 4215c025fc..37c21ed6d0 100644 --- a/hw/arm/mainstone.c +++ b/hw/arm/mainstone.c @@ -115,7 +115,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem, MachineState *machine, enum mainstone_model_e model, int arm_id) { - uint32_t sector_len = 256 * 1024; + uint32_t sector_len = 256 * K_BYTE; hwaddr mainstone_flash_base[] = { MST_FLASH_0, MST_FLASH_1 }; PXA2xxState *mpu; DeviceState *mst_irq; diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 38d7322a19..d6d1ce75c5 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -62,8 +62,8 @@ #define MP_SRAM_BASE 0xC0000000 #define MP_SRAM_SIZE 0x00020000 -#define MP_RAM_DEFAULT_SIZE 32*1024*1024 -#define MP_FLASH_SIZE_MAX 32*1024*1024 +#define MP_RAM_DEFAULT_SIZE (32 * M_BYTE) +#define MP_FLASH_SIZE_MAX (32 * M_BYTE) #define MP_TIMER1_IRQ 4 #define MP_TIMER2_IRQ 5 @@ -1625,8 +1625,8 @@ static void musicpal_init(MachineState *machine) BlockBackend *blk = blk_by_legacy_dinfo(dinfo); flash_size = blk_getlength(blk); - if (flash_size != 8*1024*1024 && flash_size != 16*1024*1024 && - flash_size != 32*1024*1024) { + if (flash_size != 8 * M_BYTE && flash_size != 16 * M_BYTE && + flash_size != 32 * M_BYTE) { error_report("Invalid flash image size"); exit(1); } diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index eccc19c77b..729af8bb80 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -88,10 +88,10 @@ static const MemoryRegionOps static_ops = { }; #define sdram_size 0x02000000 -#define sector_size (128 * 1024) -#define flash0_size (16 * 1024 * 1024) -#define flash1_size ( 8 * 1024 * 1024) -#define flash2_size (32 * 1024 * 1024) +#define sector_size (128 * K_BYTE) +#define flash0_size (16 * M_BYTE) +#define flash1_size (8 * M_BYTE) +#define flash2_size (32 * M_BYTE) #define total_ram_v1 (sdram_size + flash0_size + flash1_size + OMAP15XX_SRAM_SIZE) #define total_ram_v2 (sdram_size + flash2_size + OMAP15XX_SRAM_SIZE) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index cd5fa8c3dc..091d07ff86 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -169,7 +169,7 @@ static void raspi2_machine_init(MachineClass *mc) mc->max_cpus = BCM2836_NCPUS; mc->min_cpus = BCM2836_NCPUS; mc->default_cpus = BCM2836_NCPUS; - mc->default_ram_size = 1024 * 1024 * 1024; + mc->default_ram_size = 1 * G_BYTE; mc->ignore_memory_transaction_failures = true; }; DEFINE_MACHINE("raspi2", raspi2_machine_init) diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index de7c0fc4a6..8ff7567126 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -1284,8 +1284,8 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board) MemoryRegion *flash = g_new(MemoryRegion, 1); MemoryRegion *system_memory = get_system_memory(); - flash_size = (((board->dc0 & 0xffff) + 1) << 1) * 1024; - sram_size = ((board->dc0 >> 18) + 1) * 1024; + flash_size = (((board->dc0 & 0xffff) + 1) << 1) * K_BYTE; + sram_size = ((board->dc0 >> 18) + 1) * K_BYTE; /* Flash programming is done via the SCU, so pretend it is ROM. */ memory_region_init_ram(flash, NULL, "stellaris.flash", flash_size, diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 418792cd02..041f12beb7 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -26,8 +26,8 @@ #include "hw/char/pl011.h" #define VERSATILE_FLASH_ADDR 0x34000000 -#define VERSATILE_FLASH_SIZE (64 * 1024 * 1024) -#define VERSATILE_FLASH_SECT_SIZE (256 * 1024) +#define VERSATILE_FLASH_SIZE (64 * M_BYTE) +#define VERSATILE_FLASH_SECT_SIZE (256 * K_BYTE) /* Primary interrupt controller. */ diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index dc5928ae1a..d48b6d60c6 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -44,8 +44,8 @@ #include "hw/cpu/a15mpcore.h" #define VEXPRESS_BOARD_ID 0x8e0 -#define VEXPRESS_FLASH_SIZE (64 * 1024 * 1024) -#define VEXPRESS_FLASH_SECT_SIZE (256 * 1024) +#define VEXPRESS_FLASH_SIZE (64 * M_BYTE) +#define VEXPRESS_FLASH_SECT_SIZE (256 * K_BYTE) /* Number of virtio transports to create (0..8; limited by * number of available IRQ lines). @@ -354,7 +354,7 @@ static void a15_daughterboard_init(const VexpressMachineState *vms, * warning if we are on a host where ram_addr_t is 32 bits. */ uint64_t rsz = ram_size; - if (rsz > (30ULL * 1024 * 1024 * 1024)) { + if (rsz > 30 * G_BYTE) { error_report("vexpress-a15: cannot model more than 30GB RAM"); exit(1); } diff --git a/hw/arm/virt.c b/hw/arm/virt.c index dbb3c8036a..8202a428e0 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -110,7 +110,7 @@ static ARMPlatformBusSystemParams platform_bus_params; * terabyte of physical address space.) */ #define RAMLIMIT_GB 255 -#define RAMLIMIT_BYTES (RAMLIMIT_GB * 1024ULL * 1024 * 1024) +#define RAMLIMIT_BYTES (RAMLIMIT_GB * G_BYTE) /* Addresses and sizes of our components. * 0..128MB is space for a flash device so we can run bootrom code such as UEFI. @@ -783,7 +783,7 @@ static void create_one_flash(const char *name, hwaddr flashbase, DriveInfo *dinfo = drive_get_next(IF_PFLASH); DeviceState *dev = qdev_create(NULL, "cfi.pflash01"); SysBusDevice *sbd = SYS_BUS_DEVICE(dev); - const uint64_t sectorlength = 256 * 1024; + const uint64_t sectorlength = 256 * K_BYTE; if (dinfo) { qdev_prop_set_drive(dev, "drive", blk_by_legacy_dinfo(dinfo), diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 0f76333770..7a68503e68 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -40,8 +40,8 @@ #define NUM_QSPI_FLASHES 2 #define NUM_QSPI_BUSSES 2 -#define FLASH_SIZE (64 * 1024 * 1024) -#define FLASH_SECTOR_SIZE (128 * 1024) +#define FLASH_SIZE (64 * M_BYTE) +#define FLASH_SECTOR_SIZE (128 * K_BYTE) #define IRQ_OFFSET 32 /* pic interrupts start from index 32 */ diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c index f0b3053fae..d312f67528 100644 --- a/hw/misc/aspeed_sdmc.c +++ b/hw/misc/aspeed_sdmc.c @@ -143,7 +143,7 @@ static const MemoryRegionOps aspeed_sdmc_ops = { static int ast2400_rambits(AspeedSDMCState *s) { - switch (s->ram_size >> 20) { + switch (s->ram_size / M_BYTE) { case 64: return ASPEED_SDMC_DRAM_64MB; case 128: @@ -159,13 +159,13 @@ static int ast2400_rambits(AspeedSDMCState *s) /* use a common default */ warn_report("Invalid RAM size 0x%" PRIx64 ". Using default 256M", s->ram_size); - s->ram_size = 256 << 20; + s->ram_size = 256 * M_BYTE; return ASPEED_SDMC_DRAM_256MB; } static int ast2500_rambits(AspeedSDMCState *s) { - switch (s->ram_size >> 20) { + switch (s->ram_size / M_BYTE) { case 128: return ASPEED_SDMC_AST2500_128MB; case 256: @@ -181,7 +181,7 @@ static int ast2500_rambits(AspeedSDMCState *s) /* use a common default */ warn_report("Invalid RAM size 0x%" PRIx64 ". Using default 512M", s->ram_size); - s->ram_size = 512 << 20; + s->ram_size = 512 * M_BYTE; return ASPEED_SDMC_AST2500_512MB; } diff --git a/hw/misc/imx7_gpr.c b/hw/misc/imx7_gpr.c index c2a9df29c6..3d46bdbd09 100644 --- a/hw/misc/imx7_gpr.c +++ b/hw/misc/imx7_gpr.c @@ -98,7 +98,7 @@ static void imx7_gpr_init(Object *obj) IMX7GPRState *s = IMX7_GPR(obj); memory_region_init_io(&s->mmio, obj, &imx7_gpr_ops, s, - TYPE_IMX7_GPR, 64 * 1024); + TYPE_IMX7_GPR, 64 * K_BYTE); sysbus_init_mmio(sd, &s->mmio); } diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c index 84f9e4c612..af6b620e3e 100644 --- a/hw/misc/omap_gpmc.c +++ b/hw/misc/omap_gpmc.c @@ -850,11 +850,11 @@ struct omap_gpmc_s *omap_gpmc_init(struct omap_mpu_state_s *mpu, &omap_nand_ops, &s->cs_file[cs], "omap-nand", - 256 * 1024 * 1024); + 256 * M_BYTE); } memory_region_init_io(&s->prefetch.iomem, NULL, &omap_prefetch_ops, s, - "omap-gpmc-prefetch", 256 * 1024 * 1024); + "omap-gpmc-prefetch", 256 * M_BYTE); return s; } diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 5059396bc6..b51cb6c0a9 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -149,35 +149,35 @@ * Segment Address Registers. */ static const AspeedSegments aspeed_segments_legacy[] = { - { 0x10000000, 32 * 1024 * 1024 }, + { 0x10000000, 32 * M_BYTE }, }; static const AspeedSegments aspeed_segments_fmc[] = { - { 0x20000000, 64 * 1024 * 1024 }, /* start address is readonly */ - { 0x24000000, 32 * 1024 * 1024 }, - { 0x26000000, 32 * 1024 * 1024 }, - { 0x28000000, 32 * 1024 * 1024 }, - { 0x2A000000, 32 * 1024 * 1024 } + { 0x20000000, 64 * M_BYTE }, /* start address is readonly */ + { 0x24000000, 32 * M_BYTE }, + { 0x26000000, 32 * M_BYTE }, + { 0x28000000, 32 * M_BYTE }, + { 0x2A000000, 32 * M_BYTE } }; static const AspeedSegments aspeed_segments_spi[] = { - { 0x30000000, 64 * 1024 * 1024 }, + { 0x30000000, 64 * M_BYTE }, }; static const AspeedSegments aspeed_segments_ast2500_fmc[] = { - { 0x20000000, 128 * 1024 * 1024 }, /* start address is readonly */ - { 0x28000000, 32 * 1024 * 1024 }, - { 0x2A000000, 32 * 1024 * 1024 }, + { 0x20000000, 128 * M_BYTE }, /* start address is readonly */ + { 0x28000000, 32 * M_BYTE }, + { 0x2A000000, 32 * M_BYTE }, }; static const AspeedSegments aspeed_segments_ast2500_spi1[] = { - { 0x30000000, 32 * 1024 * 1024 }, /* start address is readonly */ - { 0x32000000, 96 * 1024 * 1024 }, /* end address is readonly */ + { 0x30000000, 32 * M_BYTE }, /* start address is readonly */ + { 0x32000000, 96 * M_BYTE }, /* end address is readonly */ }; static const AspeedSegments aspeed_segments_ast2500_spi2[] = { - { 0x38000000, 32 * 1024 * 1024 }, /* start address is readonly */ - { 0x3A000000, 96 * 1024 * 1024 }, /* end address is readonly */ + { 0x38000000, 32 * M_BYTE }, /* start address is readonly */ + { 0x3A000000, 96 * M_BYTE }, /* end address is readonly */ }; static const AspeedSMCController controllers[] = { From patchwork Thu Feb 15 04:28:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873621 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IKXVJtph"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhk702ByYz9t2l for ; Thu, 15 Feb 2018 15:38:36 +1100 (AEDT) Received: from localhost ([::1]:37553 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBJa-0005lY-AC for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:38:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBAz-0007hJ-4j for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBAx-0003zW-Ih for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:41 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:41142) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBAx-0003zN-Cq for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:39 -0500 Received: by mail-qk0-x243.google.com with SMTP id h129so9489636qke.8 for ; Wed, 14 Feb 2018 20:29:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=twI58ssxSbbXrWRPif44v9iBsXZoERM1lfAmhkFCO2k=; b=IKXVJtphUz3N0J+podhCIP/+l6+glH2QcpMBIVzmfuZzUm+VyCXqVcFpFmGAJdvAI5 BqzxeS0+T10SO7joi9xzfzEMgS34Mf227OBWOBgJyR2LFw9VhZqVtYacK41nOgYf8hor Ij+a0xjuCsTD3L3VIdvLZuL936AfCin+b/6w5+UnqRu0KUWwCUCMOf5mcpJgNxM8P7JQ hYH1iwj41WP1w27PMK+PTgy5poID1fyo9YxAhcVt8deHs45MlXjg+nU4QJLkfR9IQ4gd owa7UrwLvVfIUvgKainSkgQE2OXfGs/KozsFchmictnLhOza2PokGKaNQ2C423UylPDF u2bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=twI58ssxSbbXrWRPif44v9iBsXZoERM1lfAmhkFCO2k=; b=AlwfvdRRG57//BfmpQ0myRCJFFxrtRfDURfFD2ypwJgKD13pPKTK0dI0XB7O87VT1t RqmDOzOrfQRw1C15CobiHEXjzs6cVinyUEmd7YAWSdmWpeOsiOOxrk+MeALaq20DVNLc nATcaRrlLCv390ibPOm/OFoRdLn75CtAyq9faOhrix+ELfL0SwuWRYVsWg1RXuHeKevU kzSTPX8BniYlVV/Vuh72QUY4XoEDMC3gZg9E/BiS93rjYrfkpXvKPHHMrBkKG+xvX+gY STv8hDQ6KzQz/Y8d5mZNGu6J81NI8feOxm8BasumjuQ1Maq+T+xEIZHrDTSl2qGwkUqj BI1w== X-Gm-Message-State: APf1xPC+mQdgf165BzlAeZ9sKJvS9IV8eUq3qSB9QPl5wHVXeWKkOiWF u97B9FShijojf/3rm/qHTPs38kWs X-Google-Smtp-Source: AH8x224+SdvFnXzi2tlLzaozhcbGb/E9MWys4TPjGxxWa9uBlspGnOtzk4cHQFn+GIcw+rXdH/AzCQ== X-Received: by 10.55.154.13 with SMTP id c13mr2088393qke.347.1518668978451; Wed, 14 Feb 2018 20:29:38 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:37 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:38 -0300 Message-Id: <20180215042900.16078-9-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH 08/30] hw/i386: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Eduardo Habkost , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?b?ZMOp?= , Anthony Perard , Paolo Bonzini , Marcel Apfelbaum , Igor Mammedov , "open list:X86" , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Igor Mammedov --- include/hw/i386/ich9.h | 2 +- hw/i386/acpi-build.c | 4 ++-- hw/i386/pc.c | 18 +++++++++--------- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/i386/pc_sysfw.c | 8 ++++---- hw/i386/xen/xen-mapcache.c | 2 +- hw/intc/apic_common.c | 2 +- hw/pci-host/gpex.c | 2 +- hw/pci-host/piix.c | 4 ++-- hw/pci-host/q35.c | 16 ++++++++-------- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h index 673d13d28f..87628dd867 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/i386/ich9.h @@ -22,7 +22,7 @@ I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base); void ich9_generate_smi(void); -#define ICH9_CC_SIZE (16 * 1024) /* 16KB. Chipset configuration registers */ +#define ICH9_CC_SIZE (16 * K_BYTE) /* Chipset configuration registers */ #define TYPE_ICH9_LPC_DEVICE "ICH9-LPC" #define ICH9_LPC_DEVICE(obj) \ diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index deb440f286..9ccc6192b5 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2320,8 +2320,8 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) (void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4, NULL, NULL); } -#define HOLE_640K_START (640 * 1024) -#define HOLE_640K_END (1024 * 1024) +#define HOLE_640K_START (640 * K_BYTE) +#define HOLE_640K_END (1024 * K_BYTE) static void build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 55e69d66fe..94a1f3bc7b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -452,8 +452,8 @@ void pc_cmos_init(PCMachineState *pcms, rtc_set_memory(s, 0x15, val); rtc_set_memory(s, 0x16, val >> 8); /* extended memory (next 64MiB) */ - if (pcms->below_4g_mem_size > 1024 * 1024) { - val = (pcms->below_4g_mem_size - 1024 * 1024) / 1024; + if (pcms->below_4g_mem_size > 1 * M_BYTE) { + val = (pcms->below_4g_mem_size - 1 * M_BYTE) / 1024; } else { val = 0; } @@ -464,8 +464,8 @@ void pc_cmos_init(PCMachineState *pcms, rtc_set_memory(s, 0x30, val); rtc_set_memory(s, 0x31, val >> 8); /* memory between 16MiB and 4GiB */ - if (pcms->below_4g_mem_size > 16 * 1024 * 1024) { - val = (pcms->below_4g_mem_size - 16 * 1024 * 1024) / 65536; + if (pcms->below_4g_mem_size > 16 * M_BYTE) { + val = (pcms->below_4g_mem_size - 16 * M_BYTE) / 65536; } else { val = 0; } @@ -1390,11 +1390,11 @@ void pc_memory_init(PCMachineState *pcms, } pcms->hotplug_memory.base = - ROUND_UP(0x100000000ULL + pcms->above_4g_mem_size, 1ULL << 30); + ROUND_UP(0x100000000ULL + pcms->above_4g_mem_size, G_BYTE); if (pcmc->enforce_aligned_dimm) { /* size hotplug region assuming 1G page max alignment per slot */ - hotplug_mem_size += (1ULL << 30) * machine->ram_slots; + hotplug_mem_size += machine->ram_slots * G_BYTE; } if ((pcms->hotplug_memory.base + hotplug_mem_size) < @@ -1436,7 +1436,7 @@ void pc_memory_init(PCMachineState *pcms, if (!pcmc->broken_reserved_end) { res_mem_end += memory_region_size(&pcms->hotplug_memory.mr); } - *val = cpu_to_le64(ROUND_UP(res_mem_end, 0x1ULL << 30)); + *val = cpu_to_le64(ROUND_UP(res_mem_end, G_BYTE)); fw_cfg_add_file(fw_cfg, "etc/reserved-memory-end", val, sizeof(*val)); } @@ -1472,7 +1472,7 @@ uint64_t pc_pci_hole64_start(void) hole64_start = 0x100000000ULL + pcms->above_4g_mem_size; } - return ROUND_UP(hole64_start, 1ULL << 30); + return ROUND_UP(hole64_start, G_BYTE); } qemu_irq pc_allocate_cpu_irq(void) @@ -2114,7 +2114,7 @@ static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v, return; } - if (value < (1ULL << 20)) { + if (value < 1 * M_BYTE) { warn_report("Only %" PRIu64 " bytes of RAM below the 4GiB boundary," "BIOS may not work with less than 1MiB", value); } diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 456dc9e9f0..975dfc848e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -131,7 +131,7 @@ static void pc_init1(MachineState *machine, if (lowmem > 0xc0000000) { lowmem = 0xc0000000; } - if (lowmem & ((1ULL << 30) - 1)) { + if (lowmem & ((1 * G_BYTE) - 1)) { warn_report("Large machine and max_ram_below_4g " "(%" PRIu64 ") not a multiple of 1G; " "possible bad performance.", diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index aba7541a82..79b84bc559 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -104,7 +104,7 @@ static void pc_q35_init(MachineState *machine) if (lowmem > pcms->max_ram_below_4g) { lowmem = pcms->max_ram_below_4g; if (machine->ram_size - lowmem > lowmem && - lowmem & ((1ULL << 30) - 1)) { + lowmem & ((1 * G_BYTE) - 1)) { warn_report("There is possibly poor performance as the ram size " " (0x%" PRIx64 ") is more then twice the size of" " max-ram-below-4g (%"PRIu64") and" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 4325575e7d..97488a832d 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -56,7 +56,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory, flash_size = memory_region_size(flash_mem); /* map the last 128KB of the BIOS in ISA space */ - isa_bios_size = MIN(flash_size, 128 * 1024); + isa_bios_size = MIN(flash_size, 128 * K_BYTE); isa_bios = g_malloc(sizeof(*isa_bios)); memory_region_init_ram(isa_bios, NULL, "isa-bios", isa_bios_size, &error_fatal); @@ -83,7 +83,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory, * only 18MB-4KB below 4G. For now, restrict the cumulative mapping to 8MB in * size. */ -#define FLASH_MAP_BASE_MIN ((hwaddr)(0x100000000ULL - 8*1024*1024)) +#define FLASH_MAP_BASE_MIN ((hwaddr)(0x100000000ULL - 8 * M_BYTE)) /* This function maps flash drives from 4G downward, in order of their unit * numbers. The mapping starts at unit#0, with unit number increments of 1, and @@ -209,8 +209,8 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) /* map the last 128KB of the BIOS in ISA space */ isa_bios_size = bios_size; - if (isa_bios_size > (128 * 1024)) { - isa_bios_size = 128 * 1024; + if (isa_bios_size > 128 * K_BYTE) { + isa_bios_size = 128 * K_BYTE; } isa_bios = g_malloc(sizeof(*isa_bios)); memory_region_init_alias(isa_bios, NULL, "isa-bios", bios, diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c index efa35dc6e0..5f48fde799 100644 --- a/hw/i386/xen/xen-mapcache.c +++ b/hw/i386/xen/xen-mapcache.c @@ -47,7 +47,7 @@ * From empirical tests I observed that qemu use 75MB more than the * max_mcache_size. */ -#define NON_MCACHE_MEMORY_SIZE (80 * 1024 * 1024) +#define NON_MCACHE_MEMORY_SIZE (80 * M_BYTE) typedef struct MapCacheEntry { hwaddr paddr_index; diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 78903ea909..3a6c297c52 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -319,7 +319,7 @@ static void apic_common_realize(DeviceState *dev, Error **errp) /* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && - !hax_enabled() && ram_size >= 1024 * 1024) { + !hax_enabled() && ram_size >= 1 * M_BYTE) { vapic = sysbus_create_simple("kvmvapic", -1, NULL); } s->vapic = vapic; diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 2583b151a4..9cab9d0e7d 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -79,7 +79,7 @@ static void gpex_host_realize(DeviceState *dev, Error **errp) pcie_host_mmcfg_init(pex, PCIE_MMCFG_SIZE_MAX); memory_region_init(&s->io_mmio, OBJECT(s), "gpex_mmio", UINT64_MAX); - memory_region_init(&s->io_ioport, OBJECT(s), "gpex_ioport", 64 * 1024); + memory_region_init(&s->io_ioport, OBJECT(s), "gpex_ioport", 64 * K_BYTE); sysbus_init_mmio(sbd, &pex->mmio); sysbus_init_mmio(sbd, &s->io_mmio); diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 0e608347c1..7fc1822ec0 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -284,7 +284,7 @@ static void i440fx_pcihost_get_pci_hole64_end(Object *obj, Visitor *v, pci_bus_get_w64_range(h->bus, &w64); value = range_is_empty(&w64) ? 0 : range_upb(&w64) + 1; - hole64_end = ROUND_UP(hole64_start + s->pci_hole64_size, 1ULL << 30); + hole64_end = ROUND_UP(hole64_start + s->pci_hole64_size, G_BYTE); if (s->pci_hole64_fix && value < hole64_end) { value = hole64_end; } @@ -430,7 +430,7 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, *piix3_devfn = piix3->dev.devfn; - ram_size = ram_size / 8 / 1024 / 1024; + ram_size /= 8 * M_BYTE; if (ram_size > 255) { ram_size = 255; } diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index a36a1195e4..a54b6736e5 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -144,7 +144,7 @@ static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v, pci_bus_get_w64_range(h->bus, &w64); value = range_is_empty(&w64) ? 0 : range_upb(&w64) + 1; - hole64_end = ROUND_UP(hole64_start + s->mch.pci_hole64_size, 1ULL << 30); + hole64_end = ROUND_UP(hole64_start + s->mch.pci_hole64_size, G_BYTE); if (s->pci_hole64_fix && value < hole64_end) { value = hole64_end; } @@ -310,15 +310,15 @@ static void mch_update_pciexbar(MCHPCIState *mch) addr_mask = MCH_HOST_BRIDGE_PCIEXBAR_ADMSK; switch (pciexbar & MCH_HOST_BRIDGE_PCIEXBAR_LENGTH_MASK) { case MCH_HOST_BRIDGE_PCIEXBAR_LENGTH_256M: - length = 256 * 1024 * 1024; + length = 256 * M_BYTE; break; case MCH_HOST_BRIDGE_PCIEXBAR_LENGTH_128M: - length = 128 * 1024 * 1024; + length = 128 * M_BYTE; addr_mask |= MCH_HOST_BRIDGE_PCIEXBAR_128ADMSK | MCH_HOST_BRIDGE_PCIEXBAR_64ADMSK; break; case MCH_HOST_BRIDGE_PCIEXBAR_LENGTH_64M: - length = 64 * 1024 * 1024; + length = 64 * M_BYTE; addr_mask |= MCH_HOST_BRIDGE_PCIEXBAR_64ADMSK; break; case MCH_HOST_BRIDGE_PCIEXBAR_LENGTH_RVD: @@ -396,16 +396,16 @@ static void mch_update_smram(MCHPCIState *mch) switch (pd->config[MCH_HOST_BRIDGE_ESMRAMC] & MCH_HOST_BRIDGE_ESMRAMC_TSEG_SZ_MASK) { case MCH_HOST_BRIDGE_ESMRAMC_TSEG_SZ_1MB: - tseg_size = 1024 * 1024; + tseg_size = 1 * M_BYTE; break; case MCH_HOST_BRIDGE_ESMRAMC_TSEG_SZ_2MB: - tseg_size = 1024 * 1024 * 2; + tseg_size = 2 * M_BYTE; break; case MCH_HOST_BRIDGE_ESMRAMC_TSEG_SZ_8MB: - tseg_size = 1024 * 1024 * 8; + tseg_size = 8 * M_BYTE; break; default: - tseg_size = 1024 * 1024 * (uint32_t)mch->ext_tseg_mbytes; + tseg_size = (uint32_t)mch->ext_tseg_mbytes * M_BYTE; break; } } else { From patchwork Thu Feb 15 04:28:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Hjccw0zq"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkBv2Bgtz9t2l for ; Thu, 15 Feb 2018 15:41:59 +1100 (AEDT) Received: from localhost ([::1]:37587 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBMr-0000qj-AW for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:41:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBB1-0007ja-CS for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBAz-00040F-UE for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:43 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:33424) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBAz-000409-PV for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:41 -0500 Received: by mail-qk0-x243.google.com with SMTP id f25so3891004qkm.0 for ; Wed, 14 Feb 2018 20:29:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cHo3IqmJnidyW8qrMtzClvncOVx94DO22vcee+MWuHM=; b=Hjccw0zqn7jjL1NqJq78YVHBeGoMsieZFyD/pvqdNVzxmk5Jbss9jgt58rejH8/VoN lOjFSEI83IPU+0GWSoCyZvfof3RFTUaNVD9XYhHmfavwVfV3cIpDgubVQe6gUATrzPQt XX/gmgGgcTvDmMaJ1VSDRi2h6WVx8zJWRmM7fLjhNg3eNOK9TEWfXNqqaD19CeFP6Lo6 2kh1lXlWt97Z+ac7uS94wibxAosCfm7CzF6ua7j5sOg+bxF/torZsx7iFhA8EwSOoEgS LoYETXnAM5tDrSD5syI/dhVKxDpne3Zhl3ygL/iSZgcghzl7FbAMe21TPM6dt4AMMdR+ RUvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cHo3IqmJnidyW8qrMtzClvncOVx94DO22vcee+MWuHM=; b=PI4ygW/3Y5+PObPYFBzRAOIUOF5sCoABq/CSI6HCqN7LsV6aFvvpJSaWBUVSicl3Va bgHXluHXQUBiwvvIxXWiHKz0MDzVpesGHe1JtbhAdEc+ORUgPtqBfo0ks8/3Ijg8oXHt U8eViJEiXeqDCf3EwyXjuKVutuJ9HKSj0eZw136Vca9h0IcAFDNbsYkNkTRmnofhGZyT YYBX0xEz8LT/Eh1Z3bYJsgtcpEXbDdRnx3qxCbLW0MEAMU90EkirYHUs0d3tZSNZSBRP vEa3GOU1EmJaHy6cqXoqCpONtLHXnAm+HftEsO+0oG7n086HWyfzk5Ue0yozRFhhF/M9 UO7A== X-Gm-Message-State: APf1xPB2kwVhhGyOtSK9Q74a0iUmMD8sNuZxcRfjMoAxMzXmmn4XbI+m eQTHXc7etoe08clwm17PerlBJAC2 X-Google-Smtp-Source: AH8x227kKVn0E5LfuRDDc+V0t+TAgxHbuWCFH9GKbfV+BPxBJth1us7bnaIBy60nTkHCMSo5JqyAZQ== X-Received: by 10.55.138.68 with SMTP id m65mr2132902qkd.166.1518668981169; Wed, 14 Feb 2018 20:29:41 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:40 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:39 -0300 Message-Id: <20180215042900.16078-10-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH 09/30] hw/sparc: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Fabien Chouteau , Artyom Tarasenko Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- hw/sparc/leon3.c | 8 ++++---- hw/sparc/sun4m.c | 7 +++---- hw/sparc64/niagara.c | 2 +- hw/sparc64/sun4u.c | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index bba3aa3dee..31be3f32b0 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -139,9 +139,9 @@ static void leon3_generic_hw_init(MachineState *machine) env->qemu_irq_ack = leon3_irq_manager; /* Allocate RAM */ - if ((uint64_t)ram_size > (1UL << 30)) { - error_report("Too much memory for this machine: %d, maximum 1G", - (unsigned int)(ram_size / (1024 * 1024))); + if (ram_size > 1 * G_BYTE) { + error_report("Too much memory for this machine: %lluMB, maximum 1G", + ram_size / M_BYTE); exit(1); } @@ -149,7 +149,7 @@ static void leon3_generic_hw_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0x40000000, ram); /* Allocate BIOS */ - prom_size = 8 * 1024 * 1024; /* 8Mb */ + prom_size = 8 * M_BYTE; memory_region_init_ram(prom, NULL, "Leon3.bios", prom_size, &error_fatal); memory_region_set_readonly(prom, true); memory_region_add_subregion(address_space_mem, 0x00000000, prom); diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 0008b90b04..40f4e0c883 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -66,7 +66,7 @@ #define KERNEL_LOAD_ADDR 0x00004000 #define CMDLINE_ADDR 0x007ff000 #define INITRD_LOAD_ADDR 0x00800000 -#define PROM_SIZE_MAX (1024 * 1024) +#define PROM_SIZE_MAX (1 * M_BYTE) #define PROM_VADDR 0xffd00000 #define PROM_FILENAME "openbios-sparc32" #define CFG_ADDR 0xd00000510ULL @@ -744,9 +744,8 @@ static void ram_init(hwaddr addr, ram_addr_t RAM_size, /* allocate RAM */ if ((uint64_t)RAM_size > max_mem) { - error_report("Too much memory for this machine: %d, maximum %d", - (unsigned int)(RAM_size / (1024 * 1024)), - (unsigned int)(max_mem / (1024 * 1024))); + error_report("Too much memory for this machine: %llu, maximum %llu", + RAM_size / M_BYTE, max_mem / M_BYTE); exit(1); } dev = qdev_create(NULL, "memory"); diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 1874477ef6..97a78ca9a2 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -84,7 +84,7 @@ typedef struct NiagaraBoardState { #define NIAGARA_PROM_BASE 0xfff0000000ULL #define NIAGARA_Q_OFFSET 0x10000ULL #define NIAGARA_OBP_OFFSET 0x80000ULL -#define PROM_SIZE_MAX (4 * 1024 * 1024) +#define PROM_SIZE_MAX (4 * M_BYTE) static void add_rom_or_fail(const char *file, const hwaddr addr) { diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index b84589e0b6..7a39ec7859 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -53,7 +53,7 @@ #define KERNEL_LOAD_ADDR 0x00404000 #define CMDLINE_ADDR 0x003ff000 -#define PROM_SIZE_MAX (4 * 1024 * 1024) +#define PROM_SIZE_MAX (4 * M_BYTE) #define PROM_VADDR 0x000ffd00000ULL #define PBM_SPECIAL_BASE 0x1fe00000000ULL #define PBM_MEM_BASE 0x1ff00000000ULL From patchwork Thu Feb 15 04:28:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873628 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q9AOTL3l"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkGX39bvz9t2x for ; Thu, 15 Feb 2018 15:45:08 +1100 (AEDT) Received: from localhost ([::1]:37615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBPq-0004Av-Vk for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:45:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBB5-0007nV-2A for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBB3-000412-9B for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:47 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:37352) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBB3-00040r-3f; Wed, 14 Feb 2018 23:29:45 -0500 Received: by mail-qk0-x241.google.com with SMTP id c128so29442784qkb.4; Wed, 14 Feb 2018 20:29:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wufTFZdIEjwCYVBwc91eIiYQn5SPRxoheNx3nrMLoqw=; b=Q9AOTL3l9B4Sc+ybSUK0VXbX0ErKEcAA1EfWNDExh9dNzgdkAiaK7CShC3t7dEboZP nBonb2QpM0YXhupbIkIYzyHLWh1HFsXqbN5x/95zgbN7xextyHxM5wZ456mPtoB5K2ls Hh5v7qoOfVvgcjM5B++NfXEy4S3M0mgtI2iveuF1qEn7+TdFrDkmhZFT034zjZgqVsW8 TN/hE0gNKZf1fTmixsc2oyl8Z+5OhmqFfkp/Lkmwf1W6pCeBxkP7vYgr5Mk3p1iJ9jmv sYDi/SPgx4jvXCFJHVUgEPU0sGQvVfvKonsTaC3u8C1uRJHq23jjORZB2er/Ya6UXkRy 03TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wufTFZdIEjwCYVBwc91eIiYQn5SPRxoheNx3nrMLoqw=; b=k1lJCUszETb2nsPL6mbnpHhXWsqsfP75Knt+Sib88pnIN5idrMXAZkCWA6nfXBdHpk aYWVWWM/IUPPIo172sUguLSMmVYj44RGD9DAwfA8x7ZLwEtAx8zImUQ8x3G3IcdFq14e j3ZTkJiaR9kSytyCX1mTLlyZfYS4Y0VAZMKHhvnWTbrCd9t8A7K+FdKakgbspDFrDEY3 GV0fBtGh9cTu/cqlwUv5Ez/28uER6BaAVJ7dnz4EqwbyLFd3z8pTJpK3s5bCXalD+Owi ireMKA3BZDhq1N3MioWUC3NWqNBz9qsd+o2OGJU77UxEAybv2BVLqmJYB8mX+JJLwD4I TB+g== X-Gm-Message-State: APf1xPA4dyqUdOUWGu1iaB2vRof58z93Cd0hAh4gWyusk2OnCCuLZJnp jXwZ1Ys5cTJjhONK/xdbwuQ5ydtX X-Google-Smtp-Source: AH8x227OpAWJNWNoiuysy6wvW8E+G0yCk6yujGhlRulc1AJZD78n0S07T4ck/L64vieKiX3p/ADRxA== X-Received: by 10.55.71.87 with SMTP id u84mr2025510qka.255.1518668984365; Wed, 14 Feb 2018 20:29:44 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:43 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:40 -0300 Message-Id: <20180215042900.16078-11-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH 10/30] hw/ppc: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Graf , =?utf-8?q?Herv=C3=A9_Poussineau?= , "open list:PReP" , "Edgar E. Iglesias" , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson --- include/hw/ppc/spapr.h | 2 +- hw/pci-host/prep.c | 2 +- hw/ppc/e500.c | 8 ++++---- hw/ppc/mac_oldworld.c | 7 +++---- hw/ppc/ppc405_boards.c | 8 ++++---- hw/ppc/ppc405_uc.c | 6 +++--- hw/ppc/ppc4xx_devs.c | 21 +++++++++++---------- hw/ppc/ppce500_spin.c | 2 +- hw/ppc/prep.c | 2 +- hw/ppc/rs6000_mc.c | 12 ++++++------ hw/ppc/virtex_ml507.c | 4 ++-- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 62c077ac20..ceeb274205 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -746,7 +746,7 @@ int spapr_rng_populate_dt(void *fdt); #define SPAPR_MAX_RAM_SLOTS 32 /* 1GB alignment for hotplug memory region */ -#define SPAPR_HOTPLUG_MEM_ALIGN (1ULL << 30) +#define SPAPR_HOTPLUG_MEM_ALIGN (1 * G_BYTE) /* * Number of 32 bit words in each LMB list entry in ibm,dynamic-memory diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 01f67f9db1..d06498e131 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -70,7 +70,7 @@ typedef struct PRePPCIState { int contiguous_map; } PREPPCIState; -#define BIOS_SIZE (1024 * 1024) +#define BIOS_SIZE (1 * M_BYTE) static inline uint32_t raven_pci_io_config(hwaddr addr) { diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index a40d3ec3e3..02675c7be4 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -45,7 +45,7 @@ #define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb" #define DTC_LOAD_PAD 0x1800000 #define DTC_PAD_MASK 0xFFFFF -#define DTB_MAX_SIZE (8 * 1024 * 1024) +#define DTB_MAX_SIZE (8 * M_BYTE) #define INITRD_LOAD_PAD 0x2000000 #define INITRD_PAD_MASK 0xFFFFFF @@ -597,7 +597,7 @@ static int ppce500_prep_device_tree(MachineState *machine, /* Create -kernel TLB entries for BookE. */ hwaddr booke206_page_size_to_tlb(uint64_t size) { - return 63 - clz64(size >> 10); + return 63 - clz64(size / K_BYTE); } static int booke206_initial_map_tsize(CPUPPCState *env) @@ -913,9 +913,9 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) /* Register spinning region */ sysbus_create_simple("e500-spin", params->spin_base, NULL); - if (cur_base < (32 * 1024 * 1024)) { + if (cur_base < 32 * M_BYTE) { /* u-boot occupies memory up to 32MB, so load blobs above */ - cur_base = (32 * 1024 * 1024); + cur_base = 32 * M_BYTE; } if (params->has_mpc8xxx_gpio) { diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 9b19551f56..a6b8b77937 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -117,10 +117,9 @@ static void ppc_heathrow_init(MachineState *machine) } /* allocate RAM */ - if (ram_size > (2047 << 20)) { - fprintf(stderr, - "qemu: Too much memory for this machine: %d MB, maximum 2047 MB\n", - ((unsigned int)ram_size / (1 << 20))); + if (ram_size > 2047 * M_BYTE) { + error_report("Too much memory for this machine: %llu MB, " + "maximum 2047 MB", ram_size / M_BYTE); exit(1); } diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index 0b658931ee..8c742449b8 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -41,7 +41,7 @@ #include "exec/address-spaces.h" #define BIOS_FILENAME "ppc405_rom.bin" -#define BIOS_SIZE (2048 * 1024) +#define BIOS_SIZE (2 * M_BYTE) #define KERNEL_LOAD_ADDR 0x00000000 #define INITRD_LOAD_ADDR 0x01800000 @@ -217,14 +217,14 @@ static void ref405ep_init(MachineState *machine) memory_region_init(&ram_memories[1], NULL, "ef405ep.ram1", 0); ram_bases[1] = 0x00000000; ram_sizes[1] = 0x00000000; - ram_size = 128 * 1024 * 1024; + ram_size = 128 * M_BYTE; #ifdef DEBUG_BOARD_INIT printf("%s: register cpu\n", __func__); #endif env = ppc405ep_init(sysmem, ram_memories, ram_bases, ram_sizes, 33333333, &pic, kernel_filename == NULL ? 0 : 1); /* allocate SRAM */ - sram_size = 512 * 1024; + sram_size = 512 * K_BYTE; memory_region_init_ram(sram, NULL, "ef405ep.sram", sram_size, &error_fatal); memory_region_add_subregion(sysmem, 0xFFF00000, sram); @@ -590,7 +590,7 @@ static void taihu_405ep_init(MachineState *machine) bios_size = blk_getlength(blk); /* XXX: should check that size is 32MB */ - bios_size = 32 * 1024 * 1024; + bios_size = 32 * M_BYTE; fl_sectors = (bios_size + 65535) >> 16; #ifdef DEBUG_BOARD_INIT printf("Register parallel flash %d size %lx" diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c index 205ebcea93..0e9d5b0ff9 100644 --- a/hw/ppc/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c @@ -983,10 +983,10 @@ static void ppc405_ocm_init(CPUPPCState *env) ocm = g_malloc0(sizeof(ppc405_ocm_t)); /* XXX: Size is 4096 or 0x04000000 */ - memory_region_init_ram(&ocm->isarc_ram, NULL, "ppc405.ocm", 4096, + memory_region_init_ram(&ocm->isarc_ram, NULL, "ppc405.ocm", 4 * K_BYTE, &error_fatal); - memory_region_init_alias(&ocm->dsarc_ram, NULL, "ppc405.dsarc", &ocm->isarc_ram, - 0, 4096); + memory_region_init_alias(&ocm->dsarc_ram, NULL, "ppc405.dsarc", + &ocm->isarc_ram, 0, 4 * K_BYTE); qemu_register_reset(&ocm_reset, ocm); ppc_dcr_register(env, OCM0_ISARC, ocm, &dcr_read_ocm, &dcr_write_ocm); diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c index 2e963894fe..52de988b13 100644 --- a/hw/ppc/ppc4xx_devs.c +++ b/hw/ppc/ppc4xx_devs.c @@ -29,6 +29,7 @@ #include "hw/boards.h" #include "qemu/log.h" #include "exec/address-spaces.h" +#include "qemu/error-report.h" #define DEBUG_UIC @@ -353,25 +354,25 @@ static uint32_t sdram_bcr (hwaddr ram_base, uint32_t bcr; switch (ram_size) { - case (4 * 1024 * 1024): + case 4 * M_BYTE: bcr = 0x00000000; break; - case (8 * 1024 * 1024): + case 8 * M_BYTE: bcr = 0x00020000; break; - case (16 * 1024 * 1024): + case 16 * M_BYTE: bcr = 0x00040000; break; - case (32 * 1024 * 1024): + case 32 * M_BYTE: bcr = 0x00060000; break; - case (64 * 1024 * 1024): + case 64 * M_BYTE: bcr = 0x00080000; break; - case (128 * 1024 * 1024): + case 128 * M_BYTE: bcr = 0x000A0000; break; - case (256 * 1024 * 1024): + case 256 * M_BYTE: bcr = 0x000C0000; break; default: @@ -399,7 +400,7 @@ static target_ulong sdram_size (uint32_t bcr) if (sh == 7) size = -1; else - size = (4 * 1024 * 1024) << sh; + size = (4 * M_BYTE) << sh; return size; } @@ -702,8 +703,8 @@ ram_addr_t ppc4xx_sdram_adjust(ram_addr_t ram_size, int nr_banks, ram_size -= size_left; if (size_left) { - printf("Truncating memory to %d MiB to fit SDRAM controller limits.\n", - (int)(ram_size >> 20)); + error_report("Truncating memory to %llu MiB to fit SDRAM " + "controller limits", ram_size / M_BYTE); } memory_region_allocate_system_memory(ram, NULL, "ppc4xx.sdram", ram_size); diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c index 69ca2d0e42..b6d224c45b 100644 --- a/hw/ppc/ppce500_spin.c +++ b/hw/ppc/ppce500_spin.c @@ -89,7 +89,7 @@ static void spin_kick(CPUState *cs, run_on_cpu_data data) PowerPCCPU *cpu = POWERPC_CPU(cs); CPUPPCState *env = &cpu->env; SpinInfo *curspin = data.host_ptr; - hwaddr map_size = 64 * 1024 * 1024; + hwaddr map_size = 64 * M_BYTE; hwaddr map_start; cpu_synchronize_state(cs); diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index f7c0a48558..eae475a34d 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -59,7 +59,7 @@ #define CFG_ADDR 0xf0000510 -#define BIOS_SIZE (1024 * 1024) +#define BIOS_SIZE (1 * M_BYTE) #define BIOS_FILENAME "ppc_rom.bin" #define KERNEL_LOAD_ADDR 0x01000000 #define INITRD_LOAD_ADDR 0x01800000 diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c index b6135650bd..6999994fe4 100644 --- a/hw/ppc/rs6000_mc.c +++ b/hw/ppc/rs6000_mc.c @@ -109,7 +109,7 @@ static void rs6000mc_port0820_write(void *opaque, uint32_t addr, uint32_t val) size = end_address - start_address; memory_region_set_enabled(&s->simm[socket - 1], size != 0); memory_region_set_address(&s->simm[socket - 1], - start_address * 8 * 1024 * 1024); + start_address * 8 * M_BYTE); } } } @@ -140,7 +140,7 @@ static void rs6000mc_realize(DeviceState *dev, Error **errp) { RS6000MCState *s = RS6000MC_DEVICE(dev); int socket = 0; - unsigned int ram_size = s->ram_size / (1024 * 1024); + unsigned int ram_size = s->ram_size / M_BYTE; while (socket < 6) { if (ram_size >= 64) { @@ -163,8 +163,8 @@ static void rs6000mc_realize(DeviceState *dev, Error **errp) char name[] = "simm.?"; name[5] = socket + '0'; memory_region_allocate_system_memory(&s->simm[socket], OBJECT(dev), - name, s->simm_size[socket] - * 1024 * 1024); + name, + s->simm_size[socket] * M_BYTE); memory_region_add_subregion_overlap(get_system_memory(), 0, &s->simm[socket], socket); } @@ -172,8 +172,8 @@ static void rs6000mc_realize(DeviceState *dev, Error **errp) if (ram_size) { /* unable to push all requested RAM in SIMMs */ error_setg(errp, "RAM size incompatible with this board. " - "Try again with something else, like %d MB", - s->ram_size / 1024 / 1024 - ram_size); + "Try again with something else, like %lld MB", + s->ram_size / M_BYTE - ram_size); return; } diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 77a1778e07..dcfb6c2670 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -47,7 +47,7 @@ #include "sysemu/block-backend.h" #define EPAPR_MAGIC (0x45504150) -#define FLASH_SIZE (16 * 1024 * 1024) +#define FLASH_SIZE (16 * M_BYTE) #define INTC_BASEADDR 0x81800000 #define UART16550_BASEADDR 0x83e01003 @@ -237,7 +237,7 @@ static void virtex_init(MachineState *machine) dinfo = drive_get(IF_PFLASH, 0, 0); pflash_cfi01_register(PFLASH_BASEADDR, NULL, "virtex.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - (64 * 1024), FLASH_SIZE >> 16, + 64 * K_BYTE, FLASH_SIZE >> 16, 1, 0x89, 0x18, 0x0000, 0x0, 1); cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT]; From patchwork Thu Feb 15 04:28:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873619 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JW16eRd7"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhk5X11kkz9t2l for ; Thu, 15 Feb 2018 15:37:20 +1100 (AEDT) Received: from localhost ([::1]:37548 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBIM-0004fM-35 for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:37:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBB6-0007pB-Pt for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBB6-00042T-0U for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:48 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:43085) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBB5-00042M-Sh; Wed, 14 Feb 2018 23:29:47 -0500 Received: by mail-qt0-x244.google.com with SMTP id d26so10452924qtk.10; Wed, 14 Feb 2018 20:29:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z6poAVp+VlcvND/9WEjhVnFtSZGvK9SjhvaeKUTgd2k=; b=JW16eRd7pvanqdlYjZ9slMb0V3Kc9L180W8xYEjny/oO+VQegsp8RTM9yif/I4U3pu hZOMPEJSaJ+5KurZNbBsi7J4HIs8nfNOqD7p0n5AVwka0Yz3RkUyMdVO/FvNSm6dOBSp AnCW4s7B3BZOoTuKEGKZsFxyIxVtGuIcbOppBiV4jH+jY9cvrUO702BWGHlV45AP/hph lsCo323aUs4pznCu7WOYvMIEG66iJyXJw5zMEkW1BtsKLasrN/ITLb3vtY6OQqZVYlE/ 9wJXsv7tfUAIz9e+/Qu0RehhcBt/tUkX3WlPxnrYQGxTNoVQVFwTQpVi6g/pwf/A5Xqu YKFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Z6poAVp+VlcvND/9WEjhVnFtSZGvK9SjhvaeKUTgd2k=; b=gpTo1b4aaqNK6v3AAqyqEauC6Rdz1ZhKoJW1Nj2HDL8qmNdIT6YSKW3AR+6ZodxHAM g6DOe8Y0fN0/U31HBrwF7Ev8gzWnHoPIuYrmeErTgEFNJVom+Y38c5GRhizPhIccqCde CNeVrGkH18qMeLDZsw4q+rc0z+L7ViI0amdMwgbHTb4ubxrqnHUktWzu8hEWBx7HD7jD +gBqkaxW4uWVtSH3FyBIHGM7IHssgoRXx0zZHbNRNZHu0vzBMFM9QRU2gi0FLv3hzp7P uVCUB5ipl0BCjkOOEICV2ec0vNJJR/wIpPljGTtLIrAycpslrA0b/YshaXjsyvIlql9k g1Ww== X-Gm-Message-State: APf1xPBC244IwkcrLl/oXrhT+MKWpmk7km09aXWA276AXVuqVOo3uh3o zqqANu46Weid7GrY5FTCn3lbXUxF X-Google-Smtp-Source: AH8x226JZYHgD1IRnyd1Flu4rH3lrRfYvetVidZYNn2ftD1zKJ7wI50/QckgIU+z/bfeUTlYetQJaQ== X-Received: by 10.237.49.105 with SMTP id 96mr2417193qtg.52.1518668987343; Wed, 14 Feb 2018 20:29:47 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:46 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:41 -0300 Message-Id: <20180215042900.16078-12-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH 11/30] hw/s390x: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand , Cornelia Huck , Alexander Graf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Christian Borntraeger , "open list:S390" , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Acked-by: Cornelia Huck --- hw/s390x/sclp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 276972b59f..8537aa2688 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -526,8 +526,8 @@ 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); + error_setg(&err, "host supports a maximum of %llu GB", + hw_limit / G_BYTE); } else if (ret) { error_setg(&err, "setting the guest size failed"); } From patchwork Thu Feb 15 04:28:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pphDznZZ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkBB33z4z9t2l for ; Thu, 15 Feb 2018 15:41:22 +1100 (AEDT) Received: from localhost ([::1]:37584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBMG-0000K6-FD for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:41:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBA-0007rK-1c for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBB8-00043G-BX for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:52 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:38239) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBB8-000439-4Z for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:50 -0500 Received: by mail-qt0-x243.google.com with SMTP id k13so10472585qtg.5 for ; Wed, 14 Feb 2018 20:29:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OrLNacxg9tVHGfc09dKrYqxenClQTbdKhOMPkFrUWLg=; b=pphDznZZaEN8f05vm2YJdlW7U9G/xSRJuI3IpFiA6JY5KqSdqQXV16JOhM3xD8oMiM f37lL9hkv9klhebKQsPFv02mY1VL6TVZdRAKDlhdSLbCB73NQrIk3LlPuHmKEXg2+tQ3 Snqbu8FCiIGWlJw6mxoTPHMiW5NH9INsVpHR6dA6xkgHg00B7VW6qE3Jspq/weymNm6X 8/h/tXiRDL9aqL1ZY+jlix/c5BJFwqRM40mabEb79og4Z/iE1vh3wzvePX3gEdmSQ6aU +p/n5rwGYg/JQlpXKm01mIFCFQ/6hlmEn4kM144LDoij5LyPFvT6tCJXlYOEckHzedD9 QWAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=OrLNacxg9tVHGfc09dKrYqxenClQTbdKhOMPkFrUWLg=; b=iP9HDNXDrMSjpqEv55Y33CHbE+t6syavPz9cfyDW/ZiNEZFTBUGSb/gOdvI1dfXpW6 S+VRaqnk5pIJHDMEOV7U3zocuosXoLNe1q1Y1NwIOzuHi/QQdGaYeu6EUhJoAOS0JZLs 7zux4/rtaHtGBc6WhcyElnwWcIlvv7uaXNXPZT9n+3KGf4mnI5X+c4gaH68IacVz+Et2 itarLe/jlUsoJD0M2O7P078MasQZ+sQUJ6LTePJJnudYetBRidvHV7nz9IruLXI2z+vq K4cPf/3GgJNWw0cnoPugoZ5vPl3DrTRW6RnCUuvYHtG3k6/2cPbXBBno5Jlb7cThvNaN Vgmw== X-Gm-Message-State: APf1xPAmtZgiE6Lm8ixcJToPpHLPdGgKRkZYMV7XS2/Z1ppRmHvnpGuH 6nv96luxFEaK5Tx+6e2RAqcZdPSa X-Google-Smtp-Source: AH8x2277I4foLr/OvTrQdR/C1Sac8SRQ34EwNm9+UoffLTxEorRTrqkdipaTBgF0sdcvu6cb/ITmvA== X-Received: by 10.237.48.163 with SMTP id 32mr2243153qtf.102.1518668989611; Wed, 14 Feb 2018 20:29:49 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:49 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:42 -0300 Message-Id: <20180215042900.16078-13-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 12/30] hw/hppa: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- hw/hppa/dino.c | 2 +- hw/hppa/machine.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c index 15aefde09c..7728123cc8 100644 --- a/hw/hppa/dino.c +++ b/hw/hppa/dino.c @@ -76,7 +76,7 @@ /* #define xxx 0x200 - bit 9 not used */ #define RS232INT 0x400 -#define DINO_MEM_CHUNK_SIZE (8 * 1024 * 1024) /* 8MB */ +#define DINO_MEM_CHUNK_SIZE (8 * M_BYTE) #define DINO_PCI_HOST_BRIDGE(obj) \ OBJECT_CHECK(DinoState, (obj), TYPE_DINO_PCI_HOST_BRIDGE) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 22a15112df..8fd364ad43 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -177,8 +177,8 @@ static void machine_hppa_init(MachineState *machine) } qemu_log_mask(CPU_LOG_PAGE, "Kernel loaded at 0x%08" PRIx64 "-0x%08" PRIx64 ", entry at 0x%08" PRIx64 - ", size %ld kB.\n", - kernel_low, kernel_high, kernel_entry, size / 1024); + ", size %llu kB\n", + kernel_low, kernel_high, kernel_entry, size / K_BYTE); if (kernel_cmdline) { cpu[0]->env.gr[24] = 0x4000; @@ -202,8 +202,8 @@ static void machine_hppa_init(MachineState *machine) (1) Due to sign-extension problems and PDC, put the initrd no higher than 1G. (2) Reserve 64k for stack. */ - initrd_base = MIN(ram_size, 1024 * 1024 * 1024); - initrd_base = initrd_base - 64 * 1024; + initrd_base = MIN(ram_size, 1 * G_BYTE); + initrd_base = initrd_base - 64 * K_BYTE; initrd_base = (initrd_base - initrd_size) & TARGET_PAGE_MASK; if (initrd_base < kernel_high) { From patchwork Thu Feb 15 04:28:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873622 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WFCsvGwb"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhk9N2zdKz9t2l for ; Thu, 15 Feb 2018 15:40:39 +1100 (AEDT) Received: from localhost ([::1]:37563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBLY-0007rx-Jp for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:40:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBB-0007sQ-AF for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBA-00044C-Fa for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:53 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34210) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBA-00043u-C5 for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:52 -0500 Received: by mail-qt0-x243.google.com with SMTP id d14so10486165qtg.1 for ; Wed, 14 Feb 2018 20:29:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nxoO8yEtmncBwEKg3LwRif4NbaNfXnPnBGBIGHUayqA=; b=WFCsvGwbzTKgGfetJ+zThsVNcqwk/owzqtnLpy1BckE9QN74WaObpHibA1/lGgHYcq GP+M6Lfi4F79KSdi3a6VqKgvIOmiNi0kuTtj+gWNj/h/aSGREEomqLR6qFx24/XW7mRn GBSqabbZ7sl/bimniXMmcZDkjnIA787VIAt8AKEU8Z9EoZOTBxfByY5Af7y1F97FJemv Tc4Vy3JCZvu4YHQk153V2kG4AsLKhezi5xvxekdb5scX1urP7afc79/hVIqGoYFSnee6 eR0IKE0PH+xlEd2Uo464uty4w6zh6B3bydvRTdksx3m54TgwrV8vIYKNgwck86TCEbQT J6gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nxoO8yEtmncBwEKg3LwRif4NbaNfXnPnBGBIGHUayqA=; b=cXNtRnve95G0qnxVyxy0dfOHlppeWVyr+dW+q8eWUibVgPszzwUUV48F1kr3U2R3Nr 1oJUdUjsHXFsdVI8sOeT0RTk7P62wOAUvz6zNDrm5NOG42DTDJyvh4imANGBk4JxMsHs iTiRd1H6WIaIMMMCSksLT7NRx0xB9AanwW0WFefzGLUFcOB5y/CRXRpyYus+2pwSI2Bl dA7SEWtAJksG1lB1Tg/Nwdb60G/eCv81ZDNs+riFscTkLCs2A2hmx9RLs9KuyjFy5NJr F2/831/8um4EOro+Vt1cf2MDLPQNmqStLQhti+4MR9VyW26RMsy+ui+4eNlgXQqAwyRx BVCA== X-Gm-Message-State: APf1xPDcZ1/Fi+bBoM8bAtiRmPaJ7GWlRQA+Wqq4GVP4lgYINEuCsYAt JcWvcqoTM7vMvbYlG80C7EM88VVv X-Google-Smtp-Source: AH8x225CKIy34fzb8QkZ5j6qj3foz6luJ8bjcUpz7ZxW89VzQf0jP5f3n6qvvJkO1UCvJ0WqdT8fow== X-Received: by 10.237.37.196 with SMTP id y4mr2377778qtc.182.1518668991843; Wed, 14 Feb 2018 20:29:51 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:51 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:43 -0300 Message-Id: <20180215042900.16078-14-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 13/30] hw/xtensa: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Max Filippov --- hw/xtensa/xtfpga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 70686a2eb1..922417af15 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -230,7 +230,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) const char *kernel_cmdline = qemu_opt_get(machine_opts, "append"); const char *dtb_filename = qemu_opt_get(machine_opts, "dtb"); const char *initrd_filename = qemu_opt_get(machine_opts, "initrd"); - const unsigned system_io_size = 224 * 1024 * 1024; + const unsigned system_io_size = 224 * M_BYTE; int n; for (n = 0; n < smp_cpus; n++) { From patchwork Thu Feb 15 04:28:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873618 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="B3j34Nib"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhk5V3MhFz9t2l for ; Thu, 15 Feb 2018 15:37:18 +1100 (AEDT) Received: from localhost ([::1]:37541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBIK-0004c1-D8 for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:37:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBD-0007v2-DR for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBC-00044u-EG for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:55 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:37139) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBC-00044n-AP for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:54 -0500 Received: by mail-qt0-x241.google.com with SMTP id d26so8885887qtj.4 for ; Wed, 14 Feb 2018 20:29:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JYLRUXR8csDauu779wQkLVzT+5wDruTCXU+S0WV/xo8=; b=B3j34NibefxIgg7gMxwQsZ/tMn365cEz2I1Dd2SxcySq+HZ2y9c3KD0wQzQfEI6GE2 68PdrCNU8XuY6am/Br0YTel4gd8CgJtH1Zbr6v2QiT4Sn3pPN5Fni0dBc8h+jVOIguSZ wAqIEObo8uX4UNJC8tvVG5B5T6EuV736B1rpiWQgNjjZ1D44rJKEXh362MpK81JP1jCJ jy6nyHhFF+hsAWwpk3ZAsA38ja/Vj4AsQUQ/Y2jn44+EotgVbVjxemn+3WZzz5dkV1tI QU+VFw8SrPUZiVvAGhE7CGBikh+FJF1/D6RfRx2IMbL1ymNBxkWah5i9rJK4YJwPJEtz iEtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JYLRUXR8csDauu779wQkLVzT+5wDruTCXU+S0WV/xo8=; b=AKsgFINs9fOp+sHa/aUUNqySbYxay/lS1pwnPARekgxcT1yFWCChg+9zNxBokg91j7 uFSGhpQPdD+nxCtaMBl6Pw/DlEfIRnq8QoRUOZ9L7JVR/kGN7ouECJDDvDMWogBlcPPK ySwnQFc6C+m17KTt7P3Eprqqa3qu4WSkLhE4ypMG0MIZ27HC46V6l4k7z1qEPW1XyYIl yVczaLtSh/gLoSHM+1V0/wq7sy8POA9qLjC95APkrzBRtSwQFtRKFO29rG7zkn+6+KDw VT47vyfeexHhiUoI45YSMAc6olY8EGnftPQdS2tZW0zCs7rF9TNJb7WNtB2xlI4hXXCU npyA== X-Gm-Message-State: APf1xPDXcV+f07t7nMcqu49fpOpCnvTMMCYlK8m6K8lo2slXw2WlLxZN 7ZoSPSNiGperBpbbkIdZ+z7Vle2k X-Google-Smtp-Source: AH8x224UWuRzVFbUWcKX30LrVM2WjFEjvUr6K/WDgr3qkHiEeLDHxRdfTsgM0ZIRakWabzpXojyG6g== X-Received: by 10.200.6.75 with SMTP id e11mr2221927qth.146.1518668993767; Wed, 14 Feb 2018 20:29:53 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:53 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:44 -0300 Message-Id: <20180215042900.16078-15-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH 14/30] hw/alpha: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- hw/alpha/typhoon.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 6a40869488..0acfb4b1d0 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -812,8 +812,6 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, qemu_irq *p_rtc_irq, AlphaCPU *cpus[4], pci_map_irq_fn sys_map_irq) { - const uint64_t MB = 1024 * 1024; - const uint64_t GB = 1024 * MB; MemoryRegion *addr_space = get_system_memory(); DeviceState *dev; TyphoonState *s; @@ -854,30 +852,30 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, /* Pchip0 CSRs, 0x801.8000.0000, 256MB. */ memory_region_init_io(&s->pchip.region, OBJECT(s), &pchip_ops, s, "pchip0", - 256*MB); + 256 * M_BYTE); memory_region_add_subregion(addr_space, 0x80180000000ULL, &s->pchip.region); /* Cchip CSRs, 0x801.A000.0000, 256MB. */ memory_region_init_io(&s->cchip.region, OBJECT(s), &cchip_ops, s, "cchip0", - 256*MB); + 256 * M_BYTE); memory_region_add_subregion(addr_space, 0x801a0000000ULL, &s->cchip.region); /* Dchip CSRs, 0x801.B000.0000, 256MB. */ memory_region_init_io(&s->dchip_region, OBJECT(s), &dchip_ops, s, "dchip0", - 256*MB); + 256 * M_BYTE); memory_region_add_subregion(addr_space, 0x801b0000000ULL, &s->dchip_region); /* Pchip0 PCI memory, 0x800.0000.0000, 4GB. */ - memory_region_init(&s->pchip.reg_mem, OBJECT(s), "pci0-mem", 4*GB); + memory_region_init(&s->pchip.reg_mem, OBJECT(s), "pci0-mem", 4 * G_BYTE); memory_region_add_subregion(addr_space, 0x80000000000ULL, &s->pchip.reg_mem); /* Pchip0 PCI I/O, 0x801.FC00.0000, 32MB. */ memory_region_init_io(&s->pchip.reg_io, OBJECT(s), &alpha_pci_ignore_ops, - NULL, "pci0-io", 32*MB); + NULL, "pci0-io", 32 * M_BYTE); memory_region_add_subregion(addr_space, 0x801fc000000ULL, &s->pchip.reg_io); @@ -898,13 +896,13 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, /* Pchip0 PCI special/interrupt acknowledge, 0x801.F800.0000, 64MB. */ memory_region_init_io(&s->pchip.reg_iack, OBJECT(s), &alpha_pci_iack_ops, - b, "pci0-iack", 64*MB); + b, "pci0-iack", 64 * M_BYTE); memory_region_add_subregion(addr_space, 0x801f8000000ULL, &s->pchip.reg_iack); /* Pchip0 PCI configuration, 0x801.FE00.0000, 16MB. */ memory_region_init_io(&s->pchip.reg_conf, OBJECT(s), &alpha_pci_conf1_ops, - b, "pci0-conf", 16*MB); + b, "pci0-conf", 16 * M_BYTE); memory_region_add_subregion(addr_space, 0x801fe000000ULL, &s->pchip.reg_conf); From patchwork Thu Feb 15 04:28:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FJtECkJ+"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkM05N35z9sRW for ; Thu, 15 Feb 2018 15:49:00 +1100 (AEDT) Received: from localhost ([::1]:37651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBTe-0007eC-QB for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:48:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBF-0007x5-IA for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBE-00045L-Nx for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:57 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:46695) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBE-00045D-Iv for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:56 -0500 Received: by mail-qt0-x241.google.com with SMTP id u6so10464148qtg.13 for ; Wed, 14 Feb 2018 20:29:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=QkCdrNMlJKv3R27cWwWBA3R7h0LzsP+psEQVgHAoHvQ=; b=FJtECkJ+DXsYHi8uCMWH/a7+4VjbU7nGtZPhYY1ToB31b8jkycJ304WGeoo3x8x2gB ZS3l8/R3MOjHDY8T0hU0SNRsxgsvN3LFppNXSzZzc3n/LFG5nAM29AvTJT/C4OzIAn/r ZDg/Md8igsIINsa8CXsZn9P0+s/a+uDl5awgDPUnnDqIZfMvf1JpvUxwL8MKpBt36rv2 9yNtJuRVnFEENmk5Nqltwt3nSysjbAM+S+U0Td3IJfzcHJTv2RebC3CBIPVo8FvArEfK XsP4m3Tc3rV34K9iU1ta51MtuK+FLKlyY4+Roi203f1e5YzCTI0vsAFtf7bJquc8BkFU 66GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=QkCdrNMlJKv3R27cWwWBA3R7h0LzsP+psEQVgHAoHvQ=; b=aqE2VGnILH/SzaRKRDNaxwqTRjzqXloXomD8zrwuVE9XKzZOYMreXyLkRirq3mTvvH VSvxjRuEBDFlI+6Aj//eSsBkoB93/HJ4j+u4LxqBOuxbB73PcZkrdjUu+JIjVCA//hYK +uEUTNv6uemHeGBhditIG2nHWRZiKdTrqqsYizk9Pc7clkvuv41AVLIRKywm01Ovbqws sLvWSmFisJZ4+k7+nrVa3WnxYKY6QAkLSnGuQ5CXeZl9uqpDtotFoLoK5qKJG6WIZCqr 010T8HJqkv7EZrRAqqT6v7Q1z8R3VOgs3MRk52EdR3/WaiGnF5mIXjxwuUaqEFeUuY4p yZkQ== X-Gm-Message-State: APf1xPDM4QVVwbJQnnTYhcTqNpKZtjofr290EaIF4SbmW4yJRH1cQZNm CytNDgIr2RP7HUUIPWe4ufvu/X+q X-Google-Smtp-Source: AH8x224pf3GanopOVWwHQW71FFnM8YCUPmsXJZ4cNV5ms2xDJ3P7uE972ukIOyQLZjwatEytphE7WA== X-Received: by 10.200.8.15 with SMTP id u15mr2304101qth.315.1518668995970; Wed, 14 Feb 2018 20:29:55 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:55 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:45 -0300 Message-Id: <20180215042900.16078-16-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH 15/30] hw/lm32: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Walle , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- hw/lm32/lm32_boards.c | 12 ++++++------ hw/lm32/milkymist.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index 527bcc229c..15315101be 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -88,10 +88,10 @@ static void lm32_evr_init(MachineState *machine) /* memory map */ hwaddr flash_base = 0x04000000; - size_t flash_sector_size = 256 * 1024; - size_t flash_size = 32 * 1024 * 1024; + size_t flash_sector_size = 256 * K_BYTE; + size_t flash_size = 32 * M_BYTE; hwaddr ram_base = 0x08000000; - size_t ram_size = 64 * 1024 * 1024; + size_t ram_size = 64 * M_BYTE; hwaddr timer0_base = 0x80002000; hwaddr uart0_base = 0x80006000; hwaddr timer1_base = 0x8000a000; @@ -174,10 +174,10 @@ static void lm32_uclinux_init(MachineState *machine) /* memory map */ hwaddr flash_base = 0x04000000; - size_t flash_sector_size = 256 * 1024; - size_t flash_size = 32 * 1024 * 1024; + size_t flash_sector_size = 256 * K_BYTE; + size_t flash_size = 32 * M_BYTE; hwaddr ram_base = 0x08000000; - size_t ram_size = 64 * 1024 * 1024; + size_t ram_size = 64 * M_BYTE; hwaddr uart0_base = 0x80000000; hwaddr timer0_base = 0x80002000; hwaddr timer1_base = 0x80010000; diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index c28379399f..b884b825bc 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -36,7 +36,7 @@ #define BIOS_FILENAME "mmone-bios.bin" #define BIOS_OFFSET 0x00860000 -#define BIOS_SIZE (512*1024) +#define BIOS_SIZE (512 * K_BYTE) #define KERNEL_LOAD_ADDR 0x40000000 typedef struct { @@ -95,10 +95,10 @@ milkymist_init(MachineState *machine) /* memory map */ hwaddr flash_base = 0x00000000; - size_t flash_sector_size = 128 * 1024; - size_t flash_size = 32 * 1024 * 1024; + size_t flash_sector_size = 128 * K_BYTE; + size_t flash_size = 32 * M_BYTE; hwaddr sdram_base = 0x40000000; - size_t sdram_size = 128 * 1024 * 1024; + size_t sdram_size = 128 * M_BYTE; hwaddr initrd_base = sdram_base + 0x1002000; hwaddr cmdline_base = sdram_base + 0x1000000; From patchwork Thu Feb 15 04:28:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873629 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NN/1CyTp"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkH93dhgz9t2l for ; Thu, 15 Feb 2018 15:45:40 +1100 (AEDT) Received: from localhost ([::1]:37621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBQP-0004ml-MN for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:45:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBL-0007zb-1d for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBH-00046f-Uz for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:03 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:38240) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBH-00046J-Qo; Wed, 14 Feb 2018 23:29:59 -0500 Received: by mail-qt0-x243.google.com with SMTP id k13so10472866qtg.5; Wed, 14 Feb 2018 20:29:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NBX4xHfslgY9TL4FOtZRkQ48XuSHzDmRkyVLP2498fo=; b=NN/1CyTp+Td8UyW7E7lD6q/C5H/v9cIcUm2hlfppeaLM4fQi1HRcWHR/WmD6JyC820 7SZDpJfgSQtiiCscny001hx5tUfp3eQyKDdw2r0TcwDWPgR2uYPXFCyW+FdwfZRVp6QX p57Do7JqjekH75wvogFrXtuQ2fF5Yqobqvl7BufzhbxvhKxeLMAJYsI4WVERuBm08rGH eGe8pvWMHGKjpTFZw/944JO5nerZeN2GIDLPiApjL04EsieE5B7/Mc1Y3EO/44PYMs2D E2GWM7UuH2YJE0JEkJX2ll8ZNUTZ2TfmNEV8f/IbAhtfSTNUSmagZIcDdFUXnZnUF4BA EZ1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NBX4xHfslgY9TL4FOtZRkQ48XuSHzDmRkyVLP2498fo=; b=Z3IbjVdQVL9a/CBySHZLMlspYAEkS85bHuyR0wnz/v/cWMDdB8wUbYdgmwWmcCkLz4 aY75B2co3t/CNIhjkLUl0yXi0SuRrLEvQwVoB5k8ky98qbXf7Dce2Qk09x2Wn+1arcpV bp2zzIrCAVx+g4jNGOdnr01yMdzH5xbRF+mo0b4m1QbRpPZoREBolJIud+jjlzz5n+Ix 4Z+kyFzKaK7Mqr7II4SvHEiJRbXwAVN3A04mwJt6T5gsUJB38h2PysX+NPnE6CLp7/qK Li4syCV59mDVkPVljreZphEu7NnaQzVZP+QYujcO2Jy/OFuvP6BJUhNp4jBd8dCKULEZ 7riQ== X-Gm-Message-State: APf1xPDBmBi9QjvwoFJtgqinDPVxWZ8qrNbkNZugVN482OuUBWFas3jE VUcwnIxZPQtbptPY0csIfa/1NSGS X-Google-Smtp-Source: AH8x225zFx+nsYHBEEtnXmKrQkU1/a7ZLAuwWWCOaK3DXSIVMc1SwvEGPReWsCdr54DSiFEQ0tKSxQ== X-Received: by 10.237.42.132 with SMTP id t4mr2257031qtd.297.1518668999207; Wed, 14 Feb 2018 20:29:59 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:46 -0300 Message-Id: <20180215042900.16078-17-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 16/30] hw/sh4: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "open list:Block layer core" , Magnus Damm , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Max Reitz , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- hw/block/tc58128.c | 2 +- hw/sh4/r2d.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c index 1d9f7ee000..3e658d509f 100644 --- a/hw/block/tc58128.c +++ b/hw/block/tc58128.c @@ -26,7 +26,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) { diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 458ed83297..720bd6ad04 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -292,7 +292,7 @@ static void r2d_init(MachineState *machine) dinfo = drive_get(IF_PFLASH, 0, 0); pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - (16 * 1024), FLASH_SIZE >> 16, + 16 * K_BYTE, FLASH_SIZE >> 16, 1, 4, 0x0000, 0x0000, 0x0000, 0x0000, 0x555, 0x2aa, 0); From patchwork Thu Feb 15 04:28:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873633 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="i2uRSI7D"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkM215SKz9sRW for ; Thu, 15 Feb 2018 15:49:02 +1100 (AEDT) Received: from localhost ([::1]:37653 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBTg-0007hL-5H for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:49:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBL-0007zm-2q for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBK-00047G-7i for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:03 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:45465) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBK-00047C-3t for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:02 -0500 Received: by mail-qk0-x241.google.com with SMTP id g2so8417542qkd.12 for ; Wed, 14 Feb 2018 20:30:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P9Hdinq7J/k/4l9f+AqW9jjPOIS+RHCVakz3Np6GL34=; b=i2uRSI7D8WD/htm4LSw0ed4T2N/ZE37T3MMbbExvT2t+YTEOEBNv0RJ+fudvvi6rmz ucuT9rQT5Mw9dVzaus/4F4LT0aTggzkN2MvJcjELbNThWZaZrLQfOJSjZ07DkFFHTbj7 cto3PVZIKqKE3UPo/9s4Kxpm/Y8yiWUXANOzCXkYVCdNO1L08L/Knx3Gq8j7kB3kXRah pIEz2KbM4ZUqh7lf47on30/fDgJ+HA213vo+D08gY38uxvkm0Wsb80GOSIbB1Vg3+PSm rD+xt3M8YOhdqb2VRXADujXpOfVE+sMOepxHxPoG0aTYbdwjWePOcEic61bOC33kqo7f +0aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=P9Hdinq7J/k/4l9f+AqW9jjPOIS+RHCVakz3Np6GL34=; b=qN2Arvnpoirk6Cua5mmyQRwFhGvUedY//FwvSa9N4pg3pmXPdH94ckq3/eMLW0kcEL 3wtzfmtTHjBoRDUnDRquKbOtyBGRAj3y3J01e2esEvQWSbPkNHuYuhKx/hyhzEZS1cRd gi0/KpvBXl9EeyP6H3hrjJ2enKB2Sv+7z+84t06ObmiHd9YIffcKNCejM0L3U3ubyr5F ScHKYvHVFtY6/BmFggwmK6HqbGG3yDgxaBu7wtm3pvOBHU21iMJR1dSGvRa8rlxILtnX Kq1mKW+lO7pLg7L0tBXoY6FksNwVk6LkfTOSZ62nxiWOXio6+qnl0N2w2/Cy1NodMbzw 4srQ== X-Gm-Message-State: APf1xPBB+A50vMZypacw43vlXzHVy5V0X0E8wzNv0e13lyQARifx4obs SdhyYUsbpIWuSuLHqq9yOJ5c+6T4 X-Google-Smtp-Source: AH8x227NlkAZ7wsFu5o2YOzwFAUlKKWFpCGdmmpGchiIfTaOWUAWXc8qXz0e6JA6HRiUzYJAkmM5lg== X-Received: by 10.55.80.3 with SMTP id e3mr2172553qkb.13.1518669001537; Wed, 14 Feb 2018 20:30:01 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:00 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:47 -0300 Message-Id: <20180215042900.16078-18-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH 17/30] hw/tricore: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bastian Koppelmann , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Bastian Koppelmann --- hw/tricore/tricore_testboard.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index ac75eb2128..032bcc8efb 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -74,17 +74,17 @@ static void tricore_testboard_init(MachineState *machine, int board_id) cpu = TRICORE_CPU(cpu_create(machine->cpu_type)); env = &cpu->env; memory_region_init_ram(ext_cram, NULL, "powerlink_ext_c.ram", - 2 * 1024 * 1024, &error_fatal); + 2 * M_BYTE, &error_fatal); memory_region_init_ram(ext_dram, NULL, "powerlink_ext_d.ram", - 4 * 1024 * 1024, &error_fatal); - memory_region_init_ram(int_cram, NULL, "powerlink_int_c.ram", 48 * 1024, + 4 * M_BYTE, &error_fatal); + memory_region_init_ram(int_cram, NULL, "powerlink_int_c.ram", 48 * K_BYTE, &error_fatal); - memory_region_init_ram(int_dram, NULL, "powerlink_int_d.ram", 48 * 1024, + memory_region_init_ram(int_dram, NULL, "powerlink_int_d.ram", 48 * K_BYTE, &error_fatal); memory_region_init_ram(pcp_data, NULL, "powerlink_pcp_data.ram", - 16 * 1024, &error_fatal); + 16 * K_BYTE, &error_fatal); memory_region_init_ram(pcp_text, NULL, "powerlink_pcp_text.ram", - 32 * 1024, &error_fatal); + 32 * K_BYTE, &error_fatal); memory_region_add_subregion(sysmem, 0x80000000, ext_cram); memory_region_add_subregion(sysmem, 0xa1000000, ext_dram); From patchwork Thu Feb 15 04:28:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873636 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="c7+g76Tj"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkQs6sHXz9sRW for ; Thu, 15 Feb 2018 15:52:21 +1100 (AEDT) Received: from localhost ([::1]:37674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBWt-0002Ux-Bi for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:52:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBN-00082R-EA for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBM-000494-H6 for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:05 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:41144) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBM-00048v-Cq for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:04 -0500 Received: by mail-qk0-x243.google.com with SMTP id h129so9490441qke.8 for ; Wed, 14 Feb 2018 20:30:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5Vu4vqbpJE3777xQdDZrg3elMaPa1dukYrX7BTy57H4=; b=c7+g76Tja5lNmZ8jt+eHu2umQ04CyNwTQLUieu+gg6V+YNmLL4qkV/cAsaqwsiTbI9 03+XFr6siau6/CHaObjJgUgswp9B90l4dJ7MS/wqbTXKdj5aJAW/v2Ac8uhpnmMNHCTZ YexHYhBQlg9oOz9AF3a9HoO7WLLK1TIlSY0nXTRX1721hqlSroDfNsdfalJzGgtPW5z0 papPs4l9HU0z57N5P7C2gYdQzXFzxIUpyn1VfmaIZAx7b7ng4zo5PjfV5mpAp5TTQx7v cTgK2Hn0NLbu+efyVpx1fxi71QtwxanltRNIP0KcptemfLfpDkyNUfksfX1DAicezrRm XI8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5Vu4vqbpJE3777xQdDZrg3elMaPa1dukYrX7BTy57H4=; b=LOeDumuhp3gqcNmlLiiLAIe50dPSKKH5It9yGtPRWPOCWUXUmCvNSXS2AxXDyd5Vfb SBppgewcaV7pWj4MQSlNNLxThhzNtxbK9mUWb5K7Ol2HAGKUswcKiWgB7pT60kjiOY39 X1OexZMQqjlLe55sBdIcCqYQEDR/8fEBN1D/qOBYRaWwSZqNtVp9hW4pWSipGjEs/VTH 9oqPI9UwQGmHdvOxAqosUx1Eu+dtf30zXdrHIfAMBJ8hIIfjot4CqzY5BBG4ovZd6wFZ YUFspOCr3J9xFpaZBGjPYel9S4IyrXo2LJ36GMU3z79OMhrzx5HRU1HblKl6TAC+HAog Yc7w== X-Gm-Message-State: APf1xPCdBgg7hPn1vI3FykX1FUNViLIGjlsP3ap9OTsUhitDttED8SXB fKLmfg3vW9lYpx9yECZPzL+Mvu8C X-Google-Smtp-Source: AH8x227JP74rJM7s7viw1GB0hZa4yYAKqM8K9WHRp4cnhx2X1nW1zoj7DcLPf/4AUWLhvo9a790MdQ== X-Received: by 10.55.55.210 with SMTP id e201mr2139667qka.10.1518669003807; Wed, 14 Feb 2018 20:30:03 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:03 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:48 -0300 Message-Id: <20180215042900.16078-19-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH 18/30] hw/microblaze: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- hw/microblaze/petalogix_ml605_mmu.c | 6 +++--- hw/microblaze/petalogix_s3adsp1800_mmu.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index b664dc0f9c..d2b316fcba 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -45,8 +45,8 @@ #include "hw/stream.h" -#define LMB_BRAM_SIZE (128 * 1024) -#define FLASH_SIZE (32 * 1024 * 1024) +#define LMB_BRAM_SIZE (128 * K_BYTE) +#define FLASH_SIZE (32 * M_BYTE) #define BINARY_DEVICE_TREE_FILE "petalogix-ml605.dtb" @@ -110,7 +110,7 @@ petalogix_ml605_init(MachineState *machine) pflash_cfi01_register(FLASH_BASEADDR, NULL, "petalogix_ml605.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - (64 * 1024), FLASH_SIZE >> 16, + 64 * K_BYTE, FLASH_SIZE >> 16, 2, 0x89, 0x18, 0x0000, 0x0, 0); diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 5cb4deb69e..d93f7184a5 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -40,8 +40,8 @@ #include "boot.h" -#define LMB_BRAM_SIZE (128 * 1024) -#define FLASH_SIZE (16 * 1024 * 1024) +#define LMB_BRAM_SIZE (128 * K_BYTE) +#define FLASH_SIZE (16 * M_BYTE) #define BINARY_DEVICE_TREE_FILE "petalogix-s3adsp1800.dtb" @@ -88,7 +88,7 @@ petalogix_s3adsp1800_init(MachineState *machine) pflash_cfi01_register(FLASH_BASEADDR, NULL, "petalogix_s3adsp1800.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - (64 * 1024), FLASH_SIZE >> 16, + 64 * K_BYTE, FLASH_SIZE >> 16, 1, 0x89, 0x18, 0x0000, 0x0, 1); dev = qdev_create(NULL, "xlnx.xps-intc"); From patchwork Thu Feb 15 04:28:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873637 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CIhZBI5X"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkR12m6Jz9sRW for ; Thu, 15 Feb 2018 15:52:29 +1100 (AEDT) Received: from localhost ([::1]:37675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBX1-0002bt-E1 for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:52:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBP-00084W-Fv for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBO-0004B1-OS for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:07 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:36662) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBO-0004AJ-JV for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:06 -0500 Received: by mail-qt0-x244.google.com with SMTP id q18so10489661qtl.3 for ; Wed, 14 Feb 2018 20:30:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UGCcO1GUKgL/AeKJawXK0v3GcIEuTBnnchgSUdRurJM=; b=CIhZBI5XWnll3mnPmcAYGGkSULYCiMJdtn1jrNE5lsXBIc2bCZuUGc4JBPAmcb+ajW RVxCU/Co9qrMiiQAMcmbziE52Fpb6dEsC6gjfrXK/eAj5ueoAXHo5ZOx16F6XBejWNXU NnKT5qPn6p1QvgAG2sFhZm90VR5pnOCADTGMmgWydTcev2uJZDcVS6zED/8S36aVCZwf 8yap65evyjhV6d4bSSsO+70b1O07Q7t8Px3T4PORsauWnbwLMgB1HoYmOxWV/CPZ57f6 rFbNsAqVeQSgMvuMWUpw5XkSlKJWkdd8JbaZx3dpuU6/WjfMPErnkAxkLPj3GV1tTLpf gDJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UGCcO1GUKgL/AeKJawXK0v3GcIEuTBnnchgSUdRurJM=; b=dv/fgKCkQjqQ1Xhsta79XkSrR9PV8e+5Hx2TGiKImx2IoVFYQt7Djp9nhd6S7oKBWh 5P24hM82u0uJOfBisQ/EviQrUyTXRFBx3nkwBdi97ohDX6o2Kfc6WPuNWDRZ1VOAonSZ 0WupdMfVTdHd5YY+ulm5bZk7toHaGG4W9S2HBq1E9nyvRPXJWzF4fKxMJP4IGahuAt2D tfMhEOtVcBoO8mYyaXjcK8BU+E+iqPaQBoS6GHwuWJloIZ7m8TXS9sr4O1PaZNOpde2D ZK97JYiQoHyCQHOkUELGL8aPc207fgxUPwQHSKFCrg1w2I6L2+0AFh/CXW/uwGiCO7m6 yJUA== X-Gm-Message-State: APf1xPDN5XGEg8BUyPr73HMwwKlsstZXcderBxfrYHENAwbOrhklygZD SKjOj+tAsruwAx4UYXqXAFQjCW/m X-Google-Smtp-Source: AH8x225wKYdHUGmptdUajBdtvcelnHV7p5jhPS7Fax/jP3ZYtr+U5OhkuGdazJfF6agN6TgqqMGT+Q== X-Received: by 10.200.20.149 with SMTP id l21mr2361160qtj.332.1518669006028; Wed, 14 Feb 2018 20:30:06 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:05 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:49 -0300 Message-Id: <20180215042900.16078-20-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH 19/30] hw/nios2: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Chris Wulff , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- hw/nios2/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 771e00267b..911f28c0d8 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -176,7 +176,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, high = ddr_base + kernel_size; } - high = ROUND_UP(high, 1024 * 1024); + high = ROUND_UP(high, 1 * M_BYTE); /* If initrd is available, it goes after the kernel, aligned to 1M. */ if (initrd_filename) { From patchwork Thu Feb 15 04:28:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873638 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iOfDAxvM"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkWM0xfFz9sRW for ; Thu, 15 Feb 2018 15:56:13 +1100 (AEDT) Received: from localhost ([::1]:38471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBad-0006fq-5w for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:56:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBU-0008B3-3E for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBR-0004D4-0C for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:12 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:35200) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBQ-0004CC-S4 for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:08 -0500 Received: by mail-qt0-x243.google.com with SMTP id g14so10490547qti.2 for ; Wed, 14 Feb 2018 20:30:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zX50IZ+1zvY2cKOi1my+J5zcSELNr8ves02YClLicvw=; b=iOfDAxvMqACIU8CnT4N/bfpof2hGL9k/PoGxgtg7T4z/13j6SlxcwtkEixQ/THPBrV V/bXUxISCx/VZuhL9gU6nKXtAeekKNaXBA+xMZxs8bIPJFdcG8ob6I0XWnR6rVz6O9O1 J8hwZTsHlvb0afCyvt/5wdfP/6qUyj+TbnFynGOvg6iPUqP78QRnVhAUlgy1YZxtMxx9 JppdNuqGUs0sKh36Ol82I9NnKqSW8vg4Vw1soxMSqyHztJHOJ/3V/rumtp2UXD4nh+RI iThvnJuMdk+fuGokHb9I9F5gIamfrQEe3R5R0GXDQMkPl9zmU6sk3U5/xS71Nr+JwmVW 82WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zX50IZ+1zvY2cKOi1my+J5zcSELNr8ves02YClLicvw=; b=AbqvQbKY8eRR8YVxHVhy5xAaWMPmBv7RRcNZR7qHXaTyQ19qLwF4MLBu7HpxIaBizq qpIPGU7VjehW164MNEOsEcrBobNyx7UviHBXSQBYfp7WHeRUUVPEq9OwyCa9j7e/q/gR gAwr4JmdtOVcT7nhjVtr75lJJEAoBs2XS9/UXKQCINTI1zIuOcUbQDPGExQSXdj3CnOv gY7bMzkHP9QZ97TRpJonRso3kWn4a66mOi5OzuSFXNqMb6PKOckwIgcmuTdufXlxD5+B RGsFyK3MdYGg/IWrFhX6E6BrY7HU83OvrJxUgKhMmDuIQedYlVKY/eP64iLJv5WU7FWd G+Ow== X-Gm-Message-State: APf1xPANWlH5Oad60DTeA8jPgTsLcxaKVnhGYcXYGMUQ9Qw9pKn+5Hpz vrYYTKzWXgKg9+zswVPj2CfP+Bbc X-Google-Smtp-Source: AH8x2250WoHjlFr/Un/mPDxO77r+gRBKqPp0nO0n0yBVh9UEqGq1bXHHGc/MeKMH6T+ZtVEpztCw0g== X-Received: by 10.200.12.203 with SMTP id o11mr2263716qti.95.1518669008328; Wed, 14 Feb 2018 20:30:08 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:07 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:50 -0300 Message-Id: <20180215042900.16078-21-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 20/30] hw/cris: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- hw/cris/axis_dev88.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c index 9ccc4350a5..1dea3c594c 100644 --- a/hw/cris/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -243,7 +243,7 @@ static const MemoryRegionOps gpio_ops = { }, }; -#define INTMEM_SIZE (128 * 1024) +#define INTMEM_SIZE (128 * K_BYTE) static struct cris_load_info li; From patchwork Thu Feb 15 04:28:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873626 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g8VuqpHo"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkF53vJgz9t2l for ; Thu, 15 Feb 2018 15:43:53 +1100 (AEDT) Received: from localhost ([::1]:37604 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBOh-0002r0-GJ for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:43:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBU-0008B4-3f for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBT-0004GR-56 for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:12 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:36661) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBT-0004FM-1c for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:11 -0500 Received: by mail-qt0-x242.google.com with SMTP id q18so10489809qtl.3 for ; Wed, 14 Feb 2018 20:30:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2Yvk2xnwZH+RIu5b+xbLBXyQAVSmHDaTRgkzOFJSS68=; b=g8VuqpHoWcfK+8DJde4sUxtQsvg+p7z146LTTAdwRqZSNzXeMqCRHQX+/7hEGkd6Sb x/QrqC/6EaqGUIWYL0LgoD+QieK24JduE3StwOyfip3o1EjmQ3c1KIsNcILCZLe5aGEb +bP34t073J/oRMmPwJG9GeP8mESgKGPnvFqmgkxsXjzOvlJjbE86pPDkozHHsjGC/5PL hbmNC4qpq+S156TTlHxqKeycPohKxfDOg+y/TnoaUgNa3P/yPpXK2Vr43WOQalrPR6Jp 8PeEPMR9z9Gdfnk/bYSvhDucXkWxU5ZQ5NHT9GK0D3qhWIPNnrVoEwwWKYS+BSU5mTMn OWYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2Yvk2xnwZH+RIu5b+xbLBXyQAVSmHDaTRgkzOFJSS68=; b=Z6fbb7dablfGg0bJk2i1Eny+ucnW4ZbbV/ElJfPaSXwL0rgAYjWgcDc3dGmofKaoyV wHuKowziic81t+5WEjE25jRG4SjKre0YC4/Q968neXEq2+OaxQIOOOb5qjR0GK0HbtnM hd5ezqxmcRE8DoMOQF9tLOXhdhLp/5p3OmhECJMKxy+WKtRUzwOsvofkQ5033cmB2Ubp 3ukiPoDpdKxtCrFDxLWDYGzdAng+PnV5AbQr+iaSj1GeI2Pyld88byorRku/wcb26dyt usLaVag6JiR3e8Vev4jBvbJYH9qAUneB+2pnXkSeNDNpv5dLm+lGiElK+bgIWDx7IX5g DpRA== X-Gm-Message-State: APf1xPALNClwq9o4zIoIyDt5AobJf85RE/ww71TBlKcwQzGv6N/D1EvJ Y6+x5ukNfDvDNZftKTPL5GQ42hO4 X-Google-Smtp-Source: AH8x226e1wsW9271RX12BMCQRS5Lke138a7VHUF1gH4Dj/7Xh1eqsCrdWSr5MsDz5ARMPzkRTeD47g== X-Received: by 10.200.48.13 with SMTP id f13mr2301816qte.140.1518669010529; Wed, 14 Feb 2018 20:30:10 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:10 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:51 -0300 Message-Id: <20180215042900.16078-22-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH 21/30] hw/misc: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiri Slaby , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- hw/misc/auxbus.c | 2 +- hw/misc/edu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c index b4cacd664b..c78aaebcbe 100644 --- a/hw/misc/auxbus.c +++ b/hw/misc/auxbus.c @@ -68,7 +68,7 @@ AUXBus *aux_init_bus(DeviceState *parent, const char *name) /* Memory related. */ bus->aux_io = g_malloc(sizeof(*bus->aux_io)); - memory_region_init(bus->aux_io, OBJECT(bus), "aux-io", (1 << 20)); + memory_region_init(bus->aux_io, OBJECT(bus), "aux-io", 2 * M_BYTE); address_space_init(&bus->aux_addr_space, bus->aux_io, "aux-io"); return bus; } diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 34eb05d213..ce8235dfc4 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -357,7 +357,7 @@ static void pci_edu_realize(PCIDevice *pdev, Error **errp) edu, QEMU_THREAD_JOINABLE); memory_region_init_io(&edu->mmio, OBJECT(edu), &edu_mmio_ops, edu, - "edu-mmio", 1 << 20); + "edu-mmio", 1 * M_BYTE); pci_register_bar(pdev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &edu->mmio); } From patchwork Thu Feb 15 04:28:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873634 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qcR0mxkI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkNg5Xvqz9sRW for ; Thu, 15 Feb 2018 15:50:27 +1100 (AEDT) Received: from localhost ([::1]:37656 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBV3-0000sF-RQ for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:50:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBb-0008G3-2W for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBW-0004Je-RQ for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:19 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:38242) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBW-0004JQ-DX for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:14 -0500 Received: by mail-qt0-x244.google.com with SMTP id k13so10473363qtg.5 for ; Wed, 14 Feb 2018 20:30:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y0NOx2SIgsgcu26l6FJBp5bourYwnfQX+jV03AgWoXk=; b=qcR0mxkIrnt2SDkjWl3PB2vEygoowCMR6zHygGU7LmgpIGopqozYg0GC/lNm2t5p9X Wcff1xy4abD1n1XquGY3izZFt6GBckNG/YLbvudFd6s0p4cwbq08rclCuBs6JC8MezBN +8hwoEmKSEo/FYZ1hFtIvKTjGPsyOvxDG9mvam6BcKrlIIg4fxtUap9m/odv0ZYMaf13 lipALaL74drux4b2AfebYmoX987/8urPb29m9rJG4VP7HU/ViMhB6tAuSc0CSMELB1Pv G9kN5aD5HKQf7qrrsfqQBrW3bF4qCa3HrRtvvk5YNO4SomFzvAKkwEqRa2+sHJ6gKnLT /TJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=y0NOx2SIgsgcu26l6FJBp5bourYwnfQX+jV03AgWoXk=; b=MJ/g4AKEid/CcRt2MP9aD7DE6VMUNkFNLMtdhbMPw9uyUnAxnznYZdxhFT68eC0dt2 goYLPWOLcFrqFXHyEbmqkOThnt76uMMlXIt/FYIbrb3P6H9MFlZu1NxiZYJvbkdyry1t BSavqTyDiNTjtURTml6pF43wqbTeaVNWRFCI8KadB7zYxRsHRtz/hzAxqAE9D/X0ZNqu OaIv9we7UtL0f/asqUPLMYOg3CRF8gmbIQET4cBL0g5/nu9Mdz/XHWHV/Stxbo+B3hcE J1Uy+q5HEBSV3HlczDx/69moU2n3b40gNRJdzOMgEwAlDfdcuyP5tV7PfyGKgT+Hnxgf hdYQ== X-Gm-Message-State: APf1xPDwO6w7tZBSubLdWvCNaDTa9XPkY4rDm8u+Z/bGCP0TJmEI3jCD rlCyKAceqKLpST4SStaGydfvBS9Z X-Google-Smtp-Source: AH8x224677lg66DGx3EIwMp0hiHeshlGDl+Sep3N/dn0A2RpKYU9pv+6zjGl/zmXcuyHLtceQ4WYUA== X-Received: by 10.200.41.8 with SMTP id y8mr2209762qty.322.1518669013687; Wed, 14 Feb 2018 20:30:13 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:13 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:52 -0300 Message-Id: <20180215042900.16078-23-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH 22/30] hw/display: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Anthony Perard , "open list:X86" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Gerd Hoffmann --- hw/display/cirrus_vga.c | 9 ++++----- hw/display/g364fb.c | 2 +- hw/display/qxl.c | 26 +++++++++++--------------- hw/display/vga-isa-mm.c | 4 ++-- hw/display/vga.c | 4 ++-- hw/display/virtio-gpu.c | 3 +-- hw/display/vmware_vga.c | 2 +- hw/display/xenfb.c | 2 +- 8 files changed, 23 insertions(+), 29 deletions(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 138ae961b9..e888056d75 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2218,7 +2218,7 @@ static inline void cirrus_cursor_compute_yrange(CirrusVGAState *s) uint32_t content; int y, y_min, y_max; - src = s->vga.vram_ptr + s->real_vram_size - 16 * 1024; + src = s->vga.vram_ptr + s->real_vram_size - 16 * K_BYTE; if (s->vga.sr[0x12] & CIRRUS_CURSOR_LARGE) { src += (s->vga.sr[0x13] & 0x3c) * 256; y_min = 64; @@ -2347,7 +2347,7 @@ static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y) return; } - src = s->vga.vram_ptr + s->real_vram_size - 16 * 1024; + src = s->vga.vram_ptr + s->real_vram_size - 16 * K_BYTE; if (s->vga.sr[0x12] & CIRRUS_CURSOR_LARGE) { src += (s->vga.sr[0x13] & 0x3c) * 256; src += (scr_y - s->vga.hw_cursor_y) * 16; @@ -2995,8 +2995,7 @@ static void cirrus_init_common(CirrusVGAState *s, Object *owner, /* I/O handler for LFB */ memory_region_init_io(&s->cirrus_linear_io, owner, &cirrus_linear_io_ops, s, - "cirrus-linear-io", s->vga.vram_size_mb - * 1024 * 1024); + "cirrus-linear-io", s->vga.vram_size_mb * M_BYTE); memory_region_set_flush_coalesced(&s->cirrus_linear_io); /* I/O handler for LFB */ @@ -3013,7 +3012,7 @@ static void cirrus_init_common(CirrusVGAState *s, Object *owner, memory_region_set_flush_coalesced(&s->cirrus_mmio_io); s->real_vram_size = - (s->device_id == CIRRUS_ID_CLGD5446) ? 4096 * 1024 : 2048 * 1024; + (s->device_id == CIRRUS_ID_CLGD5446) ? 4 * M_BYTE : 2 * M_BYTE; /* XXX: s->vga.vram_size must be a power of two */ s->cirrus_addr_mask = s->real_vram_size - 1; diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 819f8be05d..009f07333b 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -510,7 +510,7 @@ static void g364fb_sysbus_reset(DeviceState *d) static Property g364fb_sysbus_properties[] = { DEFINE_PROP_UINT32("vram_size", G364SysBusState, g364.vram_size, - 8 * 1024 * 1024), + 8 * M_BYTE), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/display/qxl.c b/hw/display/qxl.c index a71714ccb4..4863f894ad 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2012,11 +2012,11 @@ static void qxl_init_ramsize(PCIQXLDevice *qxl) if (qxl->vgamem_size_mb > 256) { qxl->vgamem_size_mb = 256; } - qxl->vgamem_size = qxl->vgamem_size_mb * 1024 * 1024; + qxl->vgamem_size = qxl->vgamem_size_mb * M_BYTE; /* vga ram (bar 0, total) */ if (qxl->ram_size_mb != -1) { - qxl->vga.vram_size = qxl->ram_size_mb * 1024 * 1024; + qxl->vga.vram_size = qxl->ram_size_mb * M_BYTE; } if (qxl->vga.vram_size < qxl->vgamem_size * 2) { qxl->vga.vram_size = qxl->vgamem_size * 2; @@ -2024,7 +2024,7 @@ static void qxl_init_ramsize(PCIQXLDevice *qxl) /* vram32 (surfaces, 32bit, bar 1) */ if (qxl->vram32_size_mb != -1) { - qxl->vram32_size = qxl->vram32_size_mb * 1024 * 1024; + qxl->vram32_size = qxl->vram32_size_mb * M_BYTE; } if (qxl->vram32_size < 4096) { qxl->vram32_size = 4096; @@ -2032,7 +2032,7 @@ static void qxl_init_ramsize(PCIQXLDevice *qxl) /* vram (surfaces, 64bit, bar 4+5) */ if (qxl->vram_size_mb != -1) { - qxl->vram_size = (uint64_t)qxl->vram_size_mb * 1024 * 1024; + qxl->vram_size = (uint64_t)qxl->vram_size_mb * M_BYTE; } if (qxl->vram_size < qxl->vram32_size) { qxl->vram_size = qxl->vram32_size; @@ -2134,13 +2134,10 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error **errp) } /* print pci bar details */ - dprint(qxl, 1, "ram/%s: %d MB [region 0]\n", - qxl->id == 0 ? "pri" : "sec", - qxl->vga.vram_size / (1024*1024)); - dprint(qxl, 1, "vram/32: %" PRIx64 "d MB [region 1]\n", - qxl->vram32_size / (1024*1024)); - dprint(qxl, 1, "vram/64: %" PRIx64 "d MB %s\n", - qxl->vram_size / (1024*1024), + dprint(qxl, 1, "ram/%s: %llu MB [region 0]\n", + qxl->id == 0 ? "pri" : "sec", qxl->vga.vram_size / M_BYTE); + dprint(qxl, 1, "vram/32: %llu MB [region 1]\n", qxl->vram32_size / M_BYTE); + dprint(qxl, 1, "vram/64: %llu MB %s\n", qxl->vram_size / M_BYTE, qxl->vram32_size < qxl->vram_size ? "[region 4]" : "[unmapped]"); qxl->ssd.qxl.base.sif = &qxl_interface.base; @@ -2167,7 +2164,7 @@ static void qxl_realize_primary(PCIDevice *dev, Error **errp) qxl->id = 0; qxl_init_ramsize(qxl); vga->vbe_size = qxl->vgamem_size; - vga->vram_size_mb = qxl->vga.vram_size >> 20; + vga->vram_size_mb = qxl->vga.vram_size / M_BYTE; vga_common_init(vga, OBJECT(dev), true); vga_init(vga, OBJECT(dev), pci_address_space(dev), pci_address_space_io(dev), false); @@ -2392,9 +2389,8 @@ static VMStateDescription qxl_vmstate = { static Property qxl_properties[] = { DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, - 64 * 1024 * 1024), - DEFINE_PROP_UINT64("vram_size", PCIQXLDevice, vram32_size, - 64 * 1024 * 1024), + 64 * M_BYTE), + DEFINE_PROP_UINT64("vram_size", PCIQXLDevice, vram32_size, 64 * M_BYTE), DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision, QXL_DEFAULT_REVISION), DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0), diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c index e887b45651..79a5950144 100644 --- a/hw/display/vga-isa-mm.c +++ b/hw/display/vga-isa-mm.c @@ -27,7 +27,7 @@ #include "vga_int.h" #include "ui/pixel_ops.h" -#define VGA_RAM_SIZE (8192 * 1024) +#define VGA_RAM_SIZE (8 * M_BYTE) typedef struct ISAVGAMMState { VGACommonState vga; @@ -130,7 +130,7 @@ int isa_vga_mm_init(hwaddr vram_base, s = g_malloc0(sizeof(*s)); - s->vga.vram_size_mb = VGA_RAM_SIZE >> 20; + s->vga.vram_size_mb = VGA_RAM_SIZE / M_BYTE; vga_common_init(&s->vga, NULL, true); vga_mm_init(s, vram_base, ctrl_base, it_shift, address_space); diff --git a/hw/display/vga.c b/hw/display/vga.c index 28f298b342..8f4527b3a0 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -721,7 +721,7 @@ uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr) val = s->vbe_regs[s->vbe_index]; } } else if (s->vbe_index == VBE_DISPI_INDEX_VIDEO_MEMORY_64K) { - val = s->vbe_size / (64 * 1024); + val = s->vbe_size / (64 * K_BYTE); } else { val = 0; } @@ -2175,7 +2175,7 @@ void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate) s->vram_size_mb = uint_clamp(s->vram_size_mb, 1, 512); s->vram_size_mb = pow2ceil(s->vram_size_mb); - s->vram_size = s->vram_size_mb << 20; + s->vram_size = s->vram_size_mb * M_BYTE; if (!s->vbe_size) { s->vbe_size = s->vram_size; diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 6658f6c6a6..7a378a4596 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1309,8 +1309,7 @@ static const VMStateDescription vmstate_virtio_gpu = { static Property virtio_gpu_properties[] = { DEFINE_PROP_UINT32("max_outputs", VirtIOGPU, conf.max_outputs, 1), - DEFINE_PROP_SIZE("max_hostmem", VirtIOGPU, conf.max_hostmem, - 256 * 1024 * 1024), + DEFINE_PROP_SIZE("max_hostmem", VirtIOGPU, conf.max_hostmem, 256 * M_BYTE), #ifdef CONFIG_VIRGL DEFINE_PROP_BIT("virgl", VirtIOGPU, conf.flags, VIRTIO_GPU_FLAG_VIRGL_ENABLED, true), diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index bd3e8b3586..8609f9c0bc 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -565,7 +565,7 @@ static inline int vmsvga_fifo_length(struct vmsvga_state_s *s) s->fifo_next >= SVGA_FIFO_SIZE) { return 0; } - if (s->fifo_max < s->fifo_min + 10 * 1024) { + if (s->fifo_max < s->fifo_min + 10 * K_BYTE) { return 0; } diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index f5afcc0358..1ae660519a 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -889,7 +889,7 @@ static int fb_initialise(struct XenDevice *xendev) return rc; fb_page = fb->c.page; - rc = xenfb_configure_fb(fb, videoram * 1024 * 1024U, + rc = xenfb_configure_fb(fb, videoram * M_BYTE, fb_page->width, fb_page->height, fb_page->depth, fb_page->mem_length, 0, fb_page->line_length); if (rc != 0) From patchwork Thu Feb 15 04:28:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873630 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kuzW07s9"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkJn241Lz9sRW for ; Thu, 15 Feb 2018 15:47:05 +1100 (AEDT) Received: from localhost ([::1]:37636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBRn-0006Ei-7E for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:47:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBa-0008Fo-QE for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBZ-0004Mt-Po for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:18 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:34349) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBZ-0004MZ-I1; Wed, 14 Feb 2018 23:30:17 -0500 Received: by mail-qk0-x243.google.com with SMTP id o7so15055038qkc.1; Wed, 14 Feb 2018 20:30:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tS6N32aqPY7x+TTEuvHXDv9hqaO9i7o+Ojp9fYmI5qs=; b=kuzW07s9pjzL3LsNb+RTb3Exp0pKDqm1VVRrkK1XrxawR+8ZqHSf5ivIcpwbGcE2wm OE7DPlclmALr8cqfMw+54JRnFQuJC3son5PKRwwJsQamhRE+BWWttfjcqlhVEaFxFjGz iBJmXN6OSeDknLM9gk3gpcPyejf0y7qjSJhePWxBwaO/rs73Rb7VWNVN1kOOBUyisYLr DOucHY2RYeqK3G0PsnEUDbYR6byFfSt0s4qzU/gdvPuenH8wJwmz8oesNo7OrsISSMQR DHr+/Zb01oicOnGXAW8tFQZ8KuzzrHZdhY1CzPYa5Q9BfYw1RP4WAVIaQXHv7ZnOHxlx lbmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tS6N32aqPY7x+TTEuvHXDv9hqaO9i7o+Ojp9fYmI5qs=; b=UF3FG7ezWOD3nyOT7rAy9sAMPcZ7G8IdpM/Nv8H0DOv8r36JhDl8g7ZJr2IZ7FdHgx wvGEuT+T5kJrrMY1pc+CZMEllzRJ3ul2IxXeXdICboDp8zyE7tc/g3HnVpxXOiT6FNmz 8sa4KmNFUVmthPj3GynINkak4gmhTAlgDJUkQsEQ923uJiB7FYEA1sShuceDdwIH5V9l KFtcurb5NnY2OQKykizu0wzZ/IsH7IVXE4N8R1veE0eS5C2vdTEMa1voo33rnmYMMPQ5 4ef3mBJl1+e+wRpNGo5zCzsOt36E7HbZ7numLvNEZ46O567MFD5W1G+dasHVebTEPic/ dQXA== X-Gm-Message-State: APf1xPAxgo6YuzuuL8Q4B9Mq4hOJaZQqa4aWAxIAAuGc083vBvRTQClJ nN9BDjpr5rqx0sU59TGJu4NNEV0N X-Google-Smtp-Source: AH8x227WvDB1Jr3Pd5tDKkREFbrIM4Xold7c7tp8wi5OpXiaMDc22QF2xnMgCRbpLXU26KQR1Q4Flg== X-Received: by 10.55.219.1 with SMTP id e1mr2157125qki.151.1518669016984; Wed, 14 Feb 2018 20:30:16 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:16 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:53 -0300 Message-Id: <20180215042900.16078-24-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH 23/30] hw/net: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dmitry Fleytman , Stefan Weil , Jason Wang , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Beniamino Galvani , "open list:Allwinner-a10" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/net/allwinner_emac.h | 4 ++-- hw/net/e1000e.c | 6 +++--- hw/net/eepro100.c | 6 ++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/hw/net/allwinner_emac.h b/include/hw/net/allwinner_emac.h index 4cc8aab7ec..93ec0e7067 100644 --- a/include/hw/net/allwinner_emac.h +++ b/include/hw/net/allwinner_emac.h @@ -125,8 +125,8 @@ #define EMAC_INT_RX (1 << 8) /* Due to lack of specifications, size of fifos is chosen arbitrarily */ -#define TX_FIFO_SIZE (4 * 1024) -#define RX_FIFO_SIZE (32 * 1024) +#define TX_FIFO_SIZE (4 * K_BYTE) +#define RX_FIFO_SIZE (32 * K_BYTE) #define NUM_TX_FIFOS 2 #define RX_HDR_SIZE 8 diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 16a9417a85..767b35fca8 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -81,10 +81,10 @@ typedef struct E1000EState { #define E1000E_IO_IDX 2 #define E1000E_MSIX_IDX 3 -#define E1000E_MMIO_SIZE (128 * 1024) -#define E1000E_FLASH_SIZE (128 * 1024) +#define E1000E_MMIO_SIZE (128 * K_BYTE) +#define E1000E_FLASH_SIZE (128 * K_BYTE) #define E1000E_IO_SIZE (32) -#define E1000E_MSIX_SIZE (16 * 1024) +#define E1000E_MSIX_SIZE (16 * K_BYTE) #define E1000E_MSIX_TABLE (0x0000) #define E1000E_MSIX_PBA (0x2000) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index a07a63247e..6fdeb05259 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -60,8 +60,6 @@ * changed to pad short packets itself. */ #define CONFIG_PAD_RECEIVED_FRAMES -#define KiB 1024 - /* Debug EEPRO100 card. */ #if 0 # define DEBUG_EEPRO100 @@ -104,9 +102,9 @@ /* Use 64 word EEPROM. TODO: could be a runtime option. */ #define EEPROM_SIZE 64 -#define PCI_MEM_SIZE (4 * KiB) +#define PCI_MEM_SIZE (4 * K_BYTE) #define PCI_IO_SIZE 64 -#define PCI_FLASH_SIZE (128 * KiB) +#define PCI_FLASH_SIZE (128 * K_BYTE) #define BITS(n, m) (((0xffffffffU << (31 - n)) >> (31 - n + m)) << m) From patchwork Thu Feb 15 04:28:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873623 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VPtGuU3h"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhk9N658tz9t2x for ; Thu, 15 Feb 2018 15:40:40 +1100 (AEDT) Received: from localhost ([::1]:37572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBLa-0007w6-QM for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:40:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBe-0008JQ-5S for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBb-0004R1-RF for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:22 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:39843) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBb-0004Po-Mn for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:19 -0500 Received: by mail-qk0-x242.google.com with SMTP id z197so12596459qkb.6 for ; Wed, 14 Feb 2018 20:30:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9b+l052V6+KYpIrl18gdVX2mL1AUhHVfv1axqq55B04=; b=VPtGuU3h9xMjWqwTtIH+0fLgszIdezmh3TXFcP3UjlPRKzl5SisDCONXMDlEqYtLqg og62pkCe1U478OdMkIUJsB9a6aKnFAv453wBxab1t9kYzIOb2Anh8t+VuamFB8XPnehq cq9qMV+EcPhIqE9FunengrBNXllNmAAmZUHC53wD9ratwAaK/r8Udi1BKtd6z2yRjJ5z +G2PBYsSxOJkwzTJ1Ca+R+/Cb8Xur5wWs951C6GKxwsPXjm9+/pFPeR/h7Yypxaxurq0 ndw88N4nhDED678Xg514abLmwaU1eQRxk9F3m6rn9vcyFeGCjceXmgXyc4LYiNWSw5ve y5OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9b+l052V6+KYpIrl18gdVX2mL1AUhHVfv1axqq55B04=; b=uGJWv50lt3amVqGEZ8GSEpme6k4REMI+PacfHy9GXnqTB5vn50NJ+EIKD7CcBxKR3v mN2YghpOZRxTqzsKtEWlMgJGYU7iJVrO05wWEF1DBIii/UTGtAFXKOBGWPi3877SOH76 D7Xq1F6Y0snqfdI0He/CTrUvQ1cNx1T+gJEqbGg/PjxnoGQexCpGTIBLr8UIAAflraJ3 3xqacP6n8XG52wjmsT5wlDY88+FYWrjH1avGVdV+kIgFwPSK+V2kZWF4/PuFXDGUMuDs wwwGykglb71v/zVoHje0Uv0fcS1oR5Nlw1W1g3xHMf55w4yk+AnqdL48taUcPZN0zGJr hexg== X-Gm-Message-State: APf1xPAikXDZyQ4MisKnhRlhaaW9LWCgMkd0yFgTTNUzdePwDe5OoTHq ergVQ/G6BWqRQmfJjyAAIoz4ygGm X-Google-Smtp-Source: AH8x226pWrxKJcE+P8Cq05HiZVHGQHp6Fir+Sm358jvltzKmpa1c284VnY0RpCky2oWFJEPJ1Y5HkA== X-Received: by 10.55.112.132 with SMTP id l126mr2099603qkc.296.1518669019173; Wed, 14 Feb 2018 20:30:19 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:18 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:54 -0300 Message-Id: <20180215042900.16078-25-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH 24/30] hw/ipack: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alberto Garcia , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alberto Garcia --- hw/ipack/tpci200.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ipack/tpci200.c b/hw/ipack/tpci200.c index da05c8589d..56c0ad8932 100644 --- a/hw/ipack/tpci200.c +++ b/hw/ipack/tpci200.c @@ -597,9 +597,9 @@ static void tpci200_realize(PCIDevice *pci_dev, Error **errp) memory_region_init_io(&s->las1, OBJECT(s), &tpci200_las1_ops, s, "tpci200_las1", 1024); memory_region_init_io(&s->las2, OBJECT(s), &tpci200_las2_ops, - s, "tpci200_las2", 1024*1024*32); + s, "tpci200_las2", 32 * M_BYTE); memory_region_init_io(&s->las3, OBJECT(s), &tpci200_las3_ops, - s, "tpci200_las3", 1024*1024*16); + s, "tpci200_las3", 16 * M_BYTE); pci_register_bar(&s->dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mmio); pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->io); pci_register_bar(&s->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->las0); From patchwork Thu Feb 15 04:28:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873627 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IigZGMKZ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkF72sNtz9t2l for ; Thu, 15 Feb 2018 15:43:55 +1100 (AEDT) Received: from localhost ([::1]:37606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBOj-0002tJ-CV for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:43:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBf-0008LY-4Q for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBe-0004We-Bn for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:23 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:35201) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBe-0004W8-4j for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:22 -0500 Received: by mail-qt0-x242.google.com with SMTP id g14so10490995qti.2 for ; Wed, 14 Feb 2018 20:30:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2BBBQqvI47UfmqKxAS0LHU2cAb/9FQUdWxwwlKHXCfk=; b=IigZGMKZ+eVzncV5N0jrt/47DRn9WrRBC6mEzUJtZZwwK6Q3Ar9d5CruGmo0IUrzaY /nKiVf8BjRGT7fVvIeWJyZW2qheqm7fwRH1/LMURQuFUXr+LenEj3JW5mJKHskSOiJ3m nYGc9slHzXoPxzO1B3HjvauXD7XBJd1IZ91/1HwFCeiaZ9pJifc0si7ZRggWSsq0rqhx 8SvyjBNmbSc3W21vTNserR+rfkc+9VD+RXM0No+tKG3dAFFPurvWleQntnESZkpMTUdi mYL0AlOxr106hfYt5pV9QWxaEZ50rSJyxrNaNHJJvNtsMkmKzuWMdPHkq2VkzintagFK 0DvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2BBBQqvI47UfmqKxAS0LHU2cAb/9FQUdWxwwlKHXCfk=; b=gck7/LNDv5StGoY/FSIqKVR2X313fsQ9wq4PWqRezNf2YMdLWUX27c7ckuNovzqpGU NieljpvifVOLoZrl7RNZoHneI5yx9Eh2/j58jzVnPX4LTW1VaK2xNTWotk02T56oOX5q MWus9I7/6ZZ9KeDr/EO5AGtakdtxsy1A34hAH3hsDYIg4XByH5JrZRGlFOdKYvv0+VMv 8ZDh7sMXFmeAEu+7efmt1m55IwPWeLP0kGhVhUriYERoOJl7d+5/YOnMp0P7q02pqy/h H6QXQVX0Q+mWVSv4bdmlzvcpegJ9sRAibBmBEzr0qlXMGUcsyolLYnbCbqISYkqehVKa +Qwg== X-Gm-Message-State: APf1xPD1joasU4GUlw3SZWZXzea5zVrjnoUzQdhVxLzfE3ilV2W/A+u6 in9H/2FKOGisjej1CFkSykE2iP6x X-Google-Smtp-Source: AH8x2263FzAhaBhrKkKwn8YJrIHNQwFriZyYIMzpZefEgsJTT3+OabmR/dk0mXtPGqRpivER1Jc3AQ== X-Received: by 10.200.40.73 with SMTP id 9mr2348102qtr.285.1518669021530; Wed, 14 Feb 2018 20:30:21 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:21 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:55 -0300 Message-Id: <20180215042900.16078-26-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH 25/30] hw/scsi: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- 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 #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" From patchwork Thu Feb 15 04:28:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873631 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LTjKn4cl"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkJr0Lpbz9sRW for ; Thu, 15 Feb 2018 15:47:08 +1100 (AEDT) Received: from localhost ([::1]:37637 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBRq-0006H0-3U for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:47:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBh-0008QZ-Jl for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBg-0004YR-GU for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:25 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34213) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBg-0004Xd-CR for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:24 -0500 Received: by mail-qt0-x243.google.com with SMTP id d14so10487051qtg.1 for ; Wed, 14 Feb 2018 20:30:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4qu1vRUPT+kT3qJ5s4pNSuwaEOiiNVddagmnnbqz0t8=; b=LTjKn4cl3T/5I3viN748ONyUduEeKRaCE5igDPm9o6YKlvfuyGdktb7zvTLk+q0yIG 1Po8k3z7tU3dqQGtyLGU6ETgFRxMMofEWDo3BxHCQOetHnz1uT+LZa7QyPOO8l9ZKxK+ KisQaBIp7debPiU6PhV93gTwh2hPCbYZtSEVlajN56fWUgBzDDZbmj0IH2Wy2MUt4vkJ uGYfETpdNvpQntxWhowNObC/as8A68qGE8vb7EAOdb/w9eZuy2nTv5c7A4u8w+3gWkoQ Dw8KIgB8mv58UYHrLWyzgasHd0ZMoFTZO2oknppNo2/PfhmwnySIiyadN6x/LN2tP3lo eGKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4qu1vRUPT+kT3qJ5s4pNSuwaEOiiNVddagmnnbqz0t8=; b=WmDjxc0O31K4sV24Ds5RGNLUtYZncIuNV4JrTrTyK/MpXXnWPhCvk2+daMtXvz9N5M J6f6vWAz4/2enkFrjlRKDmwsvZB+8GsClDO8Udkf9+YDokeAOSb28uW+zgwZ915iDrdw rmdojpE11PGCQkMcM4Zu5kC/WNcrVZvCa0ouK/vrVGNa5KED0bE4gYIUArRVAKnOAOcH EjH1+TQBzafTJPigXUVzydwRgJN2LrOAu+h5ySMbumOvmonkONvjWZklMNxIglDiYoEK FACs69KsdcH5anwLQlScfucKu8m6PeGrAg8dUXsYnVIZofth1q6Olw6kbLmWhUlEAMS1 9PPw== X-Gm-Message-State: APf1xPD3IvCgTjVKtR75yPkGEG8EYLRZZkgK2rNFkxj8Ea97ul2XHyO3 dIa6Ny4AEWJ/7ASGnIprnCjOlwEx X-Google-Smtp-Source: AH8x22647ONF4q5b4T7xIQl4l7Orlw8JbdAQ+sZJqnWUdkuKzwUCA4cfnY4UlL+CGe/akFN9zdmuaQ== X-Received: by 10.200.4.159 with SMTP id s31mr2312168qtg.144.1518669023807; Wed, 14 Feb 2018 20:30:23 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:23 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:56 -0300 Message-Id: <20180215042900.16078-27-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 26/30] hw/smbios: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Igor Mammedov --- hw/smbios/smbios.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 27a07e96f4..fa02f9ce3f 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -625,10 +625,6 @@ static void smbios_build_type_11_table(void) SMBIOS_BUILD_TABLE_POST; } -#define ONE_KB ((ram_addr_t)1 << 10) -#define ONE_MB ((ram_addr_t)1 << 20) -#define ONE_GB ((ram_addr_t)1 << 30) - #define MAX_T16_STD_SZ 0x80000000 /* 2T in Kilobytes */ static void smbios_build_type_16_table(unsigned dimm_cnt) @@ -640,7 +636,7 @@ static void smbios_build_type_16_table(unsigned dimm_cnt) t->location = 0x01; /* Other */ t->use = 0x03; /* System memory */ t->error_correction = 0x06; /* Multi-bit ECC (for Microsoft, per SeaBIOS) */ - size_kb = QEMU_ALIGN_UP(ram_size, ONE_KB) / ONE_KB; + size_kb = QEMU_ALIGN_UP(ram_size, K_BYTE) / K_BYTE; if (size_kb < MAX_T16_STD_SZ) { t->maximum_capacity = cpu_to_le32(size_kb); t->extended_maximum_capacity = cpu_to_le64(0); @@ -668,7 +664,7 @@ static void smbios_build_type_17_table(unsigned instance, uint64_t size) t->memory_error_information_handle = cpu_to_le16(0xFFFE); /* Not provided */ t->total_width = cpu_to_le16(0xFFFF); /* Unknown */ t->data_width = cpu_to_le16(0xFFFF); /* Unknown */ - size_mb = QEMU_ALIGN_UP(size, ONE_MB) / ONE_MB; + size_mb = QEMU_ALIGN_UP(size, M_BYTE) / M_BYTE; if (size_mb < MAX_T17_STD_SZ) { t->size = cpu_to_le16(size_mb); t->extended_size = cpu_to_le32(0); @@ -707,8 +703,8 @@ static void smbios_build_type_19_table(unsigned instance, end = start + size - 1; assert(end > start); - start_kb = start / ONE_KB; - end_kb = end / ONE_KB; + start_kb = start / K_BYTE; + end_kb = end / K_BYTE; if (start_kb < UINT32_MAX && end_kb < UINT32_MAX) { t->starting_address = cpu_to_le32(start_kb); t->ending_address = cpu_to_le32(end_kb); @@ -869,7 +865,7 @@ void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, smbios_build_type_11_table(); -#define MAX_DIMM_SZ (16ll * ONE_GB) +#define MAX_DIMM_SZ (16 * G_BYTE) #define GET_DIMM_SZ ((i < dimm_cnt - 1) ? MAX_DIMM_SZ \ : ((ram_size - 1) % MAX_DIMM_SZ) + 1) From patchwork Thu Feb 15 04:28:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873639 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Wevts7Pi"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkWM5wkWz9t2f for ; Thu, 15 Feb 2018 15:56:15 +1100 (AEDT) Received: from localhost ([::1]:38501 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBaf-0006kc-VN for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:56:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBj-0008Sg-I7 for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBi-0004cy-Mj for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:27 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:41147) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBi-0004c7-Hy for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:26 -0500 Received: by mail-qk0-x242.google.com with SMTP id h129so9491156qke.8 for ; Wed, 14 Feb 2018 20:30:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wcYbXffxxh/1hw6GaMGMI8mhUVMIi4AXYjwbEClsbHY=; b=Wevts7Pi+uKbEHXtFHgsbzzSiL2BLosL8oy+71UvkDD7Eej7vkVgjhujQdqqtBt+0d /Le1m93wFbf2aHZHIlU1i7o3Y6+AipjhKlCqCSpai9bAzQVY+cZdqBst6FS89bNcNw0M kN27uZV3tAOXG7rPUcCjU8QwSMu0PAD/6bztxjm/6KIyD8zROH11C2brpF/hLt9ajbek 1IPtVTR2mEa8j1Unptw808DT0CdjQ83ZqW9mplwvSqCUFXXS+sl7gF+Z+7Qz7duelfeY PTUax9QYgVKCgkXidWX+5LZlyg8oyIOJ2GcjoSbPBekxrNflGseLX5mOXBdEjgsvnXlD Waag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wcYbXffxxh/1hw6GaMGMI8mhUVMIi4AXYjwbEClsbHY=; b=KdHqhIJDIjVuZZeJ9Wbo6o41zGoNvRtW9MuLqY22A9h6pkOoS9h2lS/0sGJ7rSmgX9 C2zcziHBzm56ip219q77JVLX6cg7U7iVjfCW59qDDNpxoo42ZCqCCZJA7q7nPOv2KS+S oySPQqLJM2Y79jZrxrYEk0cAHvRPpc2SvKk4zaDOre4FLbykywSUo/kdt/LRx3htu4v3 13jxXRm12SgcHK9UzcGuI9XSjsAreomq9fh/4ipwy6FaZ7HehtaYE/fOgUYB8okYm/hA w1s5k3PISL08IQOmTNwP5faVOJCoWbZdvS7kVxsPIwHiE5B7FdUxyER5Jh2iwxvZbFCd zGJA== X-Gm-Message-State: APf1xPBUX+Y3TBnCZqeKqaPU1jfm23RtIBG4jde7frBA1SeFtSU/fWlS vjcec5qLGgGanF5JTuWF5HCW9BrH X-Google-Smtp-Source: AH8x2240BgXPm4lBLOrg/LbuwoUi3Sdg57da3+4xVYraUzGMOTB/nIpo8kBnAA5I4dQNmJZrox4Iig== X-Received: by 10.55.154.13 with SMTP id c13mr2090746qke.347.1518669025992; Wed, 14 Feb 2018 20:30:25 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:25 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:57 -0300 Message-Id: <20180215042900.16078-28-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH 27/30] vfio/pci: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Williamson , =?utf-8?q?Philippe_Mathi?= =?utf-8?b?ZXUtRGF1ZMOp?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/pci-quirks.c | 8 ++++---- hw/vfio/pci.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index e5779a7ad3..3c091106dd 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -1255,9 +1255,9 @@ static int vfio_igd_gtt_max(VFIOPCIDevice *vdev) ggms = 1 << ggms; } - ggms *= 1024 * 1024; + ggms *= M_BYTE; - return (ggms / (4 * 1024)) * (gen < 8 ? 4 : 8); + return (ggms / (4 * K_BYTE)) * (gen < 8 ? 4 : 8); } /* @@ -1514,7 +1514,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr) igd->vdev = vdev; igd->index = ~0; igd->bdsm = vfio_pci_read_config(&vdev->pdev, IGD_BDSM, 4); - igd->bdsm &= ~((1 << 20) - 1); /* 1MB aligned */ + igd->bdsm &= ~((1 * M_BYTE) - 1); /* 1MB aligned */ memory_region_init_io(&quirk->mem[0], OBJECT(vdev), &vfio_igd_index_quirk, igd, "vfio-igd-index-quirk", 4); @@ -1561,7 +1561,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr) * config offset 0x5C. */ bdsm_size = g_malloc(sizeof(*bdsm_size)); - *bdsm_size = cpu_to_le64((ggms_mb + gms_mb) * 1024 * 1024); + *bdsm_size = cpu_to_le64((ggms_mb + gms_mb) * M_BYTE); fw_cfg_add_file(fw_cfg_find(), "etc/igd-bdsm-size", bdsm_size, sizeof(*bdsm_size)); diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 033cc8dea1..db337476ef 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -1408,7 +1408,7 @@ static void vfio_pci_relocate_msix(VFIOPCIDevice *vdev, Error **errp) } /* 2GB max size for 32-bit BARs, cannot double if already > 1G */ - if (vdev->bars[target_bar].size > (1 * 1024 * 1024 * 1024) && + if (vdev->bars[target_bar].size > 1 * G_BYTE && !vdev->bars[target_bar].mem64) { error_setg(errp, "Invalid MSI-X relocation BAR %d, " "no space to extend 32-bit BAR", target_bar); From patchwork Thu Feb 15 04:28:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873640 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="o5zAf/gv"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkYg1Bk1z9sRW for ; Thu, 15 Feb 2018 15:58:15 +1100 (AEDT) Received: from localhost ([::1]:38723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBcb-0008Vj-5V for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:58:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBm-0008Tn-O8 for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBk-0004gy-GY for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:30 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:40812) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBk-0004gK-CV for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:28 -0500 Received: by mail-qk0-x243.google.com with SMTP id n198so5147824qke.7 for ; Wed, 14 Feb 2018 20:30:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=a9kWH/FlGKANJ1c1WdGCHyPeTU8xtk1seErRzwDEXBU=; b=o5zAf/gv13dGCcv1FbUznQIB5XFllendxGi+KoAclBXtcZC2GNoIM7Im8ZBNhnAtuR awRswqvmnmybkGLRTZ2Gug6qkKNaXSVruvhC32inoPCzPXif1Cj0IpRizVAG672DWocw AWfAM4inxyO9V3pSr4uJj1XN7u756hrT0hxRL2gxv+zzqz2LXEOmHsRr4T2xT1A80cdT 3aiV03EHD9TPivPlX2h7vptzmjKljZPoqgDuta/7frejMUitXTSZEjtj9u+fLEoMaVyN 09JNLHfvsMOEDjXPQ+xFYZHAEv0/67pyiYgk/tM4PC0Q653LoCEqnN4VN/LG3NvPKPok AqUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=a9kWH/FlGKANJ1c1WdGCHyPeTU8xtk1seErRzwDEXBU=; b=Xz5INkYBjxLrZu/2keEOTmiS7PT5uSdqsnyQQv9THhQxnOdLqhLAm2P/ztbBbM13BB ji6GFQusnrZkuCvX5AcZgU0c2dj8ARjpCxDD2nsnFJH/exb76mfreZ6gdR55AFiGb7aX d8/z8kUQkL07IAPysSr6x2/Lri7atUmkrv8dwZ1H7JdZaNyJilpGYQwDkkdrNJkjURuA fAnD+CxfHoBE9Yjnxyp86mcpR6QAemrnD/TPgUqO6278c1+cl8lk8lzevFIFK0cqrmMs 0uHeo+kCUrzP8cPgITR2+NwjtW8GDSjijw3YnUY5e0YW+7ZFsuMexm/NNoB+SXo9PoK6 ZzFg== X-Gm-Message-State: APf1xPCF31ElNQZpaRFVrkUwFjFFiCjtWRrXp6snb7afwMDlEgUKvCf6 w5Ado2uHfqmDIdG4WDyH0mvibh2f X-Google-Smtp-Source: AH8x2270nTNPxp/WUNDCACI0/+fS67HllQQ7xQpxxITaRbpFP9j5OVVhZy2X+p8Lf7pgz+uKC2n4sQ== X-Received: by 10.55.182.69 with SMTP id g66mr2085449qkf.181.1518669027852; Wed, 14 Feb 2018 20:30:27 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:27 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:58 -0300 Message-Id: <20180215042900.16078-29-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH 28/30] ivshmem: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau --- hw/misc/ivshmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 16f03701b7..9b3ad96471 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -1302,7 +1302,7 @@ static void ivshmem_realize(PCIDevice *dev, Error **errp) } if (s->sizearg == NULL) { - s->legacy_size = 4 << 20; /* 4 MB default */ + s->legacy_size = 4 * M_BYTE; /* 4 MB default */ } else { int ret; uint64_t size; From patchwork Thu Feb 15 04:28:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873635 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="N7Ygv5/g"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkNl1pj1z9sRW for ; Thu, 15 Feb 2018 15:50:31 +1100 (AEDT) Received: from localhost ([::1]:37658 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBV7-0000vV-7q for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:50:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBn-0008Un-OQ for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBn-0004iL-0v for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:31 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:40565) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBm-0004i6-TC for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:30 -0500 Received: by mail-qt0-x242.google.com with SMTP id c19so10465556qtm.7 for ; Wed, 14 Feb 2018 20:30:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OZ5r8BgJ+VpmQ5LM5ATFai5v0ecbBVlJG2PPxKfAyAI=; b=N7Ygv5/gSqz3bK+iMjrnibooaJk5h+Dq73Z4JMArS3dpVApBzYwsurX/fBKsHJqnOk clG1exSA1O2asbxwcPFB7dAdK50tHT6hlX99Kf3SdCZuB4DPtjMXCfnpGUzdTRZEFTDR bLSaoOB6TjM9Gmwg6MzraOg/j0XpUdJOSA7aZdUjzwjsWuofSVNorbZJK0IF+xxwsRyG CjH9riyf3b/1m6N26HQcIwzoz06YUfEqEbg6yvxZfpK+AJEUO0BfZEOrNmnu2Oor5YhZ 8QttTqd1G7B+3It195eMPXVSqZ6kDa8S4ZXI27L1VVaqAJdf9zsdL4hdgHen2JZoYObZ m4MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=OZ5r8BgJ+VpmQ5LM5ATFai5v0ecbBVlJG2PPxKfAyAI=; b=Ir73euRWD1UYkSI3IyOrn+2VtLEmq35Zh8uJcyYAOzPQb0MUJ1vsZZ+3Cj4kGfe6i4 21Mqzgw2mkVftiTgdtcazAvTaRKKTgg5/3GLI/ncPiN7LTKZnBv9HVU2RdW3A1dlj0Qa 0WTLo4yja/8F4s3BoMblVJP0G7rYmfMTFA29eAPS33Tg+LnsdU2fiYd0IE2AkBm/YCDm 9uMpExKEm5xEDoXaLErZVxlAcg5YhlfS5XalCyxDPRJ8L2SKFLtvZj8hHolpSh+2kQl7 nV7YBIUReet9LOcVlsAMsucSSxrO6L1LkrsWbunpmR6G6Vst/9GJW5s/6wh2WqWf+qVy 8eFw== X-Gm-Message-State: APf1xPDZpBRcI5M+id4QumUCKSroQ8K1pOr+pWusTn0kFb7AxnnFGBak pYOO6wuyE8A1qYW9i37KRfFKP/UX X-Google-Smtp-Source: AH8x224NXF2nrdq+enwG4Wb428ezMxauHMQs2/vLC+v767nsQXml55JiWxy6fwfiry26vKdcRe8RtA== X-Received: by 10.200.5.11 with SMTP id u11mr2178274qtg.196.1518669030342; Wed, 14 Feb 2018 20:30:30 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:29 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:59 -0300 Message-Id: <20180215042900.16078-30-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH 29/30] tpm: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?b?ZMOp?= , Stefan Berger Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau --- include/hw/acpi/tpm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h index 96fd3a92f7..751567a73a 100644 --- a/include/hw/acpi/tpm.h +++ b/include/hw/acpi/tpm.h @@ -71,7 +71,7 @@ REG32(CRB_DATA_BUFFER, 0x80) #define TPM_CRB_ADDR_CTRL (TPM_CRB_ADDR_BASE + A_CRB_CTRL_REQ) #define TPM_CRB_R_MAX R_CRB_DATA_BUFFER -#define TPM_LOG_AREA_MINIMUM_SIZE (64 * 1024) +#define TPM_LOG_AREA_MINIMUM_SIZE (64 * K_BYTE) #define TPM_TCPA_ACPI_CLASS_CLIENT 0 #define TPM_TCPA_ACPI_CLASS_SERVER 1 From patchwork Thu Feb 15 04:29:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 873641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rY2AVoHf"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhkYl0B39z9sRW for ; Thu, 15 Feb 2018 15:58:19 +1100 (AEDT) Received: from localhost ([::1]:38731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBcf-000079-5I for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 23:58:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBr-000071-AN for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBq-0004je-Cx for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:35 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:35203) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBq-0004jW-8g; Wed, 14 Feb 2018 23:30:34 -0500 Received: by mail-qt0-x243.google.com with SMTP id g14so10491381qti.2; Wed, 14 Feb 2018 20:30:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HIXdqXfcNvBEd4yVZGk1YqTRgThhZ5cz8kqGu+ZWyvA=; b=rY2AVoHfHv6noliAr0Y2TRT3IEpa9oA7d4d9+V3eqG01gq0TjnWAs/8i3xRL3728mE IFCuDL/IEPlqYF1mRUpE12MIiuvkW6Hm9b5fqrvl6hM6h+MrCte75BqPggYICgDqPnRg QJ9Eo5rkmMoJ+XRfh7JRuh9iK5EuRx5crXTnXc2vJdrB0G7O1UzXthdmoSMPN3qfKlMo yVpOA30zECpINfYaj90Z7I/VnODWo6JzT8JnXxXzfOZYgCkyFgNhOAKZtX8a8MoTv8sY gXMjE5kM/8cOKJR54PM0ozocNZ+8Wa7VX75sYyiiL19FFbPysI9tPxE4E7YZx9ofb32t 7gxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HIXdqXfcNvBEd4yVZGk1YqTRgThhZ5cz8kqGu+ZWyvA=; b=cBIqc+ZNwG0I9Qw3Qxg81K95AHeAJALidzEJ0NyjkB/eJFz97u+GU7adGoQWlAq3KA 5ETk/cz/VD4oDjBLbsdMFbHNIDlo36RB6TwPmUnhj8IudnmBCp3yN4UboHJ3xoW7ESl8 BZn05MXyjcZ2zZLsXsMCiNdB1yaQny5g3V5bJRWmx/oVyBZeYIMv/m3BIgVR1GUn1uH3 EIrlkA2I3t/lW0nS+bmVWHJ0rzyFcggWUYATTFHrBrepmsFfMWlC4bOYw73FIdGvjwSH WjHtAPNsrkH/ZY5CHXQt4HPfXbOOn8pmXmswe7aMwkUCiCI3nTAj1CJjNDj9G8CsYue6 vc/g== X-Gm-Message-State: APf1xPDCPINqX2MQoNFmaDJa5+y1lyDT/fkZ9yXi7geYfWKbZHn52EDn ISfmU8elpCE7W/5jyM0VBn4CX59l+cM= X-Google-Smtp-Source: AH8x226qIfEZLfklTOqny/nPoVcjAezP7gWZu6h9XdQAfXZQmssrb4cOEwVwOraTwg/joM4LuT4+VQ== X-Received: by 10.200.20.149 with SMTP id l21mr2362789qtj.332.1518669033691; Wed, 14 Feb 2018 20:30:33 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:33 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:29:00 -0300 Message-Id: <20180215042900.16078-31-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 30/30] xen: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stefano Stabellini , "open list:Block layer core" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Max Reitz , Anthony Perard , "open list:X86" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé --- hw/block/xen_disk.c | 4 ++-- hw/xenpv/xen_domainbuild.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index f74fcd42d1..557005b5e5 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -1153,9 +1153,9 @@ static int blk_connect(struct XenDevice *xendev) } xen_pv_printf(xendev, 1, "type \"%s\", fileproto \"%s\", filename \"%s\"," - " size %" PRId64 " (%" PRId64 " MB)\n", + " size %" PRId64 " (%llu MB)\n", blkdev->type, blkdev->fileproto, blkdev->filename, - blkdev->file_size, blkdev->file_size >> 20); + blkdev->file_size, blkdev->file_size / M_BYTE); /* Fill in number of sector size and number of sectors */ xenstore_write_be_int(&blkdev->xendev, "sector-size", blkdev->file_blk); diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index 027f76fad1..083fb80ee5 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -75,9 +75,9 @@ int xenstore_domain_init1(const char *kernel, const char *ramdisk, xenstore_write_str(dom, "vm", vm); /* memory */ - xenstore_write_int(dom, "memory/target", ram_size >> 10); // kB - xenstore_write_int(vm, "memory", ram_size >> 20); // MB - xenstore_write_int(vm, "maxmem", ram_size >> 20); // MB + xenstore_write_int(dom, "memory/target", ram_size * K_BYTE); + xenstore_write_int(vm, "memory", ram_size * M_BYTE); + xenstore_write_int(vm, "maxmem", ram_size * M_BYTE); /* cpus */ for (i = 0; i < smp_cpus; i++) { @@ -260,7 +260,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, } #endif - rc = xc_domain_setmaxmem(xen_xc, xen_domid, ram_size >> 10); + rc = xc_domain_setmaxmem(xen_xc, xen_domid, ram_size / K_BYTE); if (rc < 0) { fprintf(stderr, "xen: xc_domain_setmaxmem() failed\n"); goto err; @@ -269,7 +269,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, xenstore_port = xc_evtchn_alloc_unbound(xen_xc, xen_domid, 0); console_port = xc_evtchn_alloc_unbound(xen_xc, xen_domid, 0); - rc = xc_linux_build(xen_xc, xen_domid, ram_size >> 20, + rc = xc_linux_build(xen_xc, xen_domid, ram_size / M_BYTE, kernel, ramdisk, cmdline, 0, flags, xenstore_port, &xenstore_mfn,