From d54544046c9c584584e96fd2a8af996f0abd9833 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Thu, 29 Oct 2020 08:22:34 +0000 Subject: [PATCH] build: Use stable virtio-fs QEMU branch Address build failure from activity in the development virtio-fs branch by using the stable fork. Signed-off-by: Rob Bradford --- scripts/run_integration_tests_aarch64.sh | 6 +++--- scripts/run_integration_tests_x86_64.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index 124188652..6cf8c6125 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -126,11 +126,11 @@ update_workloads() { if [ ! -f "$VIRTIOFSD" ]; then pushd $WORKLOADS_DIR - git clone --depth 1 "https://gitlab.com/virtio-fs/qemu.git" -b "virtio-fs-dev" $QEMU_DIR + git clone --depth 1 "https://gitlab.com/virtio-fs/qemu.git" -b "qemu5.0-virtiofs-dax" $QEMU_DIR pushd $QEMU_DIR time ./configure --prefix=$PWD --target-list=aarch64-softmmu - time make -j `nproc` - cp build/tools/virtiofsd/virtiofsd $VIRTIOFSD || exit 1 + time make virtiofsd -j `nproc` + cp virtiofsd $VIRTIOFSD || exit 1 popd rm -rf $QEMU_DIR popd diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh index 798d9b2fb..e046fd115 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -127,11 +127,11 @@ VIRTIOFSD="$WORKLOADS_DIR/virtiofsd" QEMU_DIR="qemu_build" if [ ! -f "$VIRTIOFSD" ]; then pushd $WORKLOADS_DIR - git clone --depth 1 "https://gitlab.com/virtio-fs/qemu.git" -b "virtio-fs-dev" $QEMU_DIR + git clone --depth 1 "https://gitlab.com/virtio-fs/qemu.git" -b "qemu5.0-virtiofs-dax" $QEMU_DIR pushd $QEMU_DIR time ./configure --prefix=$PWD --target-list=x86_64-softmmu - time make -j `nproc` - cp build/tools/virtiofsd/virtiofsd $VIRTIOFSD || exit 1 + time make virtiofsd -j `nproc` + cp virtiofsd $VIRTIOFSD || exit 1 popd rm -rf $QEMU_DIR popd