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) {