rebase patches onto 2.6.1

[pve-qemu-kvm.git] / debian / patches / pve / 0038-qapi-qmp_mashal_-renames-for-async-snapshot.patch

diff --git a/debian/patches/pve/0038-qapi-qmp_mashal_-renames-for-async-snapshot.patch b/debian/patches/pve/0038-qapi-qmp_mashal_-renames-for-async-snapshot.patch
index 99228aa44d32332e0d9e30d25bfd137681d35cee..c87aa7549a077e514a4f91d76f4c40e33e86fb82 100644 (file)
--- a/debian/patches/pve/0038-qapi-qmp_mashal_-renames-for-async-snapshot.patch
+++ b/debian/patches/pve/0038-qapi-qmp_mashal_-renames-for-async-snapshot.patch
@@ -1,7 +1,7 @@
-From 610ba269757b48a75efce7a05cfd2bc4d9016da7 Mon Sep 17 00:00:00 2001
+From 6eeadc56b6dac81222e595fd4d95daac4cac3333 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Thu, 10 Dec 2015 15:21:10 +0100
-Subject: [PATCH 38/41] qapi: qmp_mashal_* renames for async snapshot
+Subject: [PATCH 38/55] qapi: qmp_mashal_* renames for async snapshot
 
 As per 7fad30f0:
 qapi: Rename qmp_marshal_input_FOO() to qmp_marshal_FOO()
@@ -12,10 +12,10 @@ For-patch: internal snapshot async
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/qmp-commands.hx b/qmp-commands.hx
-index 478de38..129e1b3 100644
+index 0eebb75..6abe9df 100644
 --- a/qmp-commands.hx
 +++ b/qmp-commands.hx
-@@ -4700,31 +4700,31 @@ EQMP
+@@ -4808,31 +4808,31 @@ EQMP
      {
          .name       = "savevm-start",
          .args_type  = "statefile:s?",