From nobody Wed Apr 16 06:39:26 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580994284454383.0077494475555; Thu, 6 Feb 2020 05:04:44 -0800 (PST) Received: from localhost ([::1]:38464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izgpn-00043H-C5 for importer@patchew.org; Thu, 06 Feb 2020 08:04:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57795) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izgde-0003pN-2B for qemu-devel@nongnu.org; Thu, 06 Feb 2020 07:52:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izgdd-0001qy-0G for qemu-devel@nongnu.org; Thu, 06 Feb 2020 07:52:09 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:25707 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1izgdc-0001pR-SN for qemu-devel@nongnu.org; Thu, 06 Feb 2020 07:52:08 -0500 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-62-HShPvbFqO5CaL9WDFue_ZA-1; Thu, 06 Feb 2020 07:52:06 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 776CA800D6C; Thu, 6 Feb 2020 12:52:05 +0000 (UTC) Received: from localhost (unknown [10.36.118.15]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1C11E60BF7; Thu, 6 Feb 2020 12:52:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580993528; 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: in-reply-to:in-reply-to:references:references; bh=rHAUWzt6avoVW6phXiYyG8JK8L6KH9qBvSRszB9uNBQ=; b=iNAWbMt9nAW5z3LFrxwvAKso9HdRtzsXkqGalAyGqU/zRRah+G3m4mg4SadoLvwVtYOVyB /dr6R2wcbYbJJm7TZ+H7CA0++PgTN54aA3sxKlYoxC6osxS8hv5ZKw0gxaEhLXFpW7mqGp XP8kLPHbBA4TVPjdvNX4WU0YOUBrXQQ= From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 15/17] qcow2: Use BDRV_SECTOR_SIZE instead of the hardcoded value Date: Thu, 6 Feb 2020 13:51:30 +0100 Message-Id: <20200206125132.594625-16-mreitz@redhat.com> In-Reply-To: <20200206125132.594625-1-mreitz@redhat.com> References: <20200206125132.594625-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: HShPvbFqO5CaL9WDFue_ZA-1 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.120 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: Kevin Wolf , Peter Maydell , qemu-devel@nongnu.org, Max Reitz 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" From: Alberto Garcia This replaces all remaining instances in the qcow2 code. Signed-off-by: Alberto Garcia Message-id: b5f74b606c2d9873b12d29acdb7fd498029c4025.1579374329.git.berto@i= galia.com Reviewed-by: Max Reitz Signed-off-by: Max Reitz --- block/qcow2.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index ff257d1a6c..ef96606f8d 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3272,7 +3272,8 @@ qcow2_co_create(BlockdevCreateOptions *create_options= , Error **errp) =20 /* Validate options and set default values */ if (!QEMU_IS_ALIGNED(qcow2_opts->size, BDRV_SECTOR_SIZE)) { - error_setg(errp, "Image size must be a multiple of 512 bytes"); + error_setg(errp, "Image size must be a multiple of %u bytes", + (unsigned) BDRV_SECTOR_SIZE); ret =3D -EINVAL; goto out; } @@ -3946,8 +3947,9 @@ static int coroutine_fn qcow2_co_truncate(BlockDriver= State *bs, int64_t offset, return -ENOTSUP; } =20 - if (offset & 511) { - error_setg(errp, "The new size must be a multiple of 512"); + if (!QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE)) { + error_setg(errp, "The new size must be a multiple of %u", + (unsigned) BDRV_SECTOR_SIZE); return -EINVAL; } =20 --=20 2.24.1