Message ID | 1534870966-9287-60-git-send-email-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="l3pMWE+L"; 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 41vzHY3w69z9s4Z for <incoming@patchwork.ozlabs.org>; Wed, 22 Aug 2018 04:10:33 +1000 (AEST) Received: from localhost ([::1]:55320 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 1fsB6t-0004Iu-6P for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 14:10:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA4y-0002SZ-50 for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA4p-0007EP-1W for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:25 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:51295) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA4o-0006yW-Lh for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:18 -0400 Received: by mail-wm0-x232.google.com with SMTP id y2-v6so3645367wma.1 for <qemu-devel@nongnu.org>; Tue, 21 Aug 2018 10:04:07 -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; bh=7m8cigBDEuBZgo1LOtio9vHXPS5Ch1iISu9Ukyh74+o=; b=l3pMWE+LiFXDPo6/IYdXylJHBDdhfEUqOavUj3qmfnUF+vxnGtOcpxG3k/wv380OyJ xn/ji7scy2mTK+ihyIr5tcz1rnpCKmFCrS2kZDIiu0YI4etmyJRa4M+beWal8ER6+QJ5 Cix/W0ThaYVeueo6B7A7/++/hp5q3m4a3NvFqSxOsR0bzJ6QgfFC9wouuIor3BrNS9jM ksIC+LZ57AkmgnfJIdtcTkto8JDI825Nk7c9Ol9TS9bWt1XKJHEASSqo2Xb++I7fYrVP 1947asnkthGmXYmdW103YGBqS7s28eu042//gQstW+veCUx9VhHMPpPaP/QTWWD380B4 vacw== 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; bh=7m8cigBDEuBZgo1LOtio9vHXPS5Ch1iISu9Ukyh74+o=; b=D1d6JH4VJBC8eMpebf7o1XtknX7/TZoLkGmzJa0CwiWAb0GARNZ3DGZYE8W/IBhs1P /KF02gs1N+jlZvSNxijQwBAs+hjMjDtnKKRsvR70kYGp0xQKQMMkSJ54Zpq73V8VcZV5 /Bosrljt3saSMj2Hq/FQ0kLxM4I0QkEaJn49DKbc4NKWHF4KjpxrHn+zvygyfIG/4ACU Of+GyeSTR72qkFF8VBIscUdB2E1MO6NGmD4BE93jveBY18VDMTvdiaktT9K6zPpoRFxa ugCdXX02QRMe8APv00vtjkaPfV+0qPx8akVrpKIcVlOxXEZqKaRlGYcs+kd4zqIhbGYF 2tGg== X-Gm-Message-State: APzg51A7SO68SstWNtOyqp7xTIbc7ZZEnQ826p9OENhhdc+U1eEE/9cg x68adhQ6OKdYJYYcR0eCtyIdw4xK X-Google-Smtp-Source: ANB0Vda5STsmqDtAz4xv0W3tXZdgKYIhNEuMsD/N55+rhssWsmvK53yfo+eIJFz4PY4JqzJ4kgi5Jg== X-Received: by 2002:a1c:2142:: with SMTP id h63-v6mr141171wmh.51.1534871046082; Tue, 21 Aug 2018 10:04:06 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.04.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:04:05 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:02:31 +0200 Message-Id: <1534870966-9287-60-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::232 Subject: [Qemu-devel] [PULL 59/74] util/oslib-win32: indicate alignment for qemu_anon_ram_alloc() 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: David Hildenbrand <david@redhat.com> 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/74] tests: virtio: separate ccw tests from libqos
|
expand
|
diff --git a/util/oslib-win32.c b/util/oslib-win32.c index bb5ad28..25dd159 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -67,15 +67,24 @@ void *qemu_memalign(size_t alignment, size_t size) return qemu_oom_check(qemu_try_memalign(alignment, size)); } +static int get_allocation_granularity(void) +{ + SYSTEM_INFO system_info; + + GetSystemInfo(&system_info); + return system_info.dwAllocationGranularity; +} + void *qemu_anon_ram_alloc(size_t size, uint64_t *align, bool shared) { void *ptr; - /* FIXME: this is not exactly optimal solution since VirtualAlloc - has 64Kb granularity, but at least it guarantees us that the - memory is page aligned. */ ptr = VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE); trace_qemu_anon_ram_alloc(size, ptr); + + if (ptr && align) { + *align = MAX(get_allocation_granularity(), getpagesize()); + } return ptr; }