From nobody Mon Feb 9 09:43:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1543330054228538.8863236910142; Tue, 27 Nov 2018 06:47:34 -0800 (PST) Received: from localhost ([::1]:42824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gReeC-00059m-Uw for importer@patchew.org; Tue, 27 Nov 2018 09:47:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gReUF-00046f-24 for qemu-devel@nongnu.org; Tue, 27 Nov 2018 09:37:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gReU7-00022w-Q7 for qemu-devel@nongnu.org; Tue, 27 Nov 2018 09:37:14 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:34202) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gReU7-0001xU-FL for qemu-devel@nongnu.org; Tue, 27 Nov 2018 09:37:07 -0500 Received: by mail-wm1-x331.google.com with SMTP id y185so1732799wmd.1 for ; Tue, 27 Nov 2018 06:37:07 -0800 (PST) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n62sm2821869wmd.25.2018.11.27.06.37.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 06:37:05 -0800 (PST) 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=gMLcmz0vPSGW8/WXOoOOiXSIyZ8mrvo7bFWY+LqmrI8=; b=TqDWiaOAEgUP3h3WudRpWL1WsNS/ko8W7m1rQ/8A0h687+UzdldUFdG1RqZCoXySCY mJJsa0MDQEsryMXllem/J/qvYL6qFIn7QP+lQ87fwOqNkTD6iHe58pLhRk0C47a3+Ji/ 4TEvBBDD1PQO9eTWs+oCFErg3OCdvBvBwwMf71+5JyuWKRY/o7lmCTywKVe7qK7J2nxi ojjzZa+Dvzt/uUv5gogTJbrklz2QmZULeVtAPhcfw+uuEcj+uPUy7aHiiqBB8Ls/h8at E6flfmSY3f+7VB0iJWAQntSRgCiD92Ik87Zh9IQ1eCzVtruIq9uCSN02VaauZM6/MDnV 2arA== 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=gMLcmz0vPSGW8/WXOoOOiXSIyZ8mrvo7bFWY+LqmrI8=; b=rIkizhzQhwmbxnU225ETXGDCOhYyrl/iNBYBiYtHZ0FFTwStAwyi3DTMaIn2Ugtqd4 5/OJtPBKO5ZBgZmKoudq2uRg60/VVQdP+BuM4A2qgIWkGOQf3yN4PPJyVDDDa0Jitpr5 DW5jiUyN5ADzcZrpQD9Vebt0fcZxt4WUPbONbkoX96npwRIsnGbwbhaAnc9WzJFoDnOA d4qlBCqY3HqQwMt7UgYfxp7SSIyRRoanzPqptLn+h7QDf7WMRfGvMqLiEujVBAeRsfT7 1sVpda7egm6qxPH/9mh315YWS9yLQuxjVCtzhSrPkexg8icGDvZKj+bfrZnbSbXOkHtl CCdw== X-Gm-Message-State: AA+aEWb6VcE6t2SVDdNX24TEmitMd+XUwIjmEzccY+BrallwY73GxMCM 8Pv7zODUwrlbhYa7dKWnBuGu9kj0 X-Google-Smtp-Source: AFSGD/Voy7NzC+uDUEVlB9yoqWYi//KolXYQh0BkXHfCZHis5oFu0AmCDFUhloPwdAahTl0bZXGzZw== X-Received: by 2002:a1c:2643:: with SMTP id m64mr12358709wmm.22.1543329425985; Tue, 27 Nov 2018 06:37:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 27 Nov 2018 15:36:37 +0100 Message-Id: <1543329397-48407-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1543329397-48407-1-git-send-email-pbonzini@redhat.com> References: <1543329397-48407-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 Subject: [Qemu-devel] [PULL 15/15] hostmem: no need to check for host_memory_backend_mr_inited() in alloc() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau memfd_backend_memory_alloc/file_backend_memory_alloc both needlessly are are calling host_memory_backend_mr_inited() which creates an illusion that alloc could be called multiple times but it isn't, it's called once from UserCreatable complete(). Suggested-by: Igor Mammedov Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Igor Mammedov Signed-off-by: Paolo Bonzini --- backends/hostmem-file.c | 24 ++++++++++++------------ backends/hostmem-memfd.c | 4 ---- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index 639c8d4..7cd3a2b 100644 --- a/backends/hostmem-file.c +++ b/backends/hostmem-file.c @@ -42,6 +42,9 @@ static void file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) { HostMemoryBackendFile *fb =3D MEMORY_BACKEND_FILE(backend); +#ifdef CONFIG_LINUX + gchar *path; +#endif =20 if (!backend->size) { error_setg(errp, "can't create backend with size 0"); @@ -54,18 +57,15 @@ file_backend_memory_alloc(HostMemoryBackend *backend, E= rror **errp) #ifndef CONFIG_POSIX error_setg(errp, "-mem-path not supported on this host"); #else - if (!host_memory_backend_mr_inited(backend)) { - gchar *path; - backend->force_prealloc =3D mem_prealloc; - path =3D object_get_canonical_path(OBJECT(backend)); - memory_region_init_ram_from_file(&backend->mr, OBJECT(backend), - path, - backend->size, fb->align, - (backend->share ? RAM_SHARED : 0) | - (fb->is_pmem ? RAM_PMEM : 0), - fb->mem_path, errp); - g_free(path); - } + backend->force_prealloc =3D mem_prealloc; + path =3D object_get_canonical_path(OBJECT(backend)); + memory_region_init_ram_from_file(&backend->mr, OBJECT(backend), + path, + backend->size, fb->align, + (backend->share ? RAM_SHARED : 0) | + (fb->is_pmem ? RAM_PMEM : 0), + fb->mem_path, errp); + g_free(path); #endif } =20 diff --git a/backends/hostmem-memfd.c b/backends/hostmem-memfd.c index 1c3579e..2eb9c82 100644 --- a/backends/hostmem-memfd.c +++ b/backends/hostmem-memfd.c @@ -44,10 +44,6 @@ memfd_backend_memory_alloc(HostMemoryBackend *backend, E= rror **errp) return; } =20 - if (host_memory_backend_mr_inited(backend)) { - return; - } - backend->force_prealloc =3D mem_prealloc; fd =3D qemu_memfd_create(TYPE_MEMORY_BACKEND_MEMFD, backend->size, m->hugetlb, m->hugetlbsize, m->seal ? --=20 1.8.3.1