| Message ID | 20200823093519.18386-15-jgross@suse.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tools: move most libraries into tools/libs | expand |
On Sun, Aug 23, 2020 at 11:34:55AM +0200, Juergen Gross wrote: > xen-hptool is including private headers from tools/libxc without any > need. Switch it to use official headers only. > > Signed-off-by: Juergen Gross <jgross@suse.com> Acked-by: Wei Liu <wl@xen.org>
diff --git a/tools/misc/Makefile b/tools/misc/Makefile index e7e74db85f..2a7f2ec42d 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -94,8 +94,6 @@ xenhypfs: xenhypfs.o xenlockprof: xenlockprof.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) -# xen-hptool incorrectly uses libxc internals -xen-hptool.o: CFLAGS += -I$(XEN_ROOT)/tools/libxc $(CFLAGS_libxencall) xen-hptool: xen-hptool.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS) diff --git a/tools/misc/xen-hptool.c b/tools/misc/xen-hptool.c index 6e27d9cf43..7f17f24942 100644 --- a/tools/misc/xen-hptool.c +++ b/tools/misc/xen-hptool.c @@ -1,9 +1,11 @@ +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #include <xenevtchn.h> #include <xenctrl.h> -#include <xc_private.h> -#include <xc_core.h> +#include <xenguest.h> #include <xenstore.h> -#include <unistd.h> +#include <xen-tools/libs.h> static xc_interface *xch;
xen-hptool is including private headers from tools/libxc without any need. Switch it to use official headers only. Signed-off-by: Juergen Gross <jgross@suse.com> --- tools/misc/Makefile | 2 -- tools/misc/xen-hptool.c | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-)