Message ID | 20180630061040.6018-18-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="DnhjK3my"; 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 41Hk011hWPz9s1B for <incoming@patchwork.ozlabs.org>; Sat, 30 Jun 2018 16:20:17 +1000 (AEST) Received: from localhost ([::1]:45708 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 1fZ9F0-0003Mf-Ou for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:20:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fZ967-00048F-3X for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fZ966-00023H-3s for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:03 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:34816) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fZ965-00021z-T0 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:02 -0400 Received: by mail-wm0-x233.google.com with SMTP id z137-v6so3958443wmc.0 for <qemu-devel@nongnu.org>; Fri, 29 Jun 2018 23:11:01 -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=s9MOWlsLaWNXwC2m8KQ43kZsKN9FKnpgqDh4lwgF94s=; b=DnhjK3myJKhqhlVMR/FqzGM/VO1iLb0oljwLRJwNVLgZlZNaRXauZXKFE2XtnSqb88 kgI/I0jWCZ8lSYfNLlAWGyDLPULzKYSxc9JpgeDOzuewFSZopNT8A3QXJvK/uFw9KCma 4CrgMPtpAYY90k1PN1xgkpa7dt04aVOX94MBTHnW67RQCVJxFggR2W4EYFonEkicxz4V m65bFydN1kPwP9I48UpyMaM5eLgZbxqI9M3zZbmzb5C5RylTIY7CFK0NJeXmBn89Rz68 4/dpNqzLLNTkF4ZSnVFpoDsXeT3QDlroE6/eGgNvPnsdCTEKTlQV5BRpoNs3GrPdp10f YEIA== 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=s9MOWlsLaWNXwC2m8KQ43kZsKN9FKnpgqDh4lwgF94s=; b=GFeUhe0VwrPWMZQW4WFwF5UF83XpAItEMETUUutxRgQ6pv0N6Ch0c62ewX3PGDNr/s UanGXmP25moYLQPhzApITak81a8b1e3LLhqIDkG9U6WMIydc/G+kYy0QloUJMf+4CEV2 an8jLgZzF0k8W9J8oD4vtYiwSMqdnw0/8iDOrQl4/unsrxFHtkXEJyQqjG86h6LxQf0C xk1NAFHctbhRHt/nny1E07k4LUVNsZC2I54HuFa6NOS/XZ7JTU6mRBQ3aeHhLud7iLUW Xc3a31SGPkL8wzGdpJ1U8ONSuLRpLePdsqdwkUl44rZXMzZ/xz5xw0thOhl7sfpsbENn JQ3g== X-Gm-Message-State: APt69E3JYWQYeSORVfKhB71EylBniqB8jj5blefj0d/6rOYwwnJMDyb6 Ls7XMQFJqHcfVq1A2blpLa0iDtNj X-Google-Smtp-Source: AAOMgpfNqs6a4kwAmG67JHpn3PkMKcQa/D4tyET2B5D06SLZWhdVrmzrsC2l6IkxL+H1EbV/Lv+iOA== X-Received: by 2002:a1c:c91a:: with SMTP id f26-v6mr3681733wmb.140.1530339060766; Fri, 29 Jun 2018 23:11:00 -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.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:00 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:10 +0200 Message-Id: <20180630061040.6018-18-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::233 Subject: [Qemu-devel] [PULL 17/47] hw/misc: 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/hw/misc/auxbus.c b/hw/misc/auxbus.c index b4cacd6..b8a8721 100644 --- a/hw/misc/auxbus.c +++ b/hw/misc/auxbus.c @@ -27,6 +27,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/log.h" #include "hw/misc/auxbus.h" #include "hw/i2c/i2c.h" @@ -68,7 +69,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", 1 * MiB); 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 34eb05d..df26a4d 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "qemu/timer.h" @@ -357,7 +358,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 * MiB); pci_register_bar(pdev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &edu->mmio); }