diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2010-10-18 16:52:37 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2010-10-18 16:52:37 +0100 |
| commit | e43181a5eb45bf8834a703b8601f93b610ec94ab (patch) | |
| tree | 15f6c2908edb90b84ca033e69b309fdf0e71213c | |
| parent | f114466a23ceaf058ac13b08e83725e6354bc519 (diff) | |
| download | xen-e43181a5eb45bf8834a703b8601f93b610ec94ab.tar.gz xen-e43181a5eb45bf8834a703b8601f93b610ec94ab.tar.bz2 xen-e43181a5eb45bf8834a703b8601f93b610ec94ab.zip | |
libxc: remove unnecessary double indirection from xc_readconsolering
The double indirection has been unnecessary since 9867:ec61a8c25429,
there is no possibility of the buffer being reallocated now.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -rw-r--r-- | tools/console/daemon/io.c | 2 | ||||
| -rw-r--r-- | tools/libxc/xc_misc.c | 3 | ||||
| -rw-r--r-- | tools/libxc/xenctrl.h | 2 | ||||
| -rw-r--r-- | tools/libxl/libxl.c | 2 | ||||
| -rw-r--r-- | tools/python/xen/lowlevel/xc/xc.c | 4 |
5 files changed, 6 insertions, 7 deletions
diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 691b0f2786..4b7f58f4a0 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -887,7 +887,7 @@ static void handle_hv_logs(void) if ((port = xc_evtchn_pending(xce_handle)) == -1) return; - if (xc_readconsolering(xch, &bufptr, &size, 0, 1, &index) == 0 && size > 0) { + if (xc_readconsolering(xch, bufptr, &size, 0, 1, &index) == 0 && size > 0) { int logret; if (log_time_hv) logret = write_with_timestamp(log_hv_fd, buffer, size, diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index c2efa377c1..a5f179a403 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -22,13 +22,12 @@ #include <xen/hvm/hvm_op.h> int xc_readconsolering(xc_interface *xch, - char **pbuffer, + char *buffer, unsigned int *pnr_chars, int clear, int incremental, uint32_t *pindex) { int ret; DECLARE_SYSCTL; - char *buffer = *pbuffer; unsigned int nr_chars = *pnr_chars; sysctl.cmd = XEN_SYSCTL_readconsole; diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index fe66548590..1662c094c9 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -729,7 +729,7 @@ int xc_physdev_pci_access_modify(xc_interface *xch, int enable); int xc_readconsolering(xc_interface *xch, - char **pbuffer, + char *buffer, unsigned int *pnr_chars, int clear, int incremental, uint32_t *pindex); diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ba274892ef..c231264856 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3464,7 +3464,7 @@ int libxl_xen_console_read_line(libxl_ctx *ctx, int ret; memset(cr->buffer, 0, cr->size); - ret = xc_readconsolering(ctx->xch, &cr->buffer, &cr->count, + ret = xc_readconsolering(ctx->xch, cr->buffer, &cr->count, cr->clear, cr->incremental, &cr->index); if (ret < 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "reading console ring buffer"); diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 6e9d3e1ac5..02cac6f27c 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1116,7 +1116,7 @@ static PyObject *pyxc_readconsolering(XcObject *self, !str ) return NULL; - ret = xc_readconsolering(self->xc_handle, &str, &count, clear, + ret = xc_readconsolering(self->xc_handle, str, &count, clear, incremental, &index); if ( ret < 0 ) return pyxc_error_to_exception(self->xc_handle); @@ -1133,7 +1133,7 @@ static PyObject *pyxc_readconsolering(XcObject *self, str = ptr + count; count = size - count; - ret = xc_readconsolering(self->xc_handle, &str, &count, clear, + ret = xc_readconsolering(self->xc_handle, str, &count, clear, 1, &index); if ( ret < 0 ) break; |