Series comparison

-[Qemu-devel] [PULL 0/8] Block patches
+[PULL for-7.0 0/2] Block patches
-The following changes since commit e5cd695266c5709308aa95b1baae499e4b5d4544:
+The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:
-  Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-05-08 17:05:58 +0100)
+  Update version for v7.0.0-rc1 release (2022-03-22 22:58:44 +0000)
 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 2539eade4f689eda7e9fe45486f18334bfbafaf0:
-  block/file-posix: add x-check-page-cache=on|off option (2018-05-11 16:43:05 +0100)
+  hw: Fix misleading hexadecimal format (2022-03-24 10:38:42 +0000)
 ----------------------------------------------------------------
-Block pull request
+Pull request
- * Support -drive cache.direct=off live migration for POSIX files
+Philippe found cases where the 0x%d format string was used, leading to
 misleading output. The patches look harmless and could save people time, so I
 think it's worth including them in 7.0.
 ----------------------------------------------------------------
-Joe Perches (4):
+Philippe Mathieu-Daudé (2):
-  checkpatch: add a --strict check for utf-8 in commit logs
+  block: Fix misleading hexadecimal format
-  checkpatch: ignore email headers better
+  hw: Fix misleading hexadecimal format
   checkpatch: emit a warning on file add/move/delete
   checkpatch: reduce MAINTAINERS update message frequency
-Pasi Savanainen (1):
+ block/parallels-ext.c | 2 +-
-  checkpatch: check utf-8 content from a commit log when it's missing
+ hw/i386/sgx.c         | 2 +-
-    from charset
+ hw/i386/trace-events  | 6 +++---
+ hw/misc/trace-events  | 4 ++--
-Stefan Hajnoczi (3):
+ hw/scsi/trace-events  | 4 ++--
-  blockjob: drop block_job_pause/resume_all()
+files changed, 9 insertions(+), 9 deletions(-)
   block/file-posix: implement bdrv_co_invalidate_cache() on Linux
   block/file-posix: add x-check-page-cache=on|off option
  qapi/block-core.json         |   7 +-
  include/block/blockjob_int.h |  14 ----
  block/file-posix.c           | 146 ++++++++++++++++++++++++++++++++++-
  blockjob.c                   |  27 -------
  scripts/checkpatch.pl        |  56 +++++++++++++-
 files changed, 202 insertions(+), 48 deletions(-)
 --
-.17.0
+.35.1

-[Qemu-devel] [PULL 1/8] blockjob: drop block_job_pause/resume_all()
+Deleted patch
-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 ---------------------------
-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.
---
-.17.0

-[Qemu-devel] [PULL 2/8] checkpatch: add a --strict check for utf-8 in commit logs
+[PULL for-7.0 1/2] block: Fix misleading hexadecimal format
-From: Joe Perches <joe@perches.com>
+From: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Some find using utf-8 in commit logs inappropriate.
+"0x%u" format is very misleading, replace by "0x%x".
-Some patch commit logs contain unintended utf-8 characters when doing
+Found running:
 things like copy/pasting compilation output.
-Look for the start of any commit log by skipping initial lines that look
+  $ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/
 like email headers and "From: " lines.
-Stop looking for utf-8 at the first signature line.
+Inspired-by: Richard Henderson <richard.henderson@linaro.org>
+Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Signed-off-by: Joe Perches <joe@perches.com>
+Reviewed-by: Hanna Reitz <hreitz@redhat.com>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
+Reviewed-by: Denis V. Lunev <den@openvz.org>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: 20220323114718.58714-2-philippe.mathieu.daude@gmail.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 ++++++++++++++++++++++++++----
+ block/parallels-ext.c | 2 +-
-file changed, 26 insertions(+), 4 deletions(-)
+file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
+diff --git a/block/parallels-ext.c b/block/parallels-ext.c
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/scripts/checkpatch.pl
+--- a/block/parallels-ext.c
-+++ b/scripts/checkpatch.pl
++++ b/block/parallels-ext.c
-@@ -XXX,XX +XXX,XX @@ our $NonptrType;
+@@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs,
- our $Type;
+             break;
- our $Declare;
+         default:
--our $UTF8    = qr {
+-            error_setg(errp, "Unknown feature: 0x%" PRIu64, fh.magic);
--    [\x09\x0A\x0D\x20-\x7E]              # ASCII
++            error_setg(errp, "Unknown feature: 0x%" PRIx64, fh.magic);
--    | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+             goto fail;
-+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
+.35.1

-[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 5/8] checkpatch: emit a warning on file add/move/delete
+Deleted patch
-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 +++++++++++-
-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" .
---
-.17.0

-[Qemu-devel] [PULL 6/8] checkpatch: reduce MAINTAINERS update message frequency
+Deleted patch
-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 ++++++
-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*$/ ||
---
-.17.0

-[Qemu-devel] [PULL 7/8] block/file-posix: implement bdrv_co_invalidate_cache() on Linux
+Deleted patch
-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:
-. Source host writes out all dirty pages and inactivates drives.
-. QEMU_VM_EOF is sent on migration stream.
-. 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 ++++++++++++++++++++++++++++++++++++++++++++++
-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,
---
-.17.0

-[Qemu-devel] [PULL 8/8] block/file-posix: add x-check-page-cache=on|off option
+[PULL for-7.0 2/2] hw: Fix misleading hexadecimal format
-mincore(2) checks whether pages are resident.  Use it to verify that
+From: Philippe Mathieu-Daudé <f4bug@amsat.org>
 page cache has been dropped.
-You can trigger a verification failure by mmapping the image file from
+"0x%u" format is very misleading, replace by "0x%x".
 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>
+Found running:
-Reviewed-by: Fam Zheng <famz@redhat.com>
-Message-id: 20180427162312.18583-3-stefanha@redhat.com
+  $ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/
 Inspired-by: Richard Henderson <richard.henderson@linaro.org>
 Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
 Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
 Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- qapi/block-core.json |   7 ++-
+ hw/i386/sgx.c        | 2 +-
- block/file-posix.c   | 100 ++++++++++++++++++++++++++++++++++++++++++-
+ hw/i386/trace-events | 6 +++---
-files changed, 104 insertions(+), 3 deletions(-)
+ hw/misc/trace-events | 4 ++--
  hw/scsi/trace-events | 4 ++--
 files changed, 8 insertions(+), 8 deletions(-)
-diff --git a/qapi/block-core.json b/qapi/block-core.json
+diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
 index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
+--- a/hw/i386/sgx.c
-+++ b/qapi/block-core.json
++++ b/hw/i386/sgx.c
@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
      }
      if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
 -        error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
 +        error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
                       sgx_epc->size);
          exit(EXIT_FAILURE);
      }
 diff --git a/hw/i386/trace-events b/hw/i386/trace-events
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/i386/trace-events
 +++ b/hw/i386/trace-events
@@ -XXX,XX +XXX,XX @@ vtd_fault_disabled(void) "Fault processing disabled for context entry"
  vtd_replay_ce_valid(const char *mode, uint8_t bus, uint8_t dev, uint8_t fn, uint16_t domain, uint64_t hi, uint64_t lo) "%s: replay valid context device %02"PRIx8":%02"PRIx8".%02"PRIx8" domain 0x%"PRIx16" hi 0x%"PRIx64" lo 0x%"PRIx64
  vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8
  vtd_page_walk_level(uint64_t addr, uint32_t level, uint64_t start, uint64_t end) "walk (base=0x%"PRIx64", level=%"PRIu32") iova range 0x%"PRIx64" - 0x%"PRIx64
 -vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIu16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d"
 +vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIx16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d"
  vtd_page_walk_one_skip_map(uint64_t iova, uint64_t mask, uint64_t translated) "iova 0x%"PRIx64" mask 0x%"PRIx64" translated 0x%"PRIx64
  vtd_page_walk_one_skip_unmap(uint64_t iova, uint64_t mask) "iova 0x%"PRIx64" mask 0x%"PRIx64
  vtd_page_walk_skip_read(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to unable to read"
  vtd_page_walk_skip_reserve(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to rsrv set"
  vtd_switch_address_space(uint8_t bus, uint8_t slot, uint8_t fn, bool on) "Device %02x:%02x.%x switching address space (iommu enabled=%d)"
  vtd_as_unmap_whole(uint8_t bus, uint8_t slot, uint8_t fn, uint64_t iova, uint64_t size) "Device %02x:%02x.%x start 0x%"PRIx64" size 0x%"PRIx64
 -vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIu16", iova 0x%"PRIx64
 -vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIu16" %d"
 +vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIx16", iova 0x%"PRIx64
 +vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIx16" %d"
  vtd_irq_generate(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64
  vtd_reg_read(uint64_t addr, uint64_t size) "addr 0x%"PRIx64" size 0x%"PRIx64
  vtd_reg_write(uint64_t addr, uint64_t size, uint64_t val) "addr 0x%"PRIx64" size 0x%"PRIx64" value 0x%"PRIx64
 diff --git a/hw/misc/trace-events b/hw/misc/trace-events
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/misc/trace-events
 +++ b/hw/misc/trace-events
 @@ -XXX,XX +XXX,XX @@
- # @locking:     whether to enable file locking. If set to 'auto', only enable
+ # See docs/devel/tracing.rst for syntax documentation.
- #               when Open File Descriptor (OFD) locking API is available
- #               (default: auto, since 2.10)
+ # allwinner-cpucfg.c
-+# @x-check-cache-dropped: whether to check that page cache was dropped on live
+-allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIu32
-+#                         migration.  May cause noticeable delays if the image
++allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIx32
-+#                         file is large, do not use in production.
+ allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
-+#                         (default: off) (since: 2.13)
+ allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
- #
- # Since: 2.9
+@@ -XXX,XX +XXX,XX @@ imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" PRIx64 "value 0x%08
- ##
-@@ -XXX,XX +XXX,XX @@
+ # mos6522.c
-   'data': { 'filename': 'str',
+ mos6522_set_counter(int index, unsigned int val) "T%d.counter=%d"
-             '*pr-manager': 'str',
+-mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRId64 " delta_next=0x%"PRId64
-             '*locking': 'OnOffAuto',
++mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRIx64 " delta_next=0x%"PRIx64
--            '*aio': 'BlockdevAioOptions' } }
+ mos6522_set_sr_int(void) "set sr_int"
-+            '*aio': 'BlockdevAioOptions',
+ mos6522_write(uint64_t addr, const char *name, uint64_t val) "reg=0x%"PRIx64 " [%s] val=0x%"PRIx64
-+            '*x-check-cache-dropped': 'bool' } }
+ mos6522_read(uint64_t addr, const char *name, unsigned val) "reg=0x%"PRIx64 " [%s] val=0x%x"
+diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events
  ##
  # @BlockdevOptionsNull:
 diff --git a/block/file-posix.c b/block/file-posix.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
+--- a/hw/scsi/trace-events
-+++ b/block/file-posix.c
++++ b/hw/scsi/trace-events
-@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRawState {
+@@ -XXX,XX +XXX,XX @@ lsi_bad_phase_interrupt(void) "Phase mismatch interrupt"
-     bool page_cache_inconsistent:1;
+ lsi_bad_selection(uint32_t id) "Selected absent target %"PRIu32
-     bool has_fallocate;
+ lsi_do_dma_unavailable(void) "DMA no data available"
-     bool needs_alignment;
+ lsi_do_dma(uint64_t addr, int len) "DMA addr=0x%"PRIx64" len=%d"
-+    bool check_cache_dropped;
+-lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRId32
++lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRIx32
-     PRManager *pr_mgr;
+ lsi_add_msg_byte_error(void) "MSG IN data too long"
- } BDRVRawState;
+ lsi_add_msg_byte(uint8_t data) "MSG IN 0x%02x"
-@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRawState {
+ lsi_reselect(int id) "Reselected target %d"
- typedef struct BDRVRawReopenState {
+@@ -XXX,XX +XXX,XX @@ lsi_do_msgout_noop(void) "MSG: No Operation"
-     int fd;
+ lsi_do_msgout_extended(uint8_t msg, uint8_t len) "Extended message 0x%x (len %d)"
-     int open_flags;
+ lsi_do_msgout_ignored(const char *msg) "%s (ignored)"
-+    bool check_cache_dropped;
+ lsi_do_msgout_simplequeue(uint8_t select_tag) "SIMPLE queue tag=0x%x"
- } BDRVRawReopenState;
+-lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRId32
++lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRIx32
- static int fd_open(BlockDriverState *bs);
+ lsi_do_msgout_clearqueue(uint32_t tag) "MSG: CLEAR QUEUE tag=0x%"PRIx32
-@@ -XXX,XX +XXX,XX @@ static QemuOptsList raw_runtime_opts = {
+ lsi_do_msgout_busdevicereset(uint32_t tag) "MSG: BUS DEVICE RESET tag=0x%"PRIx32
-             .type = QEMU_OPT_STRING,
+ lsi_do_msgout_select(int id) "Select LUN %d"
              .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
 --
-.17.0
+.35.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 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:

Update version for v7.0.0-rc1 release (2022-03-22 22:58:44 +0000)

are available in the Git repository at:

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

for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0:

hw: Fix misleading hexadecimal format (2022-03-24 10:38:42 +0000)

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

Philippe found cases where the 0x%d format string was used, leading to
misleading output. The patches look harmless and could save people time, so I
think it's worth including them in 7.0.

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

Philippe Mathieu-Daudé (2):
  block: Fix misleading hexadecimal format
  hw: Fix misleading hexadecimal format

-- 
2.35.1

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

"0x%u" format is very misleading, replace by "0x%x".

Found running:

$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/

Inspired-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Message-id: 20220323114718.58714-2-philippe.mathieu.daude@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/parallels-ext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/parallels-ext.c b/block/parallels-ext.c
index XXXXXXX..XXXXXXX 100644
--- a/block/parallels-ext.c
+++ b/block/parallels-ext.c
@@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs,
             break;
 
         default:
-            error_setg(errp, "Unknown feature: 0x%" PRIu64, fh.magic);
+            error_setg(errp, "Unknown feature: 0x%" PRIx64, fh.magic);
             goto fail;
         }
 
-- 
2.35.1

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

"0x%u" format is very misleading, replace by "0x%x".

Found running:

$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/

Inspired-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/i386/sgx.c        | 2 +-
 hw/i386/trace-events | 6 +++---
 hw/misc/trace-events | 4 ++--
 hw/scsi/trace-events | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/i386/sgx.c
+++ b/hw/i386/sgx.c
@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
     }
 
     if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
-        error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
+        error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
                      sgx_epc->size);
         exit(EXIT_FAILURE);
     }
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/hw/i386/trace-events
+++ b/hw/i386/trace-events
@@ -XXX,XX +XXX,XX @@ vtd_fault_disabled(void) "Fault processing disabled for context entry"
 vtd_replay_ce_valid(const char *mode, uint8_t bus, uint8_t dev, uint8_t fn, uint16_t domain, uint64_t hi, uint64_t lo) "%s: replay valid context device %02"PRIx8":%02"PRIx8".%02"PRIx8" domain 0x%"PRIx16" hi 0x%"PRIx64" lo 0x%"PRIx64
 vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8
 vtd_page_walk_level(uint64_t addr, uint32_t level, uint64_t start, uint64_t end) "walk (base=0x%"PRIx64", level=%"PRIu32") iova range 0x%"PRIx64" - 0x%"PRIx64
-vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIu16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d"
+vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIx16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d"
 vtd_page_walk_one_skip_map(uint64_t iova, uint64_t mask, uint64_t translated) "iova 0x%"PRIx64" mask 0x%"PRIx64" translated 0x%"PRIx64
 vtd_page_walk_one_skip_unmap(uint64_t iova, uint64_t mask) "iova 0x%"PRIx64" mask 0x%"PRIx64
 vtd_page_walk_skip_read(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to unable to read"
 vtd_page_walk_skip_reserve(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to rsrv set"
 vtd_switch_address_space(uint8_t bus, uint8_t slot, uint8_t fn, bool on) "Device %02x:%02x.%x switching address space (iommu enabled=%d)"
 vtd_as_unmap_whole(uint8_t bus, uint8_t slot, uint8_t fn, uint64_t iova, uint64_t size) "Device %02x:%02x.%x start 0x%"PRIx64" size 0x%"PRIx64
-vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIu16", iova 0x%"PRIx64
-vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIu16" %d"
+vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIx16", iova 0x%"PRIx64
+vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIx16" %d"
 vtd_irq_generate(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64
 vtd_reg_read(uint64_t addr, uint64_t size) "addr 0x%"PRIx64" size 0x%"PRIx64
 vtd_reg_write(uint64_t addr, uint64_t size, uint64_t val) "addr 0x%"PRIx64" size 0x%"PRIx64" value 0x%"PRIx64
diff --git a/hw/misc/trace-events b/hw/misc/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/hw/misc/trace-events
+++ b/hw/misc/trace-events
@@ -XXX,XX +XXX,XX @@
 # See docs/devel/tracing.rst for syntax documentation.
 
 # allwinner-cpucfg.c
-allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIu32
+allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIx32
 allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
 allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
 
@@ -XXX,XX +XXX,XX @@ imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" PRIx64 "value 0x%08
 
 # mos6522.c
 mos6522_set_counter(int index, unsigned int val) "T%d.counter=%d"
-mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRId64 " delta_next=0x%"PRId64
+mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRIx64 " delta_next=0x%"PRIx64
 mos6522_set_sr_int(void) "set sr_int"
 mos6522_write(uint64_t addr, const char *name, uint64_t val) "reg=0x%"PRIx64 " [%s] val=0x%"PRIx64
 mos6522_read(uint64_t addr, const char *name, unsigned val) "reg=0x%"PRIx64 " [%s] val=0x%x"
diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/hw/scsi/trace-events
+++ b/hw/scsi/trace-events
@@ -XXX,XX +XXX,XX @@ lsi_bad_phase_interrupt(void) "Phase mismatch interrupt"
 lsi_bad_selection(uint32_t id) "Selected absent target %"PRIu32
 lsi_do_dma_unavailable(void) "DMA no data available"
 lsi_do_dma(uint64_t addr, int len) "DMA addr=0x%"PRIx64" len=%d"
-lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRId32
+lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRIx32
 lsi_add_msg_byte_error(void) "MSG IN data too long"
 lsi_add_msg_byte(uint8_t data) "MSG IN 0x%02x"
 lsi_reselect(int id) "Reselected target %d"
@@ -XXX,XX +XXX,XX @@ lsi_do_msgout_noop(void) "MSG: No Operation"
 lsi_do_msgout_extended(uint8_t msg, uint8_t len) "Extended message 0x%x (len %d)"
 lsi_do_msgout_ignored(const char *msg) "%s (ignored)"
 lsi_do_msgout_simplequeue(uint8_t select_tag) "SIMPLE queue tag=0x%x"
-lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRId32
+lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRIx32
 lsi_do_msgout_clearqueue(uint32_t tag) "MSG: CLEAR QUEUE tag=0x%"PRIx32
 lsi_do_msgout_busdevicereset(uint32_t tag) "MSG: BUS DEVICE RESET tag=0x%"PRIx32
 lsi_do_msgout_select(int id) "Select LUN %d"
-- 
2.35.1