docs/devel: clean-up the CI links in the docs

[qemu.git] / block / vpc.c

diff --git a/block/vpc.c b/block/vpc.c
index 29c8517ff83fa1f42d78130ced711554e2cb9252..4d8f16e1990c6b470db329b55fc81386a4a4f1d6 100644 (file)
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -33,6 +33,7 @@
 #include "migration/blocker.h"
 #include "qemu/bswap.h"
 #include "qemu/uuid.h"
 #include "migration/blocker.h"
 #include "qemu/bswap.h"
 #include "qemu/uuid.h"

+#include "qemu/memalign.h"

 #include "qapi/qmp/qdict.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qapi-visit-block-core.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qapi-visit-block-core.h"


@@ -276,7 +277,8 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
         if (ret < 0) {
             goto fail;
         }
         if (ret < 0) {
             goto fail;
         }

-        if (strncmp(footer->creator, "conectix", 8)) {
+        if (strncmp(footer->creator, "conectix", 8) ||
+            be32_to_cpu(footer->type) != VHD_FIXED) {

             error_setg(errp, "invalid VPC image");
             ret = -EINVAL;
             goto fail;
             error_setg(errp, "invalid VPC image");
             ret = -EINVAL;
             goto fail;


@@ -658,8 +660,8 @@ fail:
 }
 
 static int coroutine_fn
 }
 
 static int coroutine_fn

-vpc_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
-               QEMUIOVector *qiov, int flags)
+vpc_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
+               QEMUIOVector *qiov, BdrvRequestFlags flags)

 {
     BDRVVPCState *s = bs->opaque;
     int64_t image_offset;
 {
     BDRVVPCState *s = bs->opaque;
     int64_t image_offset;