bump version to 2.6.2-2

[pve-qemu-kvm.git] / debian / patches / pve / 0033-vma-bdrv_open-dropped-the-drv-parameter.patch

From c0ca2a0437b4d648df1b54513c9f22a7519a328a Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Thu, 10 Dec 2015 14:43:07 +0100
Subject: [PATCH 33/55] vma: bdrv_open dropped the drv parameter

we now pass the 'drive' option via a qdict.
As per commit:
6ebf9aa2ef: block: Drop drv parameter from bdrv_open()

For-patch: introduce new vma archive format
---
 vma.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vma.c b/vma.c
index 543e7d8..cc48013 100644
--- a/vma.c
+++ b/vma.c
@@ -25,6 +25,7 @@
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
+#include "sysemu/char.h" /* qstring_from_str */
 
 static void help(void)
 {
@@ -302,10 +303,10 @@ static int extract_content(int argc, char **argv)
 
 	    const char *tmp = g_strrstr(devfn, ".");
 	    const char *format = (tmp == NULL) ? "raw" : ++tmp;
+	    QDict *options = qdict_new();
+	    qdict_put(options, "driver", qstring_from_str(format));
 
- 	    BlockDriver *drv = bdrv_find_format(format);
-
-	    if (errp || bdrv_open(&bs, devfn, NULL, NULL, flags, drv, &errp)) {
+	    if (errp || bdrv_open(&bs, devfn, NULL, options, flags, &errp)) {
                 g_error("can't open file %s - %s", devfn,
                         error_get_pretty(errp));
             }
@@ -534,11 +535,10 @@ static int create_archive(int argc, char **argv)
         char *devname = NULL;
         path = extract_devname(path, &devname, devcount++);
 
-        BlockDriver *drv = NULL;
         Error *errp = NULL;
         BlockDriverState *bs = bdrv_new();
 
-        res = bdrv_open(&bs, path, NULL, NULL, BDRV_O_CACHE_WB , drv, &errp);
+        res = bdrv_open(&bs, path, NULL, NULL, BDRV_O_CACHE_WB, &errp);
         if (res < 0) {
             unlink(archivename);
             g_error("bdrv_open '%s' failed - %s", path, error_get_pretty(errp));
-- 
2.1.4