Patchwork Fix : Enable qemu-img QED image commit support.

login
register
mail settings
Submitter Onkar N Mahajan
Date Jan. 4, 2013, 10:02 a.m.
Message ID <1357293761.2078.17.camel@oc2826874472.ibm.com>
Download mbox | patch
Permalink /patch/209495/
State New
Headers show

Comments

Onkar N Mahajan - Jan. 4, 2013, 10:02 a.m.
Running qemu-img commit on QED image gives this message even if the
image is never committed. This patch fixes this. Do we need to do any
L1, L2 table cleanup here ? I see that cleanup code is commented out in
the case of qcow2 (qcow2_make_empty).

before patching - 
# qemu-img commit -f qed ss.qed 
qemu-img: Image is already committed

even before committing the image.

after patching -
# qemu-img commit -f qed ss.qed 
Image committed.

and image is actually successfully committed.
-------------------------------------------------------

Signed-off-by: Onkar N Mahajan/India/IBM
<onkar.n.mahajan@linux.vnet.ibm.com>

---
 block/qed.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

 static BDRVQEDState *acb_to_s(QEDAIOCB *acb)
Anthony Liguori - Jan. 4, 2013, 8:21 p.m.
Hi,

This is an automated message generated from the QEMU Patches.
Thank you for submitting this patch.  This patch no longer applies to qemu.git.

This may have occurred due to:
 
  1) Changes in mainline requiring your patch to be rebased and re-tested.

  2) Sending the mail using a tool other than git-send-email.  Please use
     git-send-email to send patches to QEMU.

  3) Basing this patch off of a branch that isn't tracking the QEMU
     master branch.  If that was done purposefully, please include the name
     of the tree in the subject line in the future to prevent this message.

     For instance: "[PATCH block-next 1/10] qcow3: add fancy new feature"

  4) You no longer wish for this patch to be applied to QEMU.  No additional
     action is required on your part.

Nacked-by: QEMU Patches <aliguori@us.ibm.com>

Below is the output from git-am:

    Applying: Fix : Enable qemu-img QED image commit support.
    fatal: corrupt patch at line 10
    Repository lacks necessary blobs to fall back on 3-way merge.
    Cannot fall back to three-way merge.
    Patch failed at 0001 Fix : Enable qemu-img QED image commit support.
    The copy of the patch that failed is found in:
       /home/aliguori/.patches/qemu-working/.git/rebase-apply/patch
    When you have resolved this problem run "git am --resolved".
    If you would prefer to skip this patch, instead run "git am --skip".
    To restore the original branch and stop patching run "git am --abort".

Patch

diff --git a/block/qed.c b/block/qed.c
index 6c182ca..32f1d53 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -695,7 +695,7 @@  static int coroutine_fn
bdrv_qed_co_is_allocated(BlockDriverState *bs,
 
 static int bdrv_qed_make_empty(BlockDriverState *bs)
 {
-    return -ENOTSUP;
+    return 0;
 }