[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[qemu-xen stable-4.13] vpc: Return 0 from vpc_co_create() on success

commit 97c478c355fee96eb2b740313f50561e69b6f305
Author:     Max Reitz <mreitz@xxxxxxxxxx>
AuthorDate: Mon Sep 2 21:33:16 2019 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Sun Oct 27 23:50:55 2019 -0500

    vpc: Return 0 from vpc_co_create() on success
    blockdev_create_run() directly uses .bdrv_co_create()'s return value as
    the job's return value.  Jobs must return 0 on success, not just any
    nonnegative value.  Therefore, using blockdev-create for VPC images may
    currently fail as the vpc driver may return a positive integer.
    Because there is no point in returning a positive integer anywhere in
    the block layer (all non-negative integers are generally treated as
    complete success), we probably do not want to add more such cases.
    Therefore, fix this problem by making the vpc driver always return 0 in
    case of success.
    Suggested-by: Kevin Wolf <kwolf@xxxxxxxxxx>
    Cc: qemu-stable@xxxxxxxxxx
    Signed-off-by: Max Reitz <mreitz@xxxxxxxxxx>
    Signed-off-by: Kevin Wolf <kwolf@xxxxxxxxxx>
    (cherry picked from commit 1a37e3124407b5a145d44478d3ecbdb89c63789f)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
 block/vpc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/block/vpc.c b/block/vpc.c
index d4776ee8a5..3a88e28e2b 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -885,6 +885,7 @@ static int create_dynamic_disk(BlockBackend *blk, uint8_t 
         goto fail;
+    ret = 0;
     return ret;
@@ -908,7 +909,7 @@ static int create_fixed_disk(BlockBackend *blk, uint8_t 
         return ret;
-    return ret;
+    return 0;
 static int calculate_rounded_image_size(BlockdevCreateOptionsVpc *vpc_opts,
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.13



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.