From nobody Mon Feb 9 11:51:31 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 1543402525533492.0582293381067; Wed, 28 Nov 2018 02:55:25 -0800 (PST) Received: from localhost ([::1]:47099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRxV1-0006yC-6A for importer@patchew.org; Wed, 28 Nov 2018 05:55:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRxT4-0005z7-Kf for qemu-devel@nongnu.org; Wed, 28 Nov 2018 05:53:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gRxT0-0007F7-VI for qemu-devel@nongnu.org; Wed, 28 Nov 2018 05:53:18 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:46593) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gRxT0-0007C4-P2 for qemu-devel@nongnu.org; Wed, 28 Nov 2018 05:53:14 -0500 Received: by mail-wr1-x42d.google.com with SMTP id l9so25782188wrt.13 for ; Wed, 28 Nov 2018 02:53:14 -0800 (PST) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 125-v6sm1688301wmr.22.2018.11.28.02.53.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 02:53:12 -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=6SgJY8DJh2HK36Wstfl83CASM96MMXlwq8InZIurRjM=; b=tIEShsUAxQ1XE1c+Gck+PQaQsoF+3p8IiT1IQZ4wk6vgI0/eKB0eTtC04kX0XXoMuP 5SpThaPhI+wgeu5icfxBPdpWN63f7lWSEkNWFYZtXbSD4LlOfS7Z4TY4YkhQ/r1pUPkW 9XX3kX78F9RA2p1JC4An2PFi4pmf4lyXQIerbOM3Yh2UB0IUTcOuj7QInscJ3EZJsOIH gt7cYI9IxGrUsjOlzsNC1Jbqw9IbVfb3C9PRDiw4J/c1boh2hgwx6bhkbVJ+WRmNjpyR b5IxUl+bDEBWWamub9icwXA4yExTBPoeaD00PGdYvTD17P/+vjnxwibt+1Maxx02qbo7 uoKw== 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=6SgJY8DJh2HK36Wstfl83CASM96MMXlwq8InZIurRjM=; b=BuYYJ+mGrkWdajcKL9kTgo2PtbNoSl0nzMKzOXujOH6/TQDx25knp4RnJgcaW+55W2 NTFZQsCLSWuriIbjCYtJ/kGkmvD9/Cb8DCHn35JVddZjkkI6p2fZHh7xrDRaHU+MeOTD U6N0qqZsCxzF3rEawAACvxnr1KG6enUMs1r/HcR6DNYYv6eNwq1e9VqKfdmZdwLz5t7j nX25ZrwpRoUEbEHH5I8/4DHxAfopqLqF/JQrXULoEPEgOpRFQlGKX548YfAYWTaIjjUt plxOnObveCtF4k0QKrkFvwIFpAVHQAwcAXplF5eUuAX9GyllxZLs427ikNKYkzxvJVcE OAAA== X-Gm-Message-State: AA+aEWbm11/IS50XiT9FSTCHTA7wwXEyBlw23Yj2698M01kwgqdIcw39 +f/FP3Juu7H9JD2/c3zh2+EtE8J+ X-Google-Smtp-Source: AFSGD/XqsZme6YuR8FV9D/SMsKByD9T7mZhAz2qPxmnjN93FPTQOYtcBeoR/DAIoaRmJd98AKnfP9Q== X-Received: by 2002:a5d:43d0:: with SMTP id v16mr32672134wrr.67.1543402393413; Wed, 28 Nov 2018 02:53:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 28 Nov 2018 11:53:10 +0100 Message-Id: <1543402390-3754-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1543402390-3754-1-git-send-email-pbonzini@redhat.com> References: <1543402390-3754-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::42d Subject: [Qemu-devel] [PULL 14/14] 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..6630021 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_POSIX + 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