From 66f47a03fb0e8d1af231e4185466f23bbfa13dea Mon Sep 17 00:00:00 2001
From: Kamil Godzwon <kamilx.godzwon@intel.com>
Date: Thu, 4 Aug 2022 05:35:41 -0400
Subject: [PATCH] pkgdep/vfio-user: change vfio-user source branch

Changed vfio-user source branch for installing and testing.

Replaced vfio-user-dbfix branch with vfio-user-irqmask2 due
to the recent issue #2600.

Signed-off-by: Kamil Godzwon <kamilx.godzwon@intel.com>
Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: Ide525cdd3496c2a3dbecea4e44e6edff63438859
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13867
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 test/common/config/pkgdep/git | 2 +-
 test/vfio_user/common.sh      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git
index fc8b1a2c6..f6738bf37 100644
--- a/test/common/config/pkgdep/git
+++ b/test/common/config/pkgdep/git
@@ -604,7 +604,7 @@ IRDMA_VERSION=1.7.72
 ICE_VERSION=1.8.8
 BPFTRACE_VERSION=v0.15.0
 
-VFIO_QEMU_BRANCH=${VFIO_QEMU_BRANCH:-vfio-user-dbfix}
+VFIO_QEMU_BRANCH=${VFIO_QEMU_BRANCH:-vfio-user-irqmask2}
 VANILLA_QEMU_BRANCH=${VANILLA_QEMU_BRANCH:-v7.0.0}
 BCC_BRANCH=${BCC_BRANCH:-6dac27d9}
 
diff --git a/test/vfio_user/common.sh b/test/vfio_user/common.sh
index 73ab3bf4b..0ec724fb3 100644
--- a/test/vfio_user/common.sh
+++ b/test/vfio_user/common.sh
@@ -4,7 +4,7 @@
 source "$rootdir/test/vhost/common.sh"
 
 # Verify vfio-user support of qemu.
-VFIO_QEMU_BIN=${VFIO_QEMU_BIN:-/usr/local/qemu/vfio-user-dbfix/bin/qemu-system-x86_64}
+VFIO_QEMU_BIN=${VFIO_QEMU_BIN:-/usr/local/qemu/vfio-user-irqmask2/bin/qemu-system-x86_64}
 
 if [[ ! -e $VFIO_QEMU_BIN ]]; then
 	error "$VFIO_QEMU_BIN QEMU not found, cannot run the vfio-user tests"