From patchwork Sun Apr 15 23:42: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: 898385 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; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VSTCqZbV"; 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 40PTHT6bPTz9s0b for ; Mon, 16 Apr 2018 10:08:21 +1000 (AEST) Received: from localhost ([::1]:53171 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7rgx-00085A-Ub for incoming@patchwork.ozlabs.org; Sun, 15 Apr 2018 20:08:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7rJs-0005Hy-LF for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:44:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7rJr-0000sY-EY for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:44:28 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:39317) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7rJm-0000nA-HD; Sun, 15 Apr 2018 19:44:22 -0400 Received: by mail-qt0-x244.google.com with SMTP id l8so9745734qtp.6; Sun, 15 Apr 2018 16:44:22 -0700 (PDT) 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=U6qpkFEWKJpCu00oMpbBKMnJhbJRja4KmvUb42QwTrw=; b=VSTCqZbV60YV4FoY7N5wC/GTZoNPDAqdjP4XO9pgx3z9Q/0xG1+J+goF25irZtj2V9 s90b0XL900vhLqa8IcsOfxSTK+nZYSAqJe3eHPWDbuZrDk6Ca5v0g7PYtc5ifqo/CGET MICIEVgKaph7Ft+/nDe95LoOlpvUo9gQn94VkDTegljIRQuwWrC15UZMHdJuiEEuOuwk HDQNxmHaE6xaqazj//ZWOI/ZEA9qPicfPcVo2zHzwiAdSTOZyeDl4G490BU5cW16NeH/ TkU/tltW7R4WI12qiTxwQn2b0hCRpiGzUB6c5CF2cxdMPqeelXufCQjThc+ZZAafvD2a qrcA== 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=U6qpkFEWKJpCu00oMpbBKMnJhbJRja4KmvUb42QwTrw=; b=WDOh+LmtsZUDaIP/kVqirRh5nN2KEbjzWjSrgOrx4i6ak2obcDqKfGIUToz3/ZT7OU TLqXaljswxKxwGp5xC3soxfRz0Cij2CpEKgRrWoIRNcnXWyB2rGj7+ZE3x/VwuMQTvzt n89S6tTkcuA2omrmNeVz4MAkzfKZ4uVsw44l9pfXBWnsD8QylmEtguYwYK25JZU3tAJ0 EXdXo8nrvAomybqF1LsThzGMUM2pK1HSG2xcRajm/XB1yIIX57evOVGxUf4ZjjTievJB tU8XAgz8snzOcXnu7xZ2ViubeKB4rr5Vdn8RH/IboUDxBQi4FG1yStkrhTJv9gMVroBj kqUw== X-Gm-Message-State: ALQs6tDlT4YyptBJnx4e+8LT8kJOKygadIJ15tZAlm7olKHJrcaXhCzY OfczyXHK1WrB7Uvi4GIFea+OldpV X-Google-Smtp-Source: AIpwx492H+HiBJXvZI3muDyvqzvPHiOubB9Q3ppoIwYoK099m07am9N4vcnjINcUEJ/VJ0cqMkREHg== X-Received: by 10.237.58.131 with SMTP id o3mr13425828qte.4.1523835861905; Sun, 15 Apr 2018 16:44:21 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id d1sm1081394qtk.57.2018.04.15.16.44.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 16:44:21 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-trivial@nongnu.org, Thomas Huth Date: Sun, 15 Apr 2018 20:42:46 -0300 Message-Id: <20180415234307.28132-21-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180415234307.28132-1-f4bug@amsat.org> References: <20180415234307.28132-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 v3 20/41] 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: Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé --- hw/hppa/dino.c | 3 ++- hw/hppa/machine.c | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c index 15aefde09c..31d69ae61b 100644 --- a/hw/hppa/dino.c +++ b/hw/hppa/dino.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" #include "hw/hw.h" @@ -76,7 +77,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 19033e268d..87dbb77987 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -17,7 +17,7 @@ #include "hw/timer/i8254.h" #include "hw/char/serial.h" #include "hw/hppa/hppa_sys.h" -#include "qemu/cutils.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu/log.h" @@ -178,8 +178,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; @@ -203,8 +203,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) {