Message ID | 20180215042900.16078-22-f4bug@amsat.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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=<UNKNOWN>) 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 <incoming@patchwork.ozlabs.org>; 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 <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) 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 <philippe.mathieu.daude@gmail.com>) 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 <philippe.mathieu.daude@gmail.com>) 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 <philippe.mathieu.daude@gmail.com>) 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 <qemu-devel@nongnu.org>; 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?= <f4bug@amsat.org> 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Jiri Slaby <jslaby@suse.cz>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
hw: use the BYTE-based definitions when useful
|
expand
|
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); }
It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/misc/auxbus.c | 2 +- hw/misc/edu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)