From patchwork Sun Apr 15 23:42: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: 898362 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="fSSDKLKp"; 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 40PSsM12hxz9s1l for ; Mon, 16 Apr 2018 09:49:11 +1000 (AEST) Received: from localhost ([::1]:52697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7rOP-0008SI-3J for incoming@patchwork.ozlabs.org; Sun, 15 Apr 2018 19:49:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7rJ9-0004V5-O1 for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:43:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7rJ8-0000Lq-VZ for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:43:43 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:46037) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7rJ6-0000Ht-Br; Sun, 15 Apr 2018 19:43:40 -0400 Received: by mail-qk0-x242.google.com with SMTP id f9so6879997qkm.12; Sun, 15 Apr 2018 16:43:40 -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=wXUXZCYeU3i4eWNmHY1DWsjK+9jzZGGtHBBnu6K8x8c=; b=fSSDKLKpbMvkIJ129yK63RwCBCNM3WFpq98ikW9WQhdklGhQP3JnHvlkoHzCWrYEVM 9B8jPjeg8J4yo8M8LHsfrLInFDCyfVuWSida8NQ1VYJ+XGznQwq4unyP1YXTj14lb9zp ewmDm8jMmdqFHjMBvdsh17iPJOMi+YTQ0yO1NuWa7KikVYai/Jctp4tiJrjhz/D4NGoV FZ4HUp4FnYR4h5AmVLP6AuxnFx/B1lGsEmDF0SB26vEBvSjfWb8oarYboF6POfhAxdmg eEnh0FeAagy8O3JAIqEHehAZyYQRqykkECd17HcS/UuFRHVSyPpq66VQ++v2jqOkqiFK bDmw== 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=wXUXZCYeU3i4eWNmHY1DWsjK+9jzZGGtHBBnu6K8x8c=; b=FtbAhFN9Tiv+7MNS0NpnKs/k4EkmzCQ7LCiBgr9J2+nwcyDU8vEvCI3zEfWQOQTqbV L3Bvat2/TZAB+dpFEwo1eXYYwoq1o98vZ62Db7Aw8myKESYrb1qh0sKvRa/QBTSczb3D xi4ZFoM5AjdInEOXnJ15dtfem7/36CUKB0AXlfvCXpce/SG58AW+bBFHK1NdaOX6hR68 9x2a0CZOqLxcUpgJBgrhzE88CJm8co00ASBjLw0BurnLOKSwr1Hn1enUWSI9N+ZpKi9A 87qXRz6x514qu4y3pMyYTRfqamRfmRreAMsgStfClu43Mxrfwa6f6i9sDyWa+6UHGoQu 6z0Q== X-Gm-Message-State: ALQs6tDdQ+3P0WRahpEmxEDAsnaZysVHN2kxnJ/OW4/ph6VZWVuay7F8 1tjfxRM8SQyqWm8lHRHS/F6ZSCMY X-Google-Smtp-Source: AIpwx4/8R0LkzxeM9/rFqwGJSW3pZ/1nIzKgmy9BeU2lhsOuOXgplDmhzLDs+TFqj2A4XMVA7v+LYA== X-Received: by 10.55.180.197 with SMTP id d188mr1999506qkf.36.1523835819704; Sun, 15 Apr 2018 16:43:39 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id d1sm1081394qtk.57.2018.04.15.16.43.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 16:43:39 -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:34 -0300 Message-Id: <20180415234307.28132-9-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:c09::242 Subject: [Qemu-devel] [PATCH v3 08/41] 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=?= , 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é Reviewed-by: Alberto Garcia --- hw/ipack/tpci200.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ipack/tpci200.c b/hw/ipack/tpci200.c index da05c8589d..8451bf8ad3 100644 --- a/hw/ipack/tpci200.c +++ b/hw/ipack/tpci200.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/ipack/ipack.h" #include "hw/pci/pci.h" #include "qemu/bitops.h" @@ -597,9 +598,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);