From: Chunyan Liu <cyliu@suse.com>
To: xen-devel@lists.xen.org
Cc: jgross@suse.com, wei.liu2@citrix.com, ian.campbell@citrix.com,
george.dunlap@eu.citrix.com, Ian.Jackson@eu.citrix.com,
Chunyan Liu <cyliu@suse.com>,
jfehlig@suse.com
Subject: [PATCH V12 2/5] libxl_utils: add internal function to read sysfs file contents
Date: Wed, 23 Dec 2015 10:24:39 +0800 [thread overview]
Message-ID: <1450837482-5074-3-git-send-email-cyliu@suse.com> (raw)
In-Reply-To: <1450837482-5074-1-git-send-email-cyliu@suse.com>
Add a new function libxl_read_sysfs_file_contents to handle sysfs file
specially. It would be used in later pvusb work.
Signed-off-by: Chunyan Liu <cyliu@suse.com>
---
Changes:
* remove unnecessary null pointer check after libxl__alloc and
libxl__realloc
tools/libxl/libxl_internal.h | 4 +++
tools/libxl/libxl_utils.c | 74 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 9e94835..d1eb18f 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -4039,6 +4039,10 @@ void libxl__bitmap_copy_best_effort(libxl__gc *gc, libxl_bitmap *dptr,
int libxl__count_physical_sockets(libxl__gc *gc, int *sockets);
+_hidden int libxl__read_sysfs_file_contents(libxl__gc *gc,
+ const char *filename,
+ void **data_r,
+ int *datalen_r);
#define LIBXL_QEMU_USER_PREFIX "xen-qemuuser"
#define LIBXL_QEMU_USER_BASE LIBXL_QEMU_USER_PREFIX"-domid"
diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c
index e42422a..e64f301 100644
--- a/tools/libxl/libxl_utils.c
+++ b/tools/libxl/libxl_utils.c
@@ -396,6 +396,80 @@ int libxl_read_file_contents(libxl_ctx *ctx, const char *filename,
return e;
}
+int libxl__read_sysfs_file_contents(libxl__gc *gc, const char *filename,
+ void **data_r, int *datalen_r)
+{
+ FILE *f = 0;
+ uint8_t *data = 0;
+ int datalen = 0;
+ int e;
+ struct stat stab;
+ ssize_t rs;
+
+ f = fopen(filename, "r");
+ if (!f) {
+ if (errno == ENOENT) return ENOENT;
+ LOGE(ERROR, "failed to open %s", filename);
+ goto xe;
+ }
+
+ if (fstat(fileno(f), &stab)) {
+ LOGE(ERROR, "failed to fstat %s", filename);
+ goto xe;
+ }
+
+ if (!S_ISREG(stab.st_mode)) {
+ LOGE(ERROR, "%s is not a plain file", filename);
+ errno = ENOTTY;
+ goto xe;
+ }
+
+ if (stab.st_size > INT_MAX) {
+ LOG(ERROR, "file %s is far too large", filename);
+ errno = EFBIG;
+ goto xe;
+ }
+
+ datalen = stab.st_size;
+
+ if (stab.st_size && data_r) {
+ data = libxl__malloc(gc, datalen);
+
+ /* For sysfs file, datalen is always PAGE_SIZE. 'read'
+ * will return the number of bytes of the actual content,
+ * rs <= datalen is expected.
+ */
+ rs = fread(data, 1, datalen, f);
+ if (rs < datalen) {
+ if (ferror(f)) {
+ LOGE(ERROR, "failed to read %s", filename);
+ goto xe;
+ }
+
+ datalen = rs;
+ data = libxl__realloc(gc, data, datalen);
+ }
+ }
+
+ if (fclose(f)) {
+ f = 0;
+ LOGE(ERROR, "failed to close %s", filename);
+ goto xe;
+ }
+
+ if (data_r) *data_r = data;
+ if (datalen_r) *datalen_r = datalen;
+
+ return 0;
+
+ xe:
+ e = errno;
+ assert(e != ENOENT);
+ if (f) fclose(f);
+ return e;
+}
+
+
#define READ_WRITE_EXACTLY(rw, zero_is_eof, constdata) \
\
int libxl_##rw##_exactly(libxl_ctx *ctx, int fd, \
--
2.1.4
next prev parent reply other threads:[~2015-12-23 2:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-23 2:24 [PATCH V12 0/5] xen pvusb toolstack work Chunyan Liu
2015-12-23 2:24 ` [PATCH V12 1/5] libxl: export some functions for pvusb use Chunyan Liu
2016-01-12 17:56 ` Ian Jackson
2015-12-23 2:24 ` Chunyan Liu [this message]
2016-01-12 17:56 ` [PATCH V12 2/5] libxl_utils: add internal function to read sysfs file contents Ian Jackson
2015-12-23 2:24 ` [PATCH V12 3/5] libxl: add pvusb API Chunyan Liu
2016-01-12 18:31 ` Ian Jackson
2016-01-14 5:41 ` Chun Yan Liu
2016-01-14 11:58 ` George Dunlap
2016-01-14 11:03 ` Ian Campbell
2015-12-23 2:24 ` [PATCH V12 4/5] xl: add pvusb commands Chunyan Liu
2015-12-23 2:24 ` [PATCH V12 5/5] domcreate: support pvusb in configuration file Chunyan Liu
2016-01-12 19:02 ` [PATCH V12 5/5] domcreate: support pvusb in configuration file [and 1 more messages] Ian Jackson
-- strict thread matches above, loose matches on Subject: below --
2015-12-22 7:01 [PATCH V12 0/5] xen pvusb toolstack work Chunyan Liu
2015-12-22 7:01 ` [PATCH V12 2/5] libxl_utils: add internal function to read sysfs file contents Chunyan Liu
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=1450837482-5074-3-git-send-email-cyliu@suse.com \
--to=cyliu@suse.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=george.dunlap@eu.citrix.com \
--cc=ian.campbell@citrix.com \
--cc=jfehlig@suse.com \
--cc=jgross@suse.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/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).