@@ -1888,7 +1888,7 @@ libxl_device_disk *libxl_device_disk_list(libxl_ctx *ctx,
void libxl_device_disk_list_free(libxl_device_disk* list, int num)
LIBXL_EXTERNAL_CALLERS_ONLY;
int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_disk *disk, libxl_diskinfo *diskinfo)
+ const libxl_device_disk *disk, libxl_diskinfo *diskinfo)
LIBXL_EXTERNAL_CALLERS_ONLY;
/*
@@ -1989,7 +1989,7 @@ libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx,
void libxl_device_nic_list_free(libxl_device_nic* list, int num)
LIBXL_EXTERNAL_CALLERS_ONLY;
int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_nic *nic, libxl_nicinfo *nicinfo)
+ const libxl_device_nic *nic, libxl_nicinfo *nicinfo)
LIBXL_EXTERNAL_CALLERS_ONLY;
/*
@@ -2000,7 +2000,7 @@ libxl_device_channel *libxl_device_channel_list(libxl_ctx *ctx,
uint32_t domid,
int *num);
int libxl_device_channel_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_channel *channel,
+ const libxl_device_channel *channel,
libxl_channelinfo *channelinfo);
/* Virtual TPMs */
@@ -2022,7 +2022,7 @@ libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx,
void libxl_device_vtpm_list_free(libxl_device_vtpm*, int num)
LIBXL_EXTERNAL_CALLERS_ONLY;
int libxl_device_vtpm_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_vtpm *vtpm, libxl_vtpminfo *vtpminfo)
+ const libxl_device_vtpm *vtpm, libxl_vtpminfo *vtpminfo)
LIBXL_EXTERNAL_CALLERS_ONLY;
/* Virtual displays */
@@ -2045,7 +2045,7 @@ libxl_device_vdispl *libxl_device_vdispl_list(libxl_ctx *ctx,
void libxl_device_vdispl_list_free(libxl_device_vdispl* list, int num)
LIBXL_EXTERNAL_CALLERS_ONLY;
int libxl_device_vdispl_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_vdispl *vdispl,
+ const libxl_device_vdispl *vdispl,
libxl_vdisplinfo *vdisplinfo)
LIBXL_EXTERNAL_CALLERS_ONLY;
@@ -2069,7 +2069,7 @@ libxl_device_vsnd *libxl_device_vsnd_list(libxl_ctx *ctx,
void libxl_device_vsnd_list_free(libxl_device_vsnd* list, int num)
LIBXL_EXTERNAL_CALLERS_ONLY;
int libxl_device_vsnd_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_vsnd *vsnd,
+ const libxl_device_vsnd *vsnd,
libxl_vsndinfo *vsndlinfo)
LIBXL_EXTERNAL_CALLERS_ONLY;
@@ -2092,7 +2092,7 @@ libxl_device_vkb *libxl_device_vkb_list(libxl_ctx *ctx,
void libxl_device_vkb_list_free(libxl_device_vkb* list, int num)
LIBXL_EXTERNAL_CALLERS_ONLY;
int libxl_device_vkb_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_vkb *vkb,
+ const libxl_device_vkb *vkb,
libxl_vkbinfo *vkbinfo)
LIBXL_EXTERNAL_CALLERS_ONLY;
@@ -566,7 +566,7 @@ libxl_device_channel *libxl_device_channel_list(libxl_ctx *ctx,
}
int libxl_device_channel_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_channel *channel,
+ const libxl_device_channel *channel,
libxl_channelinfo *channelinfo)
{
GC_INIT(ctx);
@@ -598,7 +598,8 @@ int libxl_vdev_to_device_disk(libxl_ctx *ctx, uint32_t domid,
}
int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_disk *disk, libxl_diskinfo *diskinfo)
+ const libxl_device_disk *disk,
+ libxl_diskinfo *diskinfo)
{
GC_INIT(ctx);
char *fe_path, *libxl_path;
@@ -399,7 +399,8 @@ void libxl_device_nic_list_free(libxl_device_nic* list, int num)
}
int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_nic *nic, libxl_nicinfo *nicinfo)
+ const libxl_device_nic *nic,
+ libxl_nicinfo *nicinfo)
{
GC_INIT(ctx);
char *nicpath, *libxl_path;
@@ -152,7 +152,7 @@ static int libxl__device_vdispl_getconnectors(libxl_ctx *ctx,
}
int libxl_device_vdispl_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_vdispl *vdispl,
+ const libxl_device_vdispl *vdispl,
libxl_vdisplinfo *info)
{
GC_INIT(ctx);
@@ -270,7 +270,7 @@ int libxl_devid_to_device_vkb(libxl_ctx *ctx, uint32_t domid,
}
int libxl_device_vkb_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_vkb *vkb,
+ const libxl_device_vkb *vkb,
libxl_vkbinfo *info)
{
GC_INIT(ctx);
@@ -563,7 +563,7 @@ static int libxl__device_stream_getinfo(libxl__gc *gc, const char *path,
}
static int libxl__device_pcm_getinfo(libxl__gc *gc, const char *path,
- libxl_device_vsnd *vsnd,
+ const libxl_device_vsnd *vsnd,
libxl_vsndinfo *info)
{
int i;
@@ -588,7 +588,7 @@ static int libxl__device_pcm_getinfo(libxl__gc *gc, const char *path,
}
int libxl_device_vsnd_getinfo(libxl_ctx *ctx, uint32_t domid,
- libxl_device_vsnd *vsnd,
+ const libxl_device_vsnd *vsnd,
libxl_vsndinfo *info)
{
GC_INIT(ctx);
@@ -90,7 +90,7 @@ static int libxl__vtpm_from_xenstore(libxl__gc *gc, const char *libxl_path,
int libxl_device_vtpm_getinfo(libxl_ctx *ctx,
uint32_t domid,
- libxl_device_vtpm *vtpm,
+ const libxl_device_vtpm *vtpm,
libxl_vtpminfo *vtpminfo)
{
GC_INIT(ctx);
The libxl_device_TYPE parameter of all the libxl_device_TYPE_getinfo function seems to be only used as input to find more information to bi stored in the libxl_TYPEinfo parameter. Make sure this is always true and constify the input parameter to avoid further mistake. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- tools/libxl/libxl.h | 14 +++++++------- tools/libxl/libxl_console.c | 2 +- tools/libxl/libxl_disk.c | 3 ++- tools/libxl/libxl_nic.c | 3 ++- tools/libxl/libxl_vdispl.c | 2 +- tools/libxl/libxl_vkb.c | 2 +- tools/libxl/libxl_vsnd.c | 4 ++-- tools/libxl/libxl_vtpm.c | 2 +- 8 files changed, 17 insertions(+), 15 deletions(-)