From: w.link@proxmox.com <w.link@proxmox.com>
Date: Wed, 10 Jun 2015 13:06:04 +0000 (+0200)
Subject: add BlockDevice type to prevent warning.
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9637ae0063e0e89afd230d9704860513fb4465b4;p=pve-qemu-kvm.git

add BlockDevice type to prevent warning.

The raw_bsd.c insert a check to warn when mounting BD, what has no device type.

Signed-off-by: w.link@proxmox.com <Wolfgang Link>
---

diff --git a/debian/patches/add_block_driver_type_to_extract b/debian/patches/add_block_driver_type_to_extract
new file mode 100644
index 0000000..98fd6f3
--- /dev/null
+++ b/debian/patches/add_block_driver_type_to_extract
@@ -0,0 +1,19 @@
+Index: qemu-kvm-devel/vma.c
+===================================================================
+--- qemu-kvm-devel.orig/vma.c
++++ qemu-kvm-devel/vma.c
+@@ -299,7 +299,13 @@ static int extract_content(int argc, cha
+             }
+ 
+             BlockDriverState *bs = bdrv_new();
+-            if (errp || bdrv_open(&bs, devfn, NULL, NULL, flags, NULL, &errp)) {
++
++	    char *tmp = g_strrstr(devfn, ".");
++	    char *format = (tmp == NULL) ? "raw" : ++tmp;
++
++ 	    BlockDriver *drv = bdrv_find_format(format);
++
++	    if (errp || bdrv_open(&bs, devfn, NULL, NULL, flags, drv, &errp)) {
+                 g_error("can't open file %s - %s", devfn,
+                         error_get_pretty(errp));
+             }
diff --git a/debian/patches/series b/debian/patches/series
index f270864..292bba6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@ gluster-backupserver.patch
 add-qmp-get-link-status.patch
 0001-friendlier-ai_flag-hints-for-ipv6-hosts.patch
 tcmalloc.patch
+add_block_driver_type_to_extract