From: Michael Tokarev <mjt@tls.msk.ru>
Date: Thu, 21 Apr 2022 20:19:04 +0000 (+0300)
Subject: debian: switch from recommending qemu-system-x86 to qemu-system-xen
X-Git-Tag: archive/raspbian/4.16.1-1+rpi1^2~32
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=df1f5fe29742f527c9d0ee587dbc662bf4573d88;p=xen.git

debian: switch from recommending qemu-system-x86 to qemu-system-xen

Qemu builds xen-specific package now with xen support, with qemu binary
being /usr/libexec/xen-qemu-system-i386.  Stop recommending generic
qemu-system-x86 with a lot of dependencies, move to much leanier
qemu-system-xen build.
---

diff --git a/debian/control b/debian/control
index 4ed2be871c..400edb0643 100644
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,7 @@ Section: admin
 Architecture: amd64 arm64 armhf
 Provides: xen-utils
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, xen-utils-common (>= ${source:Version})
-Recommends: bridge-utils, xen-hypervisor-4.16, qemu-system-x86 [amd64], grub-xen-host [amd64]
+Recommends: bridge-utils, xen-hypervisor-4.16, qemu-system-xen [amd64], grub-xen-host [amd64]
 Suggests: qemu-utils [amd64], seabios [amd64], ovmf
 Description: XEN administrative tools
  The userspace tools to manage a system virtualized through the XEN virtual
diff --git a/debian/rules b/debian/rules
index f245a29e42..78bfdf5ea5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -207,7 +207,7 @@ override_dh_auto_configure:
 		--disable-blktap1 \
 		--disable-blktap2 \
 		--disable-qemu-traditional --disable-rombios \
-		--with-system-qemu=/usr/bin/qemu-system-i386 \
+		--with-system-qemu=/usr/libexec/xen-qemu-system-i386 \
 		--enable-ovmf --with-system-ovmf=/usr/share/ovmf/OVMF.fd \
 		--with-system-seabios=/usr/share/seabios/bios-256k.bin
 
diff --git a/debian/xen-utils-common.xen.init b/debian/xen-utils-common.xen.init
index dadb3dcd08..ca38c51435 100644
--- a/debian/xen-utils-common.xen.init
+++ b/debian/xen-utils-common.xen.init
@@ -58,7 +58,7 @@ XENCONSOLED_PIDFILE="/run/xenconsoled.pid"
 CXENSTORED="$ROOT"/bin/xenstored
 OXENSTORED="$ROOT"/bin/oxenstored
 XENSTORED_PIDFILE="/run/xenstore.pid"
-QEMU=/usr/bin/qemu-system-i386
+QEMU=/usr/libexec/xen-qemu-system-i386
 QEMU_PIDFILE="/run/qemu-dom0.pid"
 QEMU_ARGS="-xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize -monitor none -serial none -parallel none"