From patchwork Sun Apr 15 23:42: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: 898365 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="cS14B8sa"; 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 40PSvt4WYKz9s0b for ; Mon, 16 Apr 2018 09:51:22 +1000 (AEST) Received: from localhost ([::1]:52719 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7rQW-0001qa-KW for incoming@patchwork.ozlabs.org; Sun, 15 Apr 2018 19:51:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7rJ7-0004Si-In for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:43:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7rJ6-0000Iv-I6 for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:43:41 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:33795) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7rJ3-0000DE-QZ; Sun, 15 Apr 2018 19:43:37 -0400 Received: by mail-qt0-x244.google.com with SMTP id a25so7272735qtm.1; Sun, 15 Apr 2018 16:43:37 -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=M0yipUmrY+nm0NvLlu0T4ZqhhYTJKb5WoR6yDj+yjI0=; b=cS14B8saMSHj7jRQivm54acEhtI/DpHbF8w8SeVa/X9dTTNYR3bYJ7pTxxRKdIkmGQ WUK7vKeQjkXKsU6jer1abd6jWFrhEpyZiyB7F56ND4O7PbeSb+35z3MQZfN+fS+ojgR3 fKoJarlC+6oXFEPd4J1AHuE64nB5LhpUm4MVTV2Hw/BYcylluYLD2M0wkHqjTwVAsp62 +7XxrK6H/zoUGGP7/iYSEqhWEiGNC6xq6a6YeA0RMNFGMANMAFGwzCh2bfYBQFtWGd6A j9amumfVSbQs2v8SOj1AzrRPa8M7lu4aft3K6FyNx+KjGdfleakHyd+TqOcM9QuZlgJ0 Wpsg== 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=M0yipUmrY+nm0NvLlu0T4ZqhhYTJKb5WoR6yDj+yjI0=; b=i9IM+XpIpv/ZWOjkXPXZ0qpd+Ay8TLf7Le+wPujEoGRK9iG0f8eoXBqjH5kbKdvQV3 hMmJKVD0+7IMGXSLGkLtUERvgONEVErSv77bgONwTM2FGVpaj8Qd0vRaHkG2tpjOIg2d Ie2Ffovx22oRSYt0u9iXh/kekBt47C8UfkA5HC5qDOWrXSrdsYVa2kiepZNvZ2J2d1n9 fxfTqR1Pxq+YiL+nzknnB11Ygxpvm4IEcGS/loTTaM6ayTuutST3abXF6v9CMNR4xwYn auk8mIqXovio21vq2qRRL/tJI0NpxJYPq3A2VdFW/LIp+KP6KjN0WujoXLpiasoeAwZ8 pHaA== X-Gm-Message-State: ALQs6tBO0t1XepVoX2B1LQJ1WExgvUHNpZ3PO8+akVaQ0uiiZXf/Y0s5 HI/E9kxTqvRR522wkeKv52HH5kn2 X-Google-Smtp-Source: AIpwx48SrbNpvB8vLj6L+GBdBtPXhQnmYHD/vTi6Sz54aH+0zpKeusfHwb0pvYUwmuVf5WaRx4Spbg== X-Received: by 10.237.35.6 with SMTP id h6mr13674120qtc.287.1523835817206; Sun, 15 Apr 2018 16:43:37 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id d1sm1081394qtk.57.2018.04.15.16.43.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 16:43:36 -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:33 -0300 Message-Id: <20180415234307.28132-8-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 07/41] hw/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?= , 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: Marc-André Lureau --- hw/misc/ivshmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 16f03701b7..2f4715abad 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -17,6 +17,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu/cutils.h" #include "hw/hw.h" @@ -1302,7 +1303,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;