From nobody Thu Nov 6 19:53:33 2025 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 1543261981847991.2372079355785; Mon, 26 Nov 2018 11:53:01 -0800 (PST) Received: from localhost ([::1]:38492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRMwG-0001bv-Cm for importer@patchew.org; Mon, 26 Nov 2018 14:53:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRMkf-0008H1-JU for qemu-devel@nongnu.org; Mon, 26 Nov 2018 14:41:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gRMkc-0004sL-GA for qemu-devel@nongnu.org; Mon, 26 Nov 2018 14:41:01 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:56082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gRMkc-0004rA-3G for qemu-devel@nongnu.org; Mon, 26 Nov 2018 14:40:58 -0500 Received: by mail-wm1-x32e.google.com with SMTP id y139so19403800wmc.5 for ; Mon, 26 Nov 2018 11:40:58 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s139sm2412468wmd.3.2018.11.26.11.40.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Nov 2018 11:40:55 -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=nZxWPOVIAA5nUzN0gMSMfsNg4zzIlGsogMvMThAGWd8=; b=PXtEC9VnaGqfuVeWMi4z5nzmPcGb3OriS9uLiGOfAuV9opfhCyXEEbhZPNY4NLf9aR BMlCVR0r+uEzgk/DEaa23RJOUH/Dpfc2nicyVlc/g8uPbsLHONFc7Y/d42wJ2OAuhDhB NVYPtDqgqyxAMmBCVTXdVsgaq4KVcZUK/7CRH6pXA9iDfdo01cvsVG6OL5j4ydzHIqAy BUCf9wrb+clv6U5k9PxdkXiuv0ULWQ58vwi0A20tEAl3jFRJa2ZzZO8sICvia+GqeB95 wITMeX7o2Dd3+nb83Lhjquv2q9C5ezxSfzfsvMcC0fhvDI2ubgsAk7beZgyJLJYTfhi7 nVTg== 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=nZxWPOVIAA5nUzN0gMSMfsNg4zzIlGsogMvMThAGWd8=; b=n9nrZ8WQcMWwWHf6phb4h+qCJDpKJ/YwZ/RBu0Yjvq6aMHA5bWS26o8/53tIQQpbVH h+nEB5fDkKMdJFwuLKs42GdIobXR/RCGCXPAUAxVX5a+HakLVGuWAMg7Tzt89lHEuhsJ G42PoM7fvncubXW7XjqVjGvD3x5RnNmJHJvphenXlQRBNEPZZbf4jdK7YTpDG6ZPo6s4 AP4VQopyYEuz+4EU6t/OP5kn6PG+ihKIg+Apt49PEk63aRad9BVAAnPhFlSdYJjAr7NU Hag+pK+P3MgRZUXznL/DLkN8nXnWX8ZlpTCnScjJrslkY7ld7RsKVvnL8pY3Hlds1MTg fRKQ== X-Gm-Message-State: AA+aEWYxkpmz5IBzg9k9s8hwCxniYLbofrP/HFthkYwpZKYMqKRL/p+K iaoxzSRfwfQ6yGiPL5JWcLvxlK1m X-Google-Smtp-Source: AJdET5dNDw/1CXp7601l5gdzkA3niKLhh4yNUM8w3YM/4sR0O7XI3YehP4svGKwN5pc7kfyb1M/K1w== X-Received: by 2002:a1c:b1d5:: with SMTP id a204mr25309845wmf.32.1543261256698; Mon, 26 Nov 2018 11:40:56 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 26 Nov 2018 20:40:35 +0100 Message-Id: <1543261235-2834-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1543261235-2834-1-git-send-email-pbonzini@redhat.com> References: <1543261235-2834-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::32e 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 Signed-off-by: Marc-Andr=C3=A9 Lureau --- 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