Merge ../master into f18
This commit is contained in:
commit
6ae593a9b4
@ -0,0 +1,14 @@
|
||||
--- qemu-kvm-1.2.0/qemu-char.c~ 2012-09-12 19:46:36.491936229 +0100
|
||||
+++ qemu-kvm-1.2.0/qemu-char.c 2012-09-12 19:47:33.349972760 +0100
|
||||
@@ -2268,9 +2268,8 @@
|
||||
}
|
||||
return ret;
|
||||
} else {
|
||||
- /* (Re-)connect for unconnected writing */
|
||||
- tcp_chr_connect(chr);
|
||||
- return 0;
|
||||
+ /* XXX: indicate an error ? */
|
||||
+ return len;
|
||||
}
|
||||
}
|
||||
|
14
qemu.spec
14
qemu.spec
@ -37,7 +37,7 @@
|
||||
Summary: QEMU is a FAST! processor emulator
|
||||
Name: qemu
|
||||
Version: 1.2.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
# Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
|
||||
Epoch: 2
|
||||
License: GPLv2+ and LGPLv2+ and BSD
|
||||
@ -189,6 +189,13 @@ Patch0363: 0363-usb-redir-Store-max_packet_size-in-endp_data.patch
|
||||
Patch0364: 0364-usb-redir-Add-support-for-migration.patch
|
||||
Patch0365: 0365-usb-redir-Add-chardev-open-close-debug-logging.patch
|
||||
|
||||
# Revert c3767ed0eb5d0.
|
||||
# NOT upstream (hopefully will be soon).
|
||||
# See: https://bugzilla.redhat.com/show_bug.cgi?id=853408
|
||||
# and: https://lists.gnu.org/archive/html/qemu-devel/2012-09/msg00526.html
|
||||
# plus followups.
|
||||
Patch0900: 0001-Revert-qemu-char-Re-connect-for-tcp_chr_write-unconn.patch
|
||||
|
||||
BuildRequires: SDL-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: which
|
||||
@ -568,6 +575,8 @@ such as kvm_stat.
|
||||
%patch364 -p1
|
||||
%patch365 -p1
|
||||
|
||||
%patch900 -p1
|
||||
|
||||
|
||||
%build
|
||||
buildarch="i386-softmmu x86_64-softmmu arm-softmmu cris-softmmu \
|
||||
@ -1046,6 +1055,9 @@ fi
|
||||
%{_mandir}/man1/qemu-img.1*
|
||||
|
||||
%changelog
|
||||
* Wed Sep 12 2012 Richard W.M. Jones <rjones@redhat.com> - 2:1.2.0-3
|
||||
- Fix RHBZ#853408 which causes libguestfs failure.
|
||||
|
||||
* Sat Sep 8 2012 Hans de Goede <hdegoede@redhat.com> - 2:1.2.0-2
|
||||
- Fix crash on (seamless) migration
|
||||
- Sync usbredir live migration patches with upstream
|
||||
|
Loading…
Reference in New Issue
Block a user