Message ID | 20200823093519.18386-25-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:35:05AM +0200, Juergen Gross wrote: > readnotes.c is including xg_private.h. Now that the xenctrl headers > are structured better this is no longer needed. > > Signed-off-by: Juergen Gross <jgross@suse.com> Acked-by: Wei Liu <wl@xen.org>
diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index 2811893980..82d42624c8 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -15,8 +15,7 @@ PROGRAMS = readnotes lsevtchn CFLAGS += -Werror -# incorrectly uses libxc internals -CFLAGS_readnotes.o := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) -I$(XEN_ROOT)/tools/libxc $(CFLAGS_libxencall) +CFLAGS_readnotes.o := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) CFLAGS_lsevtchn.o := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) .PHONY: all diff --git a/tools/xcutils/readnotes.c b/tools/xcutils/readnotes.c index a6b7358e70..ff684c7dcb 100644 --- a/tools/xcutils/readnotes.c +++ b/tools/xcutils/readnotes.c @@ -11,8 +11,9 @@ #include <sys/stat.h> #include <sys/mman.h> -#include <xg_private.h> -#include <xenctrl_dom.h> /* gunzip bits */ +#include <xen/xen.h> +#include <xenctrl.h> +#include <xenguest.h> #include <xen/libelf/libelf.h>
readnotes.c is including xg_private.h. Now that the xenctrl headers are structured better this is no longer needed. Signed-off-by: Juergen Gross <jgross@suse.com> --- tools/xcutils/Makefile | 3 +-- tools/xcutils/readnotes.c | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-)