From 789f95736a14264f1b8dd7260eb6633606e39458 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 25 Mar 2015 10:28:54 +0100 Subject: [PATCH] - eanble kvm on x32 (patch from debian-x32.org) - disable xen on x32 --- kvm-on-x32.patch | 13 +++++++++++++ qemu.spec | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 kvm-on-x32.patch diff --git a/kvm-on-x32.patch b/kvm-on-x32.patch new file mode 100644 index 0000000..434338a --- /dev/null +++ b/kvm-on-x32.patch @@ -0,0 +1,13 @@ +--- qemu-2.1+dfsg.orig/configure ++++ qemu-2.1+dfsg/configure +@@ -5080,7 +5080,9 @@ case "$target_name" in + \( "$target_name" = "ppcemb" -a "$cpu" = "ppc64" \) -o \ + \( "$target_name" = "mipsel" -a "$cpu" = "mips" \) -o \ + \( "$target_name" = "x86_64" -a "$cpu" = "i386" \) -o \ +- \( "$target_name" = "i386" -a "$cpu" = "x86_64" \) \) ; then ++ \( "$target_name" = "i386" -a "$cpu" = "x86_64" \) -o \ ++ \( "$target_name" = "x86_64" -a "$cpu" = "x32" \) -o \ ++ \( "$target_name" = "i386" -a "$cpu" = "x32" \) \) ; then + echo "CONFIG_KVM=y" >> $config_target_mak + if test "$vhost_net" = "yes" ; then + echo "CONFIG_VHOST_NET=y" >> $config_target_mak diff --git a/qemu.spec b/qemu.spec index 2d496e0..15f62ac 100644 --- a/qemu.spec +++ b/qemu.spec @@ -29,6 +29,10 @@ %undefine with_gtk3 %endif +%ifarch x32 +%undefine with_xen +%endif + Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora Name: qemu @@ -58,6 +62,7 @@ Patch2: %{name}-whitelist.patch Patch3: %{name}-system-libcacard.patch Patch4: %{name}-xattr.patch Patch5: libjpeg-boolean.patch +Patch6: kvm-on-x32.patch # Proof of concept, for reference, do not remove Patch400: %{name}-kde_virtual_workspaces_hack.patch URL: http://www.qemu-project.org/ @@ -725,6 +730,7 @@ Moduł QEMU dla urządeń blokowych typu 'ssh'. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %{__mv} libcacard libcacard-use-system-lib -- 2.44.0