From 7f6b0960858dd42ee3d81aa47c6422b7e3b7926c Mon Sep 17 00:00:00 2001 From: Dario Faggioli Date: Mon, 30 Jun 2014 19:19:01 +0200 Subject: [PATCH] libxl: don't break the build on Xen>=4.5 because of libxl_vcpu_setaffinity() libxl interface for vcpu pinning is changing in Xen 4.5. Basically, libxl_set_vcpuaffinity() now wants one more parameter. That is representative of 'VCPU soft affinity', which libvirt does not use. To mark such change, the macro LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY is defined. Use it as a gate and, if present, re-#define the calls from the old to the new interface, to avoid breaking the build. Signed-off-by: Dario Faggioli Cc: Jim Fehlig Cc: Ian Campbell Cc: Ian Jackson (cherry picked from commit bfc72e99920215c9b004a5380ca61fe6ff81ea6b) --- src/libxl/libxl_conf.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index f743541895..9abc2d91cb 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -50,6 +50,17 @@ # define LIBXL_SAVE_DIR LIBXL_LIB_DIR "/save" # define LIBXL_BOOTLOADER_PATH BINDIR "/pygrub" +/* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new + * parameter has been added, representative of 'VCPU soft affinity'. If one + * does not care about it (and that's libvirt case), passing NULL is the + * right thing to do. To mark that change, LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY + * is defined. */ +# ifdef LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY +# define libxl_set_vcpuaffinity(ctx, domid, vcpuid, map) \ + libxl_set_vcpuaffinity((ctx), (domid), (vcpuid), (map), NULL) +# define libxl_set_vcpuaffinity_all(ctx, domid, max_vcpus, map) \ + libxl_set_vcpuaffinity_all((ctx), (domid), (max_vcpus), (map), NULL) +# endif typedef struct _libxlDriverPrivate libxlDriverPrivate; typedef libxlDriverPrivate *libxlDriverPrivatePtr;