From nobody Sun Oct 5 19:23:35 2025 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=1594998996; cv=none; d=zohomail.com; s=zohoarc; b=KHUkd1JcvR4SzIOqkOGPb1jWniy6QabhDIL2FzcmkX4WEoN8cf5VYBFAvfCceQTeb9cTBoVgpiI7KCssGcGHnhn0j7wndfA+v/fAEslKWgGWy7IhOdz3tlWGdh/CgipgN2cR054uDAP+B3Y/7c1x1XOO6JkTadSNdDLGXucV+FE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594998996; 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=BfoIaOMsSAV66f6T35BcXzPvDmkqchT24FliN0xinPU=; b=U/VD8VV5AlObCmhDNYuBxTG4iQkr5v/3UqJxwn3RNa16NeS+hRLLlbLq+AN1Miav2J9XxZU19+ICAT3hPv/CV0GtYMyY+kOROYZbmQy1GXcqJEW1M7CfugF+VzoxKVZ5Tae2uI3xwARFUkW1r2kQh0Ly4p5TMerDUqPOHtd0aR8= 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 1594998996092864.7809978712612; Fri, 17 Jul 2020 08:16:36 -0700 (PDT) Received: from localhost ([::1]:34582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwS6E-0001aJ-SV for importer@patchew.org; Fri, 17 Jul 2020 11:16:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwS52-0000aD-B2 for qemu-devel@nongnu.org; Fri, 17 Jul 2020 11:15:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:25314 helo=us-smtp-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 1jwS4z-0004HI-Aw for qemu-devel@nongnu.org; Fri, 17 Jul 2020 11:15:20 -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-193-iWGsAUcfOqqUFx3EEfS-Ug-1; Fri, 17 Jul 2020 11:15:13 -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 E33D7108C283; Fri, 17 Jul 2020 15:15:11 +0000 (UTC) Received: from blue.redhat.com (ovpn-113-239.phx2.redhat.com [10.3.113.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id 697C87B439; Fri, 17 Jul 2020 15:14:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594998915; 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=BfoIaOMsSAV66f6T35BcXzPvDmkqchT24FliN0xinPU=; b=aasuHjlKwGzdapT/PH7lobIXgrGsPxi42aVmZ4i8HJ8hMQznVxlRW/c0GoTGnRd0f79Uwc sppzmjE/IQJiIIF6pX2EXPrBxb+Be4f9ksJrMl5XiN4ah3YtWCmMC/1laSPfu9HOWG3eIY Bkb8qS7DLSSIkAgeEHg69RF4YtoL658= X-MC-Unique: iWGsAUcfOqqUFx3EEfS-Ug-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PULL 1/1] migration/block-dirty-bitmap: fix add_bitmaps_to_list Date: Fri, 17 Jul 2020 10:14:46 -0500 Message-Id: <20200717151446.655571-2-eblake@redhat.com> In-Reply-To: <20200717151446.655571-1-eblake@redhat.com> References: <20200717151446.655571-1-eblake@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 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=207.211.31.120; envelope-from=eblake@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/17 03:33:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: Fam Zheng , Vladimir Sementsov-Ogievskiy , "open list:Block I/O path" , Juan Quintela , "Dr. David Alan Gilbert" , Stefan Hajnoczi , John Snow 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: Vladimir Sementsov-Ogievskiy We shouldn't fail when finding an unnamed bitmap in a unnamed node or node with auto-generated node name, as bitmap migration ignores such bitmaps in the first place. Fixes: 82640edb88faa Fixes: 4ff5cc121b089 Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20200626130658.76498-1-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake [eblake: commit message grammar tweaks] Signed-off-by: Eric Blake --- migration/block-dirty-bitmap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 47bc0f650c1e..b0dbf9eeed43 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -274,7 +274,11 @@ static int add_bitmaps_to_list(BlockDriverState *bs, c= onst char *bs_name) DirtyBitmapMigBitmapState *dbms; Error *local_err =3D NULL; - bitmap =3D bdrv_dirty_bitmap_first(bs); + FOR_EACH_DIRTY_BITMAP(bs, bitmap) { + if (bdrv_dirty_bitmap_name(bitmap)) { + break; + } + } if (!bitmap) { return 0; } --=20 2.27.0