Hi,
the attached patch adds kvm support (now that I have virt-manager on
x32), which was somewhat tested:
• virsh and virt-manager could still not start the VM as they
say they have trouble using KVM:
error: Failed to start domain MirBSD
error: internal error: Process exited while reading console log output: char
device redirected to /dev/pts/16 (label charserial0)
Could not access KVM kernel module: Permission denied
failed to initialize KVM: Permission denied
• qemu directly has problems with AIO:
qemu-system-x86_64: -drive
file=/dev/vg-tglase/mirbsd,if=none,id=drive-ide0-0-0,format=raw,cache=none,aio=native:
could not open disk image /dev/vg-tglase/mirbsd: Could not set AIO state:
Inappropriate ioctl for device
When I remove the “,aio=native” from the command line, the VM
does come up and appears to use KVM acceleration. (Just, the
network setup is a bit more tricky then. I changed /dev/fd/24
to user network for manual testing.)
bye,
//mirabilos
--
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-235
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg
diff -Nru qemu-2.1+dfsg/debian/changelog qemu-2.1+dfsg/debian/changelog
--- qemu-2.1+dfsg/debian/changelog 2014-08-31 07:32:59.000000000 +0200
+++ qemu-2.1+dfsg/debian/changelog 2014-09-08 15:28:41.000000000 +0200
@@ -1,3 +1,15 @@
+qemu (2.1+dfsg-4+x32.2) unreleased; urgency=medium
+
+ * Enable kvm for x32
+
+ -- Thorsten Glaser <[email protected]> Mon, 08 Sep 2014 15:28:39 +0200
+
+qemu (2.1+dfsg-4+x32.1) unreleased; urgency=medium
+
+ * Add x32 to the list of supported architectures
+
+ -- Thorsten Glaser <[email protected]> Wed, 03 Sep 2014 15:34:57 +0200
+
qemu (2.1+dfsg-4) unstable; urgency=medium
* mention libnuma-dev but not enable for now
diff -Nru qemu-2.1+dfsg/debian/control qemu-2.1+dfsg/debian/control
--- qemu-2.1+dfsg/debian/control 2014-08-31 07:38:30.000000000 +0200
+++ qemu-2.1+dfsg/debian/control 2014-09-08 15:16:09.000000000 +0200
@@ -114,7 +114,7 @@
Vcs-Git: git://anonscm.debian.org/pkg-qemu/qemu.git
Package: qemu
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${misc:Depends}, qemu-system (>= ${source:Version}), qemu-user (>=
${source:Version}) [linux-any], qemu-utils (>= ${source:Version})
Suggests: qemu-user-static [linux-any]
@@ -138,7 +138,7 @@
This package is a metapackage depending on all qemu-related packages.
Package: qemu-system
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${misc:Depends},
qemu-system-arm,
@@ -158,7 +158,7 @@
QEMU supports.
Package: qemu-system-common
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Pre-Depends: adduser
Provides: qemu-keymaps
@@ -187,7 +187,7 @@
full system emulation (qemu-system-*) packages.
Package: qemu-system-misc
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>>
2.0.0+dfsg-7~)
Recommends: qemu-utils
@@ -212,7 +212,7 @@
machines on a single server.
Package: qemu-system-arm
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>>
2.0.0+dfsg-7~)
Recommends: qemu-utils
@@ -234,7 +234,7 @@
machines on a single server.
Package: qemu-system-mips
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>>
2.0.0+dfsg-7~)
Recommends: qemu-utils
@@ -256,7 +256,7 @@
machines on a single server.
Package: qemu-system-ppc
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>>
2.0.0+dfsg-7~),
# ubuntu can't Depend on openbios-ppc and openhackware as they're in universe
@@ -280,7 +280,7 @@
machines on a single server.
Package: qemu-system-sparc
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>>
2.0.0+dfsg-7~),
# ubuntu/openbios-sparc is in universe
@@ -306,7 +306,7 @@
machines on a single server.
Package: qemu-system-x86
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>>
2.0.0+dfsg-7~),
seabios (>= 1.7.5~), ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
@@ -336,7 +336,7 @@
usage on systems which supports it.
Package: qemu-user
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: qemu-user-binfmt
@@ -358,7 +358,7 @@
qemu-user-static will register statically linked binfmt handlers instead.
Package: qemu-user-static
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: binfmt-support
@@ -380,7 +380,7 @@
that it will be possible to run foreign binaries directly.
Package: qemu-user-binfmt
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${misc:Depends}, qemu-user (= ${binary:Version}), binfmt-support
Conflicts: qemu-user-static
@@ -396,7 +396,7 @@
at install and remove times.
Package: qemu-utils
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: sharutils
@@ -437,7 +437,7 @@
qemu virtual machine. It is not used on the host.
Package: qemu-kvm
-Architecture: i386 amd64
+Architecture: i386 amd64 x32
Multi-Arch: foreign
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, qemu-system-x86 (>= 1.7.0+dfsg-2~)
diff -Nru qemu-2.1+dfsg/debian/control-in qemu-2.1+dfsg/debian/control-in
--- qemu-2.1+dfsg/debian/control-in 2014-08-31 07:27:32.000000000 +0200
+++ qemu-2.1+dfsg/debian/control-in 2014-09-08 15:13:27.000000000 +0200
@@ -120,7 +120,7 @@
:ubuntu:XS-Debian-Vcs-Git: git://anonscm.debian.org/pkg-qemu/qemu.git
Package: qemu
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${misc:Depends}, qemu-system (>= ${source:Version}), qemu-user (>=
${source:Version}) [linux-any], qemu-utils (>= ${source:Version})
Suggests: qemu-user-static [linux-any]
@@ -144,7 +144,7 @@
This package is a metapackage depending on all qemu-related packages.
Package: qemu-system
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${misc:Depends},
qemu-system-arm,
@@ -164,7 +164,7 @@
QEMU supports.
Package: qemu-system-common
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Pre-Depends: adduser
Provides: qemu-keymaps
@@ -197,7 +197,7 @@
full system emulation (qemu-system-*) packages.
Package: qemu-system-misc
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>>
2.0.0+dfsg-7~)
Recommends: qemu-utils
@@ -222,7 +222,7 @@
machines on a single server.
Package: qemu-system-arm
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>>
2.0.0+dfsg-7~)
Recommends: qemu-utils
@@ -252,7 +252,7 @@
machines on a single server.
Package: qemu-system-mips
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>>
2.0.0+dfsg-7~)
Recommends: qemu-utils
@@ -274,7 +274,7 @@
machines on a single server.
Package: qemu-system-ppc
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>>
2.0.0+dfsg-7~),
# ubuntu can't Depend on openbios-ppc and openhackware as they're in universe
@@ -305,7 +305,7 @@
machines on a single server.
Package: qemu-system-sparc
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>>
2.0.0+dfsg-7~),
# ubuntu/openbios-sparc is in universe
@@ -337,7 +337,7 @@
machines on a single server.
Package: qemu-system-x86
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>>
2.0.0+dfsg-7~),
seabios (>= 1.7.5~), ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
@@ -375,7 +375,7 @@
usage on systems which supports it.
Package: qemu-user
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: qemu-user-binfmt
@@ -399,7 +399,7 @@
qemu-user-static will register statically linked binfmt handlers instead.
Package: qemu-user-static
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: binfmt-support
@@ -421,7 +421,7 @@
that it will be possible to run foreign binaries directly.
Package: qemu-user-binfmt
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${misc:Depends}, qemu-user (= ${binary:Version}), binfmt-support
Conflicts: qemu-user-static
@@ -437,7 +437,7 @@
at install and remove times.
Package: qemu-utils
-Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
+Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: sharutils
@@ -480,7 +480,7 @@
qemu virtual machine. It is not used on the host.
Package: qemu-kvm
-:debian:Architecture: i386 amd64
+:debian:Architecture: i386 amd64 x32
:ubuntu:Architecture: i386 amd64 armhf armel powerpc sparc
Multi-Arch: foreign
Pre-Depends: ${misc:Pre-Depends}
diff -Nru qemu-2.1+dfsg/debian/patches/series
qemu-2.1+dfsg/debian/patches/series
--- qemu-2.1+dfsg/debian/patches/series 2014-08-31 07:27:32.000000000 +0200
+++ qemu-2.1+dfsg/debian/patches/series 2014-09-08 15:23:58.000000000 +0200
@@ -8,3 +8,4 @@
9p-readdir.patch
pc-reserve-more-memory-for-acpi.patch
qemu-options-add-missing--drive-discard-option-to-cmdline-help.diff
+x32-kvm.patch
diff -Nru qemu-2.1+dfsg/debian/patches/x32-kvm.patch
qemu-2.1+dfsg/debian/patches/x32-kvm.patch
--- qemu-2.1+dfsg/debian/patches/x32-kvm.patch 1970-01-01 01:00:00.000000000
+0100
+++ qemu-2.1+dfsg/debian/patches/x32-kvm.patch 2014-09-08 15:28:35.000000000
+0200
@@ -0,0 +1,34 @@
+Author: Thorsten Glaser <[email protected]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760386
+Forwarded: no
+Description: add KVM support for x32, and harmonise x86 variants
+
+--- a/configure
++++ b/configure
+@@ -2922,7 +2922,7 @@ fi
+ ##########################################
+ # TPM passthrough is only on x86 Linux
+
+-if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then
++if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64 -o
"$cpu" = x32; then
+ tpm_passthrough=$tpm
+ else
+ tpm_passthrough=no
+@@ -4100,7 +4100,7 @@ fi
+
+ # Mac OS X ships with a broken assembler
+ roms=
+-if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
++if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" -o "$cpu" = x32 \) -a \
+ "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \
+ "$softmmu" = yes ; then
+ roms="optionrom"
+@@ -5079,6 +5079,8 @@ case "$target_name" in
+ \( "$target_name" = "ppc" -a "$cpu" = "ppc64" \) -o \
+ \( "$target_name" = "ppcemb" -a "$cpu" = "ppc64" \) -o \
+ \( "$target_name" = "mipsel" -a "$cpu" = "mips" \) -o \
++ \( "$target_name" = "i386" -a "$cpu" = "x32" \) -o \
++ \( "$target_name" = "x86_64" -a "$cpu" = "x32" \) -o \
+ \( "$target_name" = "x86_64" -a "$cpu" = "i386" \) -o \
+ \( "$target_name" = "i386" -a "$cpu" = "x86_64" \) \) ; then
+ echo "CONFIG_KVM=y" >> $config_target_mak
diff -Nru qemu-2.1+dfsg/debian/rules qemu-2.1+dfsg/debian/rules
--- qemu-2.1+dfsg/debian/rules 2014-08-31 07:31:40.000000000 +0200
+++ qemu-2.1+dfsg/debian/rules 2014-09-08 15:11:12.000000000 +0200
@@ -178,7 +178,7 @@
# /usr/bin/kvm compat script. This needs some more work for other arches
# How about a manpage for it?
-ifneq ($(filter $(DEB_HOST_ARCH),amd64 i386),)
+ifneq ($(filter $(DEB_HOST_ARCH),amd64 i386 x32),)
dh_install -pqemu-kvm debian/kvm /usr/bin/
dh_install -pqemu-kvm debian/kvm.1 /usr/share/man/man1/
ifeq ($(DEB_VENDOR),Ubuntu)
@@ -248,7 +248,7 @@
# qemu-ifup is arch-specific
install -D debian/qemu-ifup.$(DEB_HOST_ARCH_OS) \
debian/qemu-system-common/etc/qemu-ifup
-ifneq ($(filter $(DEB_HOST_ARCH),amd64 i386),)
+ifneq ($(filter $(DEB_HOST_ARCH),amd64 i386 x32),)
# we load kvm module only on x86 (modern kernels don't need even that),
# and we don't want to fail installation if module can't be loaded
# remoe past jessie (and maybe for jessie too)
