From: Boris Ostrovsky Date: Mon, 11 May 2015 16:31:29 +0000 (-0400) Subject: libxc: Provide set_xen_guest_handle_offset macro X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3255 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e47d65dc63013f4b140d3f8760fd9113e353280f;p=xen.git libxc: Provide set_xen_guest_handle_offset macro Add set_xen_guest_handle_offset() macro that can be used for setting xen_guest_handle to an offset into hypercall buffer. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index a404855285..4b3c26ec22 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -322,16 +322,24 @@ typedef struct xc_hypercall_buffer xc_hypercall_buffer_t; * Set a xen_guest_handle in a type safe manner, ensuring that the * data pointer has been correctly allocated. */ -#undef set_xen_guest_handle -#define set_xen_guest_handle(_hnd, _val) \ +#define set_xen_guest_handle_impl(_hnd, _val, _byte_off) \ do { \ xc_hypercall_buffer_t _hcbuf_hnd1; \ typeof(XC__HYPERCALL_BUFFER_NAME(_val)) *_hcbuf_hnd2 = \ HYPERCALL_BUFFER(_val); \ (void) (&_hcbuf_hnd1 == _hcbuf_hnd2); \ - set_xen_guest_handle_raw(_hnd, (_hcbuf_hnd2)->hbuf); \ + set_xen_guest_handle_raw(_hnd, \ + (_hcbuf_hnd2)->hbuf + (_byte_off)); \ } while (0) +#undef set_xen_guest_handle +#define set_xen_guest_handle(_hnd, _val) \ + set_xen_guest_handle_impl(_hnd, _val, 0) + +#define set_xen_guest_handle_offset(_hnd, _val, _off) \ + set_xen_guest_handle_impl(_hnd, _val, \ + ((sizeof(*_val)*(_off)))) + /* Use with set_xen_guest_handle in place of NULL */ extern xc_hypercall_buffer_t XC__HYPERCALL_BUFFER_NAME(HYPERCALL_BUFFER_NULL);