7325eaecfb
- Include upstream patches targeted for the next stable release (bug fixes only) spapr-Fix-failure-path-for-attempting-to.patch target-i386-do-not-set-unsupported-VMX-s.patch target-xtensa-fix-pasto-in-pfwait.r-opco.patch tcg-i386-Fix-INDEX_op_dup2_vec.patch tcg-mips-mips-sync-encode-error.patch vhost-user-gpu-Release-memory-returned-b.patch vpc-Don-t-round-up-already-aligned-BAT-s.patch xen-block-Fix-double-qlist-remove-and-re.patch - Fix bug causing weak encryption in PAuth for ARM (CVE-2020-10702 bsc#1168681) target-arm-Fix-PAuth-sbox-functions.patch - Fix OOB in tulip NIC emulation (CVE-2020-11102 bsc#1168713 net-tulip-check-frame-size-and-r-w-data-.patch - Note that previously included patch addresses CVE-2020-1711 and bsc#1166240 iscsi-Cap-block-count-from-GET-LBA-STATU.patch - Include performance improvement (and related?) patch aio-wait-delegate-polling-of-main-AioCon.patch async-use-explicit-memory-barriers.patch - Rework previous patch at Olaf H.'s direction hw-i386-disable-smbus-migration-for-xenf.patch - Eliminate is_opensuse usage in producing seabios version string what we are doing here is just replacing the upstream string with one indicating that the openSUSE build service built it, and so just leave it as "-rebuilt.opensuse.org" - Alter algorithm used to produce "unique" symbol for coordinating qemu with the optional modules it may load. This is a reasonable relaxation for broader compatibility configure-remove-pkgversion-from-CONFIG_.patch - Tweak supported.*.txt for latest deprecations, and other fixes - Tweak update_git.sh, config.sh - One more fix is needed for: s390x Protected Virtualization support - start and control guest in secure mode (bsc#1167075 jsc#SLE-7407) s390x-s390-virtio-ccw-Fix-build-on-syste.patch OBS-URL: https://build.opensuse.org/request/show/795118 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=542
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Thu, 2 Apr 2020 11:36:03 +0200
|
|
Subject: vpc: Don't round up already aligned BAT sizes
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Git-commit: 3f6de653b946fe849330208becf79d6af7e876cb
|
|
|
|
As reported on Launchpad, Azure apparently doesn't accept images for
|
|
upload that are not both aligned to 1 MB blocks and have a BAT size that
|
|
matches the image size exactly.
|
|
|
|
As far as I can tell, there is no real reason why we create a BAT that
|
|
is one entry longer than necessary for aligned image sizes, so change
|
|
that.
|
|
|
|
(Even though the condition is only mentioned as "should" in the spec and
|
|
previous products accepted larger BATs - but we'll try to maintain
|
|
compatibility with as many of Microsoft's ever-changing interpretations
|
|
of the VHD spec as possible.)
|
|
|
|
Fixes: https://bugs.launchpad.net/bugs/1870098
|
|
Reported-by: Tobias Witek
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Message-Id: <20200402093603.2369-1-kwolf@redhat.com>
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
block/vpc.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/block/vpc.c b/block/vpc.c
|
|
index a65550298e195af52c51a31d1f9f..21b08033a6ab56115c6258b7ef3c 100644
|
|
--- a/block/vpc.c
|
|
+++ b/block/vpc.c
|
|
@@ -835,7 +835,7 @@ static int create_dynamic_disk(BlockBackend *blk, uint8_t *buf,
|
|
|
|
/* Write the footer (twice: at the beginning and at the end) */
|
|
block_size = 0x200000;
|
|
- num_bat_entries = (total_sectors + block_size / 512) / (block_size / 512);
|
|
+ num_bat_entries = DIV_ROUND_UP(total_sectors, block_size / 512);
|
|
|
|
ret = blk_pwrite(blk, offset, buf, HEADER_SIZE, 0);
|
|
if (ret < 0) {
|