Message ID | 20180630061040.6018-44-pbonzini@redhat.com |
---|---|
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; 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="dFdNoj2G"; 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 41HkRb4z9Hz9ry1 for <incoming@patchwork.ozlabs.org>; Sat, 30 Jun 2018 16:40:43 +1000 (AEST) Received: from localhost ([::1]:45818 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 1fZ9Yn-0004h7-AW for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:40:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fZ96a-0004hE-OU for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fZ96V-00034T-Pp for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:32 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:35835) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fZ96V-00032e-JO for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:27 -0400 Received: by mail-wm0-x22c.google.com with SMTP id z137-v6so3958931wmc.0 for <qemu-devel@nongnu.org>; Fri, 29 Jun 2018 23:11:27 -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=AYeDQa9x4KUNBfhIJpOWL466AgJUKMTAwe4h8IAyZyo=; b=dFdNoj2GPxrp5kn9BYEdbc3e+ND87arRbgRoZTb8M37RTL4lIsn6my7/zaKMzMeieE qOG/zDezwIyyZ66AfE7e5CdFQQgUkTGU4BDFl8QJtTqGWF3kYZvd0vPGElBp9XZQfDj3 bdgEYOSZcAphHwfVVQEjNBHdD3hy5h5uy7uFfbHeOESP+2Z0bbR+ZaWF3aWHBqaTvc7/ ioevT4+mUf11rvE0FzPH5aV+zxjUv6S2jScC9iDDJ+tuKr3+1OxebIsvO64giKLgwNYQ uxz4rwu19ojXHydw8ZU0B3NJr1SmkqkH2nwR3570RWCpjq2BQ2gaIyXsdrDu4q3NInDP Qbiw== 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=AYeDQa9x4KUNBfhIJpOWL466AgJUKMTAwe4h8IAyZyo=; b=oNodAiPUvnG6psiicErhv+DBh1Cdp32KpXGQQfLGiGFudawlCYL+vlCArdGj0DSgAx 38Up8Mp9tMxUJEO02PA2j6rZK4Roq4FqjbrwLhy0ur/9cxFU1i69MJRlhv8kP0I8bRtZ 1F0USB5SGRCQ61BWU/Ro8nZRuY/pkpSXWvDRUbR3Y2umiESMnsjrGzoJ+iuE6YMSIPya tsSOW98yliUWG7+xm2iDUOhOWI8NhsgHYdsHj4RZVZqkQHCq2fyJjwcRTuf4WIDClVP8 Z8djRJZvJ1yjiiw5qk/ovqmccfxVIZDH02xpXy+RFuZ6ZSIX4QN0/6PO7bzdHRafRkFc OGBQ== X-Gm-Message-State: APt69E1ykcMzrhzm9q8xZTwXEzaafE07KsGTG3rIVt5whFusCkKDE43W bGvRoM8gb8VhjGJxG/HGPH7CsvPE X-Google-Smtp-Source: AAOMgpc9ZnK5zDe8stA4rcRaONaFeTvcNx940jp444NZalYMnRX//3fWnej9LIlztc+Y2pdzPt/SOg== X-Received: by 2002:a1c:ee5d:: with SMTP id m90-v6mr3569670wmh.113.1530339086453; Fri, 29 Jun 2018 23:11:26 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:26 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:36 +0200 Message-Id: <20180630061040.6018-44-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 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: 2a00:1450:400c:c09::22c Subject: [Qemu-devel] [PULL 43/47] vl: Use the IEC binary prefix 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: =?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 |
[PULL,01/47] i386/kvm: add support for Hyper-V TLB flush
|
expand
|
diff --git a/vl.c b/vl.c index ef6cfce..93795c1 100644 --- a/vl.c +++ b/vl.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-version.h" #include "qemu/cutils.h" @@ -2808,8 +2809,8 @@ static void set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size, if (g_ascii_isdigit(mem_str[strlen(mem_str) - 1])) { uint64_t overflow_check = sz; - sz <<= 20; - if ((sz >> 20) != overflow_check) { + sz *= MiB; + if (sz / MiB != overflow_check) { error_report("too large 'size' option value"); exit(EXIT_FAILURE); }