From nobody Fri Nov 14 06:44:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585820221; cv=none; d=zohomail.com; s=zohoarc; b=YWFlCPmY3ec4hjFRSCPDD3w/iaJR8iVz77nwVjkFqpT2ulUTANEgJfG4pKPXf/FO0kLIRekX4ZAwV5UQ7fQGlTQVLhYwEUv4SlPLNnAGBATaEeTucwQZQWqi6FGZ92LTRtLv0NlBIVrT5IoXvBMkdza6+nmDtnfd+7MtZYhUO+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585820221; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=gwLaH9lWOhAZzCooeXUriFmtjp1ufcEf1u8SQeYEFq4=; b=nR0KFi2TMlGzvKF95BbMh0vid2rHw8W0RpKlbuKbkmyUjHHJEJYYABDYIL3eBcXiQ1iXtIPlQgAOLko2tgJR0EWntiFsoYF/bDZKTLpQ2lv6vDmHyfOo+mXzvCEADJ5Xhu11F2gVBs7oOyEV9F0/Idc7BcpkIKt2ZM2uht0R0rM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585820221478637.9779194831141; Thu, 2 Apr 2020 02:37:01 -0700 (PDT) Received: from localhost ([::1]:36084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJwHU-0007mf-2u for importer@patchew.org; Thu, 02 Apr 2020 05:37:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55878) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJwGq-0007Fs-OA for qemu-devel@nongnu.org; Thu, 02 Apr 2020 05:36:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJwGp-00034e-Fp for qemu-devel@nongnu.org; Thu, 02 Apr 2020 05:36:20 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:56610 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJwGp-00032C-Ce for qemu-devel@nongnu.org; Thu, 02 Apr 2020 05:36:19 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-406-zZDYPei1MWiux7bQOGoQOw-1; Thu, 02 Apr 2020 05:36:14 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4AA92190B2A3; Thu, 2 Apr 2020 09:36:13 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-227.ams2.redhat.com [10.36.114.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A6F496F83; Thu, 2 Apr 2020 09:36:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585820178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gwLaH9lWOhAZzCooeXUriFmtjp1ufcEf1u8SQeYEFq4=; b=G0Ozo/4Hn3Jq1mpzoQfdxskqBgITI0NGosyPs/kdWXHd1/1e9HRy5yb8JdQZ/E3cw9hZEG vZiXqvkSU1w14GZ9mohjDSGtfNkfWGmfS8MWGXxNx1MMlW5kkOhwTHUgWaMcE/HcQRRTiS Q/0rtPPMVYfwa1avQY4EIw9kBzcOA2A= X-MC-Unique: zZDYPei1MWiux7bQOGoQOw-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH for-5.0] vpc: Don't round up already aligned BAT sizes Date: Thu, 2 Apr 2020 11:36:03 +0200 Message-Id: <20200402093603.2369-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Max Reitz Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/vpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/vpc.c b/block/vpc.c index 6df75e22dc..d8141b52da 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -835,7 +835,7 @@ static int create_dynamic_disk(BlockBackend *blk, uint8= _t *buf, =20 /* Write the footer (twice: at the beginning and at the end) */ block_size =3D 0x200000; - num_bat_entries =3D (total_sectors + block_size / 512) / (block_size /= 512); + num_bat_entries =3D DIV_ROUND_UP(total_sectors, block_size / 512); =20 ret =3D blk_pwrite(blk, offset, buf, HEADER_SIZE, 0); if (ret < 0) { --=20 2.20.1