From nobody Sun Feb 8 08:47:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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 1554479501169663.4109036459838; Fri, 5 Apr 2019 08:51:41 -0700 (PDT) Received: from localhost ([127.0.0.1]:43756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCR7v-0004hY-7A for importer@patchew.org; Fri, 05 Apr 2019 11:51:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCR6F-0003m1-CO for qemu-devel@nongnu.org; Fri, 05 Apr 2019 11:49:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hCR6D-0004Bm-4p for qemu-devel@nongnu.org; Fri, 05 Apr 2019 11:49:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hCR68-00046c-C1 for qemu-devel@nongnu.org; Fri, 05 Apr 2019 11:49:48 -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 mx1.redhat.com (Postfix) with ESMTPS id 048A63086208; Fri, 5 Apr 2019 15:49:42 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-242.ams2.redhat.com [10.36.117.242]) by smtp.corp.redhat.com (Postfix) with ESMTP id 047F55D704; Fri, 5 Apr 2019 15:49:40 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, chen.zhang@intel.com, quintela@redhat.com, peterx@redhat.com Date: Fri, 5 Apr 2019 16:49:33 +0100 Message-Id: <20190405154934.18664-2-dgilbert@redhat.com> In-Reply-To: <20190405154934.18664-1-dgilbert@redhat.com> References: <20190405154934.18664-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 05 Apr 2019 15:49:42 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/2] migration/ram.c: Fix codes conflict about bitmap_mutex X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Zhang Chen I found upstream codes conflict with COLO and lead to crash, and I located to this patch: commit 386a907b37a9321bc5d699bc37104d6ffba1b34d Author: Wei Wang Date: Tue Dec 11 16:24:49 2018 +0800 migration: use bitmap_mutex in migration_bitmap_clear_dirty My colleague Wei's patch add bitmap_mutex in migration_bitmap_clear_dirty, but COLO didn't initialize the bitmap_mutex. So we always get an error when COLO start up. like that: qemu-system-x86_64: util/qemu-thread-posix.c:64: qemu_mutex_lock_impl: Asse= rtion `mutex->initialized' failed. This patch add the bitmap_mutex initialize and destroy in COLO lifecycle. Signed-off-by: Zhang Chen Message-Id: <20190329222951.28945-1-chen.zhang@intel.com> Reviewed-by: Wei Wang Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- migration/ram.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index d7f8fe45a8..f68beeeeff 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3918,6 +3918,7 @@ int colo_init_ram_cache(void) } ram_state =3D g_new0(RAMState, 1); ram_state->migration_dirty_pages =3D 0; + qemu_mutex_init(&ram_state->bitmap_mutex); memory_global_dirty_log_start(); =20 return 0; @@ -3956,6 +3957,7 @@ void colo_release_ram_cache(void) } =20 rcu_read_unlock(); + qemu_mutex_destroy(&ram_state->bitmap_mutex); g_free(ram_state); ram_state =3D NULL; } --=20 2.21.0 From nobody Sun Feb 8 08:47:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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 1554479500607999.9990973727851; Fri, 5 Apr 2019 08:51:40 -0700 (PDT) Received: from localhost ([127.0.0.1]:43760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCR7x-0004kB-Lo for importer@patchew.org; Fri, 05 Apr 2019 11:51:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCR6H-0003mD-E0 for qemu-devel@nongnu.org; Fri, 05 Apr 2019 11:49:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hCR6F-0004DR-Al for qemu-devel@nongnu.org; Fri, 05 Apr 2019 11:49:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37374) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hCR6A-000475-Sp for qemu-devel@nongnu.org; Fri, 05 Apr 2019 11:49:50 -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 mx1.redhat.com (Postfix) with ESMTPS id 4E8333078AC3; Fri, 5 Apr 2019 15:49:43 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-242.ams2.redhat.com [10.36.117.242]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4BD915D704; Fri, 5 Apr 2019 15:49:42 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, chen.zhang@intel.com, quintela@redhat.com, peterx@redhat.com Date: Fri, 5 Apr 2019 16:49:34 +0100 Message-Id: <20190405154934.18664-3-dgilbert@redhat.com> In-Reply-To: <20190405154934.18664-1-dgilbert@redhat.com> References: <20190405154934.18664-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 05 Apr 2019 15:49:43 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/2] migration: Fix migrate_set_parameter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Juan Quintela Otherwise we are setting err twice, what is wrong and causes an abort. Signed-off-by: Juan Quintela Message-Id: <20190403114958.3705-2-quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- hmp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hmp.c b/hmp.c index 92941142af..8eec768088 100644 --- a/hmp.c +++ b/hmp.c @@ -1825,8 +1825,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const Q= Dict *qdict) case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE: p->has_xbzrle_cache_size =3D true; visit_type_size(v, param, &cache_size, &err); - if (err || cache_size > INT64_MAX - || (size_t)cache_size !=3D cache_size) { + if (err) { + break; + } + if (cache_size > INT64_MAX || (size_t)cache_size !=3D cache_size) { error_setg(&err, "Invalid size %s", valuestr); break; } --=20 2.21.0