From nobody Thu Nov 6 08:30:59 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497524100694858.8426190214474; Thu, 15 Jun 2017 03:55:00 -0700 (PDT) Received: from localhost ([::1]:53130 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSQV-0000uB-Dn for importer@patchew.org; Thu, 15 Jun 2017 06:54:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSOl-00082p-V5 for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLSOl-0007R0-0m for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:12 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:35205) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLSOk-0007Pu-QA for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:10 -0400 Received: by mail-wr0-x242.google.com with SMTP id z45so2760525wrb.2 for ; Thu, 15 Jun 2017 03:53:10 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id f21sm3258597wra.5.2017.06.15.03.53.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 03:53:08 -0700 (PDT) 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=Y+BINau26GEINQ22ddQEwTrro23EUlecYZPEnxoyWfY=; b=upPtv9KKpETmzzskTGfMXQRd6mBdsGgdvX/mV6kAf0vJmuprYwom3VZRvNVPIpU5R1 qTY+E+xvZZrmFMTNjwmcEMYfQmbwMffX63cLbx38go1heWS+8zZB1k+N2l2e+CsHvZpT Qusdo/JIAzfJWRK2gOL33BfT5RpHkR+PpFuoaKJGI8Rl23vr+u1AQRhdxOjr3Ox5sGhz WZCETwAZcc988SP2QJzTYKFwI2apcFGyrxUvh2RmJI5uKWKDFWjp/LU2fWbG5lt0p3MN 6BhZJibLi3F9r68drX3zo+KxM+JYnTEI/e4/V1Y8rpCNoenc1pK00kQ5VbQRq4CRauQR oUzw== 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=Y+BINau26GEINQ22ddQEwTrro23EUlecYZPEnxoyWfY=; b=h4CPf6ZMDqiC0eMJUH4O/8eOdijl5xDM5MJvCbWrO4AsliN7VV7k5y9zPynSZC6VV4 fGW5K8+RLNC2rpJUvFPNY/08zbTtSVFhQBh16VnPVp5UPuW8pZU4cQj9B/WTZZXxT1C/ sinVGSt3BIkQOSiKiqFvVlWV73xkvdGi5jB79GRtYjNprsKJ3oh9gF0TyGl4rQkdSxct kuvWxPKOC+X69FyrkGS+ulnsfawnSKi+XZhogpysIwHpgO8OlkAK8xtepIKygY8O6BH6 7Wass5DoibKpkHhL7wXL6f9YGuvag6U+c6K7Cch4ImHTHzIH4NGS9Qte31zbqzQPyTxh KGAw== X-Gm-Message-State: AKS2vOzJOmfV/2hztsSJ4fFF+PvCHuKWX3j5ir/TvjYdEqPy2g3Kmx6J mB/sPpReDZFOQsniEM8= X-Received: by 10.223.153.165 with SMTP id y34mr3183987wrb.41.1497523989412; Thu, 15 Jun 2017 03:53:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Jun 2017 12:52:23 +0200 Message-Id: <1497523981-38449-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> References: <1497523981-38449-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:400c:c0c::242 Subject: [Qemu-devel] [PULL 03/41] exec: split qemu_ram_alloc_from_file() 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) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Marc-Andr=C3=A9 Lureau Add qemu_ram_alloc_from_fd(), which can be use to allocate ramblock from fd only. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20170602141229.15326-4-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- exec.c | 45 ++++++++++++++++++++++++++++++--------------- include/exec/ram_addr.h | 3 +++ 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/exec.c b/exec.c index 42a5a7c..42ad1ea 100644 --- a/exec.c +++ b/exec.c @@ -1914,14 +1914,12 @@ static void ram_block_add(RAMBlock *new_block, Erro= r **errp) } =20 #ifdef __linux__ -RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, - bool share, const char *mem_path, - Error **errp) +RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, + bool share, int fd, + Error **errp) { RAMBlock *new_block; Error *local_err =3D NULL; - int fd; - bool created; int64_t file_size; =20 if (xen_enabled()) { @@ -1946,18 +1944,12 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size,= MemoryRegion *mr, return NULL; } =20 - fd =3D file_ram_open(mem_path, memory_region_name(mr), &created, errp); - if (fd < 0) { - return NULL; - } - size =3D HOST_PAGE_ALIGN(size); file_size =3D get_file_size(fd); if (file_size > 0 && file_size < size) { error_setg(errp, "backing store %s size 0x%" PRIx64 " does not match 'size' option 0x" RAM_ADDR_FMT, mem_path, file_size, size); - close(fd); return NULL; } =20 @@ -1968,10 +1960,6 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, = MemoryRegion *mr, new_block->flags =3D share ? RAM_SHARED : 0; new_block->host =3D file_ram_alloc(new_block, size, fd, !file_size, er= rp); if (!new_block->host) { - if (created) { - unlink(mem_path); - } - close(fd); g_free(new_block); return NULL; } @@ -1983,6 +1971,33 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, = MemoryRegion *mr, return NULL; } return new_block; + +} + + +RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, + bool share, const char *mem_path, + Error **errp) +{ + int fd; + bool created; + RAMBlock *block; + + fd =3D file_ram_open(mem_path, memory_region_name(mr), &created, errp); + if (fd < 0) { + return NULL; + } + + block =3D qemu_ram_alloc_from_fd(size, mr, share, fd, errp); + if (!block) { + if (created) { + unlink(mem_path); + } + close(fd); + return NULL; + } + + return block; } #endif =20 diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 140efa8..73d1bea 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -65,6 +65,9 @@ unsigned long last_ram_page(void); RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, bool share, const char *mem_path, Error **errp); +RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, + bool share, int fd, + Error **errp); RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, MemoryRegion *mr, Error **errp); RAMBlock *qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr, Error **errp); --=20 1.8.3.1