From patchwork Wed Oct 21 17:38:02 2020 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: 1385688 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; 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" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=GN9uua4V; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGdW64NMGz9sRR for ; Thu, 22 Oct 2020 04:57:38 +1100 (AEDT) Received: from localhost ([::1]:56742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVIMi-0002Bh-B7 for incoming@patchwork.ozlabs.org; Wed, 21 Oct 2020 13:57:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVI48-0006pe-NP for qemu-devel@nongnu.org; Wed, 21 Oct 2020 13:38:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56182) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVI3z-0006Vt-AF for qemu-devel@nongnu.org; Wed, 21 Oct 2020 13:38:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603301894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wCTQX4mLqj2f5H121RmQ/r4zkcw4nXTmcR2H90CkbeE=; b=GN9uua4Vph1kvPHjpSKdzX7lJciqNh+5ngYDK/oanthrpo1hZr3u8mkVLlzgt79N2WU+wy B1dygeiJ88nSUNUt2FMPyxdpi9lgcqyzRJ2G2RBqoWxjwEqnLh6sd2JXYI6NTRgNv0O1HG /65xatdwri3/5WC+STLWrFnMMKMsH74= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-303-UZHwNRgqNgqRGk4exizU8A-1; Wed, 21 Oct 2020 13:38:11 -0400 X-MC-Unique: UZHwNRgqNgqRGk4exizU8A-1 Received: by mail-wr1-f72.google.com with SMTP id x16so2989789wrg.7 for ; Wed, 21 Oct 2020 10:38:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wCTQX4mLqj2f5H121RmQ/r4zkcw4nXTmcR2H90CkbeE=; b=WU68ZXThmT49aLtPE7KTvZ0FsA9kVsFnCt72uK0NRGQE5Xqg1mFA3sh025vTmJrIAc VKdQwVCc/XKcmfhD1yXhCQB+8RrjqkB2agpiq9vcWTVxQzDv0BTYc2DP9yklKE4oCeAG BNW1eTF0ypI+LajnDfAvlY/X6IgRD0RyM8FMu9uyxK8mHFWX3fXhiYwSA6S6E/KxRiX5 09mU+WdrbgzqKyuWhuFLdGQsenc+0vWGIh0MhnqJfRpbpTQ3RwrrXjF6l6Gr/FGn40Yg VDs5LJIIXm7S4FJ4d+ugz3tKLTGpQs6UkGp6WzeUB2mDJn7dYa1mjMWPIRhtCQpPgpxD sduQ== X-Gm-Message-State: AOAM533EOrFTwK1lB4zv4sA4K/LA7ymHbjEbUq0A5XmAIihSaMlgVsxm I8YPktx/f6eXaax2OXvyrzLEKUj/IEaxvm8Qlr/yNt1iix3dJ/GVDc6hMF+HByZF86ByE/NqnPr AIZVUU6bThNG/wTw= X-Received: by 2002:adf:bbc6:: with SMTP id z6mr6011345wrg.298.1603301890709; Wed, 21 Oct 2020 10:38:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+gInbogEgvA5LYqMVO8Vqg0xBxVjoml4Dg59/ixdlEM5N1rJJS542EuRfO8pbKPGigDLclQ== X-Received: by 2002:adf:bbc6:: with SMTP id z6mr6011330wrg.298.1603301890496; Wed, 21 Oct 2020 10:38:10 -0700 (PDT) Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id x81sm4606765wmb.11.2020.10.21.10.38.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 10:38:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Subject: [PATCH v5 1/2] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign Date: Wed, 21 Oct 2020 19:38:02 +0200 Message-Id: <20201021173803.2619054-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021173803.2619054-1-philmd@redhat.com> References: <20201021173803.2619054-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/21 02:16:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Stefan Weil Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson We do not need or want to be allocating page sized quanta. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Weil Message-Id: <20201018164836.1149452-1-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- util/oslib-win32.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/util/oslib-win32.c b/util/oslib-win32.c index e99debfb8dd..29dd05d59d7 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -39,6 +39,7 @@ #include "trace.h" #include "qemu/sockets.h" #include "qemu/cutils.h" +#include /* this must come after including "trace.h" */ #include @@ -56,10 +57,8 @@ void *qemu_try_memalign(size_t alignment, size_t size) { void *ptr; - if (!size) { - abort(); - } - ptr = VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE); + g_assert(size != 0); + ptr = _aligned_malloc(alignment, size); trace_qemu_memalign(alignment, size, ptr); return ptr; } @@ -93,9 +92,7 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align, bool shared) void qemu_vfree(void *ptr) { trace_qemu_vfree(ptr); - if (ptr) { - VirtualFree(ptr, 0, MEM_RELEASE); - } + _aligned_free(ptr); } void qemu_anon_ram_free(void *ptr, size_t size)