[qemu/f16: 4/4] Merge branch 'master' into f16

Justin M. Forbes jforbes at fedoraproject.org
Thu Aug 4 20:01:14 UTC 2011


commit 58c34c6ec3e39bbeca39e595cdd5560c1627c28e
Merge: 1e4ec79 b51ebd0
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Thu Aug 4 15:00:28 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	qemu.spec

 .gitignore                                         |    1 +
 ...out-tcp-socket-close-code-in-a-separate-f.patch |   10 +-
 ...QemuChrHandlers-struct-to-initialise-char.patch |    8 +-
 ...Add-enable-disable_write_fd_handler-funct.patch |    4 +-
 ...-framework-for-a-write-unblocked-callback.patch |    6 +-
 ...-send_all-to-handle-nonblocking-chardev-w.patch |   10 +-
 ...the-unix-tcp-backend-to-handle-nonblockin.patch |   10 +-
 ...har-Throttle-when-host-connection-is-down.patch |    8 +-
 ...ole-Enable-port-throttling-when-chardev-i.patch |    4 +-
 0009-spice-qemu-char.c-add-throttling.patch        |    4 +-
 ...ce-qemu-char.c-remove-intermediate-buffer.patch |    4 +-
 0011-usb-redir-Add-flow-control-support.patch      |    4 +-
 ...-usb-redir-Call-qemu_chr_guest_open-close.patch |    4 +-
 ...u-char-Generate-chardev-open-close-events.patch |    4 +-
 0014-spice-add-worker-wrapper-functions.patch      |  323 ++++++++++
 ...-spice-add-qemu_spice_display_init_common.patch |   84 +++
 0016-spice-qxl-move-worker-wrappers.patch          |  294 +++++++++
 0017-qxl-fix-surface-tracking-locking.patch        |   92 +++
 0018-qxl-add-io_port_to_string.patch               |   71 +++
 0019-qxl-error-handling-fixes-and-cleanups.patch   |  110 ++++
 ...ake-qxl_guest_bug-take-variable-arguments.patch |   52 ++
 ...l-only-disallow-specific-io-s-in-vga-mode.patch |   31 +
 ...-qxl-async-io-support-using-new-spice-api.patch |  659 ++++++++++++++++++++
 ..._IO_FLUSH_-SURFACES-RELEASE-for-guest-S3-.patch |   77 +++
 0024-qxl-bump-pci-rev.patch                        |   90 +++
 ...serial-bus-replay-guest_open-on-migration.patch |   50 ++
 qemu.spec                                          |   33 +-
 sources                                            |    2 +-
 28 files changed, 2005 insertions(+), 44 deletions(-)
---


More information about the scm-commits mailing list