update sources for v4.0.1

[pve-qemu.git] / debian / patches / pve / 0020-PVE-backup-introduce-vma-archive-format.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 2 Aug 2017 13:51:02 +0200
Subject: [PATCH] PVE: backup: introduce vma archive format

TODO: Move to a libvma block backend.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 MAINTAINERS          |   6 +
 block/Makefile.objs  |   3 +
 block/vma.c          | 503 ++++++++++++++++++++++++++++++++++++++++
 blockdev.c           | 536 +++++++++++++++++++++++++++++++++++++++++++
 configure            |  29 +++
 hmp-commands-info.hx |  13 ++
 hmp-commands.hx      |  31 +++
 hmp.c                |  63 +++++
 hmp.h                |   3 +
 qapi/block-core.json | 109 ++++++++-
 qapi/common.json     |  13 ++
 qapi/misc.json       |  13 --
 12 files changed, 1308 insertions(+), 14 deletions(-)
 create mode 100644 block/vma.c

diff --git a/MAINTAINERS b/MAINTAINERS
index 56139ac8ab..5588f5c91e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2499,6 +2499,12 @@ L: qemu-block@nongnu.org
 S: Supported
 F: block/vvfat.c
 
+VMA
+M: Wolfgang Bumiller <w.bumiller@proxmox.com>.
+L: pve-devel@proxmox.com
+S: Supported
+F: block/vma.c
+
 Image format fuzzer
 M: Stefan Hajnoczi <stefanha@redhat.com>
 L: qemu-block@nongnu.org
diff --git a/block/Makefile.objs b/block/Makefile.objs
index 03b5763bfa..00fa730d7b 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -33,6 +33,7 @@ block-obj-$(CONFIG_RBD) += rbd.o
 block-obj-$(CONFIG_GLUSTERFS) += gluster.o
 block-obj-$(CONFIG_VXHS) += vxhs.o
 block-obj-$(CONFIG_LIBSSH2) += ssh.o
+block-obj-$(CONFIG_VMA) += vma.o
 block-obj-y += accounting.o dirty-bitmap.o
 block-obj-y += write-threshold.o
 block-obj-y += backup.o
@@ -64,3 +65,5 @@ qcow.o-libs        := -lz
 linux-aio.o-libs   := -laio
 parallels.o-cflags := $(LIBXML2_CFLAGS)
 parallels.o-libs   := $(LIBXML2_LIBS)
+vma.o-cflags       := $(VMA_CFLAGS)
+vma.o-libs         := $(VMA_LIBS)
diff --git a/block/vma.c b/block/vma.c
new file mode 100644
index 0000000000..b911b198dc
--- /dev/null
+++ b/block/vma.c
@@ -0,0 +1,503 @@
+/*
+ * VMA archive backend for QEMU, container object
+ *
+ * Copyright (C) 2017 Proxmox Server Solutions GmbH
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+#include <vma/vma.h>
+
+#include "qemu/osdep.h"
+#include "qemu/uuid.h"
+#include "qemu/option.h"
+#include "qemu-common.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qdict.h"
+#include "qom/object.h"
+#include "qom/object_interfaces.h"
+#include "block/block_int.h"
+
+/* exported interface */
+void vma_object_add_config_file(Object *obj, const char *name,
+                                const char *contents, size_t len,
+                                Error **errp);
+
+#define TYPE_VMA_OBJECT "vma"
+#define VMA_OBJECT(obj) \
+    OBJECT_CHECK(VMAObjectState, (obj), TYPE_VMA_OBJECT)
+#define VMA_OBJECT_GET_CLASS(obj) \
+    OBJECT_GET_CLASS(VMAObjectClass, (obj), TYPE_VMA_OBJECT)
+
+typedef struct VMAObjectClass {
+    ObjectClass parent_class;
+} VMAObjectClass;
+
+typedef struct VMAObjectState {
+    Object parent;
+
+    char        *filename;
+
+    QemuUUID     uuid;
+    bool         blocked;
+    VMAWriter   *vma;
+    QemuMutex    mutex;
+} VMAObjectState;
+
+static VMAObjectState *vma_by_id(const char *name)
+{
+    Object *container;
+    Object *obj;
+
+    container = object_get_objects_root();
+    obj = object_resolve_path_component(container, name);
+
+    return VMA_OBJECT(obj);
+}
+
+static void vma_object_class_complete(UserCreatable *uc, Error **errp)
+{
+    int rc;
+    VMAObjectState *vo = VMA_OBJECT(uc);
+    VMAObjectClass *voc = VMA_OBJECT_GET_CLASS(uc);
+    (void)!vo;
+    (void)!voc;
+
+    if (!vo->filename) {
+        error_setg(errp, "Parameter 'filename' is required");
+        return;
+    }
+
+    vo->vma = VMAWriter_fopen(vo->filename);
+    if (!vo->vma) {
+        error_setg_errno(errp, errno, "failed to create VMA archive");
+        return;
+    }
+
+    rc = VMAWriter_set_uuid(vo->vma, vo->uuid.data, sizeof(vo->uuid.data));
+    if (rc < 0) {
+        error_setg_errno(errp, -rc, "failed to set UUID of VMA archive");
+        return;
+    }
+
+    qemu_mutex_init(&vo->mutex);
+}
+
+static bool vma_object_can_be_deleted(UserCreatable *uc)
+{
+    //VMAObjectState *vo = VMA_OBJECT(uc);
+    //if (!vo->vma) {
+    //    return true;
+    //}
+    //return false;
+    return true;
+}
+
+static void vma_object_class_init(ObjectClass *oc, void *data)
+{
+    UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
+
+    ucc->can_be_deleted = vma_object_can_be_deleted;
+    ucc->complete = vma_object_class_complete;
+}
+
+static char *vma_object_get_filename(Object *obj, Error **errp)
+{
+    VMAObjectState *vo = VMA_OBJECT(obj);
+
+    return g_strdup(vo->filename);
+}
+
+static void vma_object_set_filename(Object *obj, const char *str, Error **errp)
+{
+    VMAObjectState *vo = VMA_OBJECT(obj);
+
+    if (vo->vma) {
+        error_setg(errp, "filename cannot be changed after creation");
+        return;
+    }
+
+    g_free(vo->filename);
+    vo->filename = g_strdup(str);
+}
+
+static char *vma_object_get_uuid(Object *obj, Error **errp)
+{
+    VMAObjectState *vo = VMA_OBJECT(obj);
+
+    return qemu_uuid_unparse_strdup(&vo->uuid);
+}
+
+static void vma_object_set_uuid(Object *obj, const char *str, Error **errp)
+{
+    VMAObjectState *vo = VMA_OBJECT(obj);
+
+    if (vo->vma) {
+        error_setg(errp, "uuid cannot be changed after creation");
+        return;
+    }
+
+    qemu_uuid_parse(str, &vo->uuid);
+}
+
+static bool vma_object_get_blocked(Object *obj, Error **errp)
+{
+    VMAObjectState *vo = VMA_OBJECT(obj);
+
+    return vo->blocked;
+}
+
+static void vma_object_set_blocked(Object *obj, bool blocked, Error **errp)
+{
+    VMAObjectState *vo = VMA_OBJECT(obj);
+
+    (void)errp;
+
+    vo->blocked = blocked;
+}
+
+void vma_object_add_config_file(Object *obj, const char *name,
+                                const char *contents, size_t len,
+                                Error **errp)
+{
+    int rc;
+    VMAObjectState *vo = VMA_OBJECT(obj);
+
+    if (!vo || !vo->vma) {
+        error_setg(errp, "not a valid vma object to add config files to");
+        return;
+    }
+
+    rc = VMAWriter_addConfigFile(vo->vma, name, contents, len);
+    if (rc < 0) {
+        error_setg_errno(errp, -rc, "failed to add config file to VMA");
+        return;
+    }
+}
+
+static void vma_object_init(Object *obj)
+{
+    VMAObjectState *vo = VMA_OBJECT(obj);
+    (void)!vo;
+
+    object_property_add_str(obj, "filename",
+                            vma_object_get_filename, vma_object_set_filename,
+                            NULL);
+    object_property_add_str(obj, "uuid",
+                            vma_object_get_uuid, vma_object_set_uuid,
+                            NULL);
+    object_property_add_bool(obj, "blocked",
+                            vma_object_get_blocked, vma_object_set_blocked,
+                            NULL);
+}
+
+static void vma_object_finalize(Object *obj)
+{
+    VMAObjectState *vo = VMA_OBJECT(obj);
+    VMAObjectClass *voc = VMA_OBJECT_GET_CLASS(obj);
+    (void)!voc;
+
+    qemu_mutex_destroy(&vo->mutex);
+
+    VMAWriter_destroy(vo->vma, true);
+    g_free(vo->filename);
+}
+
+static const TypeInfo vma_object_info = {
+    .name = TYPE_VMA_OBJECT,
+    .parent = TYPE_OBJECT,
+    .class_size = sizeof(VMAObjectClass),
+    .class_init = vma_object_class_init,
+    .instance_size = sizeof(VMAObjectState),
+    .instance_init = vma_object_init,
+    .instance_finalize = vma_object_finalize,
+    .interfaces = (InterfaceInfo[]) {
+        { TYPE_USER_CREATABLE },
+        { }
+    }
+};
+
+static void register_types(void)
+{
+    type_register_static(&vma_object_info);
+}
+
+type_init(register_types);
+
+typedef struct {
+    VMAObjectState *vma_obj;
+    char           *name;
+    size_t          device_id;
+    uint64_t        byte_size;
+} BDRVVMAState;
+
+static void qemu_vma_parse_filename(const char *filename, QDict *options,
+                                    Error **errp)
+{
+    char *sep;
+
+    if (strncmp(filename, "vma:", sizeof("vma:")-1) == 0) {
+        filename += sizeof("vma:")-1;
+    }
+
+    sep = strchr(filename, '/');
+    if (!sep || sep == filename) {
+        error_setg(errp, "VMA file should be <vma-obj>/<name>/<size>");
+        return;
+    }
+
+    qdict_put(options, "vma", qstring_from_substr(filename, 0, sep-filename));
+
+    while (*sep && *sep == '/')
+        ++sep;
+    if (!*sep) {
+        error_setg(errp, "missing device name\n");
+        return;
+    }
+
+    filename = sep;
+    sep = strchr(filename, '/');
+    if (!sep || sep == filename) {
+        error_setg(errp, "VMA file should be <vma-obj>/<name>/<size>");
+        return;
+    }
+
+    qdict_put(options, "name", qstring_from_substr(filename, 0, sep-filename));
+
+    while (*sep && *sep == '/')
+        ++sep;
+    if (!*sep) {
+        error_setg(errp, "missing device size\n");
+        return;
+    }
+
+    filename = sep;
+    qdict_put_str(options, "size", filename);
+}
+
+static QemuOptsList runtime_opts = {
+    .name = "vma-drive",
+    .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
+    .desc = {
+        {
+            .name = "vma",
+            .type = QEMU_OPT_STRING,
+            .help = "VMA Object name",
+        },
+        {
+            .name = "name",
+            .type = QEMU_OPT_STRING,
+            .help = "VMA device name",
+        },
+        {
+            .name = BLOCK_OPT_SIZE,
+            .type = QEMU_OPT_SIZE,
+            .help = "Virtual disk size"
+        },
+        { /* end of list */ }
+    },
+};
+static int qemu_vma_open(BlockDriverState *bs, QDict *options, int flags,
+                         Error **errp)
+{
+    Error *local_err = NULL;
+    BDRVVMAState *s = bs->opaque;
+    QemuOpts *opts;
+    const char *vma_id, *device_name;
+    ssize_t dev_id;
+    int64_t bytes = 0;
+    int ret;
+
+    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
+    qemu_opts_absorb_qdict(opts, options, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        ret = -EINVAL;
+        goto failed_opts;
+    }
+
+    bytes = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),
+                     BDRV_SECTOR_SIZE);
+
+    vma_id = qemu_opt_get(opts, "vma");
+    if (!vma_id) {
+        ret = -EINVAL;
+        error_setg(errp, "missing 'vma' property");
+        goto failed_opts;
+    }
+
+    device_name = qemu_opt_get(opts, "name");
+    if (!device_name) {
+        ret = -EINVAL;
+        error_setg(errp, "missing 'name' property");
+        goto failed_opts;
+    }
+
+    VMAObjectState *vma = vma_by_id(vma_id);
+    if (!vma) {
+        ret = -EINVAL;
+        error_setg(errp, "no such VMA object: %s", vma_id);
+        goto failed_opts;
+    }
+
+    dev_id = VMAWriter_findDevice(vma->vma, device_name);
+    if (dev_id >= 0) {
+        error_setg(errp, "drive already exists in VMA object");
+        ret = -EIO;
+        goto failed_opts;
+    }
+
+    dev_id = VMAWriter_addDevice(vma->vma, device_name, (uint64_t)bytes);
+    if (dev_id < 0) {
+        error_setg_errno(errp, -dev_id, "failed to add VMA device");
+        ret = -EIO;
+        goto failed_opts;
+    }
+
+    object_ref(OBJECT(vma));
+    s->vma_obj = vma;
+    s->name = g_strdup(device_name);
+    s->device_id = (size_t)dev_id;
+    s->byte_size = bytes;
+
+    ret = 0;
+
+failed_opts:
+    qemu_opts_del(opts);
+    return ret;
+}
+
+static void qemu_vma_close(BlockDriverState *bs)
+{
+    BDRVVMAState *s = bs->opaque;
+
+    (void)VMAWriter_finishDevice(s->vma_obj->vma, s->device_id);
+    object_unref(OBJECT(s->vma_obj));
+
+    g_free(s->name);
+}
+
+static int64_t qemu_vma_getlength(BlockDriverState *bs)
+{
+    BDRVVMAState *s = bs->opaque;
+
+    return s->byte_size;
+}
+
+static coroutine_fn int qemu_vma_co_writev(BlockDriverState *bs,
+                                           int64_t sector_num,
+                                           int nb_sectors,
+                                           QEMUIOVector *qiov,
+                                           int flags)
+{
+    size_t i;
+    ssize_t rc;
+    BDRVVMAState *s = bs->opaque;
+    VMAObjectState *vo = s->vma_obj;
+    off_t offset = sector_num * BDRV_SECTOR_SIZE;
+    /* flags can be only values we set in supported_write_flags */
+    assert(flags == 0);
+
+    qemu_mutex_lock(&vo->mutex);
+    if (vo->blocked) {
+        return -EPERM;
+    }
+    for (i = 0; i != qiov->niov; ++i) {
+        const struct iovec *v = &qiov->iov[i];
+        size_t blocks = v->iov_len / VMA_BLOCK_SIZE;
+        if (blocks * VMA_BLOCK_SIZE != v->iov_len) {
+            return -EIO;
+        }
+        rc = VMAWriter_writeBlocks(vo->vma, s->device_id,
+                                   v->iov_base, blocks, offset);
+        if (errno) {
+            return -errno;
+        }
+        if (rc != blocks) {
+            return -EIO;
+        }
+        offset += v->iov_len;
+    }
+    qemu_mutex_unlock(&vo->mutex);
+    return 0;
+}
+
+static int qemu_vma_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
+{
+    bdi->cluster_size = VMA_CLUSTER_SIZE;
+    bdi->unallocated_blocks_are_zero = true;
+    return 0;
+}
+
+static int qemu_vma_check_perm(BlockDriverState *bs,
+                           uint64_t perm,
+                           uint64_t shared,
+                           Error **errp)
+{
+    /* Nothing to do. */
+    return 0;
+}
+
+static void qemu_vma_set_perm(BlockDriverState *bs,
+                              uint64_t perm,
+                              uint64_t shared)
+{
+    /* Nothing to do. */
+}
+
+static void qemu_vma_abort_perm_update(BlockDriverState *bs)
+{
+    /* Nothing to do. */
+}
+
+static void qemu_vma_refresh_limits(BlockDriverState *bs, Error **errp)
+{
+    bs->bl.request_alignment = BDRV_SECTOR_SIZE; /* No sub-sector I/O */
+}
+static void qemu_vma_child_perm(BlockDriverState *bs, BdrvChild *c,
+                                const BdrvChildRole *role,
+                                BlockReopenQueue *reopen_queue,
+                                uint64_t perm, uint64_t shared,
+                                uint64_t *nperm, uint64_t *nshared)
+{
+    *nperm = BLK_PERM_ALL;
+    *nshared = BLK_PERM_ALL;
+}
+
+static BlockDriver bdrv_vma_drive = {
+    .format_name                  = "vma-drive",
+    .protocol_name                = "vma",
+    .instance_size                = sizeof(BDRVVMAState),
+
+#if 0
+    .bdrv_create                  = qemu_vma_create,
+    .create_opts                  = &qemu_vma_create_opts,
+#endif
+
+    .bdrv_parse_filename          = qemu_vma_parse_filename,
+    .bdrv_file_open               = qemu_vma_open,
+
+    .bdrv_close                   = qemu_vma_close,
+    .bdrv_has_zero_init           = bdrv_has_zero_init_1,
+    .bdrv_getlength               = qemu_vma_getlength,
+    .bdrv_get_info                = qemu_vma_get_info,
+
+    //.bdrv_co_preadv               = qemu_vma_co_preadv,
+    .bdrv_co_writev               = qemu_vma_co_writev,
+
+    .bdrv_refresh_limits          = qemu_vma_refresh_limits,
+    .bdrv_check_perm              = qemu_vma_check_perm,
+    .bdrv_set_perm                = qemu_vma_set_perm,
+    .bdrv_abort_perm_update       = qemu_vma_abort_perm_update,
+    .bdrv_child_perm              = qemu_vma_child_perm,
+};
+
+static void bdrv_vma_init(void)
+{
+    bdrv_register(&bdrv_vma_drive);
+}
+
+block_init(bdrv_vma_init);
diff --git a/blockdev.c b/blockdev.c
index a3542db57a..5d524b9a74 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -31,11 +31,13 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/uuid.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "hw/block/block.h"
 #include "block/blockjob.h"
 #include "block/qdict.h"
+#include "block/blockjob_int.h"
 #include "block/throttle-groups.h"
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"
@@ -44,6 +46,7 @@
 #include "qapi/qapi-commands-block.h"
 #include "qapi/qapi-commands-transaction.h"
 #include "qapi/qapi-visit-block-core.h"
+#include "qapi/qapi-types-misc.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"
@@ -3148,6 +3151,539 @@ out:
     aio_context_release(aio_context);
 }
 
+/* PVE backup related function */
+
+static struct PVEBackupState {
+    Error *error;
+    bool cancel;
+    QemuUUID uuid;
+    char uuid_str[37];
+    int64_t speed;
+    time_t start_time;
+    time_t end_time;
+    char *backup_file;
+    Object *vmaobj;
+    GList *di_list;
+    size_t next_job;
+    size_t total;
+    size_t transferred;
+    size_t zero_bytes;
+    QemuMutex backup_mutex;
+    bool      backup_mutex_initialized;
+} backup_state;
+
+typedef struct PVEBackupDevInfo {
+    BlockDriverState *bs;
+    size_t size;
+    uint8_t dev_id;
+    bool completed;
+    char targetfile[PATH_MAX];
+    BlockDriverState *target;
+} PVEBackupDevInfo;
+
+static void pvebackup_run_next_job(void);
+
+static void pvebackup_cleanup(void)
+{
+    qemu_mutex_lock(&backup_state.backup_mutex);
+    // Avoid race between block jobs and backup-cancel command:
+    if (!backup_state.vmaw) {
+        qemu_mutex_unlock(&backup_state.backup_mutex);
+        return;
+    }
+
+    backup_state.end_time = time(NULL);
+
+    if (backup_state.vmaobj) {
+        object_unparent(backup_state.vmaobj);
+        backup_state.vmaobj = NULL;
+    }
+
+    g_list_free(backup_state.di_list);
+    backup_state.di_list = NULL;
+    qemu_mutex_unlock(&backup_state.backup_mutex);
+}
+
+static void pvebackup_complete_cb(void *opaque, int ret)
+{
+    // This always runs in the main loop
+
+    PVEBackupDevInfo *di = opaque;
+
+    di->completed = true;
+
+    if (ret < 0 && !backup_state.error) {
+        error_setg(&backup_state.error, "job failed with err %d - %s",
+                   ret, strerror(-ret));
+    }
+
+    di->bs = NULL;
+    di->target = NULL;
+
+    if (backup_state.vmaobj) {
+        object_unparent(backup_state.vmaobj);
+        backup_state.vmaobj = NULL;
+    }
+
+    // remove self from job queue
+    qemu_mutex_lock(&backup_state.backup_mutex);
+    backup_state.di_list = g_list_remove(backup_state.di_list, di);
+    g_free(di);
+    qemu_mutex_unlock(&backup_state.backup_mutex);
+
+    if (!backup_state.cancel) {
+        pvebackup_run_next_job();
+    }
+}
+
+static void pvebackup_cancel(void *opaque)
+{
+    backup_state.cancel = true;
+    qemu_mutex_lock(&backup_state.backup_mutex);
+    // Avoid race between block jobs and backup-cancel command:
+    if (!backup_state.vmaw) {
+        qemu_mutex_unlock(&backup_state.backup_mutex);
+        return;
+    }
+
+    if (!backup_state.error) {
+        error_setg(&backup_state.error, "backup cancelled");
+    }
+
+    if (backup_state.vmaobj) {
+        Error *err;
+        /* make sure vma writer does not block anymore */
+        if (!object_set_props(backup_state.vmaobj, &err, "blocked", "yes", NULL)) {
+            if (err) {
+                error_report_err(err);
+            }
+        }
+    }
+
+    GList *l = backup_state.di_list;
+    while (l) {
+        PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+        l = g_list_next(l);
+        if (!di->completed && di->bs) {
+            BlockJob *job = di->bs->job;
+            if (job) {
+                AioContext *aio_context = blk_get_aio_context(job->blk);
+                aio_context_acquire(aio_context);
+                if (!di->completed) {
+                    job_cancel(&job->job, false);
+                }
+                aio_context_release(aio_context);
+            }
+        }
+    }
+
+    qemu_mutex_unlock(&backup_state.backup_mutex);
+    pvebackup_cleanup();
+}
+
+void qmp_backup_cancel(Error **errp)
+{
+    if (!backup_state.backup_mutex_initialized)
+        return;
+    Coroutine *co = qemu_coroutine_create(pvebackup_cancel, NULL);
+    qemu_coroutine_enter(co);
+
+    while (backup_state.vmaobj) {
+        /* FIXME: Find something better for this */
+        aio_poll(qemu_get_aio_context(), true);
+    }
+}
+
+void vma_object_add_config_file(Object *obj, const char *name, 
+                                const char *contents, size_t len,
+                                Error **errp);
+static int config_to_vma(const char *file, BackupFormat format,
+                         Object *vmaobj,
+                         const char *backup_dir,
+                         Error **errp)
+{
+    char *cdata = NULL;
+    gsize clen = 0;
+    GError *err = NULL;
+    if (!g_file_get_contents(file, &cdata, &clen, &err)) {
+        error_setg(errp, "unable to read file '%s'", file);
+        return 1;
+    }
+
+    char *basename = g_path_get_basename(file);
+
+    if (format == BACKUP_FORMAT_VMA) {
+        vma_object_add_config_file(vmaobj, basename, cdata, clen, errp);
+    } else if (format == BACKUP_FORMAT_DIR) {
+        char config_path[PATH_MAX];
+        snprintf(config_path, PATH_MAX, "%s/%s", backup_dir, basename);
+        if (!g_file_set_contents(config_path, cdata, clen, &err)) {
+            error_setg(errp, "unable to write config file '%s'", config_path);
+            g_free(cdata);
+            g_free(basename);
+            return 1;
+        }
+    }
+
+    g_free(basename);
+    g_free(cdata);
+    return 0;
+}
+
+static void pvebackup_run_next_job(void)
+{
+    qemu_mutex_lock(&backup_state.backup_mutex);
+
+    GList *next = g_list_nth(backup_state.di_list, backup_state.next_job);
+    while (next) {
+        PVEBackupDevInfo *di = (PVEBackupDevInfo *)next->data;
+        backup_state.next_job++;
+        if (!di->completed && di->bs && di->bs->job) {
+            BlockJob *job = di->bs->job;
+            AioContext *aio_context = blk_get_aio_context(job->blk);
+            aio_context_acquire(aio_context);
+            qemu_mutex_unlock(&backup_state.backup_mutex);
+            if (backup_state.error || backup_state.cancel) {
+                job_cancel_sync(job);
+            } else {
+                job_resume(job);
+            }
+            aio_context_release(aio_context);
+            return;
+        }
+        next = g_list_next(next);
+    }
+    qemu_mutex_unlock(&backup_state.backup_mutex);
+
+    // no more jobs, run the cleanup
+    pvebackup_cleanup();
+}
+
+UuidInfo *qmp_backup(const char *backup_file, bool has_format,
+                    BackupFormat format,
+                    bool has_config_file, const char *config_file,
+                    bool has_firewall_file, const char *firewall_file,
+                    bool has_devlist, const char *devlist,
+                    bool has_speed, int64_t speed, Error **errp)
+{
+    BlockBackend *blk;
+    BlockDriverState *bs = NULL;
+    const char *backup_dir = NULL;
+    Error *local_err = NULL;
+    QemuUUID uuid;
+    gchar **devs = NULL;
+    GList *di_list = NULL;
+    GList *l;
+    UuidInfo *uuid_info;
+    BlockJob *job;
+
+    if (!backup_state.backup_mutex_initialized) {
+        qemu_mutex_init(&backup_state.backup_mutex);
+        backup_state.backup_mutex_initialized = true;
+    }
+
+    if (backup_state.di_list || backup_state.vmaobj) {
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR,
+                  "previous backup not finished");
+        return NULL;
+    }
+
+    /* Todo: try to auto-detect format based on file name */
+    format = has_format ? format : BACKUP_FORMAT_VMA;
+
+    if (has_devlist) {
+        devs = g_strsplit_set(devlist, ",;:", -1);
+
+        gchar **d = devs;
+        while (d && *d) {
+            blk = blk_by_name(*d);
+            if (blk) {
+                bs = blk_bs(blk);
+                if (bdrv_is_read_only(bs)) {
+                    error_setg(errp, "Node '%s' is read only", *d);
+                    goto err;
+                }
+                if (!bdrv_is_inserted(bs)) {
+                    error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, *d);
+                    goto err;
+                }
+                PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
+                di->bs = bs;
+                di_list = g_list_append(di_list, di);
+            } else {
+                error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
+                          "Device '%s' not found", *d);
+                goto err;
+            }
+            d++;
+        }
+
+    } else {
+        BdrvNextIterator it;
+
+        bs = NULL;
+        for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
+            if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
+                continue;
+            }
+
+            PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
+            di->bs = bs;
+            di_list = g_list_append(di_list, di);
+        }
+    }
+
+    if (!di_list) {
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR, "empty device list");
+        goto err;
+    }
+
+    size_t total = 0;
+
+    l = di_list;
+    while (l) {
+        PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+        l = g_list_next(l);
+        if (bdrv_op_is_blocked(di->bs, BLOCK_OP_TYPE_BACKUP_SOURCE, errp)) {
+            goto err;
+        }
+
+        ssize_t size = bdrv_getlength(di->bs);
+        if (size < 0) {
+            error_setg_errno(errp, -di->size, "bdrv_getlength failed");
+            goto err;
+        }
+        di->size = size;
+        total += size;
+    }
+
+    qemu_uuid_generate(&uuid);
+
+    if (format == BACKUP_FORMAT_VMA) {
+        char uuidstr[UUID_FMT_LEN+1];
+        qemu_uuid_unparse(&uuid, uuidstr);
+        uuidstr[UUID_FMT_LEN] = 0;
+        backup_state.vmaobj =
+            object_new_with_props("vma", object_get_objects_root(),
+                                  "vma-backup-obj", &local_err,
+                                  "filename", backup_file,
+                                  "uuid", uuidstr,
+                                  NULL);
+        if (!backup_state.vmaobj) {
+            if (local_err) {
+                error_propagate(errp, local_err);
+            }
+            goto err;
+        }
+
+        l = di_list;
+        while (l) {
+            QDict *options = qdict_new();
+
+            PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+            l = g_list_next(l);
+
+            const char *devname = bdrv_get_device_name(di->bs);
+            snprintf(di->targetfile, PATH_MAX, "vma-backup-obj/%s.raw", devname);
+
+            qdict_put(options, "driver", qstring_from_str("vma-drive"));
+            qdict_put(options, "size", qint_from_int(di->size));
+            di->target = bdrv_open(di->targetfile, NULL, options, BDRV_O_RDWR, &local_err);
+            if (!di->target) {
+                error_propagate(errp, local_err);
+                goto err;
+            }
+        }
+    } else if (format == BACKUP_FORMAT_DIR) {
+        if (mkdir(backup_file, 0640) != 0) {
+            error_setg_errno(errp, errno, "can't create directory '%s'\n",
+                             backup_file);
+            goto err;
+        }
+        backup_dir = backup_file;
+
+        l = di_list;
+        while (l) {
+            PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+            l = g_list_next(l);
+
+            const char *devname = bdrv_get_device_name(di->bs);
+            snprintf(di->targetfile, PATH_MAX, "%s/%s.raw", backup_dir, devname);
+
+            int flags = BDRV_O_RDWR;
+            bdrv_img_create(di->targetfile, "raw", NULL, NULL, NULL,
+                            di->size, flags, false, &local_err);
+            if (local_err) {
+                error_propagate(errp, local_err);
+                goto err;
+            }
+
+            di->target = bdrv_open(di->targetfile, NULL, NULL, flags, &local_err);
+            if (!di->target) {
+                error_propagate(errp, local_err);
+                goto err;
+            }
+        }
+    } else {
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR, "unknown backup format");
+        goto err;
+    }
+
+    /* add configuration file to archive */
+    if (has_config_file) {
+        if(config_to_vma(config_file, format, backup_state.vmaobj, backup_dir, errp) != 0) {
+            goto err;
+        }
+    }
+
+    /* add firewall file to archive */
+    if (has_firewall_file) {
+        if(config_to_vma(firewall_file, format, backup_state.vmaobj, backup_dir, errp) != 0) {
+            goto err;
+        }
+    }
+    /* initialize global backup_state now */
+
+    backup_state.cancel = false;
+
+    if (backup_state.error) {
+        error_free(backup_state.error);
+        backup_state.error = NULL;
+    }
+
+    backup_state.speed = (has_speed && speed > 0) ? speed : 0;
+
+    backup_state.start_time = time(NULL);
+    backup_state.end_time = 0;
+
+    if (backup_state.backup_file) {
+        g_free(backup_state.backup_file);
+    }
+    backup_state.backup_file = g_strdup(backup_file);
+
+    memcpy(&backup_state.uuid, &uuid, sizeof(uuid));
+    qemu_uuid_unparse(&uuid, backup_state.uuid_str);
+
+    qemu_mutex_lock(&backup_state.backup_mutex);
+    backup_state.di_list = di_list;
+    backup_state.next_job = 0;
+
+    backup_state.total = total;
+    backup_state.transferred = 0;
+    backup_state.zero_bytes = 0;
+
+    /* start all jobs (paused state) */
+    l = di_list;
+    while (l) {
+        PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+        l = g_list_next(l);
+
+        job = backup_job_create(NULL, di->bs, di->target, speed, MIRROR_SYNC_MODE_FULL, NULL,
+                                false, BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT,
+                                JOB_DEFAULT,
+                                pvebackup_complete_cb, di, 2, NULL, &local_err);
+        if (di->target) {
+            bdrv_unref(di->target);
+            di->target = NULL;
+        }
+        if (!job || local_err != NULL) {
+            error_setg(&backup_state.error, "backup_job_create failed");
+            pvebackup_cancel(NULL);
+        } else {
+            job_start(&job->job);
+        }
+    }
+
+    qemu_mutex_unlock(&backup_state.backup_mutex);
+
+    if (!backup_state.error) {
+        pvebackup_run_next_job(); // run one job
+    }
+
+    uuid_info = g_malloc0(sizeof(*uuid_info));
+    uuid_info->UUID = g_strdup(backup_state.uuid_str);
+
+    return uuid_info;
+
+err:
+
+    l = di_list;
+    while (l) {
+        PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+        l = g_list_next(l);
+
+        if (di->target) {
+            bdrv_unref(di->target);
+        }
+
+        if (di->targetfile[0]) {
+            unlink(di->targetfile);
+        }
+        g_free(di);
+    }
+    g_list_free(di_list);
+
+    if (devs) {
+        g_strfreev(devs);
+    }
+
+    if (backup_state.vmaobj) {
+        object_unparent(backup_state.vmaobj);
+        backup_state.vmaobj = NULL;
+    }
+
+    if (backup_dir) {
+        rmdir(backup_dir);
+    }
+
+    return NULL;
+}
+
+BackupStatus *qmp_query_backup(Error **errp)
+{
+    BackupStatus *info = g_malloc0(sizeof(*info));
+
+    if (!backup_state.start_time) {
+        /* not started, return {} */
+        return info;
+    }
+
+    info->has_status = true;
+    info->has_start_time = true;
+    info->start_time = backup_state.start_time;
+
+    if (backup_state.backup_file) {
+        info->has_backup_file = true;
+        info->backup_file = g_strdup(backup_state.backup_file);
+    }
+
+    info->has_uuid = true;
+    info->uuid = g_strdup(backup_state.uuid_str);
+
+    if (backup_state.end_time) {
+        if (backup_state.error) {
+            info->status = g_strdup("error");
+            info->has_errmsg = true;
+            info->errmsg = g_strdup(error_get_pretty(backup_state.error));
+        } else {
+            info->status = g_strdup("done");
+        }
+        info->has_end_time = true;
+        info->end_time = backup_state.end_time;
+    } else {
+        info->status = g_strdup("active");
+    }
+
+    info->has_total = true;
+    info->total = backup_state.total;
+    info->has_zero_bytes = true;
+    info->zero_bytes = backup_state.zero_bytes;
+    info->has_transferred = true;
+    info->transferred = backup_state.transferred;
+
+    return info;
+}
+
 void qmp_block_stream(bool has_job_id, const char *job_id, const char *device,
                       bool has_base, const char *base,
                       bool has_base_node, const char *base_node,
diff --git a/configure b/configure
index 1c563a7027..d164677950 100755
--- a/configure
+++ b/configure
@@ -491,6 +491,7 @@ docker="no"
 debug_mutex="no"
 libpmem=""
 default_devices="yes"
+vma=""
 
 # cross compilers defaults, can be overridden with --cross-cc-ARCH
 cross_cc_aarch64="aarch64-linux-gnu-gcc"
@@ -1518,6 +1519,10 @@ for opt do
   ;;
   --disable-libpmem) libpmem=no
   ;;
+  --enable-vma) vma=yes
+  ;;
+  --disable-vma) vma=no
+  ;;
   *)
       echo "ERROR: unknown option $opt"
       echo "Try '$0 --help' for more information"
@@ -1818,6 +1823,7 @@ disabled with --disable-FEATURE, default is enabled if available:
   capstone        capstone disassembler support
   debug-mutex     mutex debugging support
   libpmem         libpmem support
+  vma             VMA archive backend
 
 NOTE: The object files are built at the place where configure is launched
 EOF
@@ -4378,6 +4384,22 @@ EOF
   fi
 fi
 
+##########################################
+# vma probe
+if test "$vma" != "no" ; then
+  if $pkg_config --exact-version=0.1.0 vma; then
+    vma="yes"
+    vma_cflags=$($pkg_config --cflags vma)
+    vma_libs=$($pkg_config --libs vma)
+  else
+    if test "$vma" = "yes" ; then
+      feature_not_found "VMA Archive backend support" \
+          "Install libvma devel"
+    fi
+    vma="no"
+  fi
+fi
+
 ##########################################
 # signalfd probe
 signalfd="no"
@@ -6438,6 +6460,7 @@ echo "docker            $docker"
 echo "libpmem support   $libpmem"
 echo "libudev           $libudev"
 echo "default devices   $default_devices"
+echo "VMA support       $vma"
 
 if test "$supported_cpu" = "no"; then
     echo
@@ -6931,6 +6954,12 @@ if test "$usb_redir" = "yes" ; then
   echo "USB_REDIR_LIBS=$usb_redir_libs" >> $config_host_mak
 fi
 
+if test "$vma" = "yes" ; then
+  echo "CONFIG_VMA=y" >> $config_host_mak
+  echo "VMA_CFLAGS=$vma_cflags" >> $config_host_mak
+  echo "VMA_LIBS=$vma_libs" >> $config_host_mak
+fi
+
 if test "$opengl" = "yes" ; then
   echo "CONFIG_OPENGL=y" >> $config_host_mak
   echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index 444bd8e43d..21106bcbe6 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -536,6 +536,19 @@ STEXI
 @item info cpustats
 @findex info cpustats
 Show CPU statistics.
+ETEXI
+
+    {
+        .name       = "backup",
+        .args_type  = "",
+        .params     = "",
+        .help       = "show backup status",
+        .cmd = hmp_info_backup,
+    },
+
+STEXI
+@item info backup
+show backup status
 ETEXI
 
 #if defined(CONFIG_SLIRP)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 284e97973a..d723552bee 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -105,6 +105,37 @@ STEXI
 @item block_stream
 @findex block_stream
 Copy data from a backing file into a block device.
+ETEXI
+
+   {
+        .name       = "backup",
+        .args_type  = "directory:-d,backupfile:s,speed:o?,devlist:s?",
+        .params     = "[-d] backupfile [speed [devlist]]",
+        .help       = "create a VM Backup."
+		    "\n\t\t\t Use -d to dump data into a directory instead"
+		    "\n\t\t\t of using VMA format.",
+        .cmd = hmp_backup,
+    },
+
+STEXI
+@item backup
+@findex backup
+Create a VM backup.
+ETEXI
+
+    {
+        .name       = "backup_cancel",
+        .args_type  = "",
+        .params     = "",
+        .help       = "cancel the current VM backup",
+        .cmd = hmp_backup_cancel,
+    },
+
+STEXI
+@item backup_cancel
+@findex backup_cancel
+Cancel the current VM backup.
+
 ETEXI
 
     {
diff --git a/hmp.c b/hmp.c
index 16243bba50..113671ad2a 100644
--- a/hmp.c
+++ b/hmp.c
@@ -167,6 +167,44 @@ void hmp_info_mice(Monitor *mon, const QDict *qdict)
     qapi_free_MouseInfoList(mice_list);
 }
 
+void hmp_info_backup(Monitor *mon, const QDict *qdict)
+{
+    BackupStatus *info;
+
+    info = qmp_query_backup(NULL);
+    if (info->has_status) {
+        if (info->has_errmsg) {
+            monitor_printf(mon, "Backup status: %s - %s\n",
+                           info->status, info->errmsg);
+        } else {
+            monitor_printf(mon, "Backup status: %s\n", info->status);
+        }
+    }
+
+    if (info->has_backup_file) {
+        monitor_printf(mon, "Start time: %s", ctime(&info->start_time));
+        if (info->end_time) {
+            monitor_printf(mon, "End time: %s", ctime(&info->end_time));
+        }
+
+        int per = (info->has_total && info->total &&
+            info->has_transferred && info->transferred) ?
+            (info->transferred * 100)/info->total : 0;
+        int zero_per = (info->has_total && info->total &&
+                        info->has_zero_bytes && info->zero_bytes) ?
+            (info->zero_bytes * 100)/info->total : 0;
+        monitor_printf(mon, "Backup file: %s\n", info->backup_file);
+        monitor_printf(mon, "Backup uuid: %s\n", info->uuid);
+        monitor_printf(mon, "Total size: %zd\n", info->total);
+        monitor_printf(mon, "Transferred bytes: %zd (%d%%)\n",
+                       info->transferred, per);
+        monitor_printf(mon, "Zero bytes: %zd (%d%%)\n",
+                       info->zero_bytes, zero_per);
+    }
+
+    qapi_free_BackupStatus(info);
+}
+
 static char *SocketAddress_to_str(SocketAddress *addr)
 {
     switch (addr->type) {
@@ -2059,6 +2097,31 @@ void hmp_block_stream(Monitor *mon, const QDict *qdict)
     hmp_handle_error(mon, &error);
 }
 
+void hmp_backup_cancel(Monitor *mon, const QDict *qdict)
+{
+    Error *error = NULL;
+
+    qmp_backup_cancel(&error);
+
+    hmp_handle_error(mon, &error);
+}
+
+void hmp_backup(Monitor *mon, const QDict *qdict)
+{
+    Error *error = NULL;
+
+    int dir = qdict_get_try_bool(qdict, "directory", 0);
+    const char *backup_file = qdict_get_str(qdict, "backupfile");
+    const char *devlist = qdict_get_try_str(qdict, "devlist");
+    int64_t speed = qdict_get_try_int(qdict, "speed", 0);
+
+    qmp_backup(backup_file, true, dir ? BACKUP_FORMAT_DIR : BACKUP_FORMAT_VMA,
+               false, NULL, false, NULL, !!devlist,
+               devlist, qdict_haskey(qdict, "speed"), speed, &error);
+
+    hmp_handle_error(mon, &error);
+}
+
 void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict)
 {
     Error *error = NULL;
diff --git a/hmp.h b/hmp.h
index bcb90c478f..043b74edee 100644
--- a/hmp.h
+++ b/hmp.h
@@ -29,6 +29,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict);
 void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
 void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict);
 void hmp_info_migrate_cache_size(Monitor *mon, const QDict *qdict);
+void hmp_info_backup(Monitor *mon, const QDict *qdict);
 void hmp_info_cpus(Monitor *mon, const QDict *qdict);
 void hmp_info_block(Monitor *mon, const QDict *qdict);
 void hmp_info_blockstats(Monitor *mon, const QDict *qdict);
@@ -89,6 +90,8 @@ void hmp_eject(Monitor *mon, const QDict *qdict);
 void hmp_change(Monitor *mon, const QDict *qdict);
 void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict);
 void hmp_block_stream(Monitor *mon, const QDict *qdict);
+void hmp_backup(Monitor *mon, const QDict *qdict);
+void hmp_backup_cancel(Monitor *mon, const QDict *qdict);
 void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict);
 void hmp_block_job_cancel(Monitor *mon, const QDict *qdict);
 void hmp_block_job_pause(Monitor *mon, const QDict *qdict);
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 7ccbfff9d0..6f97460806 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -796,6 +796,97 @@
 { 'command': 'query-block', 'returns': ['BlockInfo'] }
 
 
+##
+# @BackupStatus:
+#
+# Detailed backup status.
+#
+# @status: string describing the current backup status.
+#          This can be 'active', 'done', 'error'. If this field is not
+#          returned, no backup process has been initiated
+#
+# @errmsg: error message (only returned if status is 'error')
+#
+# @total: total amount of bytes involved in the backup process
+#
+# @transferred: amount of bytes already backed up.
+#
+# @zero-bytes: amount of 'zero' bytes detected.
+#
+# @start-time: time (epoch) when backup job started.
+#
+# @end-time: time (epoch) when backup job finished.
+#
+# @backup-file: backup file name
+#
+# @uuid: uuid for this backup job
+#
+##
+{ 'struct': 'BackupStatus',
+  'data': {'*status': 'str', '*errmsg': 'str', '*total': 'int',
+           '*transferred': 'int', '*zero-bytes': 'int',
+           '*start-time': 'int', '*end-time': 'int',
+           '*backup-file': 'str', '*uuid': 'str' } }
+
+##
+# @BackupFormat:
+#
+# An enumeration of supported backup formats.
+#
+# @vma: Proxmox vma backup format
+##
+{ 'enum': 'BackupFormat',
+  'data': [ 'vma', 'dir' ] }
+
+##
+# @backup:
+#
+# Starts a VM backup.
+#
+# @backup-file: the backup file name
+#
+# @format: format of the backup file
+#
+# @config-file: a configuration file to include into
+# the backup archive.
+#
+# @speed: the maximum speed, in bytes per second
+#
+# @devlist: list of block device names (separated by ',', ';'
+# or ':'). By default the backup includes all writable block devices.
+#
+# Returns: the uuid of the backup job
+#
+##
+{ 'command': 'backup', 'data': { 'backup-file': 'str',
+                                    '*format': 'BackupFormat',
+                                    '*config-file': 'str',
+                                    '*firewall-file': 'str',
+                                    '*devlist': 'str', '*speed': 'int' },
+  'returns': 'UuidInfo' }
+
+##
+# @query-backup:
+#
+# Returns information about current/last backup task.
+#
+# Returns: @BackupStatus
+#
+##
+{ 'command': 'query-backup', 'returns': 'BackupStatus' }
+
+##
+# @backup-cancel:
+#
+# Cancel the current executing backup process.
+#
+# Returns: nothing on success
+#
+# Notes: This command succeeds even if there is no backup process running.
+#
+##
+{ 'command': 'backup-cancel' }
+
 ##
 # @BlockDeviceTimedStats:
 #
@@ -2819,7 +2910,7 @@
             'qcow2', 'qed', 'quorum', 'raw', 'rbd',
             { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
             'sheepdog',
-            'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
+            'ssh', 'throttle', 'vdi', 'vhdx', 'vma-drive', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
 
 ##
 # @BlockdevOptionsFile:
@@ -3836,6 +3927,21 @@
             'server': 'InetSocketAddressBase',
             '*tls-creds': 'str' } }
 
+##
+# @BlockdevOptionsVMADrive:
+#
+# Driver specific block device options for VMA Drives
+#
+# @filename: vma-drive path
+#
+# @size: drive size in bytes
+#
+# Since: 2.9
+##
+{ 'struct': 'BlockdevOptionsVMADrive',
+  'data': { 'filename': 'str',
+            'size': 'int' } }
+
 ##
 # @BlockdevOptionsThrottle:
 #
@@ -3931,6 +4037,7 @@
       'throttle':   'BlockdevOptionsThrottle',
       'vdi':        'BlockdevOptionsGenericFormat',
       'vhdx':       'BlockdevOptionsGenericFormat',
+      'vma-drive':  'BlockdevOptionsVMADrive',
       'vmdk':       'BlockdevOptionsGenericCOWFormat',
       'vpc':        'BlockdevOptionsGenericFormat',
       'vvfat':      'BlockdevOptionsVVFAT',
diff --git a/qapi/common.json b/qapi/common.json
index 99d313ef3b..bae0650c51 100644
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -193,3 +193,16 @@
              'ppc64', 'riscv32', 'riscv64', 's390x', 'sh4',
              'sh4eb', 'sparc', 'sparc64', 'tricore', 'unicore32',
              'x86_64', 'xtensa', 'xtensaeb' ] }
+
+##
+# @UuidInfo:
+#
+# Guest UUID information (Universally Unique Identifier).
+#
+# @UUID: the UUID of the guest
+#
+# Since: 0.14.0
+#
+# Notes: If no UUID was specified for the guest, a null UUID is returned.
+##
+{ 'struct': 'UuidInfo', 'data': {'UUID': 'str'} }
diff --git a/qapi/misc.json b/qapi/misc.json
index 49dfda0b28..376f26002a 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -274,19 +274,6 @@
 ##
 { 'command': 'query-kvm', 'returns': 'KvmInfo' }
 
-##
-# @UuidInfo:
-#
-# Guest UUID information (Universally Unique Identifier).
-#
-# @UUID: the UUID of the guest
-#
-# Since: 0.14.0
-#
-# Notes: If no UUID was specified for the guest, a null UUID is returned.
-##
-{ 'struct': 'UuidInfo', 'data': {'UUID': 'str'} }
-
 ##
 # @query-uuid:
 #