add sheepdog loadvm/savevm patch

diff --git a/debian/patches/series b/debian/patches/series
index 2581fd15289430b88c2d23f2ee2dfd1b0b2e3dbd..392f091f4b5548a6a68e3010863ad1e8e2a1851b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ update-cpus-x86_64.conf-to-rhel6.2-version.patch
 vencrypt-auth-plain.patch
 ahci-add_migration-support.patch
 ahci-properly-reset-pxcmd.patch
+sheepdog-fix-savevm-loadvm.patch
 fix-qemu-img-snapshot-removal.patch
 implement-qemu-fopen-bdrv.patch
 load-state-from-blockdev.patch

diff --git a/debian/patches/sheepdog-fix-savevm-loadvm.patch b/debian/patches/sheepdog-fix-savevm-loadvm.patch
new file mode 100644 (file)
index 0000000..d846075
--- /dev/null
+++ b/debian/patches/sheepdog-fix-savevm-loadvm.patch
@@ -0,0 +1,37 @@
+From 1f7a48de4467f31afc51169122453318efdb0f33 Mon Sep 17 00:00:00 2001
+From: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
+Date: Thu, 30 Aug 2012 03:39:45 +0900
+Subject: [PATCH] sheepdog: fix savevm and loadvm
+
+This patch sets data to be sent to Sheepdog correctly and fixes savevm
+and loadvm operations on a Sheepdog image.
+
+Signed-off-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ block/sheepdog.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/block/sheepdog.c b/block/sheepdog.c
+index df4f441..e0753ee 100644
+--- a/block/sheepdog.c
++++ b/block/sheepdog.c
+@@ -1986,7 +1986,7 @@ static int do_load_save_vmstate(BDRVSheepdogState *s, uint8_t *data,
+         vdi_index = pos / SD_DATA_OBJ_SIZE;
+         offset = pos % SD_DATA_OBJ_SIZE;
+ 
+-        data_len = MIN(remaining, SD_DATA_OBJ_SIZE);
++        data_len = MIN(remaining, SD_DATA_OBJ_SIZE - offset);
+ 
+         vmstate_oid = vid_to_vmstate_oid(s->inode.vdi_id, vdi_index);
+ 
+@@ -2007,6 +2007,7 @@ static int do_load_save_vmstate(BDRVSheepdogState *s, uint8_t *data,
+         }
+ 
+         pos += data_len;
++        data += data_len;
+         remaining -= data_len;
+     }
+     ret = size;
+-- 
+1.7.0.4