qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Xiao Guangrong <guangrong.xiao@linux.intel.com>
To: pbonzini@redhat.com, imammedo@redhat.com
Cc: vsementsov@virtuozzo.com,
	Xiao Guangrong <guangrong.xiao@linux.intel.com>,
	ehabkost@redhat.com, kvm@vger.kernel.org, mst@redhat.com,
	gleb@kernel.org, mtosatti@redhat.com, qemu-devel@nongnu.org,
	stefanha@redhat.com, dan.j.williams@intel.com, rth@twiddle.net
Subject: [Qemu-devel] [PATCH v7 11/35] util: introduce qemu_file_getlength()
Date: Mon,  2 Nov 2015 17:13:13 +0800	[thread overview]
Message-ID: <1446455617-129562-12-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1446455617-129562-1-git-send-email-guangrong.xiao@linux.intel.com>

It is used to get the size of the specified file, also qemu_fd_getlength()
is introduced to unify the code with raw_getlength() in block/raw-posix.c

Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
---
 block/raw-posix.c    |  7 +------
 include/qemu/osdep.h |  2 ++
 util/osdep.c         | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 918c756..734e6dd 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -1592,18 +1592,13 @@ static int64_t raw_getlength(BlockDriverState *bs)
 {
     BDRVRawState *s = bs->opaque;
     int ret;
-    int64_t size;
 
     ret = fd_open(bs);
     if (ret < 0) {
         return ret;
     }
 
-    size = lseek(s->fd, 0, SEEK_END);
-    if (size < 0) {
-        return -errno;
-    }
-    return size;
+    return qemu_fd_getlength(s->fd);
 }
 #endif
 
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index dbc17dc..ca4c3fa 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -303,4 +303,6 @@ int qemu_read_password(char *buf, int buf_size);
 pid_t qemu_fork(Error **errp);
 
 size_t qemu_file_get_page_size(const char *mem_path, Error **errp);
+int64_t qemu_fd_getlength(int fd);
+size_t qemu_file_getlength(const char *file, Error **errp);
 #endif
diff --git a/util/osdep.c b/util/osdep.c
index 0092bb6..5a61e19 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -428,3 +428,34 @@ writev(int fd, const struct iovec *iov, int iov_cnt)
     return readv_writev(fd, iov, iov_cnt, true);
 }
 #endif
+
+int64_t qemu_fd_getlength(int fd)
+{
+    int64_t size;
+
+    size = lseek(fd, 0, SEEK_END);
+    if (size < 0) {
+        return -errno;
+    }
+    return size;
+}
+
+size_t qemu_file_getlength(const char *file, Error **errp)
+{
+    int64_t size;
+    int fd = qemu_open(file, O_RDONLY);
+
+    if (fd < 0) {
+        error_setg_file_open(errp, errno, file);
+        return 0;
+    }
+
+    size = qemu_fd_getlength(fd);
+    if (size < 0) {
+        error_setg_errno(errp, -size, "can't get size of file %s", file);
+        size = 0;
+    }
+
+    qemu_close(fd);
+    return size;
+}
-- 
1.8.3.1

  parent reply	other threads:[~2015-11-02  9:19 UTC|newest]

Thread overview: 101+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-02  9:13 [Qemu-devel] [PATCH v7 00/35] implement vNVDIMM Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 01/35] acpi: add aml_derefof Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 02/35] acpi: add aml_sizeof Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 03/35] acpi: add aml_create_field Xiao Guangrong
2015-11-03  6:14   ` Shannon Zhao
2015-11-03 14:52     ` Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 04/35] acpi: add aml_concatenate Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 05/35] acpi: add aml_object_type Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 06/35] acpi: add aml_method_serialized Xiao Guangrong
2015-11-03 12:30   ` Igor Mammedov
2015-11-03 13:27     ` Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 07/35] util: introduce qemu_file_get_page_size() Xiao Guangrong
2015-11-02 13:56   ` Vladimir Sementsov-Ogievskiy
2015-11-06 15:36   ` Eduardo Habkost
2015-11-09  4:36     ` Xiao Guangrong
2015-11-09 18:34       ` Eduardo Habkost
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 08/35] exec: allow memory to be allocated from any kind of path Xiao Guangrong
2015-11-02 14:51   ` Vladimir Sementsov-Ogievskiy
2015-11-02 15:22     ` Xiao Guangrong
2015-11-02 15:52       ` Vladimir Sementsov-Ogievskiy
2015-11-03 23:00   ` Eduardo Habkost
2015-11-04  3:12     ` Xiao Guangrong
2015-11-04 12:40       ` Eduardo Habkost
2015-11-04 14:22         ` Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 09/35] exec: allow file_ram_alloc to work on file Xiao Guangrong
2015-11-02 15:12   ` Vladimir Sementsov-Ogievskiy
2015-11-02 15:25     ` Xiao Guangrong
2015-11-02 15:58       ` Vladimir Sementsov-Ogievskiy
2015-11-02 21:12   ` Paolo Bonzini
2015-11-03  3:56     ` Xiao Guangrong
2015-11-03 13:55       ` Paolo Bonzini
2015-11-03 14:26         ` Xiao Guangrong
2015-11-03 12:34   ` Igor Mammedov
2015-11-03 13:32     ` Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 10/35] hostmem-file: clean up memory allocation Xiao Guangrong
2015-11-02  9:13 ` Xiao Guangrong [this message]
2015-11-02 15:26   ` [Qemu-devel] [PATCH v7 11/35] util: introduce qemu_file_getlength() Vladimir Sementsov-Ogievskiy
2015-11-03 23:21   ` Eduardo Habkost
2015-11-04  3:17     ` Xiao Guangrong
2015-11-04 14:44       ` Eduardo Habkost
2015-11-04 14:44         ` Xiao Guangrong
2015-11-06 15:50   ` Eduardo Habkost
2015-11-09  4:44     ` Xiao Guangrong
2015-11-09 19:21       ` Eduardo Habkost
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 12/35] util: let qemu_fd_getlength support block device Xiao Guangrong
2015-11-02 16:11   ` Vladimir Sementsov-Ogievskiy
2015-11-02 16:21     ` Xiao Guangrong
2015-11-06 15:44       ` Eduardo Habkost
2015-11-06 15:48   ` Eduardo Habkost
2015-11-06 15:54   ` Eduardo Habkost
2015-11-09  5:58     ` Xiao Guangrong
2015-11-09 18:43       ` Eduardo Habkost
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 13/35] hostmem-file: use whole file size if possible Xiao Guangrong
2015-11-02 17:09   ` Vladimir Sementsov-Ogievskiy
2015-11-03 14:51     ` Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 14/35] pc-dimm: remove DEFAULT_PC_DIMMSIZE Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 15/35] pc-dimm: make pc_existing_dimms_capacity static and rename it Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 16/35] pc-dimm: drop the prefix of pc-dimm Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 17/35] stubs: rename qmp_pc_dimm_device_list.c Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 18/35] pc-dimm: rename pc-dimm.c and pc-dimm.h Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 19/35] dimm: abstract dimm device from pc-dimm Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 20/35] dimm: get mapped memory region from DIMMDeviceClass->get_memory_region Xiao Guangrong
2015-11-02 12:19   ` Vladimir Sementsov-Ogievskiy
2015-11-02 13:08     ` Xiao Guangrong
2015-11-02 14:26       ` Vladimir Sementsov-Ogievskiy
2015-11-02 15:06         ` Xiao Guangrong
2015-11-02 16:16           ` Vladimir Sementsov-Ogievskiy
2015-11-03 14:47             ` Xiao Guangrong
2015-11-05  8:53               ` Vladimir Sementsov-Ogievskiy
2015-11-05 17:29   ` Eduardo Habkost
2015-11-06  2:50     ` Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 21/35] dimm: keep the state of the whole backend memory Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 22/35] dimm: introduce realize callback Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 23/35] nvdimm: implement NVDIMM device abstract Xiao Guangrong
2015-11-13 16:53   ` Vladimir Sementsov-Ogievskiy
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 24/35] docs: add NVDIMM ACPI documentation Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 25/35] nvdimm acpi: init the resource used by NVDIMM ACPI Xiao Guangrong
2015-11-05  9:58   ` Igor Mammedov
2015-11-05 10:15     ` Xiao Guangrong
2015-11-05 13:03       ` Igor Mammedov
2015-11-05 13:33         ` Xiao Guangrong
2015-11-05 14:49           ` Igor Mammedov
2015-11-06  8:31             ` Xiao Guangrong
2015-11-06  8:56               ` Xiao Guangrong
2015-11-09 11:13               ` Igor Mammedov
2015-11-11  3:01                 ` [Qemu-devel] Ask for ACK (was Re: [PATCH v7 25/35] nvdimm acpi: init the resource used by NVDIMM ACPI) Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 26/35] nvdimm acpi: build ACPI NFIT table Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 27/35] nvdimm acpi: build ACPI nvdimm devices Xiao Guangrong
2015-11-03 13:13   ` Igor Mammedov
2015-11-03 14:22     ` Xiao Guangrong
2015-11-04  8:56       ` Igor Mammedov
2015-11-04 14:11         ` Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 28/35] nvdimm acpi: save arg3 for NVDIMM device _DSM method Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 29/35] nvdimm acpi: support function 0 Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 30/35] nvdimm acpi: support Get Namespace Label Size function Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 31/35] nvdimm acpi: support Get Namespace Label Data function Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 32/35] nvdimm acpi: support Set " Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 33/35] nvdimm: allow using whole backend memory as pmem Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 34/35] nvdimm acpi: support _FIT method Xiao Guangrong
2015-11-02  9:13 ` [Qemu-devel] [PATCH v7 35/35] nvdimm: add maintain info Xiao Guangrong
2015-11-02 11:51 ` [Qemu-devel] [PATCH v7 00/35] implement vNVDIMM Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1446455617-129562-12-git-send-email-guangrong.xiao@linux.intel.com \
    --to=guangrong.xiao@linux.intel.com \
    --cc=dan.j.williams@intel.com \
    --cc=ehabkost@redhat.com \
    --cc=gleb@kernel.org \
    --cc=imammedo@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=mtosatti@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=stefanha@redhat.com \
    --cc=vsementsov@virtuozzo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).