Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A825C43331 for ; Thu, 2 Apr 2020 13:58:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 415562073B for ; Thu, 2 Apr 2020 13:58:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BWmrw+5+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 415562073B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jK0Ma-0004QJ-FT for qemu-devel@archiver.kernel.org; Thu, 02 Apr 2020 09:58:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52916) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jK0LW-0003Vh-6X for qemu-devel@nongnu.org; Thu, 02 Apr 2020 09:57:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jK0LV-0006wm-4e for qemu-devel@nongnu.org; Thu, 02 Apr 2020 09:57:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:43612 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 1jK0LV-0006w8-1L for qemu-devel@nongnu.org; Thu, 02 Apr 2020 09:57:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585835844; 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=XdKEkrM5O83lKYyHUHteA3FZmjSqJlNG9kE7N+inQdE=; b=BWmrw+5+V0C5h673f9yCaftWff4yYYchLseA0JtcOcBuBINQT39gt4xJBP24lUAuecIAif Mj5TJKo97PfAVfkOwyer+hPW4GJ1mTLxAHwHqL0T/MRkowpdMks5zPYfh6DVzGMMN8Vtd4 1almDYsoZ4V421m1ncanXDpzSu6Ncjs= 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-93-c_jrGKQsPlOdpA-D3YlP-A-1; Thu, 02 Apr 2020 09:57:20 -0400 X-MC-Unique: c_jrGKQsPlOdpA-D3YlP-A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9CD98024D6; Thu, 2 Apr 2020 13:57:19 +0000 (UTC) Received: from blue.redhat.com (ovpn-113-246.phx2.redhat.com [10.3.113.246]) by smtp.corp.redhat.com (Postfix) with ESMTP id 257175D9CA; Thu, 2 Apr 2020 13:57:18 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Subject: [PATCH for-5.0? v3] qemu-img: Report convert errors by bytes, not sectors Date: Thu, 2 Apr 2020 08:57:17 -0500 Message-Id: <20200402135717.476398-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.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 , Vladimir Sementsov-Ogievskiy , "open list:Block layer core" , Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Various qemu-img commands are inconsistent on whether they report status/errors in terms of bytes or sector offsets. The latter is confusing (especially as more places move to 4k block sizes), so let's switch everything to just use bytes everywhere. One iotest is impacted. Signed-off-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- v3: Fix affected iotest [patchew] qemu-img.c | 8 ++++---- tests/qemu-iotests/244.out | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index b167376bd72e..821cbf610e5f 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1924,8 +1924,8 @@ retry: if (status =3D=3D BLK_DATA && !copy_range) { ret =3D convert_co_read(s, sector_num, n, buf); if (ret < 0) { - error_report("error while reading sector %" PRId64 - ": %s", sector_num, strerror(-ret)); + error_report("error while reading at byte %lld: %s", + sector_num * BDRV_SECTOR_SIZE, strerror(-ret)= ); s->ret =3D ret; } } else if (!s->min_sparse && status =3D=3D BLK_ZERO) { @@ -1953,8 +1953,8 @@ retry: ret =3D convert_co_write(s, sector_num, n, buf, status); } if (ret < 0) { - error_report("error while writing sector %" PRId64 - ": %s", sector_num, strerror(-ret)); + error_report("error while writing at byte %lld: %s", + sector_num * BDRV_SECTOR_SIZE, strerror(-ret)= ); s->ret =3D ret; } } diff --git a/tests/qemu-iotests/244.out b/tests/qemu-iotests/244.out index e6f4dc79934b..56329deb4b9f 100644 --- a/tests/qemu-iotests/244.out +++ b/tests/qemu-iotests/244.out @@ -33,7 +33,7 @@ Convert to compressed target with data file: Formatting 'TEST_DIR/t.IMGFMT.src', fmt=3DIMGFMT size=3D67108864 wrote 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-img: error while writing sector 0: Operation not supported +qemu-img: error while writing at byte 0: Operation not supported Convert uncompressed, then write compressed data manually: Images are identical. --=20 2.26.0.rc2