From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 1/5] libxc: xc_domain_restore, make toolstack_restore const-correct Date: Thu, 17 May 2012 19:53:32 +0100 Message-ID: <1337280816-25370-2-git-send-email-ian.jackson@eu.citrix.com> References: <1337280816-25370-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1337280816-25370-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Ian Jackson List-Id: xen-devel@lists.xenproject.org Also provide typedefs for the nontrivial function callback types. Update the one provider of this callback, in libxl. Signed-off-by: Ian Jackson --- tools/libxc/xenguest.h | 14 ++++++++++---- tools/libxl/libxl_dom.c | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index 6435f65..ddf9a0b 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -31,6 +31,10 @@ #define X86_64_B_SIZE 64 #define X86_32_B_SIZE 32 +typedef int xc_switch_qemu_logdirty_cb(int domid, unsigned enable, void *data); +typedef int xc_toolstack_save_cb(uint32_t domid, uint8_t **buf, + uint32_t *len, void *data); + /* callbacks provided by xc_domain_save */ struct save_callbacks { int (*suspend)(void* data); @@ -42,7 +46,7 @@ struct save_callbacks { int (*checkpoint)(void* data); /* Enable qemu-dm logging dirty pages to xen */ - int (*switch_qemu_logdirty)(int domid, unsigned enable, void *data); /* HVM only */ + xc_switch_qemu_logdirty_cb *switch_qemu_logdirty; /* HVM only */ /* Save toolstack specific data * @param buf the buffer with the data to be saved @@ -50,7 +54,7 @@ struct save_callbacks { * The callee allocates the buffer, the caller frees it (buffer must * be free'able). */ - int (*toolstack_save)(uint32_t domid, uint8_t **buf, uint32_t *len, void *data); + xc_toolstack_save_cb *toolstack_save; /* to be provided as the last argument to each callback function */ void* data; @@ -70,11 +74,13 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter unsigned long vm_generationid_addr); +typedef int xc_toolstack_restore_cb(uint32_t domid, const uint8_t *buf, + uint32_t size, void* data); + /* callbacks provided by xc_domain_restore */ struct restore_callbacks { /* callback to restore toolstack specific data */ - int (*toolstack_restore)(uint32_t domid, uint8_t *buf, - uint32_t size, void* data); + xc_toolstack_restore_cb *toolstack_restore; /* to be provided as the last argument to each callback function */ void* data; diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 6064d44..01d5595 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -461,13 +461,13 @@ static inline char *restore_helper(libxl__gc *gc, uint32_t domid, domid, phys_offset, node); } -static int libxl__toolstack_restore(uint32_t domid, uint8_t *buf, +static int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, uint32_t size, void *data) { libxl__gc *gc = (libxl__gc *) data; libxl_ctx *ctx = gc->owner; int i, ret; - uint8_t *ptr = buf; + const uint8_t *ptr = buf; uint32_t count = 0, version = 0; struct libxl__physmap_info* pi; char *xs_path; -- 1.7.2.5