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 4ed2be871c76b5f3218b282bdc37d83d9c32fba6..400edb0643c56e64abf67d7e8d45a1f914abc05f 100644 (file)
--- 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 f245a29e4253505a5fe6eb930f8e5bca13fe2fc5..78bfdf5ea5276bfb4c3b27dadbfb1d0a435253cf 100755 (executable)
--- 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 dadb3dcd080d58b7969290c4c7e3734b99ba0851..ca38c514356a00ca6fe18512df9bed93b03e769e 100644 (file)
--- 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"