Update to qemu stable 1.4.2

Alias qemu-system-* man page to qemu.1 (bz #907746) Drop execute bit on service files (bz #963917) Conditionalize KSM service on host virt support (bz #963681) Split out KSM package, make it not pulled in by default
2013-05-25 14:38:28 -04:00 · 2013-05-25 14:38:28 -04:00 · a7b9285033
parent b37e2081e5
commit a7b9285033
73 changed files with 384 additions and 519 deletions
--- a/.gitignore
+++ b/.gitignore
@ -19,3 +19,4 @@ qemu-kvm-0.13.0-25fdf4a.tar.gz
 /qemu-1.3.0.tar.bz2
 /qemu-1.4.0.tar.bz2
 /qemu-1.4.1.tar.bz2
+/qemu-1.4.2.tar.bz2
--- a/0001-char-Split-out-tcp-socket-close-code-in-a-separate-f.patch
+++ b/0001-char-Split-out-tcp-socket-close-code-in-a-separate-f.patch
@ -1,4 +1,4 @@
-From bed754a15e27a3630681959cf1d3161084f29fe9 Mon Sep 17 00:00:00 2001
+From f85faeccdc2b98c4aab0d9781c9650a71a30c23b Mon Sep 17 00:00:00 2001
 From: Amit Shah <amit.shah@redhat.com>
 Date: Mon, 21 Mar 2011 21:57:47 +0100
 Subject: [PATCH] char: Split out tcp socket close code in a separate function
--- a/0002-char-Add-a-QemuChrHandlers-struct-to-initialise-char.patch
+++ b/0002-char-Add-a-QemuChrHandlers-struct-to-initialise-char.patch
@ -1,4 +1,4 @@
-From de768f74c31d04063889c5dc588d55bc19cf7315 Mon Sep 17 00:00:00 2001
+From 260acf7f716aa138138dc301b80a1bd10761b0bc Mon Sep 17 00:00:00 2001
 From: Amit Shah <amit.shah@redhat.com>
 Date: Mon, 21 Mar 2011 20:31:45 +0100
 Subject: [PATCH] char: Add a QemuChrHandlers struct to initialise chardev
@ -764,7 +764,7 @@ index 47ac8c9..2f8757f 100644
 
     if (s->cs->opened && !dev->attached) {
 diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
-index 8c0ead0..bb07c62 100644
+index 1406e3f..2ee9ad1 100644
 --- a/hw/usb/redirect.c
 +++ b/hw/usb/redirect.c
@@ -1227,6 +1227,12 @@ static void usbredir_chardev_event(void *opaque, int event)
--- a/0003-iohandlers-Add-enable-disable_write_fd_handler-funct.patch
+++ b/0003-iohandlers-Add-enable-disable_write_fd_handler-funct.patch
@ -1,4 +1,4 @@
-From 64080f1b8983660b707ed8c0d10ace22e9b46f7a Mon Sep 17 00:00:00 2001
+From 1f039120d2d1b4b97dbb92ec84492a7e917ab09e Mon Sep 17 00:00:00 2001
 From: Amit Shah <amit.shah@redhat.com>
 Date: Mon, 21 Mar 2011 20:32:58 +0100
 Subject: [PATCH] iohandlers: Add enable/disable_write_fd_handler() functions
--- a/0004-char-Add-framework-for-a-write-unblocked-callback.patch
+++ b/0004-char-Add-framework-for-a-write-unblocked-callback.patch
@ -1,4 +1,4 @@
-From 84877040f31425a8fecdbee19cb24fcc5a8212df Mon Sep 17 00:00:00 2001
+From bd1a691c11f718cbd6018a8ef5077c47a2e6d883 Mon Sep 17 00:00:00 2001
 From: Amit Shah <amit.shah@redhat.com>
 Date: Mon, 21 Mar 2011 21:41:42 +0100
 Subject: [PATCH] char: Add framework for a 'write unblocked' callback
--- a/0005-char-Update-send_all-to-handle-nonblocking-chardev-w.patch
+++ b/0005-char-Update-send_all-to-handle-nonblocking-chardev-w.patch
@ -1,4 +1,4 @@
-From c7e9b2a5b981209f4e77b26562758663cc060900 Mon Sep 17 00:00:00 2001
+From c2dfb673b44dc776109b6c1a9f6a3e28b3e32cf4 Mon Sep 17 00:00:00 2001
 From: Amit Shah <amit.shah@redhat.com>
 Date: Mon, 21 Mar 2011 22:00:27 +0100
 Subject: [PATCH] char: Update send_all() to handle nonblocking chardev write
--- a/0006-char-Equip-the-unix-tcp-backend-to-handle-nonblockin.patch
+++ b/0006-char-Equip-the-unix-tcp-backend-to-handle-nonblockin.patch
@ -1,4 +1,4 @@
-From 6540bebbaa749d405df91516e1ca5a075e354628 Mon Sep 17 00:00:00 2001
+From cf067f179258c741547a792eb7c38542d2574165 Mon Sep 17 00:00:00 2001
 From: Amit Shah <amit.shah@redhat.com>
 Date: Mon, 21 Mar 2011 22:02:47 +0100
 Subject: [PATCH] char: Equip the unix/tcp backend to handle nonblocking
--- a/0007-virtio-console-Enable-port-throttling-when-chardev-i.patch
+++ b/0007-virtio-console-Enable-port-throttling-when-chardev-i.patch
@ -1,4 +1,4 @@
-From 33f3874dc760f0960d408be2f916d04373de543b Mon Sep 17 00:00:00 2001
+From 563ef1912e4b0c0b5728bc53d2b225d2ff3cd9ef Mon Sep 17 00:00:00 2001
 From: Amit Shah <amit.shah@redhat.com>
 Date: Mon, 21 Mar 2011 22:06:41 +0100
 Subject: [PATCH] virtio-console: Enable port throttling when chardev is slow
--- a/0008-spice-qemu-char.c-add-throttling.patch
+++ b/0008-spice-qemu-char.c-add-throttling.patch
@ -1,4 +1,4 @@
-From aa0a2c94c70ae5ed0fb215328c8ecebbef10cbe9 Mon Sep 17 00:00:00 2001
+From 7f533f631ffb62d2330003e687d47c83d3359026 Mon Sep 17 00:00:00 2001
 From: Alon Levy <alevy@redhat.com>
 Date: Tue, 22 Mar 2011 12:27:59 +0200
 Subject: [PATCH] spice-qemu-char.c: add throttling
--- a/0009-spice-qemu-char.c-remove-intermediate-buffer.patch
+++ b/0009-spice-qemu-char.c-remove-intermediate-buffer.patch
@ -1,4 +1,4 @@
-From de979c48aa4b5e7f3f8658f9ac69030f3de3c99c Mon Sep 17 00:00:00 2001
+From d126441f71fde3b8a1d1cfea62d05382faea0985 Mon Sep 17 00:00:00 2001
 From: Alon Levy <alevy@redhat.com>
 Date: Tue, 22 Mar 2011 12:28:00 +0200
 Subject: [PATCH] spice-qemu-char.c: remove intermediate buffer
--- a/0010-usb-redir-Add-flow-control-support.patch
+++ b/0010-usb-redir-Add-flow-control-support.patch
@ -1,4 +1,4 @@
-From 1e87b85766f9c18a2f9dffd289c0e56d640637c4 Mon Sep 17 00:00:00 2001
+From a0d12b6040efbe6aa8e6e74cef91cf613ff2bf55 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Tue, 19 Jul 2011 10:56:19 +0200
 Subject: [PATCH] usb-redir: Add flow control support
@ -9,7 +9,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 1 file changed, 20 insertions(+), 2 deletions(-)

 diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
-index bb07c62..4d23b66 100644
+index 2ee9ad1..bf6aaf0 100644
 --- a/hw/usb/redirect.c
 +++ b/hw/usb/redirect.c
@@ -257,8 +257,9 @@ static int usbredir_read(void *priv, uint8_t *data, int count)
--- a/0011-char-Disable-write-callback-if-throttled-chardev-is-.patch
+++ b/0011-char-Disable-write-callback-if-throttled-chardev-is-.patch
@ -1,4 +1,4 @@
-From 42931bebb2856307dcdc9babc5dd9954b60c8094 Mon Sep 17 00:00:00 2001
+From 8dec49852492007b4e5afc599376a4d88623cba8 Mon Sep 17 00:00:00 2001
 From: Amit Shah <amit.shah@redhat.com>
 Date: Fri, 2 Dec 2011 15:42:55 +0530
 Subject: [PATCH] char: Disable write callback if throttled chardev is detached
--- a/0012-hw-virtio-serial-bus-replay-guest-open-on-destinatio.patch
+++ b/0012-hw-virtio-serial-bus-replay-guest-open-on-destinatio.patch
@ -1,4 +1,4 @@
-From 81ab56732f4990c288c88a545925dc4431c313d2 Mon Sep 17 00:00:00 2001
+From 1a888642291d5bc49c657c313e4bc01b59f47d2a Mon Sep 17 00:00:00 2001
 From: Alon Levy <alevy@redhat.com>
 Date: Fri, 16 Nov 2012 16:24:47 +0200
 Subject: [PATCH] hw/virtio-serial-bus: replay guest open on destination
--- a/0101-vnc-tls-Fix-compilation-with-newer-versions-of-GNU-T.patch
+++ b/0101-vnc-tls-Fix-compilation-with-newer-versions-of-GNU-T.patch
@ -0,0 +1,47 @@
+From 0aa1a9b167ca8a32d7c7112df375ddfa608f1f72 Mon Sep 17 00:00:00 2001
+From: Andre Przywara <andre.przywara@amd.com>
+Date: Thu, 18 Oct 2012 11:16:58 +0200
+Subject: [PATCH] vnc-tls: Fix compilation with newer versions of GNU-TLS
+
+In my installation of GNU-TLS (v3.0.23) the type
+gnutls_anon_server_credentials is marked deprecated, so -Werror
+breaks compilation.
+Simply replacing it with the newer ..._t version fixed the compilation
+on my machine (Slackware 14.0). I cannot tell how far back this "new"
+type goes, at least the header file in RHEL 5.0 (v1.4.1) seems to have
+it already. If someone finds a broken distribution, tell me and I
+insert some compat code.
+
+Signed-off-by: Andre Przywara <andre.przywara@amd.com>
+Message-id: 1350551818-14717-1-git-send-email-andre.przywara@amd.com
+Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
+(cherry picked from commit 7d2a929feba319c18603e324b1750830d6c8b7a1)
+---
+ ui/vnc-tls.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c
+index 5629263..8d4cc8e 100644
+--- a/ui/vnc-tls.c
+++ b/ui/vnc-tls.c
+@@ -99,9 +99,9 @@ static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport,
+ }
+ 
+ 
+-static gnutls_anon_server_credentials vnc_tls_initialize_anon_cred(void)
+static gnutls_anon_server_credentials_t vnc_tls_initialize_anon_cred(void)
+ {
+-    gnutls_anon_server_credentials anon_cred;
+    gnutls_anon_server_credentials_t anon_cred;
+     int ret;
+ 
+     if ((ret = gnutls_anon_allocate_server_credentials(&anon_cred)) < 0) {
+@@ -382,7 +382,7 @@ int vnc_tls_client_setup(struct VncState *vs,
+             }
+ 
+         } else {
+-            gnutls_anon_server_credentials anon_cred = vnc_tls_initialize_anon_cred();
+            gnutls_anon_server_credentials_t anon_cred = vnc_tls_initialize_anon_cred();
+             if (!anon_cred) {
+                 gnutls_deinit(vs->tls.session);
+                 vs->tls.session = NULL;
--- a/0102-migration-change-initial-value-of-expected_downtime.patch
+++ b/0102-migration-change-initial-value-of-expected_downtime.patch
@ -1,7 +1,7 @@
-From c30be405e8d7344268900de953df863667950217 Mon Sep 17 00:00:00 2001
+From 60388b2884f904b408ec8650ab2af0a03ea7073e Mon Sep 17 00:00:00 2001
 From: Juan Quintela <quintela@redhat.com>
 Date: Fri, 1 Feb 2013 11:12:26 +0100
-Subject: [PATCH 201/246] migration: change initial value of expected_downtime
+Subject: [PATCH] migration: change initial value of expected_downtime

 0 is a very bad initial value, what we are trying to get is
 max_downtime, so that is a much better estimation.
@ -9,6 +9,7 @@ max_downtime, so that is a much better estimation.
 Signed-off-by: Juan Quintela <quintela@redhat.com>

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+(cherry picked from commit cc283e3bf04d2f64eb6ec2ee5bcd36edd779fe89)
 ---
 migration.c | 2 ++
 1 file changed, 2 insertions(+)
@ -26,6 +27,3 @@ index 98c7696..3584a24 100644
 
     s->xfer_limit = s->bandwidth_limit / XFER_LIMIT_RATIO;
     s->complete = false;
-- 
-1.8.2.1
-
--- a/0103-migration-calculate-end-time-after-we-have-sent-the-.patch
+++ b/0103-migration-calculate-end-time-after-we-have-sent-the-.patch
@ -1,12 +1,12 @@
-From 306e49f278d465051e83253022252b1c69737eb1 Mon Sep 17 00:00:00 2001
+From f34eeb6b65d36c31a0e412eefae1f735e48a3a69 Mon Sep 17 00:00:00 2001
 From: Juan Quintela <quintela@redhat.com>
 Date: Fri, 1 Feb 2013 12:39:08 +0100
-Subject: [PATCH 202/246] migration: calculate end time after we have sent the
- data
+Subject: [PATCH] migration: calculate end time after we have sent the data

 Signed-off-by: Juan Quintela <quintela@redhat.com>

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+(cherry picked from commit a3e879cd51c4f614f702117c4b1449f0218c00f3)
 ---
 migration.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
@ -32,6 +32,3 @@ index 3584a24..0026f08 100644
         if (current_time >= initial_time + BUFFER_DELAY) {
             uint64_t transferred_bytes = s->bytes_xfer;
             uint64_t time_spent = current_time - initial_time;
-- 
-1.8.2.1
-
--- a/0104-migration-don-t-account-sleep-time-for-calculating-b.patch
+++ b/0104-migration-don-t-account-sleep-time-for-calculating-b.patch
@ -1,8 +1,7 @@
-From abda6f8a1cd72a04737ebd9e814a8eb427783a21 Mon Sep 17 00:00:00 2001
+From 84b78ab739083a154713d89384b85550b39f2057 Mon Sep 17 00:00:00 2001
 From: Juan Quintela <quintela@redhat.com>
 Date: Fri, 1 Feb 2013 12:41:38 +0100
-Subject: [PATCH 203/246] migration: don't account sleep time for calculating
- bandwidth
+Subject: [PATCH] migration: don't account sleep time for calculating bandwidth

 While we are sleeping we are not sending, so we should not use that
 time to estimate our bandwidth.
@ -10,6 +9,7 @@ time to estimate our bandwidth.
 Signed-off-by: Juan Quintela <quintela@redhat.com>

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+(cherry picked from commit 7161082c8d8cf167c508976887a0a63f4db92b51)
 ---
 migration.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
@ -49,6 +49,3 @@ index 0026f08..ebfbbde 100644
         }
         ret = buffered_flush(s);
         if (ret < 0) {
-- 
-1.8.2.1
-
--- a/0105-migration-calculate-expected_downtime.patch
+++ b/0105-migration-calculate-expected_downtime.patch
@ -1,7 +1,7 @@
-From 5b6a7544893648bc29dee219a634bfa7d2ca857a Mon Sep 17 00:00:00 2001
+From 0d9d4a5c179f09bd801ba3470b97e1fd3f184ce2 Mon Sep 17 00:00:00 2001
 From: Juan Quintela <quintela@redhat.com>
 Date: Fri, 1 Feb 2013 13:22:37 +0100
-Subject: [PATCH 204/246] migration: calculate expected_downtime
+Subject: [PATCH] migration: calculate expected_downtime

 We removed the calculation in commit e4ed1541ac9413eac494a03532e34beaf8a7d1c5

@ -12,6 +12,7 @@ include TARGET_PAGE_SIZE.
 Signed-off-by: Juan Quintela <quintela@redhat.com>

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+(cherry picked from commit 90f8ae724a575861f093fbdbfd49a925bcfec327)
 ---
 arch_init.c                   | 1 +
 include/migration/migration.h | 1 +
@ -58,6 +59,3 @@ index ebfbbde..59e479d 100644
 
             s->bytes_xfer = 0;
             sleep_time = 0;
-- 
-1.8.2.1
-
--- a/0106-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
+++ b/0106-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
@ -1,46 +0,0 @@
-From f76e7a03ac948a7649878d7ddbb02ace0f6e3625 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Wed, 20 Feb 2013 11:14:45 -0500
-Subject: [PATCH] docs: Fix generating qemu-doc.html with texinfo 5
-
-LC_ALL=C makeinfo --no-headers --no-split --number-sections --html qemu-doc.texi -o qemu-doc.html
-./qemu-options.texi:1521: unknown command `list'
-./qemu-options.texi:1521: table requires an argument: the formatter for @item
-./qemu-options.texi:1521: warning: @table has text but no @item
-
-CC: qemu-stable@nongnu.org
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- qemu-options.hx | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
-
-diff --git a/qemu-options.hx b/qemu-options.hx
-index 15dc29e..470c2b4 100644
--- a/qemu-options.hx
-+++ b/qemu-options.hx
-@@ -2092,18 +2092,13 @@ QEMU supports using either local sheepdog devices or remote networked
- devices.
- 
- Syntax for specifying a sheepdog device
-@table @list
-``sheepdog:<vdiname>''
-
-``sheepdog:<vdiname>:<snapid>''
-
-``sheepdog:<vdiname>:<tag>''
-
-``sheepdog:<host>:<port>:<vdiname>''
-
-``sheepdog:<host>:<port>:<vdiname>:<snapid>''
-
-``sheepdog:<host>:<port>:<vdiname>:<tag>''
-+@table @code
-+@item sheepdog:<vdiname>
-+@item sheepdog:<vdiname>:<snapid>
-+@item sheepdog:<vdiname>:<tag>
-+@item sheepdog:<host>:<port>:<vdiname>
-+@item sheepdog:<host>:<port>:<vdiname>:<snapid>
-+@item sheepdog:<host>:<port>:<vdiname>:<tag>
- @end table
- 
- Example
--- a/0106-migration-simplify-while-loop.patch
+++ b/0106-migration-simplify-while-loop.patch
@ -1,13 +1,14 @@
-From 9c9566a75a88ff2db9d747ab24cbb7a3d71c4d8b Mon Sep 17 00:00:00 2001
+From 8dd1a13b6ce0a9d83080823c8bc9d82d09100576 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:07 +0100
-Subject: [PATCH 205/246] migration: simplify while loop
+Subject: [PATCH] migration: simplify while loop

 Unify the goto around the loop, with the exit condition at the end of it.
 Both can be expressed as "while (ret >= 0)".

 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 5da5aad068def65b5e278a6380192d4bfe279585)
 ---
 migration.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
@ -45,6 +46,3 @@ index 59e479d..71c0eec 100644
     if (ret < 0) {
         migrate_fd_error(s);
     }
-- 
-1.8.2.1
-
--- a/0107-migration-always-use-vm_stop_force_state.patch
+++ b/0107-migration-always-use-vm_stop_force_state.patch
@ -1,7 +1,7 @@
-From 9a914ea26d69de42b55e70c6d330eeec0cb7ccfe Mon Sep 17 00:00:00 2001
+From e78d91a594e42f11a915bd95afcaee2f4f11bc1a Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:08 +0100
-Subject: [PATCH 206/246] migration: always use vm_stop_force_state
+Subject: [PATCH] migration: always use vm_stop_force_state

 vm_stop_force_state does:

@ -26,6 +26,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 891518abd804401978e402d588733e282be960ad)
 ---
 migration.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
@ -47,6 +48,3 @@ index 71c0eec..d601641 100644
                 ret = qemu_savevm_state_complete(s->file);
                 if (ret < 0) {
                     qemu_mutex_unlock_iothread();
-- 
-1.8.2.1
-
--- a/0107-usb-redir-Fix-crash-on-migration-with-no-client-conn.patch
+++ b/0107-usb-redir-Fix-crash-on-migration-with-no-client-conn.patch
@ -1,31 +0,0 @@
-From 106a39c50211b7c7e96ffb47ad9deae5d9be6d84 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 15 Mar 2013 11:52:37 +0100
-Subject: [PATCH] usb-redir: Fix crash on migration with no client connected
-
-If no client is connected on the src side, then we won't receive a
-parser during migrate, in this case usbredir_post_load() should be a nop,
-rather then to try to derefefence the NULL dev->parser pointer.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-(cherry picked from commit 3713e1485e6eace7d48b9c790602cfd92c616e5f)
---
- hw/usb/redirect.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
-index 4d23b66..bf6aaf0 100644
--- a/hw/usb/redirect.c
-+++ b/hw/usb/redirect.c
-@@ -2008,6 +2008,10 @@ static int usbredir_post_load(void *priv, int version_id)
- {
-     USBRedirDevice *dev = priv;
- 
-+    if (dev->parser == NULL) {
-+        return 0;
-+    }
-+
-     switch (dev->device_info.speed) {
-     case usb_redir_speed_low:
-         dev->dev.speed = USB_SPEED_LOW;
--- a/0108-migration-move-more-error-handling-to-migrate_fd_cle.patch
+++ b/0108-migration-move-more-error-handling-to-migrate_fd_cle.patch
@ -1,8 +1,7 @@
-From fa25441af918e5e19c181cd5aac537a6bb8799ed Mon Sep 17 00:00:00 2001
+From b259853dce28b7a8e0efe6bfedc7850821c8c76b Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:09 +0100
-Subject: [PATCH 207/246] migration: move more error handling to
- migrate_fd_cleanup
+Subject: [PATCH] migration: move more error handling to migrate_fd_cleanup

 The next patch will add more cases where qemu_savevm_state_cancel
 needs to be called; prepare for that already, the function can be
@ -12,6 +11,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 7a2c17216cd5ae4c22844123b8e9360d517932f8)
 ---
 migration.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
@ -64,6 +64,3 @@ index d601641..739e38c 100644
 
     migrate_fd_cleanup(s);
 }
-- 
-1.8.2.1
-
--- a/0109-migration-push-qemu_savevm_state_cancel-out-of-qemu_.patch
+++ b/0109-migration-push-qemu_savevm_state_cancel-out-of-qemu_.patch
@ -1,7 +1,7 @@
-From af258e54dc3654dbe326dcdf022b277e8872072a Mon Sep 17 00:00:00 2001
+From bd0d732bc7d23b686f13ab377f58e227c4edc707 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:10 +0100
-Subject: [PATCH 208/246] migration: push qemu_savevm_state_cancel out of
+Subject: [PATCH] migration: push qemu_savevm_state_cancel out of
 qemu_savevm_state_*

 This is useful, because it lets us keep the cancellation callbacks
@ -11,6 +11,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 04943ebaa9e4f5f9ac080198a7b0d25c6d7ac444)
 ---
 savevm.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)
@ -67,6 +68,3 @@ index a8a53ef..4302903 100644
 
     return ret;
 }
-- 
-1.8.2.1
-
--- a/0110-block-migration-remove-useless-calls-to-blk_mig_clea.patch
+++ b/0110-block-migration-remove-useless-calls-to-blk_mig_clea.patch
@ -1,8 +1,7 @@
-From d00dba1bf360ad47957774923dfd2c07ee9cdec0 Mon Sep 17 00:00:00 2001
+From a52c9450418c1a03aebbd95216fbd177430e2fc7 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:11 +0100
-Subject: [PATCH 209/246] block-migration: remove useless calls to
- blk_mig_cleanup
+Subject: [PATCH] block-migration: remove useless calls to blk_mig_cleanup

 Now that the cancel callback is called consistently for all errors,
 we can avoid doing its work in the other callbacks.
@ -11,6 +10,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit d418cf57a3e699746ef0bfa772bbe8c7e17cebb5)
 ---
 block-migration.c | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)
@ -101,6 +101,3 @@ index 43ab202..e6c917d 100644
     return 0;
 }
 
-- 
-1.8.2.1
-
--- a/0111-qemu-file-pass-errno-from-qemu_fflush-via-f-last_err.patch
+++ b/0111-qemu-file-pass-errno-from-qemu_fflush-via-f-last_err.patch
@ -1,8 +1,7 @@
-From 64774c81205e77bd55d69b6a116f0ef5f61929ba Mon Sep 17 00:00:00 2001
+From d35fb24839d0a0dd18b322ba8d9fbcd0b587819b Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:12 +0100
-Subject: [PATCH 210/246] qemu-file: pass errno from qemu_fflush via
- f->last_error
+Subject: [PATCH] qemu-file: pass errno from qemu_fflush via f->last_error

 This is done by almost all callers of qemu_fflush, move the code
 directly to qemu_fflush.
@ -11,6 +10,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 93bf21044c38134bc7d35577b675d9f2bdcb8419)
 ---
 savevm.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)
@ -82,6 +82,3 @@ index 4302903..a681177 100644
     }
 }
 
-- 
-1.8.2.1
-
--- a/0112-migration-use-qemu_file_set_error-to-pass-error-code.patch
+++ b/0112-migration-use-qemu_file_set_error-to-pass-error-code.patch
@ -1,13 +1,14 @@
-From 8b3e57abc68b37922399034c92dd4a10890c2c0e Mon Sep 17 00:00:00 2001
+From 8d5406a6a42ece0d7d9e250aabe68ea8a0e3fbf6 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:13 +0100
-Subject: [PATCH 211/246] migration: use qemu_file_set_error to pass error
- codes back to qemu_savevm_state
+Subject: [PATCH] migration: use qemu_file_set_error to pass error codes back
+ to qemu_savevm_state

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 47c8c17af883b5bd0f147cfcec8d7ef8ff76023b)
 ---
 include/sysemu/sysemu.h |  6 +++---
 savevm.c                | 44 ++++++++++++++++++--------------------------
@ -140,6 +141,3 @@ index a681177..a1690b4 100644
     return ret;
 }
 
-- 
-1.8.2.1
-
--- a/0113-qemu-file-temporarily-expose-qemu_file_set_error-and.patch
+++ b/0113-qemu-file-temporarily-expose-qemu_file_set_error-and.patch
@ -1,7 +1,7 @@
-From 5d4b7aa9dee156a613086d343987220c99adddd9 Mon Sep 17 00:00:00 2001
+From 8c77add1c1b00cdfc3d7380aabec3add69381150 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:14 +0100
-Subject: [PATCH 212/246] qemu-file: temporarily expose qemu_file_set_error and
+Subject: [PATCH] qemu-file: temporarily expose qemu_file_set_error and
 qemu_fflush

 Right now, migration cannot entirely rely on QEMUFile's automatic
@ -19,6 +19,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 4eb938102b3d533e142de23e255e46da1326fc5a)
 ---
 include/migration/qemu-file.h | 2 ++
 savevm.c                      | 4 ++--
@ -66,6 +67,3 @@ index a1690b4..e10a045 100644
 {
     int ret = 0;
 
-- 
-1.8.2.1
-
--- a/0114-migration-flush-all-data-to-fd-when-buffered_flush-i.patch
+++ b/0114-migration-flush-all-data-to-fd-when-buffered_flush-i.patch
@ -1,8 +1,7 @@
-From 0c1da6466596bc25328f896161f06622899cce48 Mon Sep 17 00:00:00 2001
+From 015c261bdbb06a737b14600d62c37fef28ea9d22 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:15 +0100
-Subject: [PATCH 213/246] migration: flush all data to fd when buffered_flush
- is called
+Subject: [PATCH] migration: flush all data to fd when buffered_flush is called

 Including data that resided in the QEMUFile's own buffer.

@ -10,6 +9,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit f5821518ed6d49aae9fd0aa6169d2d74bb83054c)
 ---
 migration.c | 2 ++
 1 file changed, 2 insertions(+)
@ -27,6 +27,3 @@ index 739e38c..1027b40 100644
     while (s->bytes_xfer < s->xfer_limit && offset < s->buffer_size) {
         size_t to_send = MIN(s->buffer_size - offset, s->xfer_limit - s->bytes_xfer);
         ret = migrate_fd_put_buffer(s, s->buffer + offset, to_send);
-- 
-1.8.2.1
-
--- a/0115-migration-use-qemu_file_set_error.patch
+++ b/0115-migration-use-qemu_file_set_error.patch
@ -1,7 +1,7 @@
-From a00d2c8014dbf2553c7bbd69a025f7e3992d25be Mon Sep 17 00:00:00 2001
+From 7f2725d2a64c533129504a9c9ea610169abd72f8 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:16 +0100
-Subject: [PATCH 214/246] migration: use qemu_file_set_error
+Subject: [PATCH] migration: use qemu_file_set_error

 Remove the return value of buffered_flush, pass it via the error code
 of s->file.  Once this is done, the error can be retrieved simply
@ -11,6 +11,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 63dfbd7ee03185c181a0791958ec9c8337089b55)
 ---
 migration.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)
@ -77,6 +78,3 @@ index 1027b40..da5f175 100644
     }
 
     if (ret < 0) {
-- 
-1.8.2.1
-
--- a/0116-migration-simplify-error-handling.patch
+++ b/0116-migration-simplify-error-handling.patch
@ -1,7 +1,7 @@
-From fd038161f3313522eb0faea2a58adcb3766e5efd Mon Sep 17 00:00:00 2001
+From 67f17b78f85bfa766ba9bde63148c3c171ef3426 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:17 +0100
-Subject: [PATCH 215/246] migration: simplify error handling
+Subject: [PATCH] migration: simplify error handling

 Always use qemu_file_get_error to detect errors, since that is how
 QEMUFile itself drops I/O after an error occurs.  There is no need
@ -14,6 +14,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit dba433c03a0f5dc22a459435dd89557886298921)
 ---
 include/migration/migration.h |  1 -
 migration.c                   | 46 +++++++++++++------------------------------
@ -137,6 +138,3 @@ index da5f175..41a592c 100644
 
     s->file = qemu_fopen_ops(s, &buffered_file_ops);
 
-- 
-1.8.2.1
-
--- a/0117-migration-do-not-nest-flushing-of-device-data.patch
+++ b/0117-migration-do-not-nest-flushing-of-device-data.patch
@ -1,7 +1,7 @@
-From 10a7d96875e75f249789c4e66578360740b6277f Mon Sep 17 00:00:00 2001
+From 907358d71215fdc486c6e70de9b16cfefc88303b Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:18 +0100
-Subject: [PATCH 216/246] migration: do not nest flushing of device data
+Subject: [PATCH] migration: do not nest flushing of device data

 Completion of migration is currently done with a "nested" loop that
 invokes buffered_flush: migrate_fd_completed is called by
@ -17,6 +17,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit a3fa1d78cbae2259491b17689812edcb643a3b30)
 ---
 migration.c | 55 ++++++++++++++++++++++++-------------------------------
 1 file changed, 24 insertions(+), 31 deletions(-)
@ -149,6 +150,3 @@ index 41a592c..57fceb6d 100644
         }
     }
 
-- 
-1.8.2.1
-
--- a/0118-migration-add-migrate_set_state-tracepoint.patch
+++ b/0118-migration-add-migrate_set_state-tracepoint.patch
@ -1,11 +1,12 @@
-From 00c79950d1190667daf58d4aa536aede816376a1 Mon Sep 17 00:00:00 2001
+From 12a2075cf44c3234ba3efd7afb7a924ff39ba441 Mon Sep 17 00:00:00 2001
 From: Kazuya Saito <saito.kazuya@jp.fujitsu.com>
 Date: Fri, 22 Feb 2013 17:36:19 +0100
-Subject: [PATCH 217/246] migration: add migrate_set_state tracepoint
+Subject: [PATCH] migration: add migrate_set_state tracepoint

 Signed-off-by: Kazuya Saito <saito.kazuya@jp.fujitsu.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit c09e5bb1d88ef38986bac7c6ed59dbd732cc4771)
 ---
 migration.c  | 9 ++++++++-
 trace-events | 3 +++
@ -78,6 +79,3 @@ index 167f481..614c4ef 100644
 +
 +# migration.c
 +migrate_set_state(int new_state) "new state %d"
-- 
-1.8.2.1
-
--- a/0119-migration-prepare-to-access-s-state-outside-critical.patch
+++ b/0119-migration-prepare-to-access-s-state-outside-critical.patch
@ -1,8 +1,8 @@
-From 5378a79abf77509ea47d75d8984644f3ba2ff209 Mon Sep 17 00:00:00 2001
+From b61e15d1ead74c97c9fa709f6d2868529bae1098 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:20 +0100
-Subject: [PATCH 218/246] migration: prepare to access s->state outside
- critical sections
+Subject: [PATCH] migration: prepare to access s->state outside critical
+ sections

 Accessing s->state outside the big QEMU lock will simplify a bit the
 locking/unlocking of the iothread lock.
@ -14,6 +14,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit f4410a5d9926886c36d9fa9fdd969d0469d62724)
 ---
 migration.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)
@ -123,6 +124,3 @@ index c0a9239..e844b2c 100644
     g_free(s->buffer);
     return NULL;
 }
-- 
-1.8.2.1
-
--- a/0120-migration-cleanup-migration-including-thread-in-the-.patch
+++ b/0120-migration-cleanup-migration-including-thread-in-the-.patch
@ -1,8 +1,8 @@
-From f3940c04a0436c4d2291df4118494154ea7463b5 Mon Sep 17 00:00:00 2001
+From bce1e693cdf25a98c120882197c9fcce975fb039 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:21 +0100
-Subject: [PATCH 219/246] migration: cleanup migration (including thread) in
- the iothread
+Subject: [PATCH] migration: cleanup migration (including thread) in the
+ iothread

 Perform final cleanup in a bottom half, and add joining the thread to
 the series of cleanup actions.
@ -14,6 +14,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit bb1fadc444ff967554c41d96cb9dde110e8aece9)
 ---
 include/migration/migration.h |  1 +
 migration.c                   | 38 ++++++++++++++++++++------------------
@ -126,6 +127,3 @@ index e844b2c..437475b 100644
 +                       QEMU_THREAD_JOINABLE);
     notifier_list_notify(&migration_state_notifiers, s);
 }
-- 
-1.8.2.1
-
--- a/0121-block-migration-remove-variables-that-are-never-read.patch
+++ b/0121-block-migration-remove-variables-that-are-never-read.patch
@ -1,12 +1,13 @@
-From 9fdbad6e2d4c5bc85daddabe74b3e26337c11219 Mon Sep 17 00:00:00 2001
+From b4800390037c71ffa12d691d3410327bc3eb826e Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:22 +0100
-Subject: [PATCH 220/246] block-migration: remove variables that are never read
+Subject: [PATCH] block-migration: remove variables that are never read

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit a55ce1c851b5802569fb00b2a645a73c03fd7c86)
 ---
 block-migration.c | 13 -------------
 1 file changed, 13 deletions(-)
@ -67,6 +68,3 @@ index e6c917d..e72f322 100644
                 blk->aiocb = bdrv_aio_readv(bmds->bs, sector, &blk->qiov,
                                             nr_sectors, blk_mig_read_cb, blk);
                 block_mig_state.submitted++;
-- 
-1.8.2.1
-
--- a/0122-block-migration-small-preparatory-changes-for-lockin.patch
+++ b/0122-block-migration-small-preparatory-changes-for-lockin.patch
@ -1,8 +1,7 @@
-From 50897e0513dd4854402e3d26d3a95860cabba5d2 Mon Sep 17 00:00:00 2001
+From b91507ad365c4672fb8c8217b9f37ce5c151e229 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:23 +0100
-Subject: [PATCH 221/246] block-migration: small preparatory changes for
- locking
+Subject: [PATCH] block-migration: small preparatory changes for locking

 Some small changes that will simplify the positioning of lock/unlock
 primitives.
@ -11,6 +10,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 13197e3cbaba0ba693dd2855a32182ca584fa97e)
 ---
 block-migration.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)
@ -86,6 +86,3 @@ index e72f322..9a40edd 100644
                        block_mig_state.submitted * BLOCK_SIZE +
                        block_mig_state.read_done * BLOCK_SIZE;
 
-- 
-1.8.2.1
-
--- a/0123-block-migration-document-usage-of-state-across-threa.patch
+++ b/0123-block-migration-document-usage-of-state-across-threa.patch
@ -1,13 +1,13 @@
-From 79d609fcbb20cd8fb41d61362778b4f491caa5c8 Mon Sep 17 00:00:00 2001
+From 4c62f3e4b8f0c014306c4e5dae4eb8c59289d562 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:24 +0100
-Subject: [PATCH 222/246] block-migration: document usage of state across
- threads
+Subject: [PATCH] block-migration: document usage of state across threads

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 323920c4eac01de74cf2b5e941c97ca9b2d36b7f)
 ---
 block-migration.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
@ -73,6 +73,3 @@ index 9a40edd..d62a8b8 100644
     int prev_progress;
     int bulk_completed;
 } BlkMigState;
-- 
-1.8.2.1
-
--- a/0124-block-migration-add-lock.patch
+++ b/0124-block-migration-add-lock.patch
@ -1,7 +1,7 @@
-From a9043cabd68e72aebb35259f420a89cf0021ee40 Mon Sep 17 00:00:00 2001
+From f53959ca0d677a2ff0bf7243faeb2174f83268dc Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:25 +0100
-Subject: [PATCH 223/246] block-migration: add lock
+Subject: [PATCH] block-migration: add lock

 Some state is shared between the block migration code and its AIO
 callbacks.  Once block migration will run outside the iothread,
@ -14,6 +14,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 52e850dea988585c3d693fd9cd4a4c38968d89b8)
 ---
 block-migration.c     | 54 ++++++++++++++++++++++++++++++++++++++++++++++++---
 include/qemu/atomic.h |  1 +
@ -276,6 +277,3 @@ index 96a194b..10becb6 100644
 /*
  * We use GCC builtin if it's available, as that can use
  * mfence on 32 bit as well, e.g. if built with -march=pentium-m.
-- 
-1.8.2.1
-
--- a/0125-migration-reorder-SaveVMHandlers-members.patch
+++ b/0125-migration-reorder-SaveVMHandlers-members.patch
@ -1,7 +1,7 @@
-From 3d91104155abc46db41f0588bdbcfbd34aa007af Mon Sep 17 00:00:00 2001
+From aa1e411294714429d6d4eb66bdb4266f65a01d1f Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:26 +0100
-Subject: [PATCH 224/246] migration: reorder SaveVMHandlers members
+Subject: [PATCH] migration: reorder SaveVMHandlers members

 This groups together the callbacks that later will have similar
 locking rules.
@ -10,6 +10,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 8c8de19d93444536d3291e6ab83e2bcf61dd2d0c)
 ---
 include/migration/vmstate.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
@ -37,6 +38,3 @@ index f27276c..6229569 100644
 } SaveVMHandlers;
 
 int register_savevm(DeviceState *dev,
-- 
-1.8.2.1
-
--- a/0126-migration-run-pending-iterate-callbacks-out-of-big-l.patch
+++ b/0126-migration-run-pending-iterate-callbacks-out-of-big-l.patch
@ -1,8 +1,7 @@
-From f873c5525a98cbf9ae06ebef1229b6810bb3186a Mon Sep 17 00:00:00 2001
+From efb8ea48a730325b4bb4cfd1b624e697b1522536 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:27 +0100
-Subject: [PATCH 225/246] migration: run pending/iterate callbacks out of big
- lock
+Subject: [PATCH] migration: run pending/iterate callbacks out of big lock

 This makes it possible to do blocking writes directly to the socket,
 with no buffer in the middle.  For RAM, only the migration_bitmap_sync()
@ -20,6 +19,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 32c835ba3984728c22d4e73cdb595090a60f437e)
 ---
 arch_init.c                 |  4 ++++
 block-migration.c           | 37 +++++++++++++++++++++++++++++++++++--
@ -263,6 +263,3 @@ index 437475b..87b5009 100644
         }
 
         current_time = qemu_get_clock_ms(rt_clock);
-- 
-1.8.2.1
-
--- a/0127-migration-run-setup-callbacks-out-of-big-lock.patch
+++ b/0127-migration-run-setup-callbacks-out-of-big-lock.patch
@ -1,7 +1,7 @@
-From 4418176da1e72e62c06b87bc39f4dc3688e9a4cf Mon Sep 17 00:00:00 2001
+From ffe95e1c4daef0e563b8d70a8f456f9e7037818d Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:28 +0100
-Subject: [PATCH 226/246] migration: run setup callbacks out of big lock
+Subject: [PATCH] migration: run setup callbacks out of big lock

 Only the migration_bitmap_sync() call needs the iothread lock.

@ -9,6 +9,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 9b0950375277467fd74a9075624477ae43b9bb22)
 ---
 arch_init.c                 | 10 ++++++----
 block-migration.c           |  2 ++
@ -114,6 +115,3 @@ index e10a045..7c7774e 100644
     while (qemu_file_get_error(f) == 0) {
         if (qemu_savevm_state_iterate(f) > 0) {
             break;
-- 
-1.8.2.1
-
--- a/0128-migration-yay-buffering-is-gone.patch
+++ b/0128-migration-yay-buffering-is-gone.patch
@ -1,7 +1,7 @@
-From 7b88ce8fc64774035975391bbab68e59810fe07b Mon Sep 17 00:00:00 2001
+From 4354cf42b4976ffc12b930cae1a4e9d8f9f71f08 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:29 +0100
-Subject: [PATCH 227/246] migration: yay, buffering is gone
+Subject: [PATCH] migration: yay, buffering is gone

 Buffering was needed because blocking writes could take a long time
 and starve other threads seeking to grab the big QEMU mutex.
@ -13,6 +13,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit edaae611f6df0d66a8b5a90c84123b72980c7a22)
 ---
 include/migration/migration.h |  3 --
 migration.c                   | 79 ++++++++++++-------------------------------
@ -173,6 +174,3 @@ index 7c7774e..ce10295 100644
 }
 
 uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size)
-- 
-1.8.2.1
-
--- a/0129-Rename-buffered_-to-migration_.patch
+++ b/0129-Rename-buffered_-to-migration_.patch
@ -1,13 +1,14 @@
-From 15a0127c8f5146f9e88faf839b7818807497b1e5 Mon Sep 17 00:00:00 2001
+From 1b49e3073fada9243cb16e24aaa09e19a6675881 Mon Sep 17 00:00:00 2001
 From: Juan Quintela <quintela@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:30 +0100
-Subject: [PATCH 228/246] Rename buffered_ to migration_
+Subject: [PATCH] Rename buffered_ to migration_

 This is consistent once that we have moved everything to migration.c

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 5f496a1be3d15f192be1ab1fed3a3278fd5a91a1)
 ---
 migration.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
@ -111,6 +112,3 @@ index 62a7f8e..71c6c10 100644
                        QEMU_THREAD_JOINABLE);
     notifier_list_notify(&migration_state_notifiers, s);
 }
-- 
-1.8.2.1
-
--- a/0130-qemu-file-make-qemu_fflush-and-qemu_file_set_error-p.patch
+++ b/0130-qemu-file-make-qemu_fflush-and-qemu_file_set_error-p.patch
@ -1,13 +1,14 @@
-From 6c3c2d1af9dbc147b7975e490cbf860502ed93e5 Mon Sep 17 00:00:00 2001
+From d1e45898016eb902411abe5c5b377a490e2b03b2 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:31 +0100
-Subject: [PATCH 229/246] qemu-file: make qemu_fflush and qemu_file_set_error
- private again
+Subject: [PATCH] qemu-file: make qemu_fflush and qemu_file_set_error private
+ again

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 05f28b837c6bd6124abab2496ce15c07a334a5ad)
 ---
 include/migration/qemu-file.h | 2 --
 savevm.c                      | 4 ++--
@ -55,6 +56,3 @@ index ce10295..fef2ab9 100644
 {
     int ret = 0;
 
-- 
-1.8.2.1
-
--- a/0131-migration-eliminate-last_round.patch
+++ b/0131-migration-eliminate-last_round.patch
@ -1,7 +1,7 @@
-From 70ae4fa3b1eb5b327a8375bcdd04c5d837f16d6f Mon Sep 17 00:00:00 2001
+From cc3b3656b4fcca8dcdfe6d174615333d7486ce69 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:32 +0100
-Subject: [PATCH 230/246] migration: eliminate last_round
+Subject: [PATCH] migration: eliminate last_round

 We will go around the loop exactly once after setting last_round.
 Eliminate the variable altogether.
@ -10,6 +10,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 059f896cefb2776181e39d9ba69345bd9d07d52b)
 ---
 migration.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
@ -64,6 +65,3 @@ index 71c6c10..a888f36 100644
             vm_start();
         }
     }
-- 
-1.8.2.1
-
--- a/0132-migration-detect-error-before-sleeping.patch
+++ b/0132-migration-detect-error-before-sleeping.patch
@ -1,12 +1,13 @@
-From 853560d2513e360ca0dc690fba8a55ad7da31312 Mon Sep 17 00:00:00 2001
+From 409d6af88505169acec3bf3ae005eba79a981688 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:33 +0100
-Subject: [PATCH 231/246] migration: detect error before sleeping
+Subject: [PATCH] migration: detect error before sleeping

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit fd45ee2c643bb3d55de5c54b50c23859ca631a9f)
 ---
 migration.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
@ -36,6 +37,3 @@ index a888f36..35c3455 100644
     }
 
     qemu_mutex_lock_iothread();
-- 
-1.8.2.1
-
--- a/0133-migration-remove-useless-qemu_file_get_error-check.patch
+++ b/0133-migration-remove-useless-qemu_file_get_error-check.patch
@ -1,7 +1,7 @@
-From f4f1096175be8a34f16fb3e39dfde22e4566d0c6 Mon Sep 17 00:00:00 2001
+From 8469b1f717180ae0ca4e764afcbaa61c931ab8d4 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:34 +0100
-Subject: [PATCH 232/246] migration: remove useless qemu_file_get_error check
+Subject: [PATCH] migration: remove useless qemu_file_get_error check

 migration_put_buffer is never called if there has been an error.

@ -9,6 +9,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit db2f25309af1af0f27e0ddec4acc3b66837fa668)
 ---
 migration.c | 6 ------
 1 file changed, 6 deletions(-)
@ -30,6 +31,3 @@ index 35c3455..d75beca 100644
     if (size <= 0) {
         return size;
     }
-- 
-1.8.2.1
-
--- a/0134-migration-use-qemu_file_rate_limit-consistently.patch
+++ b/0134-migration-use-qemu_file_rate_limit-consistently.patch
@ -1,12 +1,13 @@
-From b806155b3d8c4ba206d90d2337fb682a446ed08c Mon Sep 17 00:00:00 2001
+From 59df9d30f0f54158975a3d3642a1d655b177cdfe Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:35 +0100
-Subject: [PATCH 233/246] migration: use qemu_file_rate_limit consistently
+Subject: [PATCH] migration: use qemu_file_rate_limit consistently

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit a0ff044b8ea81908cd8fe5819ce33780f53f58ee)
 ---
 migration.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
@ -33,6 +34,3 @@ index d75beca..ae2c83c 100644
             /* usleep expects microseconds */
             g_usleep((initial_time + BUFFER_DELAY - current_time)*1000);
             sleep_time += qemu_get_clock_ms(rt_clock) - current_time;
-- 
-1.8.2.1
-
--- a/0135-migration-merge-qemu_popen_cmd-with-qemu_popen.patch
+++ b/0135-migration-merge-qemu_popen_cmd-with-qemu_popen.patch
@ -1,7 +1,7 @@
-From d168927f61149c211e156be639be1cf8399bf30e Mon Sep 17 00:00:00 2001
+From 4f88dd44aa288f1ded954850a9a222f4ecdf00b8 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:36 +0100
-Subject: [PATCH 234/246] migration: merge qemu_popen_cmd with qemu_popen
+Subject: [PATCH] migration: merge qemu_popen_cmd with qemu_popen

 There is no reason for outgoing exec migration to do popen manually
 anymore (the reason used to be that we needed the FILE* to make it
@ -11,6 +11,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 817b9ed5eb300dbb434d752da416441028539a96)
 ---
 include/migration/qemu-file.h |  1 -
 migration-exec.c              | 10 ++++------
@ -100,6 +101,3 @@ index fef2ab9..38699de 100644
 static const QEMUFileOps stdio_file_read_ops = {
     .get_fd =     stdio_get_fd,
     .get_buffer = stdio_get_buffer,
-- 
-1.8.2.1
-
--- a/0136-qemu-file-fsync-a-writable-stdio-QEMUFile.patch
+++ b/0136-qemu-file-fsync-a-writable-stdio-QEMUFile.patch
@ -1,7 +1,7 @@
-From 1b98be7980ca1ac4a5ea1b140e09594c74824204 Mon Sep 17 00:00:00 2001
+From 701731a81e40d7321f619020b9062a5d88f7466a Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:37 +0100
-Subject: [PATCH 235/246] qemu-file: fsync a writable stdio QEMUFile
+Subject: [PATCH] qemu-file: fsync a writable stdio QEMUFile

 This is what fd_close does.  Prepare for switching to a QEMUFile.

@ -9,6 +9,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit ce39ee3184a02eca7f9529cc19b1582f6f704c70)
 ---
 savevm.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
@ -42,6 +43,3 @@ index 38699de..1d49fde 100644
     if (fclose(s->stdio_file) == EOF) {
         ret = -errno;
     }
-- 
-1.8.2.1
-
--- a/0137-qemu-file-check-exit-status-when-closing-a-pipe-QEMU.patch
+++ b/0137-qemu-file-check-exit-status-when-closing-a-pipe-QEMU.patch
@ -1,8 +1,7 @@
-From 0755b0d7d8d94d566945d1016ca7a61a5913f4ae Mon Sep 17 00:00:00 2001
+From ba58f61422bff38da15331a092adfd2cfaadc8d5 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:38 +0100
-Subject: [PATCH 236/246] qemu-file: check exit status when closing a pipe
- QEMUFile
+Subject: [PATCH] qemu-file: check exit status when closing a pipe QEMUFile

 This is what exec_close does.  Move this to the underlying QEMUFile.

@ -10,6 +9,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 13c7b2da073ec83cb47f9582149c8d28bb038e73)
 ---
 include/qemu/osdep.h | 7 +++++++
 migration-exec.c     | 4 ----
@ -63,6 +63,3 @@ index 1d49fde..6d6f1f1 100644
     }
     g_free(s);
     return ret;
-- 
-1.8.2.1
-
--- a/0138-qemu-file-add-writable-socket-QEMUFile.patch
+++ b/0138-qemu-file-add-writable-socket-QEMUFile.patch
@ -1,12 +1,13 @@
-From dcda429cd8f860b774686d69ee640c82bbfa9db4 Mon Sep 17 00:00:00 2001
+From b38aa57a296bd4fdc31a9ebf3f28ffb612ad6e32 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:39 +0100
-Subject: [PATCH 237/246] qemu-file: add writable socket QEMUFile
+Subject: [PATCH] qemu-file: add writable socket QEMUFile

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 0cc3f3ccc9d29acc94b995430518bda1c7c01bef)
 ---
 include/migration/qemu-file.h |  2 +-
 migration-tcp.c               |  2 +-
@ -108,6 +109,3 @@ index 6d6f1f1..76c88c7 100644
     return s->file;
 }
 
-- 
-1.8.2.1
-
--- a/0139-qemu-file-simplify-and-export-qemu_ftell.patch
+++ b/0139-qemu-file-simplify-and-export-qemu_ftell.patch
@ -1,7 +1,7 @@
-From 6690c2eb2a183f2853742e20a0d2a6fb0c39ae65 Mon Sep 17 00:00:00 2001
+From 6afaa318d59f4532dd9a6682704bfbfef280c86e Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:40 +0100
-Subject: [PATCH 238/246] qemu-file: simplify and export qemu_ftell
+Subject: [PATCH] qemu-file: simplify and export qemu_ftell

 Force a flush when qemu_ftell is called.  This simplifies the buffer magic
 (it also breaks qemu_ftell for input QEMUFiles, but we never use it).
@ -10,6 +10,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 3f2d38faab97f4d676c41868a8243997b2aab7cb)
 ---
 savevm.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)
@ -70,6 +71,3 @@ index 76c88c7..c60ace3 100644
 }
 
 int qemu_file_rate_limit(QEMUFile *f)
-- 
-1.8.2.1
-
--- a/0140-migration-use-QEMUFile-for-migration-channel-lifetim.patch
+++ b/0140-migration-use-QEMUFile-for-migration-channel-lifetim.patch
@ -1,8 +1,7 @@
-From aa1e9e2e0165a02552ae87e88ec76d3fe17c407b Mon Sep 17 00:00:00 2001
+From 163a01830d0dbdb57f332915ebe298f86be84cb0 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:41 +0100
-Subject: [PATCH 239/246] migration: use QEMUFile for migration channel
- lifetime
+Subject: [PATCH] migration: use QEMUFile for migration channel lifetime

 As a start, use QEMUFile to store the destination and close it.
 qemu_get_fd gets a file descriptor that will be used by the write
@ -12,6 +11,12 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit f8bbc1286337a8506162b5785babe6f2a7de2476)
+
+Conflicts:
+	migration-tcp.c
+	migration-unix.c
+	savevm.c
 ---
 include/migration/migration.h |  7 ++++---
 migration-exec.c              | 21 ++-------------------
@ -273,6 +278,3 @@ index c60ace3..43963ce 100644
         s->file = qemu_fopen_ops(s, &socket_write_ops);
     } else {
         s->file = qemu_fopen_ops(s, &socket_read_ops);
-- 
-1.8.2.1
-
--- a/0141-migration-use-QEMUFile-for-writing-outgoing-migratio.patch
+++ b/0141-migration-use-QEMUFile-for-writing-outgoing-migratio.patch
@ -1,8 +1,7 @@
-From 16a0242081586af3bfb38b0b710fc9fd3b681143 Mon Sep 17 00:00:00 2001
+From e15601079ef83c1fed53fb82d938bb2e4d6104ca Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:42 +0100
-Subject: [PATCH 240/246] migration: use QEMUFile for writing outgoing
- migration data
+Subject: [PATCH] migration: use QEMUFile for writing outgoing migration data

 Second, drop the file descriptor indirection, and write directly to the
 QEMUFile.
@ -11,6 +10,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit e6a1cf21328802f3a83e84e893b8cb8a468141cc)
 ---
 include/migration/migration.h |  4 ----
 migration-exec.c              | 12 -----------
@ -249,6 +249,3 @@ index fa630ed..26ba6c9 100644
     s->file = qemu_fopen_ops(s, &migration_file_ops);
 
     qemu_thread_create(&s->thread, migration_thread, s,
-- 
-1.8.2.1
-
--- a/0142-migration-use-qemu_ftell-to-compute-bandwidth.patch
+++ b/0142-migration-use-qemu_ftell-to-compute-bandwidth.patch
@ -1,7 +1,7 @@
-From 75a2c8fdbeb4eb8fbe66e6b12a13994bf80bb08b Mon Sep 17 00:00:00 2001
+From c6c8a4fa26f5aa2f687a779997a2bd040cd01ff4 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:43 +0100
-Subject: [PATCH 241/246] migration: use qemu_ftell to compute bandwidth
+Subject: [PATCH] migration: use qemu_ftell to compute bandwidth

 Prepare for when s->bytes_xfer will be removed.

@ -9,6 +9,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit be7172e22a9c3bc448894e57f6c2d1af6ffd47fd)
 ---
 migration.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
@ -42,6 +43,3 @@ index 26ba6c9..def1e9e 100644
         }
         if (qemu_file_rate_limit(s->file)) {
             /* usleep expects microseconds */
-- 
-1.8.2.1
-
--- a/0143-migration-small-changes-around-rate-limiting.patch
+++ b/0143-migration-small-changes-around-rate-limiting.patch
@ -1,7 +1,7 @@
-From ac64f1634590c63facd49747946d4c90975ed7be Mon Sep 17 00:00:00 2001
+From 6709fac663d343a1f34178da389001d46df3cac9 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:44 +0100
-Subject: [PATCH 242/246] migration: small changes around rate-limiting
+Subject: [PATCH] migration: small changes around rate-limiting

 This patch extracts a few small changes from the next patch, which
 are unrelated to adding generic rate-limiting functionality to
@ -13,6 +13,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 442773cef15092b5927851237850760345d2cf16)
 ---
 migration.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)
@ -75,6 +76,3 @@ index def1e9e..5c7d04f 100644
     qemu_thread_create(&s->thread, migration_thread, s,
                        QEMU_THREAD_JOINABLE);
     notifier_list_notify(&migration_state_notifiers, s);
-- 
-1.8.2.1
-
--- a/0144-migration-move-rate-limiting-to-QEMUFile.patch
+++ b/0144-migration-move-rate-limiting-to-QEMUFile.patch
@ -1,7 +1,7 @@
-From 61af111810219339d4029bb9a35ff930feb3ec49 Mon Sep 17 00:00:00 2001
+From 9324971693642bf648f60b3598a8b588bef000e8 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:45 +0100
-Subject: [PATCH 243/246] migration: move rate limiting to QEMUFile
+Subject: [PATCH] migration: move rate limiting to QEMUFile

 Rate limiting is now simply a byte counter; client call
 qemu_file_rate_limit() manually to determine if they have to exit.
@ -14,6 +14,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 1964a397063967acc5ce71a2a24ed26e74824ee1)
 ---
 docs/migration.txt            | 20 +----------------
 include/migration/qemu-file.h | 18 ++-------------
@ -267,6 +268,3 @@ index 43963ce..e9471a5 100644
 }
 
 void qemu_put_be16(QEMUFile *f, unsigned int v)
-- 
-1.8.2.1
-
--- a/0145-migration-move-contents-of-migration_close-to-migrat.patch
+++ b/0145-migration-move-contents-of-migration_close-to-migrat.patch
@ -1,7 +1,7 @@
-From 89c59de898603ea7ee0879f5e4244ab33dd4ec3d Mon Sep 17 00:00:00 2001
+From 2b2c8310a60981dfe3bb37cdd007016f285d1b8a Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:46 +0100
-Subject: [PATCH 244/246] migration: move contents of migration_close to
+Subject: [PATCH] migration: move contents of migration_close to
 migrate_fd_cleanup

 With this patch, the migration_file is not needed anymore.
@ -10,6 +10,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 404a7c05bcc20c51fe1a9bf2deaeb4d6b658d3a3)
 ---
 migration.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)
@ -49,6 +50,3 @@ index ea84008..949a5bc 100644
 }
 
 static int migration_get_fd(void *opaque)
-- 
-1.8.2.1
-
--- a/0146-migration-eliminate-s-migration_file.patch
+++ b/0146-migration-eliminate-s-migration_file.patch
@ -1,7 +1,7 @@
-From facf543c0113987a0fd9ec48138cd2da09c41efd Mon Sep 17 00:00:00 2001
+From 2e690b6127da765a58b4f69e7bc79c8abfa03551 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:47 +0100
-Subject: [PATCH 245/246] migration: eliminate s->migration_file
+Subject: [PATCH] migration: eliminate s->migration_file

 The indirection is useless now.  Backends can open s->file directly.

@ -9,6 +9,7 @@ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit b352365f5abec075dede0222f1bc37674d64117c)
 ---
 include/migration/migration.h |  2 --
 migration-exec.c              |  4 ++--
@ -193,6 +194,3 @@ index 949a5bc..68ce4c9 100644
 
     qemu_file_set_rate_limit(s->file,
                              s->bandwidth_limit / XFER_LIMIT_RATIO);
-- 
-1.8.2.1
-
--- a/0147-migration-inline-migrate_fd_close.patch
+++ b/0147-migration-inline-migrate_fd_close.patch
@ -1,12 +1,13 @@
-From 9b421d01c4ffdf89ec93b84363357773d8e09083 Mon Sep 17 00:00:00 2001
+From 4c0d468f2aed75305117ea9860af21c32a915041 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Fri, 22 Feb 2013 17:36:48 +0100
-Subject: [PATCH 246/246] migration: inline migrate_fd_close
+Subject: [PATCH] migration: inline migrate_fd_close

 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Juan Quintela <quintela@redhat.com>
+(cherry picked from commit 6f190a0641f5b06a462b62955c15c77b8fb3990c)
 ---
 migration.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
@ -45,6 +46,3 @@ index 68ce4c9..0aff06d 100644
 void add_migration_state_change_notifier(Notifier *notify)
 {
     notifier_list_add(&migration_state_notifiers, notify);
-- 
-1.8.2.1
-
--- a/0148-Revert-migration-don-t-account-sleep-time-for-calcul.patch
+++ b/0148-Revert-migration-don-t-account-sleep-time-for-calcul.patch
@ -1,4 +1,4 @@
-From ac5728da4f591e704b7bd56a95ce72bd9f3d184a Mon Sep 17 00:00:00 2001
+From 45d723c48255328fbd5128c4c70c91103e420590 Mon Sep 17 00:00:00 2001
 From: Michael Roth <mdroth@linux.vnet.ibm.com>
 Date: Thu, 16 May 2013 16:25:44 -0500
 Subject: [PATCH] Revert "migration: don't account sleep time for calculating
@ -48,6 +48,7 @@ Conflicts:
 Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
 Message-id: 1368739544-31021-1-git-send-email-mdroth@linux.vnet.ibm.com
 Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
+(cherry picked from commit 77417f10701d330c7005b0f0a2c0cef9e05d430d)
 ---
 migration.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
@ -88,6 +89,3 @@ index 0aff06d..cca6df6 100644
         }
     }
 
-- 
-1.8.2.1
-
--- a/0200-ui-vnc-tls.c-fix-gnutls-warning.patch
+++ b/0200-ui-vnc-tls.c-fix-gnutls-warning.patch
@ -1,45 +0,0 @@
-From ad2bca6903af3d02737b893679396343cd598a3e Mon Sep 17 00:00:00 2001
-From: Alon Levy <alevy@redhat.com>
-Date: Wed, 22 May 2013 19:22:26 -0400
-Subject: [PATCH 200/246] ui/vnc-tls.c: fix gnutls warning
-
---
- ui/vnc-tls.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c
-index 5629263..2d01982 100644
--- a/ui/vnc-tls.c
-+++ b/ui/vnc-tls.c
-@@ -99,9 +99,13 @@ static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport,
- }
- 
- 
-static gnutls_anon_server_credentials vnc_tls_initialize_anon_cred(void)
-+static gnutls_anon_server_credentials_t vnc_tls_initialize_anon_cred(void)
- {
-+#if GNUTLS_VERSION_MAJOR < 3
-     gnutls_anon_server_credentials anon_cred;
-+#else
-+    gnutls_anon_server_credentials_t anon_cred;
-+#endif
-     int ret;
- 
-     if ((ret = gnutls_anon_allocate_server_credentials(&anon_cred)) < 0) {
-@@ -382,7 +386,12 @@ int vnc_tls_client_setup(struct VncState *vs,
-             }
- 
-         } else {
-            gnutls_anon_server_credentials anon_cred = vnc_tls_initialize_anon_cred();
-+#if GNUTLS_VERSION_MAJOR < 2
-+            gnutls_anon_server_credentials
-+#else
-+            gnutls_anon_server_credentials_t
-+#endif
-+               anon_cred = vnc_tls_initialize_anon_cred();
-             if (!anon_cred) {
-                 gnutls_deinit(vs->tls.session);
-                 vs->tls.session = NULL;
-- 
-1.8.2.1
-
--- a/0201-configure-Add-enable-migration-from-qemu-kvm.patch
+++ b/0201-configure-Add-enable-migration-from-qemu-kvm.patch
@ -1,4 +1,4 @@
-From c6c153bfd7f9da48eb541d78bf09bc03bcc337e5 Mon Sep 17 00:00:00 2001
+From 7daeb79e054ba552bd598557a3373325727d2231 Mon Sep 17 00:00:00 2001
 From: Cole Robinson <crobinso@redhat.com>
 Date: Tue, 19 Feb 2013 14:39:05 -0500
 Subject: [PATCH] configure: Add --enable-migration-from-qemu-kvm
@ -16,7 +16,7 @@ Signed-off-by: Cole Robinson <crobinso@redhat.com>
 1 file changed, 10 insertions(+)

 diff --git a/configure b/configure
-index e7468a9..719e348 100755
+index f4097ef..bc2870b 100755
 --- a/configure
 +++ b/configure
@@ -170,6 +170,7 @@ xfs=""
@ -46,7 +46,7 @@ index e7468a9..719e348 100755
 echo "  --enable-tcg-interpreter enable TCG with bytecode interpreter (TCI)"
 echo "  --disable-nptl           disable usermode NPTL support"
 echo "  --enable-nptl            enable usermode NPTL support"
-@@ -3324,6 +3330,7 @@ echo "Linux AIO support $linux_aio"
+@@ -3358,6 +3364,7 @@ echo "Linux AIO support $linux_aio"
 echo "ATTR/XATTR support $attr"
 echo "Install blobs     $blobs"
 echo "KVM support       $kvm"
@ -54,7 +54,7 @@ index e7468a9..719e348 100755
 echo "TCG interpreter   $tcg_interpreter"
 echo "fdt support       $fdt"
 echo "preadv support    $preadv"
-@@ -3612,6 +3619,9 @@ fi
+@@ -3646,6 +3653,9 @@ fi
 if test "$signalfd" = "yes" ; then
   echo "CONFIG_SIGNALFD=y" >> $config_host_mak
 fi
--- a/0202-acpi_piix4-Drop-minimum_version_id-to-handle-qemu-kv.patch
+++ b/0202-acpi_piix4-Drop-minimum_version_id-to-handle-qemu-kv.patch
@ -1,4 +1,4 @@
-From 75e3acce2d9302a2344b3de381a49f6cd0fa04ad Mon Sep 17 00:00:00 2001
+From b94ccea34cf71689a751fcec9fb7afb417ce7442 Mon Sep 17 00:00:00 2001
 From: Cole Robinson <crobinso@redhat.com>
 Date: Tue, 19 Feb 2013 14:44:49 -0500
 Subject: [PATCH] acpi_piix4: Drop minimum_version_id to handle qemu-kvm
--- a/0203-i8254-Fix-migration-from-qemu-kvm-1.1.patch
+++ b/0203-i8254-Fix-migration-from-qemu-kvm-1.1.patch
@ -1,4 +1,4 @@
-From c50ed212c0b0814a0edefb2d2a2fc7abc6aed2af Mon Sep 17 00:00:00 2001
+From fb124a30d5b7eff071122fd6236ebbcf8cbeaf46 Mon Sep 17 00:00:00 2001
 From: Cole Robinson <crobinso@redhat.com>
 Date: Tue, 19 Feb 2013 15:04:59 -0500
 Subject: [PATCH] i8254: Fix migration from qemu-kvm < 1.1
--- a/0204-pc_piix-Add-compat-handling-for-qemu-kvm-VGA-mem-siz.patch
+++ b/0204-pc_piix-Add-compat-handling-for-qemu-kvm-VGA-mem-siz.patch
@ -1,4 +1,4 @@
-From 271e4d924c39efd716cc3ad86a5f615660b13f22 Mon Sep 17 00:00:00 2001
+From 296b2d495cca8331481939dce7f2c04f4d640366 Mon Sep 17 00:00:00 2001
 From: Cole Robinson <crobinso@redhat.com>
 Date: Tue, 19 Feb 2013 15:35:40 -0500
 Subject: [PATCH] pc_piix: Add compat handling for qemu-kvm VGA mem size
--- a/0205-qxl-Add-rom_size-compat-property-fix-migration-from-.patch
+++ b/0205-qxl-Add-rom_size-compat-property-fix-migration-from-.patch
@ -1,4 +1,4 @@
-From 66cc6383d6b1d934d22e9a16b432cacacd58c315 Mon Sep 17 00:00:00 2001
+From 59d4955ec7fd78cabb8d2a2460d742580de180f1 Mon Sep 17 00:00:00 2001
 From: Cole Robinson <crobinso@redhat.com>
 Date: Tue, 19 Feb 2013 16:19:02 -0500
 Subject: [PATCH] qxl: Add rom_size compat property, fix migration from 1.2
--- a/ksm.service
+++ b/ksm.service
@ -1,6 +1,7 @@
 [Unit]
 Description=Kernel Samepage Merging
 ConditionPathExists=/sys/kernel/mm/ksm
+ConditionVirtualization=no

 [Service]
 Type=oneshot
--- a/ksmtuned.service
+++ b/ksmtuned.service
@ -2,6 +2,7 @@
 Description=Kernel Samepage Merging (KSM) Tuning Daemon
 After=ksm.service
 Requires=ksm.service
+ConditionVirtualization=no

 [Service]
 ExecStart=/usr/sbin/ksmtuned
--- a/qemu.spec
+++ b/qemu.spec
@ -130,8 +130,8 @@

 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 1.4.1
-Release: 4%{?dist}
+Version: 1.4.2
+Release: 1%{?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
@ -187,68 +187,62 @@ Patch0010: 0010-usb-redir-Add-flow-control-support.patch
 Patch0011: 0011-char-Disable-write-callback-if-throttled-chardev-is-.patch
 Patch0012: 0012-hw-virtio-serial-bus-replay-guest-open-on-destinatio.patch

-# qemu-kvm migration compat (posted upstream)
-Patch0101: 0101-configure-Add-enable-migration-from-qemu-kvm.patch
-Patch0102: 0102-acpi_piix4-Drop-minimum_version_id-to-handle-qemu-kv.patch
-Patch0103: 0103-i8254-Fix-migration-from-qemu-kvm-1.1.patch
-Patch0104: 0104-pc_piix-Add-compat-handling-for-qemu-kvm-VGA-mem-siz.patch
-# Fix migration w/ qxl from qemu-kvm 1.2 (solution pending upstream)
-Patch0105: 0105-qxl-Add-rom_size-compat-property-fix-migration-from-.patch
-# Fix generating docs with texinfo 5 (posted upstream)
-Patch0106: 0106-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
-# Fix crash with usbredir (bz #962826)
-Patch0107: 0107-usb-redir-Fix-crash-on-migration-with-no-client-conn.patch
+# Fix migration crash with spice (bz #962954)
+Patch0101: 0101-vnc-tls-Fix-compilation-with-newer-versions-of-GNU-T.patch
+Patch0102: 0102-migration-change-initial-value-of-expected_downtime.patch
+Patch0103: 0103-migration-calculate-end-time-after-we-have-sent-the-.patch
+Patch0104: 0104-migration-don-t-account-sleep-time-for-calculating-b.patch
+Patch0105: 0105-migration-calculate-expected_downtime.patch
+Patch0106: 0106-migration-simplify-while-loop.patch
+Patch0107: 0107-migration-always-use-vm_stop_force_state.patch
+Patch0108: 0108-migration-move-more-error-handling-to-migrate_fd_cle.patch
+Patch0109: 0109-migration-push-qemu_savevm_state_cancel-out-of-qemu_.patch
+Patch0110: 0110-block-migration-remove-useless-calls-to-blk_mig_clea.patch
+Patch0111: 0111-qemu-file-pass-errno-from-qemu_fflush-via-f-last_err.patch
+Patch0112: 0112-migration-use-qemu_file_set_error-to-pass-error-code.patch
+Patch0113: 0113-qemu-file-temporarily-expose-qemu_file_set_error-and.patch
+Patch0114: 0114-migration-flush-all-data-to-fd-when-buffered_flush-i.patch
+Patch0115: 0115-migration-use-qemu_file_set_error.patch
+Patch0116: 0116-migration-simplify-error-handling.patch
+Patch0117: 0117-migration-do-not-nest-flushing-of-device-data.patch
+Patch0118: 0118-migration-add-migrate_set_state-tracepoint.patch
+Patch0119: 0119-migration-prepare-to-access-s-state-outside-critical.patch
+Patch0120: 0120-migration-cleanup-migration-including-thread-in-the-.patch
+Patch0121: 0121-block-migration-remove-variables-that-are-never-read.patch
+Patch0122: 0122-block-migration-small-preparatory-changes-for-lockin.patch
+Patch0123: 0123-block-migration-document-usage-of-state-across-threa.patch
+Patch0124: 0124-block-migration-add-lock.patch
+Patch0125: 0125-migration-reorder-SaveVMHandlers-members.patch
+Patch0126: 0126-migration-run-pending-iterate-callbacks-out-of-big-l.patch
+Patch0127: 0127-migration-run-setup-callbacks-out-of-big-lock.patch
+Patch0128: 0128-migration-yay-buffering-is-gone.patch
+Patch0129: 0129-Rename-buffered_-to-migration_.patch
+Patch0130: 0130-qemu-file-make-qemu_fflush-and-qemu_file_set_error-p.patch
+Patch0131: 0131-migration-eliminate-last_round.patch
+Patch0132: 0132-migration-detect-error-before-sleeping.patch
+Patch0133: 0133-migration-remove-useless-qemu_file_get_error-check.patch
+Patch0134: 0134-migration-use-qemu_file_rate_limit-consistently.patch
+Patch0135: 0135-migration-merge-qemu_popen_cmd-with-qemu_popen.patch
+Patch0136: 0136-qemu-file-fsync-a-writable-stdio-QEMUFile.patch
+Patch0137: 0137-qemu-file-check-exit-status-when-closing-a-pipe-QEMU.patch
+Patch0138: 0138-qemu-file-add-writable-socket-QEMUFile.patch
+Patch0139: 0139-qemu-file-simplify-and-export-qemu_ftell.patch
+Patch0140: 0140-migration-use-QEMUFile-for-migration-channel-lifetim.patch
+Patch0141: 0141-migration-use-QEMUFile-for-writing-outgoing-migratio.patch
+Patch0142: 0142-migration-use-qemu_ftell-to-compute-bandwidth.patch
+Patch0143: 0143-migration-small-changes-around-rate-limiting.patch
+Patch0144: 0144-migration-move-rate-limiting-to-QEMUFile.patch
+Patch0145: 0145-migration-move-contents-of-migration_close-to-migrat.patch
+Patch0146: 0146-migration-eliminate-s-migration_file.patch
+Patch0147: 0147-migration-inline-migrate_fd_close.patch
+Patch0148: 0148-Revert-migration-don-t-account-sleep-time-for-calcul.patch

-# qemu-km migration cleanup (bz #962954)
-# Moves migration notifiers to iothread, fixing spice assert
-Patch0200: 0200-ui-vnc-tls.c-fix-gnutls-warning.patch
-Patch0201: 0201-migration-change-initial-value-of-expected_downtime.patch
-Patch0202: 0202-migration-calculate-end-time-after-we-have-sent-the-.patch
-Patch0203: 0203-migration-don-t-account-sleep-time-for-calculating-b.patch
-Patch0204: 0204-migration-calculate-expected_downtime.patch
-Patch0205: 0205-migration-simplify-while-loop.patch
-Patch0206: 0206-migration-always-use-vm_stop_force_state.patch
-Patch0207: 0207-migration-move-more-error-handling-to-migrate_fd_cle.patch
-Patch0208: 0208-migration-push-qemu_savevm_state_cancel-out-of-qemu_.patch
-Patch0209: 0209-block-migration-remove-useless-calls-to-blk_mig_clea.patch
-Patch0210: 0210-qemu-file-pass-errno-from-qemu_fflush-via-f-last_err.patch
-Patch0211: 0211-migration-use-qemu_file_set_error-to-pass-error-code.patch
-Patch0212: 0212-qemu-file-temporarily-expose-qemu_file_set_error-and.patch
-Patch0213: 0213-migration-flush-all-data-to-fd-when-buffered_flush-i.patch
-Patch0214: 0214-migration-use-qemu_file_set_error.patch
-Patch0215: 0215-migration-simplify-error-handling.patch
-Patch0216: 0216-migration-do-not-nest-flushing-of-device-data.patch
-Patch0217: 0217-migration-add-migrate_set_state-tracepoint.patch
-Patch0218: 0218-migration-prepare-to-access-s-state-outside-critical.patch
-Patch0219: 0219-migration-cleanup-migration-including-thread-in-the-.patch
-Patch0220: 0220-block-migration-remove-variables-that-are-never-read.patch
-Patch0221: 0221-block-migration-small-preparatory-changes-for-lockin.patch
-Patch0222: 0222-block-migration-document-usage-of-state-across-threa.patch
-Patch0223: 0223-block-migration-add-lock.patch
-Patch0224: 0224-migration-reorder-SaveVMHandlers-members.patch
-Patch0225: 0225-migration-run-pending-iterate-callbacks-out-of-big-l.patch
-Patch0226: 0226-migration-run-setup-callbacks-out-of-big-lock.patch
-Patch0227: 0227-migration-yay-buffering-is-gone.patch
-Patch0228: 0228-Rename-buffered_-to-migration_.patch
-Patch0229: 0229-qemu-file-make-qemu_fflush-and-qemu_file_set_error-p.patch
-Patch0230: 0230-migration-eliminate-last_round.patch
-Patch0231: 0231-migration-detect-error-before-sleeping.patch
-Patch0232: 0232-migration-remove-useless-qemu_file_get_error-check.patch
-Patch0233: 0233-migration-use-qemu_file_rate_limit-consistently.patch
-Patch0234: 0234-migration-merge-qemu_popen_cmd-with-qemu_popen.patch
-Patch0235: 0235-qemu-file-fsync-a-writable-stdio-QEMUFile.patch
-Patch0236: 0236-qemu-file-check-exit-status-when-closing-a-pipe-QEMU.patch
-Patch0237: 0237-qemu-file-add-writable-socket-QEMUFile.patch
-Patch0238: 0238-qemu-file-simplify-and-export-qemu_ftell.patch
-Patch0239: 0239-migration-use-QEMUFile-for-migration-channel-lifetim.patch
-Patch0240: 0240-migration-use-QEMUFile-for-writing-outgoing-migratio.patch
-Patch0241: 0241-migration-use-qemu_ftell-to-compute-bandwidth.patch
-Patch0242: 0242-migration-small-changes-around-rate-limiting.patch
-Patch0243: 0243-migration-move-rate-limiting-to-QEMUFile.patch
-Patch0244: 0244-migration-move-contents-of-migration_close-to-migrat.patch
-Patch0245: 0245-migration-eliminate-s-migration_file.patch
-Patch0246: 0246-migration-inline-migrate_fd_close.patch
-Patch0247: 0247-Revert-migration-don-t-account-sleep-time-for-calcul.patch
+# qemu-kvm migration compat (posted upstream)
+Patch0201: 0201-configure-Add-enable-migration-from-qemu-kvm.patch
+Patch0202: 0202-acpi_piix4-Drop-minimum_version_id-to-handle-qemu-kv.patch
+Patch0203: 0203-i8254-Fix-migration-from-qemu-kvm-1.1.patch
+Patch0204: 0204-pc_piix-Add-compat-handling-for-qemu-kvm-VGA-mem-siz.patch
+Patch0205: 0205-qxl-Add-rom_size-compat-property-fix-migration-from-.patch

 BuildRequires: SDL-devel
 BuildRequires: zlib-devel
@ -451,6 +445,19 @@ This package does not need to be installed on the host OS.
 %systemd_postun_with_restart qemu-guest-agent.service


+%package -n ksm
+Summary: Kernel Samepage Merging services
+Group: Development/Tools
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires(post): systemd-units
+Requires(postun): systemd-units
+%description -n ksm
+Kernel Samepage Merging (KSM) is a memory-saving de-duplication feature,
+that merges anonymous (private) pages (not pagecache ones).
+
+This package provides service files for disabling and tuning KSM.
+
+
 %if 0%{?user:1}
 %package %{user}
 Summary: QEMU user mode emulation of qemu targets
@ -712,67 +719,62 @@ CAC emulation development files.
 %patch0011 -p1
 %patch0012 -p1

-# qemu-kvm migration compat (posted upstream)
+# Fix migration crash with spice (bz #962954)
 %patch0101 -p1
 %patch0102 -p1
 %patch0103 -p1
 %patch0104 -p1
-# Fix migration w/ qxl from qemu-kvm 1.2 (solution pending upstream)
 %patch0105 -p1
-# Fix generating docs with texinfo 5 (posted upstream)
 %patch0106 -p1
-# Fix crash with usbredir (bz #962826)
 %patch0107 -p1
+%patch0108 -p1
+%patch0109 -p1
+%patch0110 -p1
+%patch0111 -p1
+%patch0112 -p1
+%patch0113 -p1
+%patch0114 -p1
+%patch0115 -p1
+%patch0116 -p1
+%patch0117 -p1
+%patch0118 -p1
+%patch0119 -p1
+%patch0120 -p1
+%patch0121 -p1
+%patch0122 -p1
+%patch0123 -p1
+%patch0124 -p1
+%patch0125 -p1
+%patch0126 -p1
+%patch0127 -p1
+%patch0128 -p1
+%patch0129 -p1
+%patch0130 -p1
+%patch0131 -p1
+%patch0132 -p1
+%patch0133 -p1
+%patch0134 -p1
+%patch0135 -p1
+%patch0136 -p1
+%patch0137 -p1
+%patch0138 -p1
+%patch0139 -p1
+%patch0140 -p1
+%patch0141 -p1
+%patch0142 -p1
+%patch0143 -p1
+%patch0144 -p1
+%patch0145 -p1
+%patch0146 -p1
+%patch0147 -p1
+%patch0148 -p1

-# qemu-km migration cleanup (bz #962954)
-%patch0200 -p1
+# qemu-kvm migration compat (posted upstream)
 %patch0201 -p1
 %patch0202 -p1
 %patch0203 -p1
 %patch0204 -p1
 %patch0205 -p1
-%patch0206 -p1
-%patch0207 -p1
-%patch0208 -p1
-%patch0209 -p1
-%patch0210 -p1
-%patch0211 -p1
-%patch0212 -p1
-%patch0213 -p1
-%patch0214 -p1
-%patch0215 -p1
-%patch0216 -p1
-%patch0217 -p1
-%patch0218 -p1
-%patch0219 -p1
-%patch0220 -p1
-%patch0221 -p1
-%patch0222 -p1
-%patch0223 -p1
-%patch0224 -p1
-%patch0225 -p1
-%patch0226 -p1
-%patch0227 -p1
-%patch0228 -p1
-%patch0229 -p1
-%patch0230 -p1
-%patch0231 -p1
-%patch0232 -p1
-%patch0233 -p1
-%patch0234 -p1
-%patch0235 -p1
-%patch0236 -p1
-%patch0237 -p1
-%patch0238 -p1
-%patch0239 -p1
-%patch0240 -p1
-%patch0241 -p1
-%patch0242 -p1
-%patch0243 -p1
-%patch0244 -p1
-%patch0245 -p1
-%patch0246 -p1
-%patch0247 -p1

 %build
 %if %{with kvmonly}
@ -855,11 +857,11 @@ gcc %{SOURCE6} -O2 -g -o ksmctl

 %define _udevdir /lib/udev/rules.d

-install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT/lib/systemd/system/ksm.service
+install -D -p -m 0744 %{SOURCE4} $RPM_BUILD_ROOT/lib/systemd/system/ksm.service
 install -D -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ksm
 install -D -p -m 0755 ksmctl $RPM_BUILD_ROOT/lib/systemd/ksmctl

-install -D -p -m 0755 %{SOURCE7} $RPM_BUILD_ROOT/lib/systemd/system/ksmtuned.service
+install -D -p -m 0744 %{SOURCE7} $RPM_BUILD_ROOT/lib/systemd/system/ksmtuned.service
 install -D -p -m 0755 %{SOURCE8} $RPM_BUILD_ROOT%{_sbindir}/ksmtuned
 install -D -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/ksmtuned.conf

@ -889,6 +891,10 @@ rm $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/qemu-system-%{kvm_target}.stp

 chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/*
 install -D -p -m 0644 -t ${RPM_BUILD_ROOT}%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE
+for emu in $RPM_BUILD_ROOT%{_bindir}/qemu-system-*; do
+    ln -sf qemu.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/$(basename $emu).1.gz
+done
+ln -sf qemu.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/qemu-kvm.1.gz

 install -D -p -m 0644 qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl2/qemu.conf

@ -1051,22 +1057,19 @@ udevadm trigger --subsystem-match=misc --sysname-match=kvm --action=add || :

 %if %{without separate_kvm}
 %post common
-%systemd_post ksm.service
-%systemd_post ksmtuned.service
-
 getent group kvm >/dev/null || groupadd -g 36 -r kvm
 getent group qemu >/dev/null || groupadd -g 107 -r qemu
 getent passwd qemu >/dev/null || \
  useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
    -c "qemu user" qemu

-
-%preun common
+%post -n ksm
+%systemd_post ksm.service
+%systemd_post ksmtuned.service
+%preun -n ksm
 %systemd_preun ksm.service
 %systemd_preun ksmtuned.service
-
-
-%postun common
+%postun -n ksm
 %systemd_postun_with_restart ksm.service
 %systemd_postun_with_restart ksmtuned.service
 %endif
@ -1088,7 +1091,8 @@ getent passwd qemu >/dev/null || \

 %if 0%{?need_qemu_kvm}
 %global qemu_kvm_files \
-%{_bindir}/qemu-kvm
+%{_bindir}/qemu-kvm \
+%{_mandir}/man1/qemu-kvm.1*
 %endif

 %files
@ -1118,7 +1122,11 @@ getent passwd qemu >/dev/null || \
 %{_bindir}/virtfs-proxy-helper
 %{_libexecdir}/qemu-bridge-helper
 %config(noreplace) %{_sysconfdir}/sasl2/qemu.conf
+%dir %{_sysconfdir}/qemu
+%config(noreplace) %{_sysconfdir}/qemu/bridge.conf
+
 %if %{without separate_kvm}
+%files -n ksm
 /lib/systemd/system/ksm.service
 /lib/systemd/ksmctl
 %config(noreplace) %{_sysconfdir}/sysconfig/ksm
@ -1126,8 +1134,6 @@ getent passwd qemu >/dev/null || \
 %{_sbindir}/ksmtuned
 %config(noreplace) %{_sysconfdir}/ksmtuned.conf
 %endif
-%dir %{_sysconfdir}/qemu
-%config(noreplace) %{_sysconfdir}/qemu/bridge.conf

 %if %{without separate_kvm}
 %files guest-agent
@ -1196,6 +1202,8 @@ getent passwd qemu >/dev/null || \
 %{_bindir}/qemu-system-x86_64
 %{_datadir}/systemtap/tapset/qemu-system-i386.stp
 %{_datadir}/systemtap/tapset/qemu-system-x86_64.stp
+%{_mandir}/man1/qemu-system-i386.1*
+%{_mandir}/man1/qemu-system-x86_64.1*
 %endif
 %{_datadir}/%{name}/acpi-dsdt.aml
 %{_datadir}/%{name}/q35-acpi-dsdt.aml
@ -1235,6 +1243,7 @@ getent passwd qemu >/dev/null || \
 %defattr(-,root,root)
 %{_bindir}/qemu-system-alpha
 %{_datadir}/systemtap/tapset/qemu-system-alpha.stp
+%{_mandir}/man1/qemu-system-alpha.1*
 %{_datadir}/%{name}/palcode-clipper
 %endif

@ -1243,6 +1252,7 @@ getent passwd qemu >/dev/null || \
 %defattr(-,root,root)
 %{_bindir}/qemu-system-arm
 %{_datadir}/systemtap/tapset/qemu-system-arm.stp
+%{_mandir}/man1/qemu-system-arm.1*
 %endif

 %if 0%{?system_mips:1}
@ -1256,6 +1266,10 @@ getent passwd qemu >/dev/null || \
 %{_datadir}/systemtap/tapset/qemu-system-mipsel.stp
 %{_datadir}/systemtap/tapset/qemu-system-mips64el.stp
 %{_datadir}/systemtap/tapset/qemu-system-mips64.stp
+%{_mandir}/man1/qemu-system-mips.1*
+%{_mandir}/man1/qemu-system-mipsel.1*
+%{_mandir}/man1/qemu-system-mips64el.1*
+%{_mandir}/man1/qemu-system-mips64.1*
 %endif

 %if 0%{?system_cris:1}
@ -1263,6 +1277,7 @@ getent passwd qemu >/dev/null || \
 %defattr(-,root,root)
 %{_bindir}/qemu-system-cris
 %{_datadir}/systemtap/tapset/qemu-system-cris.stp
+%{_mandir}/man1/qemu-system-cris.1*
 %endif

 %if 0%{?system_lm32:1}
@ -1270,6 +1285,7 @@ getent passwd qemu >/dev/null || \
 %defattr(-,root,root)
 %{_bindir}/qemu-system-lm32
 %{_datadir}/systemtap/tapset/qemu-system-lm32.stp
+%{_mandir}/man1/qemu-system-lm32.1*
 %endif

 %if 0%{?system_m68k:1}
@ -1277,6 +1293,7 @@ getent passwd qemu >/dev/null || \
 %defattr(-,root,root)
 %{_bindir}/qemu-system-m68k
 %{_datadir}/systemtap/tapset/qemu-system-m68k.stp
+%{_mandir}/man1/qemu-system-m68k.1*
 %endif

 %if 0%{?system_microblaze:1}
@ -1286,6 +1303,8 @@ getent passwd qemu >/dev/null || \
 %{_bindir}/qemu-system-microblazeel
 %{_datadir}/systemtap/tapset/qemu-system-microblaze.stp
 %{_datadir}/systemtap/tapset/qemu-system-microblazeel.stp
+%{_mandir}/man1/qemu-system-microblaze.1*
+%{_mandir}/man1/qemu-system-microblazeel.1*
 %{_datadir}/%{name}/petalogix*.dtb
 %endif

@ -1294,6 +1313,7 @@ getent passwd qemu >/dev/null || \
 %defattr(-,root,root)
 %{_bindir}/qemu-system-or32
 %{_datadir}/systemtap/tapset/qemu-system-or32.stp
+%{_mandir}/man1/qemu-system-or32.1*
 %endif

 %if 0%{?system_s390x:1}
@ -1301,6 +1321,7 @@ getent passwd qemu >/dev/null || \
 %defattr(-,root,root)
 %{_bindir}/qemu-system-s390x
 %{_datadir}/systemtap/tapset/qemu-system-s390x.stp
+%{_mandir}/man1/qemu-system-s390x.1*
 %{_datadir}/%{name}/s390-zipl.rom
 %ifarch s390x
 %{?kvm_files:}
@ -1315,6 +1336,8 @@ getent passwd qemu >/dev/null || \
 %{_bindir}/qemu-system-sh4eb
 %{_datadir}/systemtap/tapset/qemu-system-sh4.stp
 %{_datadir}/systemtap/tapset/qemu-system-sh4eb.stp
+%{_mandir}/man1/qemu-system-sh4.1*
+%{_mandir}/man1/qemu-system-sh4eb.1*
 %endif

 %if 0%{?system_sparc:1}
@ -1324,6 +1347,8 @@ getent passwd qemu >/dev/null || \
 %{_bindir}/qemu-system-sparc64
 %{_datadir}/systemtap/tapset/qemu-system-sparc.stp
 %{_datadir}/systemtap/tapset/qemu-system-sparc64.stp
+%{_mandir}/man1/qemu-system-sparc.1*
+%{_mandir}/man1/qemu-system-sparc64.1*
 %endif

 %if 0%{?system_ppc:1}
@ -1336,6 +1361,9 @@ getent passwd qemu >/dev/null || \
 %{_datadir}/systemtap/tapset/qemu-system-ppc.stp
 %{_datadir}/systemtap/tapset/qemu-system-ppc64.stp
 %{_datadir}/systemtap/tapset/qemu-system-ppcemb.stp
+%{_mandir}/man1/qemu-system-ppc.1*
+%{_mandir}/man1/qemu-system-ppc64.1*
+%{_mandir}/man1/qemu-system-ppcemb.1*
 %endif
 %{_datadir}/%{name}/bamboo.dtb
 %{_datadir}/%{name}/ppc_rom.bin
@ -1351,6 +1379,7 @@ getent passwd qemu >/dev/null || \
 %defattr(-,root,root)
 %{_bindir}/qemu-system-unicore32
 %{_datadir}/systemtap/tapset/qemu-system-unicore32.stp
+%{_mandir}/man1/qemu-system-unicore32.1*
 %endif

 %if 0%{?system_xtensa:1}
@ -1360,6 +1389,8 @@ getent passwd qemu >/dev/null || \
 %{_bindir}/qemu-system-xtensaeb
 %{_datadir}/systemtap/tapset/qemu-system-xtensa.stp
 %{_datadir}/systemtap/tapset/qemu-system-xtensaeb.stp
+%{_mandir}/man1/qemu-system-xtensa.1*
+%{_mandir}/man1/qemu-system-xtensaeb.1*
 %endif

 %if %{without separate_kvm}
@ -1388,6 +1419,13 @@ getent passwd qemu >/dev/null || \
 %endif

 %changelog
+* Sat May 25 2013 Cole Robinson <crobinso@redhat.com> - 2:1.4.2-1
+- Update to qemu stable 1.4.2
+- Alias qemu-system-* man page to qemu.1 (bz #907746)
+- Drop execute bit on service files (bz #963917)
+- Conditionalize KSM service on host virt support (bz #963681)
+- Split out KSM package, make it not pulled in by default
+
 * Wed May 22 2013 Alon Levy <alevy@redhat.com> - 2:1.4.1-4
 - Backport migration cleanup (bz #962954)

--- a/2
+++ b/2
@ -1 +1 @@
-eb2d696956324722b5ecfa46e41f9a75  qemu-1.4.1.tar.bz2
+b3eafa033ae4b8faba584f9f141b888f  qemu-1.4.2.tar.bz2