Merge ~paelzer/ubuntu/+source/qemu:lp-1921468-1887535-1921665-FOCAL into ubuntu/+source/qemu:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4504/+packages

[Sergio Durigan Junior (sergiodj)]

Thanks, Christian.

I reviewed everything and the changes look alright. The patches are properly named, the DEP-3 headers are OK, the changelog entry is OK.

I'm marking this as Needs Information because (as of this writing) the builds haven't finished on the PPA, which means that the dep8 tests have not been run yet. I'd like to see the results before approving the MP.

I have reviewed the SRU templates for the bugs mentioned in the changelog, with the exception of #1921468 which still doesn't have a template ready. I think the template for #1887535 could be expanded a bit on the "Regression potential" (which now should be named "Where problems could occur", by the way). I agree that a regression would likely cause a failed build, but not always. Are there any more scenarios where a regression could creep in and change the result of the build?

Once the build finishes and the test results are available I will update this review. Thanks.

review: Needs Information

[Christian Ehrhardt  (paelzer)]

Builds are complete by now and LGTM.
Tests started but not yet finished.

I have expanded on the regression potential (it was filed before the rename) of bug 1887535

I added an SRU template to 1921468 as well

[Utkarsh Gupta (utkarsh)]

* Changelog:
  - [✔] changelog entry correct version and targeted codename
  - [✔] changelog entries correct
  - [✔] update-maintainer has been run

* New Delta:
  - [✔] patches match what was proposed upstream
  - [✔] patches correctly included in debian/patches/series
  - [✔] patches have correct DEP3 metadata
  - [?] patches are all correct

A quick note here: I prefer to run `quilt refresh` after a patch is applied to refresh a patch, this removes the unnecessary noise from all the patches.

The first 3 patches seems to be partially refreshed (which is good!), but the last two (namely, lp-1921665-1-block-Require-aligned-image-size-to-avoid-assert.patch and lp-1921665-2-file-posix-Allow-byte-aligned-O_DIRECT-with-NFS.patch) haven't been refreshed. I know this is based on preferences, et al, but this is one thing that I always try to adapt to. Trivial (but of significance for me), so you could ignore as well, but I'd love it if you could do a complete refresh of all the 5 patches! :)

* Build/Test:
  - [✔] build is ok
  - [✔] verified PPA package installs/uninstalls
  - [✔] autopkgtest against the PPA package passes

* Extra:
  - [?] lintian warnings

I get a bunch of lintian warning for spelling errors; cf: https://paste.ubuntu.com/p/fbCQ8j47xq/. Maybe worth fixing it now or later? Or in fact, just forward the Debian specific ones to mjt and he can fix them. And maybe, we can fix the Ubuntu specific ones?

Another very, very trivial lintian comment is about trailing whitespaces in debian/changelog. You could run:
sed -i -e 's@[[:space:]]*$@@g' debian/changelog
to get rid of them but I guess worth sending this pointer to mjt maybe?

That said, this MP looks good and you can upload as-is but maybe worth considering my points above?

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks for the review.

Ok on patch refreshing and done - thanks.

The rest I have postponed and answered in more detail on the groovy MP.

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/qemu
 * [new tag] upload/1%4.2-3ubuntu6.15 -> upload/1%4.2-3ubuntu6.15

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading qemu_4.2-3ubuntu6.15.dsc: done.
  Uploading qemu_4.2-3ubuntu6.15.debian.tar.xz: done.
  Uploading qemu_4.2-3ubuntu6.15_source.buildinfo: done.
  Uploading qemu_4.2-3ubuntu6.15_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

merged - closing MP

diff --git a/debian/changelog b/debian/changelog
index 6728b7a..d263f9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+qemu (1:4.2-3ubuntu6.15) focal; urgency=medium
+
+  * d/p/u/lp-1921468-*: fix issues handling boot menu index on s390x
+    (LP: #1921468)
+  * d/p/u/lp-1887535-configure-replace-enable-disable-git-update-with-wit.patch,
+    d/rules: Backport --with-git-submodules param so building from git repo
+    doesn't fail (LP: #1887535)
+  * Fix byte aligned writes when writing to image stored on NFS
+    server, as they aren't required to be 4kib aligned. (LP: #1921665)
+    - d/p/u/lp-1921665-1-block-Require-aligned-image-size-to-avoid-assert.patch
+    - d/p/u/lp-1921665-2-file-posix-Allow-byte-aligned-O_DIRECT-with-NFS.patch
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 26 Mar 2021 10:38:47 +0100
+
 qemu (1:4.2-3ubuntu6.14) focal-security; urgency=medium
 
   * SECURITY REGRESSION: fix multiple regressions caused by CVE-2020-13754
diff --git a/debian/patches/series b/debian/patches/series
index e622674..631f85a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -258,3 +258,8 @@ ubuntu/CVE-2020-13754-4.patch
 ubuntu/CVE-2020-13754-5.patch
 ubuntu/CVE-2020-13754-6.patch
 ubuntu/CVE-2020-13754-9.patch
+ubuntu/lp-1921468-pc-bios-s390-ccw-fix-off-by-one-error.patch
+ubuntu/lp-1921468-pc-bios-s390-ccw-break-loop-if-a-null-block-number-i.patch
+ubuntu/lp-1887535-configure-replace-enable-disable-git-update-with-wit.patch
+ubuntu/lp-1921665-1-block-Require-aligned-image-size-to-avoid-assert.patch
+ubuntu/lp-1921665-2-file-posix-Allow-byte-aligned-O_DIRECT-with-NFS.patch
diff --git a/debian/patches/ubuntu/lp-1887535-configure-replace-enable-disable-git-update-with-wit.patch b/debian/patches/ubuntu/lp-1887535-configure-replace-enable-disable-git-update-with-wit.patch
new file mode 100644
index 0000000..0fe0ec5
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1887535-configure-replace-enable-disable-git-update-with-wit.patch
@@ -0,0 +1,277 @@
+From 7d7dbf9dc15be6e1465c756c2c5ae7f1ab104fc8 Mon Sep 17 00:00:00 2001
+From: Dan Streetman <[e-mail]>
+Date: Tue, 19 Jan 2021 12:20:46 -0500
+Subject: [PATCH] configure: replace --enable/disable-git-update with
+ --with-git-submodules
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1887535
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=7d7dbf9dc15be6e1465c756c2c5ae7f1ab104fc8
+
+Replace the --enable-git-update and --disable-git-update configure params
+with the param --with-git-submodules=(update|validate|ignore) to
+allow 3 options for building from a git repo.
+
+This is needed because downstream packagers, e.g. Debian, Ubuntu, etc,
+also keep the source code in git, but do not want to enable the
+'git_update' mode; with the current code, that's not possible even
+if the downstream package specifies --disable-git-update.
+
+The previous parameters are deprecated but still available; the
+--enable-git-update parameter maps to --with-git-submodules=update and
+--disable-git-update parameter maps to --with-git-submodules=validate.
+
+The configure script behavior is slightly modified, where previously
+the dtc, capstone, and slirp submodules were not validated when
+--disable-git-update was specified (but were updated with git-update
+enabled), now they are validated when using --with-git-submodules=validate
+and are only ignored when using --with-git-submodules=ignore.
+
+Signed-off-by: Dan Streetman <[e-mail]>
+Signed-off-by: Daniel P. Berrangé <[e-mail]>
+---
+ Makefile                 | 24 ++-----------------
+ configure                | 51 ++++++++++++++++++++++++++++++----------
+ scripts/git-submodule.sh | 34 ++++++++++++++++++++-------
+ 3 files changed, 66 insertions(+), 43 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -24,33 +24,11 @@ ifneq ($(wildcard config-host.mak),)
+ all:
+ include config-host.mak
+ 
+-git-submodule-update:
+-
+ .PHONY: git-submodule-update
+-
+-git_module_status := $(shell \
+-  cd '$(SRC_PATH)' && \
+-  GIT="$(GIT)" ./scripts/git-submodule.sh status $(GIT_SUBMODULES); \
+-  echo $$?; \
+-)
+-
+-ifeq (1,$(git_module_status))
+-ifeq (no,$(GIT_UPDATE))
+-git-submodule-update:
+-	$(call quiet-command, \
+-            echo && \
+-            echo "GIT submodule checkout is out of date. Please run" && \
+-            echo "  scripts/git-submodule.sh update $(GIT_SUBMODULES)" && \
+-            echo "from the source directory checkout $(SRC_PATH)" && \
+-            echo && \
+-            exit 1)
+-else
+ git-submodule-update:
+ 	$(call quiet-command, \
+-          (cd $(SRC_PATH) && GIT="$(GIT)" ./scripts/git-submodule.sh update $(GIT_SUBMODULES)), \
+-          "GIT","$(GIT_SUBMODULES)")
+-endif
+-endif
++		(GIT="$(GIT)" "$(SRC_PATH)/scripts/git-submodule.sh" $(GIT_SUBMODULES_ACTION) $(GIT_SUBMODULES)), \
++		"GIT","$(GIT_SUBMODULES)")
+ 
+ .git-submodule-status: git-submodule-update config-host.mak
+ 
+--- a/configure
++++ b/configure
+@@ -305,12 +305,12 @@ stack_protector=""
+ 
+ if test -e "$source_path/.git"
+ then
+-    git_update=yes
++    git_submodules_action="update"
+     git_submodules="ui/keycodemapdb"
+     git_submodules="$git_submodules tests/fp/berkeley-testfloat-3"
+     git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
+ else
+-    git_update=no
++    git_submodules_action="ignore"
+     git_submodules=""
+ 
+     if ! test -f "$source_path/ui/keycodemapdb/README"
+@@ -1524,9 +1524,16 @@ for opt do
+   ;;
+   --with-git=*) git="$optarg"
+   ;;
+-  --enable-git-update) git_update=yes
++  --enable-git-update)
++      git_submodules_action="update"
++      echo "--enable-git-update deprecated, use --with-git-submodules=update"
++  ;;
++  --disable-git-update)
++      git_submodules_action="validate"
++      echo "--disable-git-update deprecated, use --with-git-submodules=validate"
+   ;;
+-  --disable-git-update) git_update=no
++  --with-git-submodules=*)
++      git_submodules_action="$optarg"
+   ;;
+   --enable-debug-mutex) debug_mutex=yes
+   ;;
+@@ -1552,6 +1559,21 @@ for opt do
+   esac
+ done
+ 
++case $git_submodules_action in
++    update|validate)
++        if test ! -e "$source_path/.git"; then
++            echo "ERROR: cannot $git_submodules_action git submodules without .git"
++            exit 1
++        fi
++    ;;
++    ignore)
++    ;;
++    *)
++        echo "ERROR: invalid --with-git-submodules= value '$git_submodules_action'"
++        exit 1
++    ;;
++esac
++
+ case "$cpu" in
+     ppc)
+            CPU_CFLAGS="-m32"
+@@ -1678,6 +1700,9 @@ Advanced options (experts only):
+   --python=PYTHON          use specified python [$python]
+   --smbd=SMBD              use specified smbd [$smbd]
+   --with-git=GIT           use specified git [$git]
++  --with-git-submodules=update   update git submodules (default if .git dir exists)
++  --with-git-submodules=validate fail if git submodules are not up to date
++  --with-git-submodules=ignore   do not update or check git submodules (default if no .git dir)
+   --static                 enable static build [$static]
+   --mandir=PATH            install man pages in PATH
+   --datadir=PATH           install firmware in PATH$confsuffix
+@@ -1885,7 +1910,7 @@ fi
+ # Consult white-list to determine whether to enable werror
+ # by default.  Only enable by default for git builds
+ if test -z "$werror" ; then
+-    if test -e "$source_path/.git" && \
++    if test $git_submodules_action != 'ignore' && \
+         { test "$linux" = "yes" || test "$mingw32" = "yes"; }; then
+         werror="yes"
+     else
+@@ -4148,10 +4173,10 @@ EOF
+     fdt=system
+   else
+       # have GIT checkout, so activate dtc submodule
+-      if test -e "${source_path}/.git" ; then
++      if test $git_submodules_action != 'ignore' ; then
+           git_submodules="${git_submodules} dtc"
+       fi
+-      if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then
++      if test -d "${source_path}/dtc/libfdt" || test $git_submodules_action != 'ignore' ; then
+           fdt=git
+           mkdir -p dtc
+           if [ "$pwd_is_source_path" != "y" ] ; then
+@@ -5084,7 +5109,7 @@ case "$capstone" in
+   "" | yes)
+     if $pkg_config capstone; then
+       capstone=system
+-    elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then
++    elif test $git_submodules_action != 'ignore' ; then
+       capstone=git
+     elif test -e "${source_path}/capstone/Makefile" ; then
+       capstone=internal
+@@ -6054,7 +6079,7 @@ case "$slirp" in
+   "" | yes)
+     if $pkg_config slirp; then
+       slirp=system
+-    elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then
++    elif test $git_submodules_action != 'ignore' ; then
+       slirp=git
+     elif test -e "${source_path}/slirp/Makefile" ; then
+       slirp=internal
+@@ -6678,7 +6703,7 @@ echo "libs_cpu=$libs_cpu" >> $config_hos
+ echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
+ echo "GIT=$git" >> $config_host_mak
+ echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak
+-echo "GIT_UPDATE=$git_update" >> $config_host_mak
++echo "GIT_SUBMODULES_ACTION=$git_submodules_action" >> $config_host_mak
+ 
+ echo "ARCH=$ARCH" >> $config_host_mak
+ 
+--- a/scripts/git-submodule.sh
++++ b/scripts/git-submodule.sh
+@@ -9,9 +9,14 @@ command=$1
+ shift
+ maybe_modules="$@"
+ 
++# if --with-git-submodules=ignore, do nothing
++test "$command" = "ignore" && exit 0
++
+ test -z "$GIT" && GIT=git
+ 
+-error() {
++cd "$(dirname "$0")/.."
++
++update_error() {
+     echo "$0: $*"
+     echo
+     echo "Unable to automatically checkout GIT submodules '$modules'."
+@@ -24,7 +29,7 @@ error() {
+     echo "Alternatively you may disable automatic GIT submodule checkout"
+     echo "with:"
+     echo
+-    echo " $ ./configure --disable-git-update"
++    echo " $ ./configure --with-git-submodules=validate"
+     echo
+     echo "and then manually update submodules prior to running make, with:"
+     echo
+@@ -33,6 +38,19 @@ error() {
+     exit 1
+ }
+ 
++validate_error() {
++    if test "$1" = "validate"; then
++        echo "GIT submodules checkout is out of date, and submodules"
++        echo "configured for validate only. Please run"
++        echo "  scripts/git-submodule.sh update $maybe_modules"
++        echo "from the source directory or call configure with"
++        echo "  --with-git-submodules=update"
++        echo "To disable GIT submodules validation, use"
++        echo "  --with-git-submodules=ignore"
++    fi
++    exit 1
++}
++
+ modules=""
+ for m in $maybe_modules
+ do
+@@ -52,17 +70,18 @@ then
+ fi
+ 
+ case "$command" in
+-status)
++status|validate)
+     if test -z "$maybe_modules"
+     then
+-         test -s ${substat} && exit 1 || exit 0
++         test -s ${substat} && validate_error "$command" || exit 0
+     fi
+ 
+-    test -f "$substat" || exit 1
++    test -f "$substat" || validate_error "$command"
+     CURSTATUS=$($GIT submodule status $modules)
+     OLDSTATUS=$(cat $substat)
+-    test "$CURSTATUS" = "$OLDSTATUS"
+-    exit $?
++    if test "$CURSTATUS" != "$OLDSTATUS"; then
++        validate_error "$command"
++    fi
+     ;;
+ update)
+     if test -z "$maybe_modules"
+@@ -72,10 +91,10 @@ update)
+     fi
+ 
+     $GIT submodule update --init $modules 1>/dev/null
+-    test $? -ne 0 && error "failed to update modules"
++    test $? -ne 0 && update_error "failed to update modules"
+ 
+     $GIT submodule status $modules > "${substat}"
+-    test $? -ne 0 && error "failed to save git submodule status" >&2
++    test $? -ne 0 && update_error "failed to save git submodule status" >&2
+     ;;
+ esac
+ 
diff --git a/debian/patches/ubuntu/lp-1921468-pc-bios-s390-ccw-break-loop-if-a-null-block-number-i.patch b/debian/patches/ubuntu/lp-1921468-pc-bios-s390-ccw-break-loop-if-a-null-block-number-i.patch
new file mode 100644
index 0000000..1df9421
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921468-pc-bios-s390-ccw-break-loop-if-a-null-block-number-i.patch
@@ -0,0 +1,40 @@
+From 468184ec9024f4f7b55247f70ec57554e8a500d7 Mon Sep 17 00:00:00 2001
+From: Marc Hartmayer <[e-mail]>
+Date: Thu, 24 Sep 2020 10:59:25 +0200
+Subject: [PATCH] pc-bios/s390-ccw: break loop if a null block number is
+ reached
+
+Break the loop if `cur_block_nr` is a null block number because this
+means that the end of chunk is reached. In this case we will try to
+boot the default entry.
+
+Fixes: ba831b25262a ("s390-ccw: read stage2 boot loader data to find menu")
+Reviewed-by: Collin Walling <[e-mail]>
+Signed-off-by: Marc Hartmayer <[e-mail]>
+Message-Id: <[e-mail]>
+Signed-off-by: Thomas Huth <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=468184ec9024
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921468
+Last-Update: 2021-03-26
+
+---
+ pc-bios/s390-ccw/bootmap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
+index 767bb612db..942fba3fa7 100644
+--- a/pc-bios/s390-ccw/bootmap.c
++++ b/pc-bios/s390-ccw/bootmap.c
+@@ -192,7 +192,7 @@ static int eckd_get_boot_menu_index(block_number_t s1b_block_nr)
+     for (i = 0; i < STAGE2_BLK_CNT_MAX; i++) {
+         cur_block_nr = eckd_block_num(&s1b->seek[i].chs);
+ 
+-        if (!cur_block_nr) {
++        if (!cur_block_nr || is_null_block_number(cur_block_nr)) {
+             break;
+         }
+ 
+-- 
+2.30.0
+
diff --git a/debian/patches/ubuntu/lp-1921468-pc-bios-s390-ccw-fix-off-by-one-error.patch b/debian/patches/ubuntu/lp-1921468-pc-bios-s390-ccw-fix-off-by-one-error.patch
new file mode 100644
index 0000000..b59bdad
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921468-pc-bios-s390-ccw-fix-off-by-one-error.patch
@@ -0,0 +1,41 @@
+From 5f97ba0c74ccace0a4014460de9751ff3c6f454a Mon Sep 17 00:00:00 2001
+From: Marc Hartmayer <[e-mail]>
+Date: Thu, 24 Sep 2020 10:59:24 +0200
+Subject: [PATCH] pc-bios/s390-ccw: fix off-by-one error
+
+This error takes effect when the magic value "zIPL" is located at the
+end of a block. For example if s2_cur_blk = 0x7fe18000 and the magic
+value "zIPL" is located at 0x7fe18ffc - 0x7fe18fff.
+
+Fixes: ba831b25262a ("s390-ccw: read stage2 boot loader data to find menu")
+Reviewed-by: Collin Walling <[e-mail]>
+Signed-off-by: Marc Hartmayer <[e-mail]>
+Message-Id: <[e-mail]>
+Reviewed-by: Thomas Huth <[e-mail]>
+[thuth: Use "<= ... - 4" instead of "< ... - 3"]
+Signed-off-by: Thomas Huth <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=5f97ba0c74cc
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921468
+Last-Update: 2021-03-26
+
+---
+ pc-bios/s390-ccw/bootmap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
+index 0ef6b851f3..767bb612db 100644
+--- a/pc-bios/s390-ccw/bootmap.c
++++ b/pc-bios/s390-ccw/bootmap.c
+@@ -163,7 +163,7 @@ static bool find_zipl_boot_menu_banner(int *offset)
+     int i;
+ 
+     /* Menu banner starts with "zIPL" */
+-    for (i = 0; i < virtio_get_block_size() - 4; i++) {
++    for (i = 0; i <= virtio_get_block_size() - 4; i++) {
+         if (magic_match(s2_cur_blk + i, ZIPL_MAGIC_EBCDIC)) {
+             *offset = i;
+             return true;
+-- 
+2.30.0
+
diff --git a/debian/patches/ubuntu/lp-1921665-1-block-Require-aligned-image-size-to-avoid-assert.patch b/debian/patches/ubuntu/lp-1921665-1-block-Require-aligned-image-size-to-avoid-assert.patch
new file mode 100644
index 0000000..81dd3fb
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921665-1-block-Require-aligned-image-size-to-avoid-assert.patch
@@ -0,0 +1,66 @@
+From 9c60a5d1978e6dcf85c0e01b50e6f7f54ca09104 Mon Sep 17 00:00:00 2001
+From: Kevin Wolf <[e-mail]>
+Date: Thu, 16 Jul 2020 16:26:00 +0200
+Subject: [PATCH] block: Require aligned image size to avoid assertion failure
+
+Unaligned requests will automatically be aligned to bl.request_alignment
+and we can't extend write requests to access space beyond the end of the
+image without resizing the image, so if we have the WRITE permission,
+but not the RESIZE one, it's required that the image size is aligned.
+
+Failing to meet this requirement could cause assertion failures like
+this if RESIZE permissions weren't requested:
+
+qemu-img: block/io.c:1910: bdrv_co_write_req_prepare: Assertion `end_sector <= bs->total_sectors || child->perm & BLK_PERM_RESIZE' failed.
+
+This was e.g. triggered by qemu-img converting to a target image with 4k
+request alignment when the image was only aligned to 512 bytes, but not
+to 4k.
+
+Turn this into a graceful error in bdrv_check_perm() so that WRITE
+without RESIZE can only be taken if the image size is aligned. If a user
+holds both permissions and drops only RESIZE, the function will return
+an error, but bdrv_child_try_set_perm() will ignore the failure silently
+if permissions are only requested to be relaxed and just keep both
+permissions while returning success.
+
+Signed-off-by: Kevin Wolf <[e-mail]>
+Message-Id: <[e-mail]>
+Reviewed-by: Max Reitz <[e-mail]>
+Signed-off-by: Kevin Wolf <[e-mail]>
+
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=9c60a5d1978e6dcf85c0e01b50e6f7f54ca09104
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921665
+Last-Update: 2021-03-29
+
+---
+ block.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+Index: qemu-4.2/block.c
+===================================================================
+--- qemu-4.2.orig/block.c	2021-03-29 16:37:44.376599273 +1300
++++ qemu-4.2/block.c	2021-03-29 16:37:44.372599220 +1300
+@@ -1842,6 +1842,22 @@
+         return -EPERM;
+     }
+ 
++    /*
++     * Unaligned requests will automatically be aligned to bl.request_alignment
++     * and without RESIZE we can't extend requests to write to space beyond the
++     * end of the image, so it's required that the image size is aligned.
++     */
++    if ((cumulative_perms & (BLK_PERM_WRITE | BLK_PERM_WRITE_UNCHANGED)) &&
++        !(cumulative_perms & BLK_PERM_RESIZE))
++    {
++        if ((bs->total_sectors * BDRV_SECTOR_SIZE) % bs->bl.request_alignment) {
++            error_setg(errp, "Cannot get 'write' permission without 'resize': "
++                             "Image size is not a multiple of request "
++                             "alignment");
++            return -EPERM;
++        }
++    }
++
+     /* Check this node */
+     if (!drv) {
+         return 0;
diff --git a/debian/patches/ubuntu/lp-1921665-2-file-posix-Allow-byte-aligned-O_DIRECT-with-NFS.patch b/debian/patches/ubuntu/lp-1921665-2-file-posix-Allow-byte-aligned-O_DIRECT-with-NFS.patch
new file mode 100644
index 0000000..3eeee86
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921665-2-file-posix-Allow-byte-aligned-O_DIRECT-with-NFS.patch
@@ -0,0 +1,86 @@
+From 5edc85571e7b7269dce408735eba7507f18ac666 Mon Sep 17 00:00:00 2001
+From: Kevin Wolf <[e-mail]>
+Date: Thu, 16 Jul 2020 16:26:01 +0200
+Subject: [PATCH] file-posix: Allow byte-aligned O_DIRECT with NFS
+
+Since commit a6b257a08e3 ('file-posix: Handle undetectable alignment'),
+we assume that if we open a file with O_DIRECT and alignment probing
+returns 1, we just couldn't find out the real alignment requirement
+because some filesystems make the requirement only for allocated blocks.
+In this case, a safe default of 4k is used.
+
+This is too strict for NFS, which does actually allow byte-aligned
+requests even with O_DIRECT. Because we can't distinguish both cases
+with generic code, let's just look at the file system magic and disable
+s->needs_alignment for NFS. This way, O_DIRECT can still be used on NFS
+for images that are not aligned to 4k.
+
+Signed-off-by: Kevin Wolf <[e-mail]>
+Reviewed-by: Eric Blake <[e-mail]>
+Message-Id: <[e-mail]>
+Reviewed-by: Max Reitz <[e-mail]>
+Signed-off-by: Kevin Wolf <[e-mail]>
+
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=5edc85571e7b7269dce408735eba7507f18ac666
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921665
+Last-Update: 2021-03-29
+
+---
+ block/file-posix.c | 26 +++++++++++++++++++++++++-
+ 1 file changed, 25 insertions(+), 1 deletion(-)
+
+Index: qemu-4.2/block/file-posix.c
+===================================================================
+--- qemu-4.2.orig/block/file-posix.c	2021-03-29 16:38:00.008804168 +1300
++++ qemu-4.2/block/file-posix.c	2021-03-29 16:38:00.008804168 +1300
+@@ -61,10 +61,12 @@
+ #include <sys/ioctl.h>
+ #include <sys/param.h>
+ #include <sys/syscall.h>
++#include <sys/vfs.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+ #include <linux/fs.h>
+ #include <linux/hdreg.h>
++#include <linux/magic.h>
+ #include <scsi/sg.h>
+ #ifdef __s390__
+ #include <asm/dasd.h>
+@@ -298,6 +300,28 @@
+ #endif
+ }
+ 
++/*
++ * Returns true if no alignment restrictions are necessary even for files
++ * opened with O_DIRECT.
++ *
++ * raw_probe_alignment() probes the required alignment and assume that 1 means
++ * the probing failed, so it falls back to a safe default of 4k. This can be
++ * avoided if we know that byte alignment is okay for the file.
++ */
++static bool dio_byte_aligned(int fd)
++{
++#ifdef __linux__
++    struct statfs buf;
++    int ret;
++
++    ret = fstatfs(fd, &buf);
++    if (ret == 0 && buf.f_type == NFS_SUPER_MAGIC) {
++        return true;
++    }
++#endif
++    return false;
++}
++
+ /* Check if read is allowed with given memory buffer and length.
+  *
+  * This function is used to check O_DIRECT memory buffer and request alignment.
+@@ -602,7 +626,7 @@
+ 
+     s->has_discard = true;
+     s->has_write_zeroes = true;
+-    if ((bs->open_flags & BDRV_O_NOCACHE) != 0) {
++    if ((bs->open_flags & BDRV_O_NOCACHE) != 0 && !dio_byte_aligned(s->fd)) {
+         s->needs_alignment = true;
+     }
+ 
diff --git a/debian/rules b/debian/rules
index e78d27d..6a55d5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ common_configure_opts = \
 	--disable-strip \
 	--interp-prefix=/etc/qemu-binfmt/%M \
 	--localstatedir=/var \
+	--with-git-submodules=ignore \
 
 # Cross compiling support
 ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))