Series comparison

-[Qemu-devel] [PULL 0/8] Block patches
+[PULL 0/5] Block patches
-The following changes since commit e5cd695266c5709308aa95b1baae499e4b5d4544:
+The following changes since commit 711c0418c8c1ce3a24346f058b001c4c5a2f0f81:
-  Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-05-08 17:05:58 +0100)
+  Merge remote-tracking branch 'remotes/philmd/tags/mips-20210702' into staging (2021-07-04 14:04:12 +0100)
 are available in the Git repository at:
-  git://github.com/stefanha/qemu.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 31be8a2a97ecba7d31a82932286489cac318e9e9:
+for you to fetch changes up to 9f460c64e13897117f35ffb61f6f5e0102cabc70:
-  block/file-posix: add x-check-page-cache=on|off option (2018-05-11 16:43:05 +0100)
+  block/io: Merge discard request alignments (2021-07-06 14:28:55 +0100)
 ----------------------------------------------------------------
-Block pull request
+Pull request
  * Support -drive cache.direct=off live migration for POSIX files
 ----------------------------------------------------------------
-Joe Perches (4):
+Akihiko Odaki (3):
-  checkpatch: add a --strict check for utf-8 in commit logs
+  block/file-posix: Optimize for macOS
-  checkpatch: ignore email headers better
+  block: Add backend_defaults property
-  checkpatch: emit a warning on file add/move/delete
+  block/io: Merge discard request alignments
   checkpatch: reduce MAINTAINERS update message frequency
-Pasi Savanainen (1):
+Stefan Hajnoczi (2):
-  checkpatch: check utf-8 content from a commit log when it's missing
+  util/async: add a human-readable name to BHs for debugging
-    from charset
+  util/async: print leaked BH name when AioContext finalizes
-Stefan Hajnoczi (3):
+ include/block/aio.h            | 31 ++++++++++++++++++++++---
-  blockjob: drop block_job_pause/resume_all()
+ include/hw/block/block.h       |  3 +++
-  block/file-posix: implement bdrv_co_invalidate_cache() on Linux
+ include/qemu/main-loop.h       |  4 +++-
-  block/file-posix: add x-check-page-cache=on|off option
+ block/file-posix.c             | 27 ++++++++++++++++++++--
+ block/io.c                     |  2 ++
- qapi/block-core.json         |   7 +-
+ hw/block/block.c               | 42 ++++++++++++++++++++++++++++++----
- include/block/blockjob_int.h |  14 ----
+ tests/unit/ptimer-test-stubs.c |  2 +-
- block/file-posix.c           | 146 ++++++++++++++++++++++++++++++++++-
+ util/async.c                   | 25 ++++++++++++++++----
- blockjob.c                   |  27 -------
+ util/main-loop.c               |  4 ++--
- scripts/checkpatch.pl        |  56 +++++++++++++-
+ tests/qemu-iotests/172.out     | 38 ++++++++++++++++++++++++++++++
-files changed, 202 insertions(+), 48 deletions(-)
+files changed, 161 insertions(+), 17 deletions(-)
 --
-.17.0
+.31.1

-[Qemu-devel] [PULL 1/8] blockjob: drop block_job_pause/resume_all()
+[PULL 1/5] util/async: add a human-readable name to BHs for debugging
-Commit 8119334918e86f45877cfc139192d54f2449a239 ("block: Don't
+It can be difficult to debug issues with BHs in production environments.
-block_job_pause_all() in bdrv_drain_all()") removed the only callers of
+Although BHs can usually be identified by looking up their ->cb()
-block_job_pause/resume_all().
+function pointer, this requires debug information for the program. It is
 also not possible to print human-readable diagnostics about BHs because
 they have no identifier.
-Pausing and resuming now happens in child_job_drained_begin/end() so
+This patch adds a name to each BH. The name is not unique per instance
-it's no longer necessary to globally pause/resume jobs.
+but differentiates between cb() functions, which is usually enough. It's
 done by changing aio_bh_new() and friends to macros that stringify cb.
 The next patch will use the name field when reporting leaked BHs.
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
+Message-Id: <20210414200247.917496-2-stefanha@redhat.com>
 Message-id: 20180424085240.5798-1-stefanha@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- include/block/blockjob_int.h | 14 --------------
+ include/block/aio.h            | 31 ++++++++++++++++++++++++++++---
- blockjob.c                   | 27 ---------------------------
+ include/qemu/main-loop.h       |  4 +++-
-files changed, 41 deletions(-)
+ tests/unit/ptimer-test-stubs.c |  2 +-
  util/async.c                   |  9 +++++++--
  util/main-loop.c               |  4 ++--
 files changed, 41 insertions(+), 9 deletions(-)
-diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
+diff --git a/include/block/aio.h b/include/block/aio.h
 index XXXXXXX..XXXXXXX 100644
---- a/include/block/blockjob_int.h
+--- a/include/block/aio.h
-+++ b/include/block/blockjob_int.h
++++ b/include/block/aio.h
-@@ -XXX,XX +XXX,XX @@ void block_job_sleep_ns(BlockJob *job, int64_t ns);
+@@ -XXX,XX +XXX,XX @@ void aio_context_acquire(AioContext *ctx);
  /* Relinquish ownership of the AioContext. */
  void aio_context_release(AioContext *ctx);
 +/**
 + * aio_bh_schedule_oneshot_full: Allocate a new bottom half structure that will
 + * run only once and as soon as possible.
 + *
 + * @name: A human-readable identifier for debugging purposes.
 + */
 +void aio_bh_schedule_oneshot_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
 +                                  const char *name);
 +
  /**
   * aio_bh_schedule_oneshot: Allocate a new bottom half structure that will run
   * only once and as soon as possible.
 + *
 + * A convenience wrapper for aio_bh_schedule_oneshot_full() that uses cb as the
 + * name string.
   */
- void block_job_yield(BlockJob *job);
+-void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
++#define aio_bh_schedule_oneshot(ctx, cb, opaque) \
--/**
++    aio_bh_schedule_oneshot_full((ctx), (cb), (opaque), (stringify(cb)))
-- * block_job_pause_all:
 - *
 - * Asynchronously pause all jobs.
 - */
 -void block_job_pause_all(void);
 -
 -/**
 - * block_job_resume_all:
 - *
 - * Resume all block jobs.  Must be paired with a preceding block_job_pause_all.
 - */
 -void block_job_resume_all(void);
 -
  /**
-  * block_job_early_fail:
+- * aio_bh_new: Allocate a new bottom half structure.
-  * @bs: The block device.
++ * aio_bh_new_full: Allocate a new bottom half structure.
-diff --git a/blockjob.c b/blockjob.c
+  *
   * Bottom halves are lightweight callbacks whose invocation is guaranteed
   * to be wait-free, thread-safe and signal-safe.  The #QEMUBH structure
   * is opaque and must be allocated prior to its use.
 + *
 + * @name: A human-readable identifier for debugging purposes.
   */
 -QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
 +QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
 +                        const char *name);
 +
 +/**
 + * aio_bh_new: Allocate a new bottom half structure
 + *
 + * A convenience wrapper for aio_bh_new_full() that uses the cb as the name
 + * string.
 + */
 +#define aio_bh_new(ctx, cb, opaque) \
 +    aio_bh_new_full((ctx), (cb), (opaque), (stringify(cb)))
  /**
   * aio_notify: Force processing of pending events.
 diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
 index XXXXXXX..XXXXXXX 100644
---- a/blockjob.c
+--- a/include/qemu/main-loop.h
-+++ b/blockjob.c
++++ b/include/qemu/main-loop.h
-@@ -XXX,XX +XXX,XX @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
+@@ -XXX,XX +XXX,XX @@ void qemu_cond_timedwait_iothread(QemuCond *cond, int ms);
-     return job;
  void qemu_fd_register(int fd);
 -QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque);
 +#define qemu_bh_new(cb, opaque) \
 +    qemu_bh_new_full((cb), (opaque), (stringify(cb)))
 +QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name);
  void qemu_bh_schedule_idle(QEMUBH *bh);
  enum {
 diff --git a/tests/unit/ptimer-test-stubs.c b/tests/unit/ptimer-test-stubs.c
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/unit/ptimer-test-stubs.c
 +++ b/tests/unit/ptimer-test-stubs.c
@@ -XXX,XX +XXX,XX @@ int64_t qemu_clock_deadline_ns_all(QEMUClockType type, int attr_mask)
      return deadline;
  }
--void block_job_pause_all(void)
+-QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
--{
++QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name)
 -    BlockJob *job = NULL;
 -    while ((job = block_job_next(job))) {
 -        AioContext *aio_context = blk_get_aio_context(job->blk);
 -
 -        aio_context_acquire(aio_context);
 -        block_job_ref(job);
 -        block_job_pause(job);
 -        aio_context_release(aio_context);
 -    }
 -}
 -
  void block_job_early_fail(BlockJob *job)
  {
-     assert(job->status == BLOCK_JOB_STATUS_CREATED);
+     QEMUBH *bh = g_new(QEMUBH, 1);
-@@ -XXX,XX +XXX,XX @@ void coroutine_fn block_job_pause_point(BlockJob *job)
-     }
+diff --git a/util/async.c b/util/async.c
 index XXXXXXX..XXXXXXX 100644
 --- a/util/async.c
 +++ b/util/async.c
@@ -XXX,XX +XXX,XX @@ enum {
  struct QEMUBH {
      AioContext *ctx;
 +    const char *name;
      QEMUBHFunc *cb;
      void *opaque;
      QSLIST_ENTRY(QEMUBH) next;
@@ -XXX,XX +XXX,XX @@ static QEMUBH *aio_bh_dequeue(BHList *head, unsigned *flags)
      return bh;
  }
--void block_job_resume_all(void)
+-void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
--{
++void aio_bh_schedule_oneshot_full(AioContext *ctx, QEMUBHFunc *cb,
--    BlockJob *job, *next;
++                                  void *opaque, const char *name)
--
+ {
--    QLIST_FOREACH_SAFE(job, &block_jobs, job_list, next) {
+     QEMUBH *bh;
--        AioContext *aio_context = blk_get_aio_context(job->blk);
+     bh = g_new(QEMUBH, 1);
--
+@@ -XXX,XX +XXX,XX @@ void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
--        aio_context_acquire(aio_context);
+         .ctx = ctx,
--        block_job_resume(job);
+         .cb = cb,
--        block_job_unref(job);
+         .opaque = opaque,
--        aio_context_release(aio_context);
++        .name = name,
--    }
+     };
--}
+     aio_bh_enqueue(bh, BH_SCHEDULED | BH_ONESHOT);
--
+ }
 -QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
 +QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
 +                        const char *name)
  {
      QEMUBH *bh;
      bh = g_new(QEMUBH, 1);
@@ -XXX,XX +XXX,XX @@ QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
          .ctx = ctx,
          .cb = cb,
          .opaque = opaque,
 +        .name = name,
      };
      return bh;
  }
 diff --git a/util/main-loop.c b/util/main-loop.c
 index XXXXXXX..XXXXXXX 100644
 --- a/util/main-loop.c
 +++ b/util/main-loop.c
@@ -XXX,XX +XXX,XX @@ void main_loop_wait(int nonblocking)
  /* Functions to operate on the main QEMU AioContext.  */
 -QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
 +QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name)
  {
 -    return aio_bh_new(qemu_aio_context, cb, opaque);
 +    return aio_bh_new_full(qemu_aio_context, cb, opaque, name);
  }
  /*
-  * Conditionally enter a block_job pending a call to fn() while
-  * under the block_job_lock critical section.
 --
-.17.0
+.31.1

-[Qemu-devel] [PULL 2/8] checkpatch: add a --strict check for utf-8 in commit logs
+Deleted patch
-From: Joe Perches <joe@perches.com>
-Some find using utf-8 in commit logs inappropriate.
-Some patch commit logs contain unintended utf-8 characters when doing
-things like copy/pasting compilation output.
-Look for the start of any commit log by skipping initial lines that look
-like email headers and "From: " lines.
-Stop looking for utf-8 at the first signature line.
-Signed-off-by: Joe Perches <joe@perches.com>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Message-id: 20180430124651.10340-2-stefanha@redhat.com
-Suggested-by: Andrew Morton <akpm@linux-foundation.org>
-Cc: Andy Whitcroft <apw@shadowen.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-(cherry picked from commit 15662b3e8644905032c2e26808401a487d4e90c1)
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Conflicts:
-  QEMU does not have CHK(), use WARN() instead.
-  QEMU WARN() only takes one argument, drop the 'type' value in the
-  first argument.
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- scripts/checkpatch.pl | 30 ++++++++++++++++++++++++++----
-file changed, 26 insertions(+), 4 deletions(-)
-diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
-index XXXXXXX..XXXXXXX 100755
---- a/scripts/checkpatch.pl
-+++ b/scripts/checkpatch.pl
-@@ -XXX,XX +XXX,XX @@ our $NonptrType;
- our $Type;
- our $Declare;
--our $UTF8    = qr {
--    [\x09\x0A\x0D\x20-\x7E]              # ASCII
--    | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
-+our $NON_ASCII_UTF8    = qr{
-+    [\xC2-\xDF][\x80-\xBF]               # non-overlong 2-byte
-     |  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
-     | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
-     |  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
-@@ -XXX,XX +XXX,XX @@ our $UTF8    = qr {
-     |  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
- }x;
-+our $UTF8    = qr{
-+    [\x09\x0A\x0D\x20-\x7E]              # ASCII
-+    | $NON_ASCII_UTF8
-+}x;
-+
- # There are still some false positives, but this catches most
- # common cases.
- our $typeTypedefs = qr{(?x:
-@@ -XXX,XX +XXX,XX @@ sub process {
-     my $signoff = 0;
-     my $is_patch = 0;
-+    my $in_header_lines = 1;
-+    my $in_commit_log = 0;        #Scanning lines before patch
-+
-     our @report = ();
-     our $cnt_lines = 0;
-     our $cnt_error = 0;
-@@ -XXX,XX +XXX,XX @@ sub process {
-         if ($line =~ /^diff --git.*?(\S+)$/) {
-             $realfile = $1;
-             $realfile =~ s@^([^/]*)/@@;
--
-         } elsif ($line =~ /^\+\+\+\s+(\S+)/) {
-             $realfile = $1;
-             $realfile =~ s@^([^/]*)/@@;
-@@ -XXX,XX +XXX,XX @@ sub process {
-         if ($line =~ /^\s*signed-off-by:/i) {
-             # This is a signoff, if ugly, so do not double report.
-             $signoff++;
-+            $in_commit_log = 0;
-+
-             if (!($line =~ /^\s*Signed-off-by:/)) {
-                 ERROR("The correct form is \"Signed-off-by\"\n" .
-                     $herecurr);
-@@ -XXX,XX +XXX,XX @@ sub process {
-             ERROR("Invalid UTF-8, patch and commit message should be encoded in UTF-8\n" . $hereptr);
-         }
-+# Check if it's the start of a commit log
-+# (not a header line and we haven't seen the patch filename)
-+        if ($in_header_lines && $realfile =~ /^$/ &&
-+            $rawline !~ /^(commit\b|from\b|\w+:).+$/i) {
-+            $in_header_lines = 0;
-+            $in_commit_log = 1;
-+        }
-+
-+# Still not yet in a patch, check for any UTF-8
-+        if ($in_commit_log && $realfile =~ /^$/ &&
-+            $rawline =~ /$NON_ASCII_UTF8/) {
-+            WARN("8-bit UTF-8 used in possible commit log\n" . $herecurr);
-+        }
-+
- # ignore non-hunk lines and lines being removed
-         next if (!$hunk_line || $line =~ /^-/);
---
-.17.0

-[Qemu-devel] [PULL 3/8] checkpatch: check utf-8 content from a commit log when it's missing from charset
+Deleted patch
-From: Pasi Savanainen <pasi.savanainen@nixu.com>
-Check that a commit log doesn't contain UTF-8 when a mail header
-explicitly defines a different charset, like
-'Content-Type: text/plain; charset="us-ascii"'
-Signed-off-by: Pasi Savanainen <pasi.savanainen@nixu.com>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Message-id: 20180430124651.10340-3-stefanha@redhat.com
-Cc: Joe Perches <joe@perches.com>
-Cc: Andy Whitcroft <apw@canonical.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-(cherry picked from commit fa64205df9dfd7b7662cc64a7e82115c00e428e5)
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- scripts/checkpatch.pl | 13 +++++++++++--
-file changed, 11 insertions(+), 2 deletions(-)
-diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
-index XXXXXXX..XXXXXXX 100755
---- a/scripts/checkpatch.pl
-+++ b/scripts/checkpatch.pl
-@@ -XXX,XX +XXX,XX @@ sub process {
-     my $in_header_lines = 1;
-     my $in_commit_log = 0;        #Scanning lines before patch
-+    my $non_utf8_charset = 0;
-+
-     our @report = ();
-     our $cnt_lines = 0;
-     our $cnt_error = 0;
-@@ -XXX,XX +XXX,XX @@ sub process {
-             $in_commit_log = 1;
-         }
--# Still not yet in a patch, check for any UTF-8
--        if ($in_commit_log && $realfile =~ /^$/ &&
-+# Check if there is UTF-8 in a commit log when a mail header has explicitly
-+# declined it, i.e defined some charset where it is missing.
-+        if ($in_header_lines &&
-+            $rawline =~ /^Content-Type:.+charset="(.+)".*$/ &&
-+            $1 !~ /utf-8/i) {
-+            $non_utf8_charset = 1;
-+        }
-+
-+        if ($in_commit_log && $non_utf8_charset && $realfile =~ /^$/ &&
-             $rawline =~ /$NON_ASCII_UTF8/) {
-             WARN("8-bit UTF-8 used in possible commit log\n" . $herecurr);
-         }
---
-.17.0

-[Qemu-devel] [PULL 4/8] checkpatch: ignore email headers better
+Deleted patch
-From: Joe Perches <joe@perches.com>
-There are some patches created by git format-patch that when scanned by
-checkpatch report errors on lines like
-To:    address.tld
-This is a checkpatch false positive.
-Improve the logic a bit to ignore folded email headers to avoid emitting
-these messages.
-Signed-off-by: Joe Perches <joe@perches.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Message-id: 20180430124651.10340-4-stefanha@redhat.com
-(cherry picked from commit 29ee1b0c67e0dd7dea8dd718e8326076bce5b6fe)
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- scripts/checkpatch.pl | 5 +++--
-file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
-index XXXXXXX..XXXXXXX 100755
---- a/scripts/checkpatch.pl
-+++ b/scripts/checkpatch.pl
-@@ -XXX,XX +XXX,XX @@ sub process {
-     my $signoff = 0;
-     my $is_patch = 0;
--    my $in_header_lines = 1;
-+    my $in_header_lines = $file ? 0 : 1;
-     my $in_commit_log = 0;        #Scanning lines before patch
-     my $non_utf8_charset = 0;
-@@ -XXX,XX +XXX,XX @@ sub process {
- # Check if it's the start of a commit log
- # (not a header line and we haven't seen the patch filename)
-         if ($in_header_lines && $realfile =~ /^$/ &&
--            $rawline !~ /^(commit\b|from\b|\w+:).+$/i) {
-+            !($rawline =~ /^\s+\S/ ||
-+              $rawline =~ /^(commit\b|from\b|[\w-]+:).*$/i)) {
-             $in_header_lines = 0;
-             $in_commit_log = 1;
-         }
---
-.17.0

-[Qemu-devel] [PULL 6/8] checkpatch: reduce MAINTAINERS update message frequency
+[PULL 2/5] util/async: print leaked BH name when AioContext finalizes
-From: Joe Perches <joe@perches.com>
+BHs must be deleted before the AioContext is finalized. If not, it's a
 bug and probably indicates that some part of the program still expects
 the BH to run in the future. That can lead to memory leaks, inconsistent
 state, or just hangs.
-When files are being added/moved/deleted and a patch contains an update to
+Unfortunately the assert(flags & BH_DELETED) call in aio_ctx_finalize()
-the MAINTAINERS file, assume it's to update the MAINTAINERS file correctly
+is difficult to debug because the assertion failure contains no
-and do not emit the "does MAINTAINERS need updating?" message.
+information about the BH!
-Reported by many people.
+Use the QEMUBH name field added in the previous patch to show a useful
 error when a leaked BH is detected.
-Signed-off-by: Joe Perches <joe@perches.com>
+Suggested-by: Eric Ernst <eric.g.ernst@gmail.com>
 Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Reviewed-by: Markus Armbruster <armbru@redhat.com>
 Reviewed-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Message-id: 20180430124651.10340-6-stefanha@redhat.com
+Message-Id: <20210414200247.917496-3-stefanha@redhat.com>
 (cherry picked from e0d975b1b439c4fef58fbc306c542c94f48bb849)
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Reviewed-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- scripts/checkpatch.pl | 6 ++++++
+ util/async.c | 16 ++++++++++++++--
-file changed, 6 insertions(+)
+file changed, 14 insertions(+), 2 deletions(-)
-diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
+diff --git a/util/async.c b/util/async.c
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/scripts/checkpatch.pl
+--- a/util/async.c
-+++ b/scripts/checkpatch.pl
++++ b/util/async.c
-@@ -XXX,XX +XXX,XX @@ sub process {
+@@ -XXX,XX +XXX,XX @@ aio_ctx_finalize(GSource     *source)
-             }
+     assert(QSIMPLEQ_EMPTY(&ctx->bh_slice_list));
-         }
+     while ((bh = aio_bh_dequeue(&ctx->bh_list, &flags))) {
-+# Check if MAINTAINERS is being updated.  If so, there's probably no need to
+-        /* qemu_bh_delete() must have been called on BHs in this AioContext */
-+# emit the "does MAINTAINERS need updating?" message on file add/move/delete
+-        assert(flags & BH_DELETED);
-+        if ($line =~ /^\s*MAINTAINERS\s*\|/) {
++        /*
-+            $reported_maintainer_file = 1;
++         * qemu_bh_delete() must have been called on BHs in this AioContext. In
-+        }
++         * many cases memory leaks, hangs, or inconsistent state occur when a
-+
++         * BH is leaked because something still expects it to run.
- # Check for added, moved or deleted files
++         *
-         if (!$reported_maintainer_file && !$in_commit_log &&
++         * If you hit this, fix the lifecycle of the BH so that
-             ($line =~ /^(?:new|deleted) file mode\s*\d+\s*$/ ||
++         * qemu_bh_delete() and any associated cleanup is called before the
 +         * AioContext is finalized.
 +         */
 +        if (unlikely(!(flags & BH_DELETED))) {
 +            fprintf(stderr, "%s: BH '%s' leaked, aborting...\n",
 +                    __func__, bh->name);
 +            abort();
 +        }
          g_free(bh);
      }
 --
-.17.0
+.31.1

-[Qemu-devel] [PULL 7/8] block/file-posix: implement bdrv_co_invalidate_cache() on Linux
+[PULL 3/5] block/file-posix: Optimize for macOS
-On Linux posix_fadvise(POSIX_FADV_DONTNEED) invalidates pages*.  Use
+From: Akihiko Odaki <akihiko.odaki@gmail.com>
 this to drop page cache on the destination host during shared storage
 migration.  This way the destination host will read the latest copy of
 the data and will not use stale data from the page cache.
-The flow is as follows:
+This commit introduces "punch hole" operation and optimizes transfer
 block size for macOS.
-. Source host writes out all dirty pages and inactivates drives.
+Thanks to Konstantin Nazarov for detailed analysis of a flaw in an
-. QEMU_VM_EOF is sent on migration stream.
+old version of this change:
-. Destination host invalidates caches before accessing drives.
+https://gist.github.com/akihikodaki/87df4149e7ca87f18dc56807ec5a1bc5#gistcomment-3654667
-This patch enables live migration even with -drive cache.direct=off.
+Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
+Message-id: 20210705130458.97642-1-akihiko.odaki@gmail.com
 * Terms and conditions may apply, please see patch for details.
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Reviewed-by: Fam Zheng <famz@redhat.com>
 Message-id: 20180427162312.18583-2-stefanha@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/file-posix.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ block/file-posix.c | 27 +++++++++++++++++++++++++--
-file changed, 46 insertions(+)
+file changed, 25 insertions(+), 2 deletions(-)
 diff --git a/block/file-posix.c b/block/file-posix.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/file-posix.c
 +++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_block_status(BlockDriverState *bs,
+@@ -XXX,XX +XXX,XX @@
-     return ret | BDRV_BLOCK_OFFSET_VALID;
+ #if defined(HAVE_HOST_BLOCK_DEVICE)
  #include <paths.h>
  #include <sys/param.h>
 +#include <sys/mount.h>
  #include <IOKit/IOKitLib.h>
  #include <IOKit/IOBSD.h>
  #include <IOKit/storage/IOMediaBSDClient.h>
@@ -XXX,XX +XXX,XX @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
          return;
      }
 +#if defined(__APPLE__) && (__MACH__)
 +    struct statfs buf;
 +
 +    if (!fstatfs(s->fd, &buf)) {
 +        bs->bl.opt_transfer = buf.f_iosize;
 +        bs->bl.pdiscard_alignment = buf.f_bsize;
 +    }
 +#endif
 +
      if (bs->sg || S_ISBLK(st.st_mode)) {
          int ret = hdev_get_max_hw_transfer(s->fd, &st);
@@ -XXX,XX +XXX,XX @@ out:
      }
  }
-+static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
++#if defined(CONFIG_FALLOCATE) || defined(BLKZEROOUT) || defined(BLKDISCARD)
-+                                                 Error **errp)
+ static int translate_err(int err)
-+{
+ {
-+    BDRVRawState *s = bs->opaque;
+     if (err == -ENODEV || err == -ENOSYS || err == -EOPNOTSUPP ||
-+    int ret;
+@@ -XXX,XX +XXX,XX @@ static int translate_err(int err)
-+
+     }
-+    ret = fd_open(bs);
+     return err;
-+    if (ret < 0) {
+ }
-+        error_setg_errno(errp, -ret, "The file descriptor is not open");
++#endif
-+        return;
-+    }
+ #ifdef CONFIG_FALLOCATE
-+
+ static int do_fallocate(int fd, int mode, off_t offset, off_t len)
-+    if (s->open_flags & O_DIRECT) {
+@@ -XXX,XX +XXX,XX @@ static int handle_aiocb_discard(void *opaque)
-+        return; /* No host kernel page cache */
+             }
-+    }
+         } while (errno == EINTR);
-+
-+#if defined(__linux__)
+-        ret = -errno;
-+    /* This sets the scene for the next syscall... */
++        ret = translate_err(-errno);
-+    ret = bdrv_co_flush(bs);
+ #endif
-+    if (ret < 0) {
+     } else {
-+        error_setg_errno(errp, -ret, "flush failed");
+ #ifdef CONFIG_FALLOCATE_PUNCH_HOLE
-+        return;
+         ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
-+    }
+                            aiocb->aio_offset, aiocb->aio_nbytes);
-+
++        ret = translate_err(-errno);
-+    /* Linux does not invalidate pages that are dirty, locked, or mmapped by a
++#elif defined(__APPLE__) && (__MACH__)
-+     * process.  These limitations are okay because we just fsynced the file,
++        fpunchhole_t fpunchhole;
-+     * we don't use mmap, and the file should not be in use by other processes.
++        fpunchhole.fp_flags = 0;
-+     */
++        fpunchhole.reserved = 0;
-+    ret = posix_fadvise(s->fd, 0, 0, POSIX_FADV_DONTNEED);
++        fpunchhole.fp_offset = aiocb->aio_offset;
-+    if (ret != 0) { /* the return value is a positive errno */
++        fpunchhole.fp_length = aiocb->aio_nbytes;
-+        error_setg_errno(errp, ret, "fadvise failed");
++        if (fcntl(s->fd, F_PUNCHHOLE, &fpunchhole) == -1) {
-+        return;
++            ret = errno == ENODEV ? -ENOTSUP : -errno;
-+    }
++        } else {
-+#else /* __linux__ */
++            ret = 0;
-+    /* Do nothing.  Live migration to a remote host with cache.direct=off is
++        }
-+     * unsupported on other host operating systems.  Cache consistency issues
+ #endif
-+     * may occur but no error is reported here, partly because that's the
+     }
-+     * historical behavior and partly because it's hard to differentiate valid
-+     * configurations that should not cause errors.
+-    ret = translate_err(ret);
-+     */
+     if (ret == -ENOTSUP) {
-+#endif /* !__linux__ */
+         s->has_discard = false;
-+}
+     }
 +
  static coroutine_fn BlockAIOCB *raw_aio_pdiscard(BlockDriverState *bs,
      int64_t offset, int bytes,
      BlockCompletionFunc *cb, void *opaque)
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = {
      .bdrv_co_create_opts = raw_co_create_opts,
      .bdrv_has_zero_init = bdrv_has_zero_init_1,
      .bdrv_co_block_status = raw_co_block_status,
 +    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
      .bdrv_co_pwrite_zeroes = raw_co_pwrite_zeroes,
      .bdrv_co_preadv         = raw_co_preadv,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
      .bdrv_reopen_abort   = raw_reopen_abort,
      .bdrv_co_create_opts = hdev_co_create_opts,
      .create_opts         = &raw_create_opts,
 +    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
      .bdrv_co_pwrite_zeroes = hdev_co_pwrite_zeroes,
      .bdrv_co_preadv         = raw_co_preadv,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
      .bdrv_reopen_abort   = raw_reopen_abort,
      .bdrv_co_create_opts = hdev_co_create_opts,
      .create_opts         = &raw_create_opts,
 +    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
      .bdrv_co_preadv         = raw_co_preadv,
 --
-.17.0
+.31.1

-[Qemu-devel] [PULL 8/8] block/file-posix: add x-check-page-cache=on|off option
+[PULL 4/5] block: Add backend_defaults property
-mincore(2) checks whether pages are resident.  Use it to verify that
+From: Akihiko Odaki <akihiko.odaki@gmail.com>
-page cache has been dropped.
+backend_defaults property allow users to control if default block
-You can trigger a verification failure by mmapping the image file from
+properties should be decided with backend information.
-another process that loads a byte from a page, forcing it to become
-resident.  bdrv_co_invalidate_cache() will fail while that process is
+If it is off, any backend information will be discarded, which is
-alive.
+suitable if you plan to perform live migration to a different disk backend.
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+If it is on, a block device may utilize backend information more
-Reviewed-by: Fam Zheng <famz@redhat.com>
+aggressively.
-Message-id: 20180427162312.18583-3-stefanha@redhat.com
 By default, it is auto, which uses backend information for block
 sizes and ignores the others, which is consistent with the older
 versions.
 Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
 Message-id: 20210705130458.97642-2-akihiko.odaki@gmail.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- qapi/block-core.json |   7 ++-
+ include/hw/block/block.h   |  3 +++
- block/file-posix.c   | 100 ++++++++++++++++++++++++++++++++++++++++++-
+ hw/block/block.c           | 42 ++++++++++++++++++++++++++++++++++----
-files changed, 104 insertions(+), 3 deletions(-)
+ tests/qemu-iotests/172.out | 38 ++++++++++++++++++++++++++++++++++
+files changed, 79 insertions(+), 4 deletions(-)
-diff --git a/qapi/block-core.json b/qapi/block-core.json
 diff --git a/include/hw/block/block.h b/include/hw/block/block.h
 index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
+--- a/include/hw/block/block.h
-+++ b/qapi/block-core.json
++++ b/include/hw/block/block.h
 @@ -XXX,XX +XXX,XX @@
- # @locking:     whether to enable file locking. If set to 'auto', only enable
- #               when Open File Descriptor (OFD) locking API is available
+ typedef struct BlockConf {
- #               (default: auto, since 2.10)
+     BlockBackend *blk;
-+# @x-check-cache-dropped: whether to check that page cache was dropped on live
++    OnOffAuto backend_defaults;
-+#                         migration.  May cause noticeable delays if the image
+     uint32_t physical_block_size;
-+#                         file is large, do not use in production.
+     uint32_t logical_block_size;
-+#                         (default: off) (since: 2.13)
+     uint32_t min_io_size;
- #
+@@ -XXX,XX +XXX,XX @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)
- # Since: 2.9
+ }
- ##
-@@ -XXX,XX +XXX,XX @@
+ #define DEFINE_BLOCK_PROPERTIES_BASE(_state, _conf)                     \
-   'data': { 'filename': 'str',
++    DEFINE_PROP_ON_OFF_AUTO("backend_defaults", _state,                 \
-             '*pr-manager': 'str',
++                            _conf.backend_defaults, ON_OFF_AUTO_AUTO),  \
-             '*locking': 'OnOffAuto',
+     DEFINE_PROP_BLOCKSIZE("logical_block_size", _state,                 \
--            '*aio': 'BlockdevAioOptions' } }
+                           _conf.logical_block_size),                    \
-+            '*aio': 'BlockdevAioOptions',
+     DEFINE_PROP_BLOCKSIZE("physical_block_size", _state,                \
-+            '*x-check-cache-dropped': 'bool' } }
+diff --git a/hw/block/block.c b/hw/block/block.c
  ##
  # @BlockdevOptionsNull:
 diff --git a/block/file-posix.c b/block/file-posix.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
+--- a/hw/block/block.c
-+++ b/block/file-posix.c
++++ b/hw/block/block.c
-@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRawState {
+@@ -XXX,XX +XXX,XX @@ bool blkconf_blocksizes(BlockConf *conf, Error **errp)
-     bool page_cache_inconsistent:1;
+ {
-     bool has_fallocate;
+     BlockBackend *blk = conf->blk;
-     bool needs_alignment;
+     BlockSizes blocksizes;
-+    bool check_cache_dropped;
+-    int backend_ret;
++    BlockDriverState *bs;
-     PRManager *pr_mgr;
++    bool use_blocksizes;
- } BDRVRawState;
++    bool use_bs;
-@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRawState {
++
- typedef struct BDRVRawReopenState {
++    switch (conf->backend_defaults) {
-     int fd;
++    case ON_OFF_AUTO_AUTO:
-     int open_flags;
++        use_blocksizes = !blk_probe_blocksizes(blk, &blocksizes);
-+    bool check_cache_dropped;
++        use_bs = false;
- } BDRVRawReopenState;
++        break;
++
- static int fd_open(BlockDriverState *bs);
++    case ON_OFF_AUTO_ON:
-@@ -XXX,XX +XXX,XX @@ static QemuOptsList raw_runtime_opts = {
++        use_blocksizes = !blk_probe_blocksizes(blk, &blocksizes);
-             .type = QEMU_OPT_STRING,
++        bs = blk_bs(blk);
-             .help = "id of persistent reservation manager object (default: none)",
++        use_bs = bs;
-         },
++        break;
-+        {
++
-+            .name = "x-check-cache-dropped",
++    case ON_OFF_AUTO_OFF:
-+            .type = QEMU_OPT_BOOL,
++        use_blocksizes = false;
-+            .help = "check that page cache was dropped on live migration (default: off)"
++        use_bs = false;
-+        },
++        break;
-         { /* end of list */ }
++
-     },
++    default:
- };
++        abort();
-@@ -XXX,XX +XXX,XX @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
++    }
 -    backend_ret = blk_probe_blocksizes(blk, &blocksizes);
      /* fill in detected values if they are not defined via qemu command line */
      if (!conf->physical_block_size) {
 -        if (!backend_ret) {
 +        if (use_blocksizes) {
             conf->physical_block_size = blocksizes.phys;
          } else {
              conf->physical_block_size = BDRV_SECTOR_SIZE;
          }
      }
+     if (!conf->logical_block_size) {
-+    s->check_cache_dropped = qemu_opt_get_bool(opts, "x-check-cache-dropped",
+-        if (!backend_ret) {
-+                                               false);
++        if (use_blocksizes) {
-+
+             conf->logical_block_size = blocksizes.log;
-     s->open_flags = open_flags;
+         } else {
-     raw_parse_flags(bdrv_flags, &s->open_flags);
+             conf->logical_block_size = BDRV_SECTOR_SIZE;
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
  {
      BDRVRawState *s;
      BDRVRawReopenState *rs;
 +    QemuOpts *opts;
      int ret = 0;
      Error *local_err = NULL;
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
      state->opaque = g_new0(BDRVRawReopenState, 1);
      rs = state->opaque;
 +    rs->fd = -1;
 +
 +    /* Handle options changes */
 +    opts = qemu_opts_create(&raw_runtime_opts, NULL, 0, &error_abort);
 +    qemu_opts_absorb_qdict(opts, state->options, &local_err);
 +    if (local_err) {
 +        error_propagate(errp, local_err);
 +        ret = -EINVAL;
 +        goto out;
 +    }
 +
 +    rs->check_cache_dropped = qemu_opt_get_bool(opts, "x-check-cache-dropped",
 +                                                s->check_cache_dropped);
      if (s->type == FTYPE_CD) {
          rs->open_flags |= O_NONBLOCK;
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
      raw_parse_flags(state->flags, &rs->open_flags);
 -    rs->fd = -1;
 -
      int fcntl_flags = O_APPEND | O_NONBLOCK;
  #ifdef O_NOATIME
      fcntl_flags |= O_NOATIME;
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
          }
      }
++    if (use_bs) {
-+out:
++        if (!conf->opt_io_size) {
-+    qemu_opts_del(opts);
++            conf->opt_io_size = bs->bl.opt_transfer;
      return ret;
  }
@@ -XXX,XX +XXX,XX @@ static void raw_reopen_commit(BDRVReopenState *state)
      BDRVRawReopenState *rs = state->opaque;
      BDRVRawState *s = state->bs->opaque;
 +    s->check_cache_dropped = rs->check_cache_dropped;
      s->open_flags = rs->open_flags;
      qemu_close(s->fd);
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_block_status(BlockDriverState *bs,
      return ret | BDRV_BLOCK_OFFSET_VALID;
  }
 +#if defined(__linux__)
 +/* Verify that the file is not in the page cache */
 +static void check_cache_dropped(BlockDriverState *bs, Error **errp)
 +{
 +    const size_t window_size = 128 * 1024 * 1024;
 +    BDRVRawState *s = bs->opaque;
 +    void *window = NULL;
 +    size_t length = 0;
 +    unsigned char *vec;
 +    size_t page_size;
 +    off_t offset;
 +    off_t end;
 +
 +    /* mincore(2) page status information requires 1 byte per page */
 +    page_size = sysconf(_SC_PAGESIZE);
 +    vec = g_malloc(DIV_ROUND_UP(window_size, page_size));
 +
 +    end = raw_getlength(bs);
 +
 +    for (offset = 0; offset < end; offset += window_size) {
 +        void *new_window;
 +        size_t new_length;
 +        size_t vec_end;
 +        size_t i;
 +        int ret;
 +
 +        /* Unmap previous window if size has changed */
 +        new_length = MIN(end - offset, window_size);
 +        if (new_length != length) {
 +            munmap(window, length);
 +            window = NULL;
 +            length = 0;
 +        }
-+
++        if (conf->discard_granularity == -1) {
-+        new_window = mmap(window, new_length, PROT_NONE, MAP_PRIVATE,
++            if (bs->bl.pdiscard_alignment) {
-+                          s->fd, offset);
++                conf->discard_granularity = bs->bl.pdiscard_alignment;
-+        if (new_window == MAP_FAILED) {
++            } else if (bs->bl.request_alignment != 1) {
-+            error_setg_errno(errp, errno, "mmap failed");
++                conf->discard_granularity = bs->bl.request_alignment;
 +            break;
 +        }
 +
 +        window = new_window;
 +        length = new_length;
 +
 +        ret = mincore(window, length, vec);
 +        if (ret < 0) {
 +            error_setg_errno(errp, errno, "mincore failed");
 +            break;
 +        }
 +
 +        vec_end = DIV_ROUND_UP(length, page_size);
 +        for (i = 0; i < vec_end; i++) {
 +            if (vec[i] & 0x1) {
 +                error_setg(errp, "page cache still in use!");
 +                break;
 +            }
 +        }
 +    }
-+
-+    if (window) {
+     if (conf->logical_block_size > conf->physical_block_size) {
-+        munmap(window, length);
+         error_setg(errp,
-+    }
+diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out
-+
+index XXXXXXX..XXXXXXX 100644
-+    g_free(vec);
+--- a/tests/qemu-iotests/172.out
-+}
++++ b/tests/qemu-iotests/172.out
-+#endif /* __linux__ */
+@@ -XXX,XX +XXX,XX @@ Testing:
-+
+               dev: floppy, id ""
- static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
+                 unit = 0 (0x0)
-                                                  Error **errp)
+                 drive = "floppy0"
- {
++                backend_defaults = "auto"
-@@ -XXX,XX +XXX,XX @@ static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
+                 logical_block_size = 512 (512 B)
-         error_setg_errno(errp, ret, "fadvise failed");
+                 physical_block_size = 512 (512 B)
-         return;
+                 min_io_size = 0 (0 B)
-     }
+@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2
-+
+               dev: floppy, id ""
-+    if (s->check_cache_dropped) {
+                 unit = 0 (0x0)
-+        check_cache_dropped(bs, errp);
+                 drive = "floppy0"
-+    }
++                backend_defaults = "auto"
- #else /* __linux__ */
+                 logical_block_size = 512 (512 B)
-     /* Do nothing.  Live migration to a remote host with cache.direct=off is
+                 physical_block_size = 512 (512 B)
-      * unsupported on other host operating systems.  Cache consistency issues
+                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "floppy1"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "floppy0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "floppy1"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "floppy0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "floppy1"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "floppy0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "floppy0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "floppy1"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "floppy0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "floppy1"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "floppy0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,unit=1
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "none1"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "floppy0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "floppy0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "floppy1"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "floppy1"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "floppy0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
                dev: floppy, id ""
                  unit = 1 (0x1)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "floppy0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global floppy.drive=none0 -device
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -device floppy
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = ""
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -device floppy,drive-type=120
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = ""
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -device floppy,drive-type=144
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = ""
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -device floppy,drive-type=288
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = ""
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,logical
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physica
                dev: floppy, id ""
                  unit = 0 (0x0)
                  drive = "none0"
 +                backend_defaults = "auto"
                  logical_block_size = 512 (512 B)
                  physical_block_size = 512 (512 B)
                  min_io_size = 0 (0 B)
 --
-.17.0
+.31.1

-[Qemu-devel] [PULL 5/8] checkpatch: emit a warning on file add/move/delete
+[PULL 5/5] block/io: Merge discard request alignments
-From: Joe Perches <joe@perches.com>
+From: Akihiko Odaki <akihiko.odaki@gmail.com>
-Whenever files are added, moved, or deleted, the MAINTAINERS file
+Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
-patterns can be out of sync or outdated.
+Message-id: 20210705130458.97642-3-akihiko.odaki@gmail.com
 To try to keep MAINTAINERS more up-to-date, add a one-time warning
 whenever a patch does any of those.
 Signed-off-by: Joe Perches <joe@perches.com>
 Acked-by: Andy Whitcroft <apw@canonical.com>
 Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Reviewed-by: Markus Armbruster <armbru@redhat.com>
 Reviewed-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: 20180430124651.10340-5-stefanha@redhat.com
 (cherry picked from commit 13f1937ef33950b1112049972249e6191b82e6c9)
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Reviewed-by: Thomas Huth <thuth@redhat.com>
 Conflicts:
   QEMU WARN() only takes one argument, drop the 'type' value in the
   first argument.
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- scripts/checkpatch.pl | 12 +++++++++++-
+ block/io.c | 2 ++
-file changed, 11 insertions(+), 1 deletion(-)
+file changed, 2 insertions(+)
-diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
+diff --git a/block/io.c b/block/io.c
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/scripts/checkpatch.pl
+--- a/block/io.c
-+++ b/scripts/checkpatch.pl
++++ b/block/io.c
-@@ -XXX,XX +XXX,XX @@ sub process {
+@@ -XXX,XX +XXX,XX @@ void bdrv_parent_drained_begin_single(BdrvChild *c, bool poll)
-     my $in_header_lines = $file ? 0 : 1;
+ static void bdrv_merge_limits(BlockLimits *dst, const BlockLimits *src)
-     my $in_commit_log = 0;        #Scanning lines before patch
+ {
--
++    dst->pdiscard_alignment = MAX(dst->pdiscard_alignment,
-+    my $reported_maintainer_file = 0;
++                                  src->pdiscard_alignment);
-     my $non_utf8_charset = 0;
+     dst->opt_transfer = MAX(dst->opt_transfer, src->opt_transfer);
+     dst->max_transfer = MIN_NON_ZERO(dst->max_transfer, src->max_transfer);
-     our @report = ();
+     dst->max_hw_transfer = MIN_NON_ZERO(dst->max_hw_transfer,
@@ -XXX,XX +XXX,XX @@ sub process {
              }
          }
 +# Check for added, moved or deleted files
 +        if (!$reported_maintainer_file && !$in_commit_log &&
 +            ($line =~ /^(?:new|deleted) file mode\s*\d+\s*$/ ||
 +             $line =~ /^rename (?:from|to) [\w\/\.\-]+\s*$/ ||
 +             ($line =~ /\{\s*([\w\/\.\-]*)\s*\=\>\s*([\w\/\.\-]*)\s*\}/ &&
 +              (defined($1) || defined($2))))) {
 +            $reported_maintainer_file = 1;
 +            WARN("added, moved or deleted file(s), does MAINTAINERS need updating?\n" . $herecurr);
 +        }
 +
  # Check for wrappage within a valid hunk of the file
          if ($realcnt != 0 && $line !~ m{^(?:\+|-| |\\ No newline|$)}) {
              ERROR("patch seems to be corrupt (line wrapped?)\n" .
 --
-.17.0
+.31.1

The following changes since commit e5cd695266c5709308aa95b1baae499e4b5d4544:

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-05-08 17:05:58 +0100)

are available in the Git repository at:

git://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 31be8a2a97ecba7d31a82932286489cac318e9e9:

block/file-posix: add x-check-page-cache=on|off option (2018-05-11 16:43:05 +0100)

----------------------------------------------------------------
Block pull request

* Support -drive cache.direct=off live migration for POSIX files

----------------------------------------------------------------

Joe Perches (4):
  checkpatch: add a --strict check for utf-8 in commit logs
  checkpatch: ignore email headers better
  checkpatch: emit a warning on file add/move/delete
  checkpatch: reduce MAINTAINERS update message frequency

Pasi Savanainen (1):
  checkpatch: check utf-8 content from a commit log when it's missing
    from charset

Stefan Hajnoczi (3):
  blockjob: drop block_job_pause/resume_all()
  block/file-posix: implement bdrv_co_invalidate_cache() on Linux
  block/file-posix: add x-check-page-cache=on|off option

-- 
2.17.0

Commit 8119334918e86f45877cfc139192d54f2449a239 ("block: Don't
block_job_pause_all() in bdrv_drain_all()") removed the only callers of
block_job_pause/resume_all().

Pausing and resuming now happens in child_job_drained_begin/end() so
it's no longer necessary to globally pause/resume jobs.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-id: 20180424085240.5798-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/block/blockjob_int.h | 14 --------------
 blockjob.c                   | 27 ---------------------------
 2 files changed, 41 deletions(-)

diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/blockjob_int.h
+++ b/include/block/blockjob_int.h
@@ -XXX,XX +XXX,XX @@ void block_job_sleep_ns(BlockJob *job, int64_t ns);
  */
 void block_job_yield(BlockJob *job);
 
-/**
- * block_job_pause_all:
- *
- * Asynchronously pause all jobs.
- */
-void block_job_pause_all(void);
-
-/**
- * block_job_resume_all:
- *
- * Resume all block jobs.  Must be paired with a preceding block_job_pause_all.
- */
-void block_job_resume_all(void);
-
 /**
  * block_job_early_fail:
  * @bs: The block device.
diff --git a/blockjob.c b/blockjob.c
index XXXXXXX..XXXXXXX 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -XXX,XX +XXX,XX @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
     return job;
 }
 
-void block_job_pause_all(void)
-{
-    BlockJob *job = NULL;
-    while ((job = block_job_next(job))) {
-        AioContext *aio_context = blk_get_aio_context(job->blk);
-
-        aio_context_acquire(aio_context);
-        block_job_ref(job);
-        block_job_pause(job);
-        aio_context_release(aio_context);
-    }
-}
-
 void block_job_early_fail(BlockJob *job)
 {
     assert(job->status == BLOCK_JOB_STATUS_CREATED);
@@ -XXX,XX +XXX,XX @@ void coroutine_fn block_job_pause_point(BlockJob *job)
     }
 }
 
-void block_job_resume_all(void)
-{
-    BlockJob *job, *next;
-
-    QLIST_FOREACH_SAFE(job, &block_jobs, job_list, next) {
-        AioContext *aio_context = blk_get_aio_context(job->blk);
-
-        aio_context_acquire(aio_context);
-        block_job_resume(job);
-        block_job_unref(job);
-        aio_context_release(aio_context);
-    }
-}
-
 /*
  * Conditionally enter a block_job pending a call to fn() while
  * under the block_job_lock critical section.
-- 
2.17.0

From: Joe Perches <joe@perches.com>

Some find using utf-8 in commit logs inappropriate.

Some patch commit logs contain unintended utf-8 characters when doing
things like copy/pasting compilation output.

Look for the start of any commit log by skipping initial lines that look
like email headers and "From: " lines.

Stop looking for utf-8 at the first signature line.

Signed-off-by: Joe Perches <joe@perches.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Message-id: 20180430124651.10340-2-stefanha@redhat.com
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 15662b3e8644905032c2e26808401a487d4e90c1)
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Conflicts:
  QEMU does not have CHK(), use WARN() instead.

QEMU WARN() only takes one argument, drop the 'type' value in the
  first argument.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/checkpatch.pl | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index XXXXXXX..XXXXXXX 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -XXX,XX +XXX,XX @@ our $NonptrType;
 our $Type;
 our $Declare;
 
-our $UTF8	= qr {
-	[\x09\x0A\x0D\x20-\x7E]              # ASCII
-	| [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+our $NON_ASCII_UTF8	= qr{
+	[\xC2-\xDF][\x80-\xBF]               # non-overlong 2-byte
 	|  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
 	| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
 	|  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
@@ -XXX,XX +XXX,XX @@ our $UTF8	= qr {
 	|  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
 }x;
 
+our $UTF8	= qr{
+	[\x09\x0A\x0D\x20-\x7E]              # ASCII
+	| $NON_ASCII_UTF8
+}x;
+
 # There are still some false positives, but this catches most
 # common cases.
 our $typeTypedefs = qr{(?x:
@@ -XXX,XX +XXX,XX @@ sub process {
 	my $signoff = 0;
 	my $is_patch = 0;
 
+	my $in_header_lines = 1;
+	my $in_commit_log = 0;		#Scanning lines before patch
+
 	our @report = ();
 	our $cnt_lines = 0;
 	our $cnt_error = 0;
@@ -XXX,XX +XXX,XX @@ sub process {
 		if ($line =~ /^diff --git.*?(\S+)$/) {
 			$realfile = $1;
 			$realfile =~ s@^([^/]*)/@@;
-
 		} elsif ($line =~ /^\+\+\+\s+(\S+)/) {
 			$realfile = $1;
 			$realfile =~ s@^([^/]*)/@@;
@@ -XXX,XX +XXX,XX @@ sub process {
 		if ($line =~ /^\s*signed-off-by:/i) {
 			# This is a signoff, if ugly, so do not double report.
 			$signoff++;
+			$in_commit_log = 0;
+
 			if (!($line =~ /^\s*Signed-off-by:/)) {
 				ERROR("The correct form is \"Signed-off-by\"\n" .
 					$herecurr);
@@ -XXX,XX +XXX,XX @@ sub process {
 			ERROR("Invalid UTF-8, patch and commit message should be encoded in UTF-8\n" . $hereptr);
 		}
 
+# Check if it's the start of a commit log
+# (not a header line and we haven't seen the patch filename)
+		if ($in_header_lines && $realfile =~ /^$/ &&
+		    $rawline !~ /^(commit\b|from\b|\w+:).+$/i) {
+			$in_header_lines = 0;
+			$in_commit_log = 1;
+		}
+
+# Still not yet in a patch, check for any UTF-8
+		if ($in_commit_log && $realfile =~ /^$/ &&
+		    $rawline =~ /$NON_ASCII_UTF8/) {
+			WARN("8-bit UTF-8 used in possible commit log\n" . $herecurr);
+		}
+
 # ignore non-hunk lines and lines being removed
 		next if (!$hunk_line || $line =~ /^-/);
 
-- 
2.17.0

From: Pasi Savanainen <pasi.savanainen@nixu.com>

Check that a commit log doesn't contain UTF-8 when a mail header
explicitly defines a different charset, like

'Content-Type: text/plain; charset="us-ascii"'

Signed-off-by: Pasi Savanainen <pasi.savanainen@nixu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Message-id: 20180430124651.10340-3-stefanha@redhat.com
Cc: Joe Perches <joe@perches.com>
Cc: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit fa64205df9dfd7b7662cc64a7e82115c00e428e5)
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/checkpatch.pl | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index XXXXXXX..XXXXXXX 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -XXX,XX +XXX,XX @@ sub process {
 	my $in_header_lines = 1;
 	my $in_commit_log = 0;		#Scanning lines before patch
 
+	my $non_utf8_charset = 0;
+
 	our @report = ();
 	our $cnt_lines = 0;
 	our $cnt_error = 0;
@@ -XXX,XX +XXX,XX @@ sub process {
 			$in_commit_log = 1;
 		}
 
-# Still not yet in a patch, check for any UTF-8
-		if ($in_commit_log && $realfile =~ /^$/ &&
+# Check if there is UTF-8 in a commit log when a mail header has explicitly
+# declined it, i.e defined some charset where it is missing.
+		if ($in_header_lines &&
+		    $rawline =~ /^Content-Type:.+charset="(.+)".*$/ &&
+		    $1 !~ /utf-8/i) {
+			$non_utf8_charset = 1;
+		}
+
+		if ($in_commit_log && $non_utf8_charset && $realfile =~ /^$/ &&
 		    $rawline =~ /$NON_ASCII_UTF8/) {
 			WARN("8-bit UTF-8 used in possible commit log\n" . $herecurr);
 		}
-- 
2.17.0

From: Joe Perches <joe@perches.com>

There are some patches created by git format-patch that when scanned by
checkpatch report errors on lines like

To:	address.tld

This is a checkpatch false positive.

Improve the logic a bit to ignore folded email headers to avoid emitting
these messages.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20180430124651.10340-4-stefanha@redhat.com
(cherry picked from commit 29ee1b0c67e0dd7dea8dd718e8326076bce5b6fe)
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/checkpatch.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index XXXXXXX..XXXXXXX 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -XXX,XX +XXX,XX @@ sub process {
 	my $signoff = 0;
 	my $is_patch = 0;
 
-	my $in_header_lines = 1;
+	my $in_header_lines = $file ? 0 : 1;
 	my $in_commit_log = 0;		#Scanning lines before patch
 
 	my $non_utf8_charset = 0;
@@ -XXX,XX +XXX,XX @@ sub process {
 # Check if it's the start of a commit log
 # (not a header line and we haven't seen the patch filename)
 		if ($in_header_lines && $realfile =~ /^$/ &&
-		    $rawline !~ /^(commit\b|from\b|\w+:).+$/i) {
+		    !($rawline =~ /^\s+\S/ ||
+		      $rawline =~ /^(commit\b|from\b|[\w-]+:).*$/i)) {
 			$in_header_lines = 0;
 			$in_commit_log = 1;
 		}
-- 
2.17.0

From: Joe Perches <joe@perches.com>

Whenever files are added, moved, or deleted, the MAINTAINERS file
patterns can be out of sync or outdated.

To try to keep MAINTAINERS more up-to-date, add a one-time warning
whenever a patch does any of those.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20180430124651.10340-5-stefanha@redhat.com
(cherry picked from commit 13f1937ef33950b1112049972249e6191b82e6c9)
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>

Conflicts:
  QEMU WARN() only takes one argument, drop the 'type' value in the
  first argument.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/checkpatch.pl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index XXXXXXX..XXXXXXX 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -XXX,XX +XXX,XX @@ sub process {
 
 	my $in_header_lines = $file ? 0 : 1;
 	my $in_commit_log = 0;		#Scanning lines before patch
-
+	my $reported_maintainer_file = 0;
 	my $non_utf8_charset = 0;
 
 	our @report = ();
@@ -XXX,XX +XXX,XX @@ sub process {
 			}
 		}
 
+# Check for added, moved or deleted files
+		if (!$reported_maintainer_file && !$in_commit_log &&
+		    ($line =~ /^(?:new|deleted) file mode\s*\d+\s*$/ ||
+		     $line =~ /^rename (?:from|to) [\w\/\.\-]+\s*$/ ||
+		     ($line =~ /\{\s*([\w\/\.\-]*)\s*\=\>\s*([\w\/\.\-]*)\s*\}/ &&
+		      (defined($1) || defined($2))))) {
+			$reported_maintainer_file = 1;
+			WARN("added, moved or deleted file(s), does MAINTAINERS need updating?\n" . $herecurr);
+		}
+
 # Check for wrappage within a valid hunk of the file
 		if ($realcnt != 0 && $line !~ m{^(?:\+|-| |\\ No newline|$)}) {
 			ERROR("patch seems to be corrupt (line wrapped?)\n" .
-- 
2.17.0

From: Joe Perches <joe@perches.com>

When files are being added/moved/deleted and a patch contains an update to
the MAINTAINERS file, assume it's to update the MAINTAINERS file correctly
and do not emit the "does MAINTAINERS need updating?" message.

Reported by many people.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20180430124651.10340-6-stefanha@redhat.com
(cherry picked from e0d975b1b439c4fef58fbc306c542c94f48bb849)
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/checkpatch.pl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index XXXXXXX..XXXXXXX 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -XXX,XX +XXX,XX @@ sub process {
 			}
 		}
 
+# Check if MAINTAINERS is being updated.  If so, there's probably no need to
+# emit the "does MAINTAINERS need updating?" message on file add/move/delete
+		if ($line =~ /^\s*MAINTAINERS\s*\|/) {
+			$reported_maintainer_file = 1;
+		}
+
 # Check for added, moved or deleted files
 		if (!$reported_maintainer_file && !$in_commit_log &&
 		    ($line =~ /^(?:new|deleted) file mode\s*\d+\s*$/ ||
-- 
2.17.0

On Linux posix_fadvise(POSIX_FADV_DONTNEED) invalidates pages*.  Use
this to drop page cache on the destination host during shared storage
migration.  This way the destination host will read the latest copy of
the data and will not use stale data from the page cache.

The flow is as follows:

1. Source host writes out all dirty pages and inactivates drives.
2. QEMU_VM_EOF is sent on migration stream.
3. Destination host invalidates caches before accessing drives.

This patch enables live migration even with -drive cache.direct=off.

* Terms and conditions may apply, please see patch for details.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 20180427162312.18583-2-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/file-posix.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_block_status(BlockDriverState *bs,
     return ret | BDRV_BLOCK_OFFSET_VALID;
 }
 
+static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
+                                                 Error **errp)
+{
+    BDRVRawState *s = bs->opaque;
+    int ret;
+
+    ret = fd_open(bs);
+    if (ret < 0) {
+        error_setg_errno(errp, -ret, "The file descriptor is not open");
+        return;
+    }
+
+    if (s->open_flags & O_DIRECT) {
+        return; /* No host kernel page cache */
+    }
+
+#if defined(__linux__)
+    /* This sets the scene for the next syscall... */
+    ret = bdrv_co_flush(bs);
+    if (ret < 0) {
+        error_setg_errno(errp, -ret, "flush failed");
+        return;
+    }
+
+    /* Linux does not invalidate pages that are dirty, locked, or mmapped by a
+     * process.  These limitations are okay because we just fsynced the file,
+     * we don't use mmap, and the file should not be in use by other processes.
+     */
+    ret = posix_fadvise(s->fd, 0, 0, POSIX_FADV_DONTNEED);
+    if (ret != 0) { /* the return value is a positive errno */
+        error_setg_errno(errp, ret, "fadvise failed");
+        return;
+    }
+#else /* __linux__ */
+    /* Do nothing.  Live migration to a remote host with cache.direct=off is
+     * unsupported on other host operating systems.  Cache consistency issues
+     * may occur but no error is reported here, partly because that's the
+     * historical behavior and partly because it's hard to differentiate valid
+     * configurations that should not cause errors.
+     */
+#endif /* !__linux__ */
+}
+
 static coroutine_fn BlockAIOCB *raw_aio_pdiscard(BlockDriverState *bs,
     int64_t offset, int bytes,
     BlockCompletionFunc *cb, void *opaque)
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = {
     .bdrv_co_create_opts = raw_co_create_opts,
     .bdrv_has_zero_init = bdrv_has_zero_init_1,
     .bdrv_co_block_status = raw_co_block_status,
+    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
     .bdrv_co_pwrite_zeroes = raw_co_pwrite_zeroes,
 
     .bdrv_co_preadv         = raw_co_preadv,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
     .bdrv_reopen_abort   = raw_reopen_abort,
     .bdrv_co_create_opts = hdev_co_create_opts,
     .create_opts         = &raw_create_opts,
+    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
     .bdrv_co_pwrite_zeroes = hdev_co_pwrite_zeroes,
 
     .bdrv_co_preadv         = raw_co_preadv,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
     .bdrv_reopen_abort   = raw_reopen_abort,
     .bdrv_co_create_opts = hdev_co_create_opts,
     .create_opts         = &raw_create_opts,
+    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
 
 
     .bdrv_co_preadv         = raw_co_preadv,
-- 
2.17.0

mincore(2) checks whether pages are resident.  Use it to verify that
page cache has been dropped.

You can trigger a verification failure by mmapping the image file from
another process that loads a byte from a page, forcing it to become
resident.  bdrv_co_invalidate_cache() will fail while that process is
alive.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 20180427162312.18583-3-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 qapi/block-core.json |   7 ++-
 block/file-posix.c   | 100 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 104 insertions(+), 3 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 # @locking:     whether to enable file locking. If set to 'auto', only enable
 #               when Open File Descriptor (OFD) locking API is available
 #               (default: auto, since 2.10)
+# @x-check-cache-dropped: whether to check that page cache was dropped on live
+#                         migration.  May cause noticeable delays if the image
+#                         file is large, do not use in production.
+#                         (default: off) (since: 2.13)
 #
 # Since: 2.9
 ##
@@ -XXX,XX +XXX,XX @@
   'data': { 'filename': 'str',
             '*pr-manager': 'str',
             '*locking': 'OnOffAuto',
-            '*aio': 'BlockdevAioOptions' } }
+            '*aio': 'BlockdevAioOptions',
+            '*x-check-cache-dropped': 'bool' } }
 
 ##
 # @BlockdevOptionsNull:
diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRawState {
     bool page_cache_inconsistent:1;
     bool has_fallocate;
     bool needs_alignment;
+    bool check_cache_dropped;
 
     PRManager *pr_mgr;
 } BDRVRawState;
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRawState {
 typedef struct BDRVRawReopenState {
     int fd;
     int open_flags;
+    bool check_cache_dropped;
 } BDRVRawReopenState;
 
 static int fd_open(BlockDriverState *bs);
@@ -XXX,XX +XXX,XX @@ static QemuOptsList raw_runtime_opts = {
             .type = QEMU_OPT_STRING,
             .help = "id of persistent reservation manager object (default: none)",
         },
+        {
+            .name = "x-check-cache-dropped",
+            .type = QEMU_OPT_BOOL,
+            .help = "check that page cache was dropped on live migration (default: off)"
+        },
         { /* end of list */ }
     },
 };
@@ -XXX,XX +XXX,XX @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
         }
     }
 
+    s->check_cache_dropped = qemu_opt_get_bool(opts, "x-check-cache-dropped",
+                                               false);
+
     s->open_flags = open_flags;
     raw_parse_flags(bdrv_flags, &s->open_flags);
 
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
 {
     BDRVRawState *s;
     BDRVRawReopenState *rs;
+    QemuOpts *opts;
     int ret = 0;
     Error *local_err = NULL;
 
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
 
     state->opaque = g_new0(BDRVRawReopenState, 1);
     rs = state->opaque;
+    rs->fd = -1;
+
+    /* Handle options changes */
+    opts = qemu_opts_create(&raw_runtime_opts, NULL, 0, &error_abort);
+    qemu_opts_absorb_qdict(opts, state->options, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        ret = -EINVAL;
+        goto out;
+    }
+
+    rs->check_cache_dropped = qemu_opt_get_bool(opts, "x-check-cache-dropped",
+                                                s->check_cache_dropped);
 
     if (s->type == FTYPE_CD) {
         rs->open_flags |= O_NONBLOCK;
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
 
     raw_parse_flags(state->flags, &rs->open_flags);
 
-    rs->fd = -1;
-
     int fcntl_flags = O_APPEND | O_NONBLOCK;
 #ifdef O_NOATIME
     fcntl_flags |= O_NOATIME;
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
         }
     }
 
+out:
+    qemu_opts_del(opts);
     return ret;
 }
 
@@ -XXX,XX +XXX,XX @@ static void raw_reopen_commit(BDRVReopenState *state)
     BDRVRawReopenState *rs = state->opaque;
     BDRVRawState *s = state->bs->opaque;
 
+    s->check_cache_dropped = rs->check_cache_dropped;
     s->open_flags = rs->open_flags;
 
     qemu_close(s->fd);
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_block_status(BlockDriverState *bs,
     return ret | BDRV_BLOCK_OFFSET_VALID;
 }
 
+#if defined(__linux__)
+/* Verify that the file is not in the page cache */
+static void check_cache_dropped(BlockDriverState *bs, Error **errp)
+{
+    const size_t window_size = 128 * 1024 * 1024;
+    BDRVRawState *s = bs->opaque;
+    void *window = NULL;
+    size_t length = 0;
+    unsigned char *vec;
+    size_t page_size;
+    off_t offset;
+    off_t end;
+
+    /* mincore(2) page status information requires 1 byte per page */
+    page_size = sysconf(_SC_PAGESIZE);
+    vec = g_malloc(DIV_ROUND_UP(window_size, page_size));
+
+    end = raw_getlength(bs);
+
+    for (offset = 0; offset < end; offset += window_size) {
+        void *new_window;
+        size_t new_length;
+        size_t vec_end;
+        size_t i;
+        int ret;
+
+        /* Unmap previous window if size has changed */
+        new_length = MIN(end - offset, window_size);
+        if (new_length != length) {
+            munmap(window, length);
+            window = NULL;
+            length = 0;
+        }
+
+        new_window = mmap(window, new_length, PROT_NONE, MAP_PRIVATE,
+                          s->fd, offset);
+        if (new_window == MAP_FAILED) {
+            error_setg_errno(errp, errno, "mmap failed");
+            break;
+        }
+
+        window = new_window;
+        length = new_length;
+
+        ret = mincore(window, length, vec);
+        if (ret < 0) {
+            error_setg_errno(errp, errno, "mincore failed");
+            break;
+        }
+
+        vec_end = DIV_ROUND_UP(length, page_size);
+        for (i = 0; i < vec_end; i++) {
+            if (vec[i] & 0x1) {
+                error_setg(errp, "page cache still in use!");
+                break;
+            }
+        }
+    }
+
+    if (window) {
+        munmap(window, length);
+    }
+
+    g_free(vec);
+}
+#endif /* __linux__ */
+
 static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
                                                  Error **errp)
 {
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
         error_setg_errno(errp, ret, "fadvise failed");
         return;
     }
+
+    if (s->check_cache_dropped) {
+        check_cache_dropped(bs, errp);
+    }
 #else /* __linux__ */
     /* Do nothing.  Live migration to a remote host with cache.direct=off is
      * unsupported on other host operating systems.  Cache consistency issues
-- 
2.17.0

The following changes since commit 711c0418c8c1ce3a24346f058b001c4c5a2f0f81:

Merge remote-tracking branch 'remotes/philmd/tags/mips-20210702' into staging (2021-07-04 14:04:12 +0100)

are available in the Git repository at:

https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 9f460c64e13897117f35ffb61f6f5e0102cabc70:

block/io: Merge discard request alignments (2021-07-06 14:28:55 +0100)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Akihiko Odaki (3):
  block/file-posix: Optimize for macOS
  block: Add backend_defaults property
  block/io: Merge discard request alignments

Stefan Hajnoczi (2):
  util/async: add a human-readable name to BHs for debugging
  util/async: print leaked BH name when AioContext finalizes

-- 
2.31.1

It can be difficult to debug issues with BHs in production environments.
Although BHs can usually be identified by looking up their ->cb()
function pointer, this requires debug information for the program. It is
also not possible to print human-readable diagnostics about BHs because
they have no identifier.

This patch adds a name to each BH. The name is not unique per instance
but differentiates between cb() functions, which is usually enough. It's
done by changing aio_bh_new() and friends to macros that stringify cb.

The next patch will use the name field when reporting leaked BHs.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210414200247.917496-2-stefanha@redhat.com>
---
 include/block/aio.h            | 31 ++++++++++++++++++++++++++++---
 include/qemu/main-loop.h       |  4 +++-
 tests/unit/ptimer-test-stubs.c |  2 +-
 util/async.c                   |  9 +++++++--
 util/main-loop.c               |  4 ++--
 5 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/include/block/aio.h b/include/block/aio.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -XXX,XX +XXX,XX @@ void aio_context_acquire(AioContext *ctx);
 /* Relinquish ownership of the AioContext. */
 void aio_context_release(AioContext *ctx);
 
+/**
+ * aio_bh_schedule_oneshot_full: Allocate a new bottom half structure that will
+ * run only once and as soon as possible.
+ *
+ * @name: A human-readable identifier for debugging purposes.
+ */
+void aio_bh_schedule_oneshot_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
+                                  const char *name);
+
 /**
  * aio_bh_schedule_oneshot: Allocate a new bottom half structure that will run
  * only once and as soon as possible.
+ *
+ * A convenience wrapper for aio_bh_schedule_oneshot_full() that uses cb as the
+ * name string.
  */
-void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
+#define aio_bh_schedule_oneshot(ctx, cb, opaque) \
+    aio_bh_schedule_oneshot_full((ctx), (cb), (opaque), (stringify(cb)))
 
 /**
- * aio_bh_new: Allocate a new bottom half structure.
+ * aio_bh_new_full: Allocate a new bottom half structure.
  *
  * Bottom halves are lightweight callbacks whose invocation is guaranteed
  * to be wait-free, thread-safe and signal-safe.  The #QEMUBH structure
  * is opaque and must be allocated prior to its use.
+ *
+ * @name: A human-readable identifier for debugging purposes.
  */
-QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
+QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
+                        const char *name);
+
+/**
+ * aio_bh_new: Allocate a new bottom half structure
+ *
+ * A convenience wrapper for aio_bh_new_full() that uses the cb as the name
+ * string.
+ */
+#define aio_bh_new(ctx, cb, opaque) \
+    aio_bh_new_full((ctx), (cb), (opaque), (stringify(cb)))
 
 /**
  * aio_notify: Force processing of pending events.
diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/main-loop.h
+++ b/include/qemu/main-loop.h
@@ -XXX,XX +XXX,XX @@ void qemu_cond_timedwait_iothread(QemuCond *cond, int ms);
 
 void qemu_fd_register(int fd);
 
-QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque);
+#define qemu_bh_new(cb, opaque) \
+    qemu_bh_new_full((cb), (opaque), (stringify(cb)))
+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name);
 void qemu_bh_schedule_idle(QEMUBH *bh);
 
 enum {
diff --git a/tests/unit/ptimer-test-stubs.c b/tests/unit/ptimer-test-stubs.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/unit/ptimer-test-stubs.c
+++ b/tests/unit/ptimer-test-stubs.c
@@ -XXX,XX +XXX,XX @@ int64_t qemu_clock_deadline_ns_all(QEMUClockType type, int attr_mask)
     return deadline;
 }
 
-QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name)
 {
     QEMUBH *bh = g_new(QEMUBH, 1);
 
diff --git a/util/async.c b/util/async.c
index XXXXXXX..XXXXXXX 100644
--- a/util/async.c
+++ b/util/async.c
@@ -XXX,XX +XXX,XX @@ enum {
 
 struct QEMUBH {
     AioContext *ctx;
+    const char *name;
     QEMUBHFunc *cb;
     void *opaque;
     QSLIST_ENTRY(QEMUBH) next;
@@ -XXX,XX +XXX,XX @@ static QEMUBH *aio_bh_dequeue(BHList *head, unsigned *flags)
     return bh;
 }
 
-void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
+void aio_bh_schedule_oneshot_full(AioContext *ctx, QEMUBHFunc *cb,
+                                  void *opaque, const char *name)
 {
     QEMUBH *bh;
     bh = g_new(QEMUBH, 1);
@@ -XXX,XX +XXX,XX @@ void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
         .ctx = ctx,
         .cb = cb,
         .opaque = opaque,
+        .name = name,
     };
     aio_bh_enqueue(bh, BH_SCHEDULED | BH_ONESHOT);
 }
 
-QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
+QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
+                        const char *name)
 {
     QEMUBH *bh;
     bh = g_new(QEMUBH, 1);
@@ -XXX,XX +XXX,XX @@ QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
         .ctx = ctx,
         .cb = cb,
         .opaque = opaque,
+        .name = name,
     };
     return bh;
 }
diff --git a/util/main-loop.c b/util/main-loop.c
index XXXXXXX..XXXXXXX 100644
--- a/util/main-loop.c
+++ b/util/main-loop.c
@@ -XXX,XX +XXX,XX @@ void main_loop_wait(int nonblocking)
 
 /* Functions to operate on the main QEMU AioContext.  */
 
-QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name)
 {
-    return aio_bh_new(qemu_aio_context, cb, opaque);
+    return aio_bh_new_full(qemu_aio_context, cb, opaque, name);
 }
 
 /*
-- 
2.31.1

BHs must be deleted before the AioContext is finalized. If not, it's a
bug and probably indicates that some part of the program still expects
the BH to run in the future. That can lead to memory leaks, inconsistent
state, or just hangs.

Unfortunately the assert(flags & BH_DELETED) call in aio_ctx_finalize()
is difficult to debug because the assertion failure contains no
information about the BH!

Use the QEMUBH name field added in the previous patch to show a useful
error when a leaked BH is detected.

Suggested-by: Eric Ernst <eric.g.ernst@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210414200247.917496-3-stefanha@redhat.com>
---
 util/async.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/util/async.c b/util/async.c
index XXXXXXX..XXXXXXX 100644
--- a/util/async.c
+++ b/util/async.c
@@ -XXX,XX +XXX,XX @@ aio_ctx_finalize(GSource     *source)
     assert(QSIMPLEQ_EMPTY(&ctx->bh_slice_list));
 
     while ((bh = aio_bh_dequeue(&ctx->bh_list, &flags))) {
-        /* qemu_bh_delete() must have been called on BHs in this AioContext */
-        assert(flags & BH_DELETED);
+        /*
+         * qemu_bh_delete() must have been called on BHs in this AioContext. In
+         * many cases memory leaks, hangs, or inconsistent state occur when a
+         * BH is leaked because something still expects it to run.
+         *
+         * If you hit this, fix the lifecycle of the BH so that
+         * qemu_bh_delete() and any associated cleanup is called before the
+         * AioContext is finalized.
+         */
+        if (unlikely(!(flags & BH_DELETED))) {
+            fprintf(stderr, "%s: BH '%s' leaked, aborting...\n",
+                    __func__, bh->name);
+            abort();
+        }
 
         g_free(bh);
     }
-- 
2.31.1

From: Akihiko Odaki <akihiko.odaki@gmail.com>

This commit introduces "punch hole" operation and optimizes transfer
block size for macOS.

Thanks to Konstantin Nazarov for detailed analysis of a flaw in an
old version of this change:
https://gist.github.com/akihikodaki/87df4149e7ca87f18dc56807ec5a1bc5#gistcomment-3654667

Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Message-id: 20210705130458.97642-1-akihiko.odaki@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/file-posix.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@
 #if defined(HAVE_HOST_BLOCK_DEVICE)
 #include <paths.h>
 #include <sys/param.h>
+#include <sys/mount.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/IOBSD.h>
 #include <IOKit/storage/IOMediaBSDClient.h>
@@ -XXX,XX +XXX,XX @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
         return;
     }
 
+#if defined(__APPLE__) && (__MACH__)
+    struct statfs buf;
+
+    if (!fstatfs(s->fd, &buf)) {
+        bs->bl.opt_transfer = buf.f_iosize;
+        bs->bl.pdiscard_alignment = buf.f_bsize;
+    }
+#endif
+
     if (bs->sg || S_ISBLK(st.st_mode)) {
         int ret = hdev_get_max_hw_transfer(s->fd, &st);
 
@@ -XXX,XX +XXX,XX @@ out:
     }
 }
 
+#if defined(CONFIG_FALLOCATE) || defined(BLKZEROOUT) || defined(BLKDISCARD)
 static int translate_err(int err)
 {
     if (err == -ENODEV || err == -ENOSYS || err == -EOPNOTSUPP ||
@@ -XXX,XX +XXX,XX @@ static int translate_err(int err)
     }
     return err;
 }
+#endif
 
 #ifdef CONFIG_FALLOCATE
 static int do_fallocate(int fd, int mode, off_t offset, off_t len)
@@ -XXX,XX +XXX,XX @@ static int handle_aiocb_discard(void *opaque)
             }
         } while (errno == EINTR);
 
-        ret = -errno;
+        ret = translate_err(-errno);
 #endif
     } else {
 #ifdef CONFIG_FALLOCATE_PUNCH_HOLE
         ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
                            aiocb->aio_offset, aiocb->aio_nbytes);
+        ret = translate_err(-errno);
+#elif defined(__APPLE__) && (__MACH__)
+        fpunchhole_t fpunchhole;
+        fpunchhole.fp_flags = 0;
+        fpunchhole.reserved = 0;
+        fpunchhole.fp_offset = aiocb->aio_offset;
+        fpunchhole.fp_length = aiocb->aio_nbytes;
+        if (fcntl(s->fd, F_PUNCHHOLE, &fpunchhole) == -1) {
+            ret = errno == ENODEV ? -ENOTSUP : -errno;
+        } else {
+            ret = 0;
+        }
 #endif
     }
 
-    ret = translate_err(ret);
     if (ret == -ENOTSUP) {
         s->has_discard = false;
     }
-- 
2.31.1

From: Akihiko Odaki <akihiko.odaki@gmail.com>

backend_defaults property allow users to control if default block
properties should be decided with backend information.

If it is off, any backend information will be discarded, which is
suitable if you plan to perform live migration to a different disk backend.

If it is on, a block device may utilize backend information more
aggressively.

By default, it is auto, which uses backend information for block
sizes and ignores the others, which is consistent with the older
versions.

Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Message-id: 20210705130458.97642-2-akihiko.odaki@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/hw/block/block.h   |  3 +++
 hw/block/block.c           | 42 ++++++++++++++++++++++++++++++++++----
 tests/qemu-iotests/172.out | 38 ++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/include/hw/block/block.h b/include/hw/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/block/block.h
+++ b/include/hw/block/block.h
@@ -XXX,XX +XXX,XX @@
 
 typedef struct BlockConf {
     BlockBackend *blk;
+    OnOffAuto backend_defaults;
     uint32_t physical_block_size;
     uint32_t logical_block_size;
     uint32_t min_io_size;
@@ -XXX,XX +XXX,XX @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)
 }
 
 #define DEFINE_BLOCK_PROPERTIES_BASE(_state, _conf)                     \
+    DEFINE_PROP_ON_OFF_AUTO("backend_defaults", _state,                 \
+                            _conf.backend_defaults, ON_OFF_AUTO_AUTO),  \
     DEFINE_PROP_BLOCKSIZE("logical_block_size", _state,                 \
                           _conf.logical_block_size),                    \
     DEFINE_PROP_BLOCKSIZE("physical_block_size", _state,                \
diff --git a/hw/block/block.c b/hw/block/block.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/block.c
+++ b/hw/block/block.c
@@ -XXX,XX +XXX,XX @@ bool blkconf_blocksizes(BlockConf *conf, Error **errp)
 {
     BlockBackend *blk = conf->blk;
     BlockSizes blocksizes;
-    int backend_ret;
+    BlockDriverState *bs;
+    bool use_blocksizes;
+    bool use_bs;
+
+    switch (conf->backend_defaults) {
+    case ON_OFF_AUTO_AUTO:
+        use_blocksizes = !blk_probe_blocksizes(blk, &blocksizes);
+        use_bs = false;
+        break;
+
+    case ON_OFF_AUTO_ON:
+        use_blocksizes = !blk_probe_blocksizes(blk, &blocksizes);
+        bs = blk_bs(blk);
+        use_bs = bs;
+        break;
+
+    case ON_OFF_AUTO_OFF:
+        use_blocksizes = false;
+        use_bs = false;
+        break;
+
+    default:
+        abort();
+    }
 
-    backend_ret = blk_probe_blocksizes(blk, &blocksizes);
     /* fill in detected values if they are not defined via qemu command line */
     if (!conf->physical_block_size) {
-        if (!backend_ret) {
+        if (use_blocksizes) {
            conf->physical_block_size = blocksizes.phys;
         } else {
             conf->physical_block_size = BDRV_SECTOR_SIZE;
         }
     }
     if (!conf->logical_block_size) {
-        if (!backend_ret) {
+        if (use_blocksizes) {
             conf->logical_block_size = blocksizes.log;
         } else {
             conf->logical_block_size = BDRV_SECTOR_SIZE;
         }
     }
+    if (use_bs) {
+        if (!conf->opt_io_size) {
+            conf->opt_io_size = bs->bl.opt_transfer;
+        }
+        if (conf->discard_granularity == -1) {
+            if (bs->bl.pdiscard_alignment) {
+                conf->discard_granularity = bs->bl.pdiscard_alignment;
+            } else if (bs->bl.request_alignment != 1) {
+                conf->discard_granularity = bs->bl.request_alignment;
+            }
+        }
+    }
 
     if (conf->logical_block_size > conf->physical_block_size) {
         error_setg(errp,
diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/172.out
+++ b/tests/qemu-iotests/172.out
@@ -XXX,XX +XXX,XX @@ Testing:
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,unit=1
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "none1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "floppy1"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
               dev: floppy, id ""
                 unit = 1 (0x1)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "floppy0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global floppy.drive=none0 -device
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -device floppy
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = ""
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -device floppy,drive-type=120
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = ""
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -device floppy,drive-type=144
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = ""
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -device floppy,drive-type=288
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = ""
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,logical
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physica
               dev: floppy, id ""
                 unit = 0 (0x0)
                 drive = "none0"
+                backend_defaults = "auto"
                 logical_block_size = 512 (512 B)
                 physical_block_size = 512 (512 B)
                 min_io_size = 0 (0 B)
-- 
2.31.1