]> git.proxmox.com Git - pve-qemu-kvm.git/commitdiff
add BlockDevice type to prevent warning.
authorw.link@proxmox.com <w.link@proxmox.com>
Wed, 10 Jun 2015 13:06:04 +0000 (15:06 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Wed, 10 Jun 2015 15:27:54 +0000 (17:27 +0200)
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>
debian/patches/add_block_driver_type_to_extract [new file with mode: 0644]
debian/patches/series

diff --git a/debian/patches/add_block_driver_type_to_extract b/debian/patches/add_block_driver_type_to_extract
new file mode 100644 (file)
index 0000000..98fd6f3
--- /dev/null
@@ -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));
+             }
index f2708643e1a3919109e778e1e25d69586db690ce..292bba6edc19b3d83ce2abd9e073555e5282c51e 100644 (file)
@@ -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