From nobody Sat May 18 09:22:56 2024 Delivered-To: importer@patchew.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=1587509444; cv=none; d=zohomail.com; s=zohoarc; b=Rx0b8B1g9cbbcohD/Z7eyZbVXyYWGAQvyu7D9HJo+cHQeM7ljrJeNH1rZTF1c+RrjuUjnltzCBpxuH0ZbAoS4tgSMiR0LQjZdYBzCN9cEwdo9xmSAfGBudyEg9WhHJ+nQmqyFW7KJ8sullMaTk7yH2oAQy7hCoDSmg2APVxYnWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587509444; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NEkmEU+AzANqs9/z/HMD4awHIPZByi0g9ZXIoAJ14cg=; b=cpj/eEe9pfJ79U3fvhReoUjMx418/eHvx+FxSzla8jN9ZxIjfnSHQodXvPNMYoFciIb/jS5BFP06Tx6zw+Gd4eXD706Z6kJGKKrCWw9Lu6eHye/7R6An7k0BOhSUYncxb3JcL/MYPcRSEOXJ5beW2wewkZ73qK69NwwqJjIVn60= 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 1587509444384542.5874083753187; Tue, 21 Apr 2020 15:50:44 -0700 (PDT) Received: from localhost ([::1]:37214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jR1j0-0004P0-L8 for importer@patchew.org; Tue, 21 Apr 2020 18:50:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45464) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jR1hj-0003rV-Rr for qemu-devel@nongnu.org; Tue, 21 Apr 2020 18:49:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jR1hi-00062F-LQ for qemu-devel@nongnu.org; Tue, 21 Apr 2020 18:49:23 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:40499 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jR1hh-0005ks-Tf for qemu-devel@nongnu.org; Tue, 21 Apr 2020 18:49:22 -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-276-0Dw26MV9MlyuCPshUN7FPQ-1; Tue, 21 Apr 2020 18:49:16 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5D6EC5A099; Tue, 21 Apr 2020 22:49:15 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-80.rdu2.redhat.com [10.10.116.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5BF58B3A60; Tue, 21 Apr 2020 22:49:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587509358; 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=NEkmEU+AzANqs9/z/HMD4awHIPZByi0g9ZXIoAJ14cg=; b=RpAYEMaNPYaCKy5iMsVvaXwscSqC/ltAx6qZnzmlrjqA+iRCmGQPekSAe1bDH2awoaVZPY 6dMyri+aLsQ/LS1uqZbZVQEYMnj0HLkM0NPe3puulkJImsWbWniy6CyvXdpSBDXBbuAVJs SDnh+uSX0y/REoNIwkkTZP5xKFr4S9Q= X-MC-Unique: 0Dw26MV9MlyuCPshUN7FPQ-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PATCH] fixup! qemu-img: Add bitmap sub-command Date: Tue, 21 Apr 2020 17:49:11 -0500 Message-Id: <20200421224911.178024-1-eblake@redhat.com> In-Reply-To: <158750773797.29038.4153256722909003079@39012742ff91> References: <158750773797.29038.4153256722909003079@39012742ff91> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=205.139.110.61; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/21 17:20:31 X-ACL-Warn: Detected OS = 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: nsoffer@redhat.com, kwolf@redhat.com, jsnow@redhat.com, qemu-block@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" Signed-off-by: Eric Blake --- Squash this into patch 3/6 to fix docker-test-mingw@fedora qemu-img.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-img.c b/qemu-img.c index 6cfc1f52ef98..cc87eaf12778 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4529,7 +4529,7 @@ static int img_bitmap(int argc, char **argv) BlockBackend *blk =3D NULL, *src =3D NULL; BlockDriverState *bs =3D NULL, *src_bs =3D NULL; bool image_opts =3D false; - unsigned long granularity =3D 0; + uint64_t granularity =3D 0; bool add =3D false, remove =3D false, clear =3D false; bool enable =3D false, disable =3D false, add_disabled =3D false; const char *merge =3D NULL; --=20 2.26.2