debian/patches/pve/0032-vma-better-driver-guessing-for-bdrv_open.patch

   1 From 0cf02f586f50e0bc1b25f0ecf76207b2510d77df Mon Sep 17 00:00:00 2001
   2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
   3 Date: Tue, 23 Feb 2016 15:48:41 +0100
   4 Subject: [PATCH 32/47] vma: better driver guessing for bdrv_open
   5
   6 Only use 'raw' when the file actually ends with .raw and
   7 no protocol has been specified. With protocol pass the
   8 BDRV_O_PROTOCOL flag to tell bdrv_fill_options() to take it
   9 into account.
  10 ---
  11  vma.c | 15 ++++++++++++++-
  12  1 file changed, 14 insertions(+), 1 deletion(-)
  13
  14 diff --git a/vma.c b/vma.c
  15 index c7c0538..4903568 100644
  16 --- a/vma.c
  17 +++ b/vma.c
  18 @@ -294,7 +294,20 @@ static int extract_content(int argc, char **argv)
  19              }
  20
  21              BlockDriverState *bs = bdrv_new();
  22 -            if (errp || bdrv_open(&bs, devfn, NULL, NULL, flags, &errp)) {
  23 +
  24 +           size_t devlen = strlen(devfn);
  25 +           bool protocol = path_has_protocol(devfn);
  26 +           QDict *options = NULL;
  27 +           if (devlen > 4 && strcmp(devfn+devlen-4, ".raw") == 0 && !protocol) {
  28 +               /* explicit raw format */
  29 +               options = qdict_new();
  30 +               qdict_put(options, "driver", qstring_from_str("raw"));
  31 +           } else if (protocol) {
  32 +               /* tell bdrv_open to honor the protocol */
  33 +               flags |= BDRV_O_PROTOCOL;
  34 +           }
  35 +
  36 +           if (errp || bdrv_open(&bs, devfn, NULL, options, flags, &errp)) {
  37                  g_error("can't open file %s - %s", devfn,
  38                          error_get_pretty(errp));
  39              }
  40 --
  41 2.1.4
  42