From patchwork Sat Jun 30 06:10:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937291 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=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RMBpMBP/"; 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 41Hjs76Gf5z9s1B for ; Sat, 30 Jun 2018 16:14:19 +1000 (AEST) Received: from localhost ([::1]:45680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ99F-0006Si-EW for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:14:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ95y-00041h-GK for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ95x-0001nd-Il for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:54 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:38910) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ95x-0001mD-BR for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:53 -0400 Received: by mail-wm0-x243.google.com with SMTP id 69-v6so3925485wmf.3 for ; Fri, 29 Jun 2018 23:10:53 -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=kde6edmnulJz8r8tSmaMrj2J/rMMQeyv2Ln8F/41JDY=; b=RMBpMBP/Cex2ZZ5VLpNWSQei3Sx5b1jyU3tYIANZuBQXL7JYSIr6CHMhHVRCq3BSoI aMOfxqTzECIP/X68QLWsMHQ7ah/Zyo2JM9rvmUBM8fZw73wqGGcTtW4j1cP54N1zGbhO jH4D75S2+L4suVGzfKo5w6RWCcEtTTl+7lpEiLXFeVsrINgNw2+Es/PHvcqKemB+0kN9 Ulwx5bi75EAcIJAdDtXpc06iQuyTmWFypWKpIxyGaBuCF2IzODVqnbaGyC4l+z+Wcrh/ Vff/Ip2WFOSfRMtWjR2LiO1Tw09Zea0/EY/dt8gpA4jJ4eZ5nmE0EOYJRhIC9XZRUreG +PTA== 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=kde6edmnulJz8r8tSmaMrj2J/rMMQeyv2Ln8F/41JDY=; b=nytT3F0Nvv9ua454/BxyNUN28VPJcF+nHXSg0HnCuEbqqUj/nc15jCBxhewyE7nj8U l/NJmsMrAlQxzc0lYdG/jCjcIlzv4L4d+fdthTVm59s7DLjAvvQOJ3e4fuXq/k6THAmd ORLth3R9C2tp8R9o7HAndmEiFGunO5jXyxKyLCozvt3kVSrCOmqD3PbQzhRwKSpn4LYS 9QihX03xPnz2h0ukkVArYW74fspqZGx8C51AmVJ/lWu39GWHqXkkrXaU4d2GfpD8RGdD x2Bl7PbD++wCePmKhoVzdhg/L4BniHRBRLihlK7JA1GdxsWbXFckfFpiaGbAeEwj1q3E 3AVw== X-Gm-Message-State: APt69E2QZEf+8cOoDE044QY+AjM91ssV1dhwaHMSQrYpdG3z374KeeNO 9FOzvCQ1MyJoMuaF7R96NjRm61Az X-Google-Smtp-Source: AAOMgpe60aAYST83rGNznmcuHxu3ztiHDMMbhL9ncIRC7+SDfqqUVi1j0HAhwV/ksT+7N6PzMcjopw== X-Received: by 2002:a1c:f009:: with SMTP id a9-v6mr3621602wmb.104.1530339052211; Fri, 29 Jun 2018 23:10:52 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:02 +0200 Message-Id: <20180630061040.6018-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 09/47] hw/ivshmem: Use the IEC binary prefix 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?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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 Message-Id: <20180625124238.25339-8-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- 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 ee01c5e..6febbab 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" @@ -1301,7 +1302,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 * MiB; /* 4 MB default */ } else { int ret; uint64_t size;