[xen master] tools: Fix configure of upstream QEMU

[patchbot@xxxxxxx]

commit 27de84d3ae462bd8311c8267c642ec95afdcf47c
Author:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Wed Sep 23 12:03:23 2020 +0100
Commit:     Wei Liu <wl@xxxxxxx>
CommitDate: Wed Sep 30 15:08:17 2020 +0000

    tools: Fix configure of upstream QEMU
    
    QEMU as recently switch its build system to use meson and the
    ./configure step with meson is more restrictive that the step used to
    be, most installation path wants to be within prefix, otherwise we
    have this error message:
    
        ERROR: The value of the 'datadir' option is '/usr/share/qemu-xen' which 
must be a subdir of the prefix '/usr/lib/xen'.
    
    In order to workaround the limitation, we will set prefix to the same
    one as for the rest of Xen installation, and set all the other paths.
    
    For reference, a thread in qemu-devel:
        "configure with datadir outside of --prefix fails with meson"
        
https://lore.kernel.org/qemu-devel/20200918133012.GH2024@xxxxxxxxxxxxxxxxxxxxxxx/t/
    
    And an issue in meson:
        "artificial limitation of directories (forced to be in prefix)"
        https://github.com/mesonbuild/meson/issues/2561
    
    Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Tested-by: Paul Durrant <paul@xxxxxxx>
    Acked-by: Wei Liu <wl@xxxxxxx>
---
 tools/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/Makefile b/tools/Makefile
index ea69675cca..c1eba22c0c 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -237,7 +237,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
        $$source/configure --enable-xen --target-list=i386-softmmu \
                $(QEMU_XEN_ENABLE_DEBUG) \
                $$enable_trace_backend \
-               --prefix=$(LIBEXEC) \
+               --prefix=$(prefix) \
                --libdir=$(LIBEXEC_LIB) \
                --includedir=$(LIBEXEC_INC) \
                --extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
@@ -249,6 +249,10 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
                --bindir=$(LIBEXEC_BIN) \
                --datadir=$(SHAREDIR)/qemu-xen \
                --localstatedir=$(localstatedir) \
+               --docdir=$(LIBEXEC)/share/doc \
+               --mandir=$(LIBEXEC)/share/man \
+               --libexecdir=$(LIBEXEC)/libexec \
+               --firmwarepath=$(LIBEXEC)/share/qemu-firmware \
                --disable-kvm \
                --disable-docs \
                --disable-guest-agent \
--
generated by git-patchbot for /home/xen/git/xen.git#master