From patchwork Fri Mar 4 11:21:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 548109 Delivered-To: patch@linaro.org Received: by 2002:ac0:f585:0:0:0:0:0 with SMTP id s5csp1279imq; Fri, 4 Mar 2022 03:32:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJzVLpxj5XZpF4J+DzbTDPurxtyz8b665SfniEK4++5TAEdek8oNtFN8wV5TPGADECxoTTFb X-Received: by 2002:a81:346:0:b0:2dc:5363:ed9c with SMTP id 67-20020a810346000000b002dc5363ed9cmr5045912ywd.378.1646393554708; Fri, 04 Mar 2022 03:32:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646393554; cv=none; d=google.com; s=arc-20160816; b=wD9ctnVSTqgbytG49/jFUGAkaQTGxQl/scN0wbFMuRuEU+1Db2r6l9byItK6vim8mP lxfr6hmFEdUkgOj0gEy0GEbnXyjGxi3ozmFaJgp7u7HaUoqIeWzT0uVGM96/3d5+Mzx7 CTTijnqRPYgsJ4+gnv6lRr5YC/ikp47Tme4kQo9jKZ6kK0AEp/s7oXm0HWXEaJ7Q+5D2 m3WhfrAKC2iEDriVPFprEsdlJIlGBmOZL0x6kIA75U7u+DNOwM7pXFgTgQdTWx4Gk81U 6K3eAZLZMdGYrPm6AtCIJkAzPPoydxWZcMWRIUsdyPbLmfLpPSWi+JD1yYONICcnbBhc suGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=1CcE3kkf6U7pzs8VKX54OJnlAyPVjTkRvkvMzX4xcmU=; b=USCsyUqY33m86Py1BmkP8qecakbwH6p7oM3GYtauAx7eHxzS7V1h91FLk7mRedqBBK UFRet85Mh8KLerf5kjyTtflFbxGfT8QT6fvVH3mnCEukQp4VJSE2v4oVlAjCWDV3EMvj dmw6226LZd8f9wGZ8wJJXxkZP779bYXDHYHoeoG09nGV3WR+62F2J/TD4vTK5gQlYEnC uFFfwT0t13ZZIE1Ga+6A34Taw1ga2TidBbHs7slb5+OX1c53YjFbCz/OdbQ/MKGNuvMp 6hM/MoRNUm8X5t+sKApTi988M/pd+8RgQRXQd1eBR480JKtrKREQ2x6AquZ+Xe5OGsyi 47Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="tAA+/lJ5"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u136-20020a812e8e000000b002dbfe4b1048si4018193ywu.539.2022.03.04.03.32.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Mar 2022 03:32:34 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="tAA+/lJ5"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQ6Ak-0006ff-4a for patch@linaro.org; Fri, 04 Mar 2022 06:32:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQ60C-0002o5-Nm for qemu-devel@nongnu.org; Fri, 04 Mar 2022 06:21:40 -0500 Received: from [2a00:1450:4864:20::430] (port=37824 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQ60B-0004gs-2P for qemu-devel@nongnu.org; Fri, 04 Mar 2022 06:21:40 -0500 Received: by mail-wr1-x430.google.com with SMTP id bk29so12205421wrb.4 for ; Fri, 04 Mar 2022 03:21:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1CcE3kkf6U7pzs8VKX54OJnlAyPVjTkRvkvMzX4xcmU=; b=tAA+/lJ5ClrHgjKwn6A6QuJVFVYG/1mig7U4ZdU9py/wDZ8gZNsJh9zytvf5JaN7NK GbaQLL9dsGDSsW3ao4OAqB2uXA/M1KPLj7S9lktecSJ0M5EaOERlQltohVIcAsJ0plJ1 5djHnVVJVZc438SyQjxqfviTURYPjgU58WO8ArSgR2VoO9nwlZYy7fIZx8074srpiwKJ Z9kh+eP1Hu49q8d4SAQxYdVlIYFen/TxrZsoEmWNkI5JtelBpGKORDUrWuexcPG5Nyso saMeBgSeYqMbCUxwQBhiUOlKLopZ24mq3fgKy7F1AYM5vwFYEpSzLC6Y+1jd3gi91Zl0 4BqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1CcE3kkf6U7pzs8VKX54OJnlAyPVjTkRvkvMzX4xcmU=; b=740zy2UUNBYFGqVFqotPHzkZUxTebXXcJPiG/vrE9fUR/iVHnXsSt+ST4FtlDiYrXC q1attHqKjhqzNMoigJvZw+TPwbvLG8z8UtYn/q+VgSkl6wQ3FJdLGKp3GjWKfwhusmAA 20S6lfNKSX76cJqS/iEdRTqzMSCSSmvwSmcOaq7BpjIRzIXpgW1CuysicRZmcjUvj7F6 aZ8tOBUnByMlF7SMo1bzPNRBKGOpxT8ZvxrLTPSNoVlMIdMOGsDwrRYcCjgIxyQMk1Vs 5l4L8xfF2EBeB9XgH+/2NTfTl0LxXsR3DE0B8QcoRwFq/YjdMlec3Ioo1Uw+59CYoAn3 rIZw== X-Gm-Message-State: AOAM532IB+G1KwtkXTeQ4j7Wk40bUHU2a+P9MfSv+yCwaezqAZEncLQi uAc5eaVox2W6JIwYy2hCzAnH09wEWDluZA== X-Received: by 2002:adf:ed0c:0:b0:1f0:4a32:4d0d with SMTP id a12-20020adfed0c000000b001f04a324d0dmr6223874wro.136.1646392897704; Fri, 04 Mar 2022 03:21:37 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id u14-20020adfed4e000000b001e3323611e5sm4148651wro.26.2022.03.04.03.21.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Mar 2022 03:21:37 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH v2 8/9] util: Put qemu_vfree() in memalign.c Date: Fri, 4 Mar 2022 11:21:25 +0000 Message-Id: <20220304112126.2261039-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220304112126.2261039-1-peter.maydell@linaro.org> References: <20220304112126.2261039-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Richard Henderson , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" qemu_vfree() is the companion free function to qemu_memalign(); put it in memalign.c so the allocation and free functions are together. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20220226180723.1706285-9-peter.maydell@linaro.org Reviewed-by: Philippe Mathieu-Daudé --- util/memalign.c | 11 +++++++++++ util/oslib-posix.c | 6 ------ util/oslib-win32.c | 6 ------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/util/memalign.c b/util/memalign.c index 2a139a5695d..5b812bc11fe 100644 --- a/util/memalign.c +++ b/util/memalign.c @@ -78,3 +78,14 @@ void *qemu_memalign(size_t alignment, size_t size) size, alignment, strerror(errno)); abort(); } + +void qemu_vfree(void *ptr) +{ + trace_qemu_vfree(ptr); +#if !defined(CONFIG_POSIX_MEMALIGN) && defined(CONFIG_ALIGNED_MALLOC) + /* Only Windows _aligned_malloc needs a special free function */ + _aligned_free(ptr); +#else + free(ptr); +#endif +} diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 91798f7e504..2ebfb750578 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -220,12 +220,6 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *alignment, bool shared, return ptr; } -void qemu_vfree(void *ptr) -{ - trace_qemu_vfree(ptr); - free(ptr); -} - void qemu_anon_ram_free(void *ptr, size_t size) { trace_qemu_anon_ram_free(ptr, size); diff --git a/util/oslib-win32.c b/util/oslib-win32.c index d9768532bec..4b1ce0be4b0 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -75,12 +75,6 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align, bool shared, return ptr; } -void qemu_vfree(void *ptr) -{ - trace_qemu_vfree(ptr); - _aligned_free(ptr); -} - void qemu_anon_ram_free(void *ptr, size_t size) { trace_qemu_anon_ram_free(ptr, size);