[qemu: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/qemu

[Justin M. Forbes]

commit b51ebd0cd2f64d7bd1f6272e98605ccb774cbc7d
Merge: 13f703f db8fd94
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Thu Aug 4 14:10:38 2011 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/qemu
    
    Conflicts:
    	qemu.spec

 qemu-kvm-default-accelerator.patch |   18 ++++++++++++++++++
 qemu.spec                          |    8 ++++++++
 2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --cc qemu.spec
index fee1353,abd8306..5896356
--- a/qemu.spec
+++ b/qemu.spec
@@@ -54,19 -54,10 +54,22 @@@ Patch10: 0010-spice-qemu-char.c-remove-
  Patch11: 0011-usb-redir-Add-flow-control-support.patch
  Patch12: 0012-usb-redir-Call-qemu_chr_guest_open-close.patch
  Patch13: 0013-spice-qemu-char-Generate-chardev-open-close-events.patch
 +Patch14: 0014-spice-add-worker-wrapper-functions.patch
 +Patch15: 0015-spice-add-qemu_spice_display_init_common.patch
 +Patch16: 0016-spice-qxl-move-worker-wrappers.patch
 +Patch17: 0017-qxl-fix-surface-tracking-locking.patch
 +Patch18: 0018-qxl-add-io_port_to_string.patch
 +Patch19: 0019-qxl-error-handling-fixes-and-cleanups.patch
 +Patch20: 0020-qxl-make-qxl_guest_bug-take-variable-arguments.patch
 +Patch21: 0021-qxl-only-disallow-specific-io-s-in-vga-mode.patch
 +Patch22: 0022-qxl-async-io-support-using-new-spice-api.patch
 +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
@@@ -252,19 -243,9 +255,21 @@@ such as kvm_stat
  %patch11 -p1
  %patch12 -p1
  %patch13 -p1
 +%patch14 -p1
 +%patch15 -p1
 +%patch16 -p1
 +%patch17 -p1
 +%patch18 -p1
 +%patch19 -p1
 +%patch20 -p1
 +%patch21 -p1
 +%patch22 -p1
 +%patch23 -p1
 +%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
@@@ -574,9 -555,9 +579,12 @@@ f
  %{_mandir}/man1/qemu-img.1*
  
  %changelog
 +* Thu Aug 04 2011 Justin M. Forbes <jforbes at redhat.com> - 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 <berrange at redhat.com> - 2:0.15.0-0.3.2011072859fadcc
+ - Fix default accelerator for non-KVM builds (rhbz #724814)
+ 
  * Thu Jul 28 2011 Justin M. Forbes <jforbes at redhat.com> - 2:0.15.0-0.1.2011072859fadcc
  - Update to 0.15.0-rc0 as we prepare for 0.15.0 release