From 5cf46a66883ad7a56c5bdee97696373473f80974 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 5 Apr 2016 20:20:53 +0100 Subject: [PATCH] libxl: colo: make it depend on availability of libnl Netlink is required when initialising COLO, so make sure only to compile COLO only when netlink is available. Change the inclusion of linux/netlink.h to netlink/netlink.h so that it doesn't use Linux kernel header directly. Provide necessary stub functions in case COLO is disabled. This should fix build on FreeBSD because there is no netlink there. It would also make libxl build properly when netlink is not present on a Linux system. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- tools/libxl/Makefile | 5 +++ tools/libxl/libxl_colo_proxy.c | 2 +- tools/libxl/libxl_no_colo.c | 62 ++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 tools/libxl/libxl_no_colo.c diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index ca295129e6..4fc264df55 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -65,10 +65,15 @@ LIBXL_OBJS-y += libxl_no_convert_callout.o endif LIBXL_OBJS-y += libxl_remus.o libxl_checkpoint_device.o libxl_remus_disk_drbd.o + +ifeq ($(CONFIG_LIBNL),y) LIBXL_OBJS-y += libxl_colo_restore.o libxl_colo_save.o LIBXL_OBJS-y += libxl_colo_qdisk.o LIBXL_OBJS-y += libxl_colo_proxy.o LIBXL_OBJS-y += libxl_colo_nic.o +else +LIBXL_OBJS-y += libxl_no_colo.o +endif LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o libxl_psr.o LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o libxl_libfdt_compat.o diff --git a/tools/libxl/libxl_colo_proxy.c b/tools/libxl/libxl_colo_proxy.c index 034e76c55c..d4b73ee85f 100644 --- a/tools/libxl/libxl_colo_proxy.c +++ b/tools/libxl/libxl_colo_proxy.c @@ -17,7 +17,7 @@ #include "libxl_internal.h" -#include +#include /* Consistent with the new COLO netlink channel in kernel side */ #define NETLINK_COLO 28 diff --git a/tools/libxl/libxl_no_colo.c b/tools/libxl/libxl_no_colo.c new file mode 100644 index 0000000000..152f19885c --- /dev/null +++ b/tools/libxl/libxl_no_colo.c @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2016 + * Author Wei Liu + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_osdeps.h" /* must come before any other headers */ + +#include "libxl_internal.h" + +void libxl__colo_restore_setup(libxl__egc *egc, + libxl__colo_restore_state *crs) +{ + STATE_AO_GC(crs->ao); + + LOG(ERROR, "COLO is not supported"); + + crs->callback(egc, crs, ERROR_FAIL); +} + +void libxl__colo_restore_teardown(libxl__egc *egc, void *dcs_void, + int ret, int retval, int errnoval) +{ + /* Shouldn't be here because setup already failed */ + abort(); +} + +void libxl__colo_save_setup(libxl__egc *egc, libxl__colo_save_state *css) +{ + libxl__domain_save_state *dss = CONTAINER_OF(css, *dss, css); + STATE_AO_GC(dss->ao); + + LOG(ERROR, "COLO is not supported"); + + dss->callback(egc, dss, ERROR_FAIL); +} + +void libxl__colo_save_teardown(libxl__egc *egc, + libxl__colo_save_state *css, + int rc) +{ + /* Shouldn't be here because setup already failed */ + abort(); +} + + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- 2.30.2