debian/patches/pve/0048-BDRV_O_CACHE_WB-was-removed.patch

   1 From 9d30e60ad2a6a450c282c6f2df4432d8b9d84b05 Mon Sep 17 00:00:00 2001
   2 From: Thomas Lamprecht <t.lamprecht@proxmox.com>
   3 Date: Wed, 6 Apr 2016 14:24:28 +0200
   4 Subject: [PATCH 48/55] BDRV_O_CACHE_WB was removed
   5
   6 see: 61de4c680846167e01d7ba42bf787f8d1d80bf5e
   7 ---
   8  blockdev.c     | 2 +-
   9  savevm-async.c | 4 ++--
  10  vma.c          | 4 ++--
  11  3 files changed, 5 insertions(+), 5 deletions(-)
  12
  13 diff --git a/blockdev.c b/blockdev.c
  14 index 96fc30b..9330836 100644
  15 --- a/blockdev.c
  16 +++ b/blockdev.c
  17 @@ -3365,7 +3365,7 @@ UuidInfo *qmp_backup(const char *backup_file, bool has_format,
  18              const char *devname = bdrv_get_device_name(di->bs);
  19              snprintf(di->targetfile, PATH_MAX, "%s/%s.raw", backup_dir, devname);
  20
  21 -            int flags = BDRV_O_RDWR|BDRV_O_CACHE_WB;
  22 +            int flags = BDRV_O_RDWR;
  23              bdrv_img_create(di->targetfile, "raw", NULL, NULL, NULL,
  24                              di->size, flags, &local_err, false);
  25              if (local_err) {
  26 diff --git a/savevm-async.c b/savevm-async.c
  27 index 4d73e66..2c41b17 100644
  28 --- a/savevm-async.c
  29 +++ b/savevm-async.c
  30 @@ -253,7 +253,7 @@ void qmp_savevm_start(bool has_statefile, const char *statefile, Error **errp)
  31  {
  32      Error *local_err = NULL;
  33
  34 -    int bdrv_oflags = BDRV_O_CACHE_WB | BDRV_O_RDWR;
  35 +    int bdrv_oflags = BDRV_O_RDWR;
  36      int ret;
  37
  38      if (snap_state.state != SAVE_STATE_DONE) {
  39 @@ -485,7 +485,7 @@ int load_state_from_blockdev(const char *filename)
  40      int ret;
  41
  42      bs = bdrv_new();
  43 -    ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_CACHE_WB, &local_err);
  44 +    ret = bdrv_open(&bs, filename, NULL, NULL, 0, &local_err);
  45      error_setg(&blocker, "block device is in use by load state");
  46      bdrv_op_block_all(bs, blocker);
  47
  48 diff --git a/vma.c b/vma.c
  49 index c3db633..c1407d3 100644
  50 --- a/vma.c
  51 +++ b/vma.c
  52 @@ -277,7 +277,7 @@ static int extract_content(int argc, char **argv)
  53          } else if (di) {
  54              char *devfn = NULL;
  55              const char *format = NULL;
  56 -            int flags = BDRV_O_RDWR|BDRV_O_CACHE_WB;
  57 +            int flags = BDRV_O_RDWR;
  58              bool write_zero = true;
  59
  60              if (readmap) {
  61 @@ -558,7 +558,7 @@ static int create_archive(int argc, char **argv)
  62          Error *errp = NULL;
  63          BlockDriverState *bs = bdrv_new();
  64
  65 -        res = bdrv_open(&bs, path, NULL, NULL, BDRV_O_CACHE_WB, &errp);
  66 +        res = bdrv_open(&bs, path, NULL, NULL, 0, &errp);
  67          if (res < 0) {
  68              unlink(archivename);
  69              g_error("bdrv_open '%s' failed - %s", path, error_get_pretty(errp));
  70 --
  71 2.1.4
  72