From b51ebd0cd2f64d7bd1f6272e98605ccb774cbc7d Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: Aug 04 2011 19:10:38 +0000 Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/qemu Conflicts: qemu.spec --- diff --git a/qemu-kvm-default-accelerator.patch b/qemu-kvm-default-accelerator.patch new file mode 100644 index 0000000..9931144 --- /dev/null +++ b/qemu-kvm-default-accelerator.patch @@ -0,0 +1,18 @@ +diff --git a/vl.c b/vl.c +index 7ae549e..28fd2f3 100644 +--- a/vl.c ++++ b/vl.c +@@ -1953,8 +1953,13 @@ static int configure_accelerator(void) + } + + if (p == NULL) { ++#ifdef CONFIG_KVM + /* Use the default "accelerator", kvm */ + p = "kvm"; ++#else ++ /* Use the default "accelerator", tcg */ ++ p = "tcg"; ++#endif + } + + while (!accel_initalised && *p != '\0') { diff --git a/qemu.spec b/qemu.spec index fee1353..5896356 100644 --- a/qemu.spec +++ b/qemu.spec @@ -67,6 +67,9 @@ Patch23: 0023-qxl-add-QXL_IO_FLUSH_-SURFACES-RELEASE-for-guest-S3-.patch Patch24: 0024-qxl-bump-pci-rev.patch Patch25: 0025-virtio-serial-bus-replay-guest_open-on-migration.patch +# Fix for default accelerator in non-KVM builds +Patch100: qemu-kvm-default-accelerator.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel BuildRequires: libaio-devel @@ -265,6 +268,8 @@ such as kvm_stat. %patch24 -p1 %patch25 -p1 +%patch100 -p1 + %build # By default we build everything, but allow x86 to build a minimal version # with only similar arch target support @@ -577,6 +582,9 @@ fi * Thu Aug 04 2011 Justin M. Forbes - 2:0.15.0-0.3.201108040af4922 - Update to 0.15.0-rc1 as we prepare for 0.15.0 release +* Thu Aug 4 2011 Daniel P. Berrange - 2:0.15.0-0.3.2011072859fadcc +- Fix default accelerator for non-KVM builds (rhbz #724814) + * Thu Jul 28 2011 Justin M. Forbes - 2:0.15.0-0.1.2011072859fadcc - Update to 0.15.0-rc0 as we prepare for 0.15.0 release