From nobody Sun Nov 24 03:25:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1726265210; cv=none; d=zohomail.com; s=zohoarc; b=UY8GoEFiQUpnPMoGJrMCK9qQROF0rw/ksRsFpkLyeSN5fzdR5wLNNLqImRqRTvuJCDjU2kiKb56xnu1hG80LDP3O4pQDpdXbIYtj/qVpG9lLbt2o0iCqk3gSjJD9zfgH7pma3USnL/7wTdOmq1Ehi0u30TEJj8W0BYhX0vAPX7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1726265210; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uusfm1MfuVUL8i1jo6E2euSTHiLrxM3ch56/b3VgrKo=; b=kFB6vGg9x9v5NqOYNnDM5FnBbItbw9rJ425tgBJGGvkZAhW3nPIplsR22Cpidt5bX5MhVJAFqXxwmUhmjTtsUMR6l3ScC1SJUgCb4v9fQsQwCODhpkAUZe0Ss0M7vbZhf2+2pQycPyc4UKttZFLL8UW6bjkIjpRqBE/ObS6mtd4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1726265210012438.8879070564574; Fri, 13 Sep 2024 15:06:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1spEQN-000120-O4; Fri, 13 Sep 2024 18:05:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1spEQL-0000tB-9Y; Fri, 13 Sep 2024 18:05:53 -0400 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1spEQJ-0002Fs-Lz; Fri, 13 Sep 2024 18:05:52 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 1353D1F456; Fri, 13 Sep 2024 22:05:48 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id A3F8913A72; Fri, 13 Sep 2024 22:05:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id cCpGGjq35GaQQgAAD6G6ig (envelope-from ); Fri, 13 Sep 2024 22:05:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1726265148; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uusfm1MfuVUL8i1jo6E2euSTHiLrxM3ch56/b3VgrKo=; b=iEnYhoCz36PQf1dp0WvMXrpX0H6ACUMnnt/+F6ZA8j5Cwe7Ml2BI56oxQm9wfWtWyZUzIW 29+WInOoS7p//FPkwLkhrmYauKWtioNLMoGenoSvGRdNRi4pWR9H7TnofYMmjd8og4UnAx XKatmp+WtPKZSvRwN/yWu9qErU338z8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1726265148; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uusfm1MfuVUL8i1jo6E2euSTHiLrxM3ch56/b3VgrKo=; b=JxVf/ek2/1J8pQ8h2FkXsDLiQifZ9PsvUiguYNQOUN/Nke5zEE5B9vIqnLupDlliSXPcP2 3o0aVNoZdv0fegBQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1726265148; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uusfm1MfuVUL8i1jo6E2euSTHiLrxM3ch56/b3VgrKo=; b=iEnYhoCz36PQf1dp0WvMXrpX0H6ACUMnnt/+F6ZA8j5Cwe7Ml2BI56oxQm9wfWtWyZUzIW 29+WInOoS7p//FPkwLkhrmYauKWtioNLMoGenoSvGRdNRi4pWR9H7TnofYMmjd8og4UnAx XKatmp+WtPKZSvRwN/yWu9qErU338z8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1726265148; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uusfm1MfuVUL8i1jo6E2euSTHiLrxM3ch56/b3VgrKo=; b=JxVf/ek2/1J8pQ8h2FkXsDLiQifZ9PsvUiguYNQOUN/Nke5zEE5B9vIqnLupDlliSXPcP2 3o0aVNoZdv0fegBQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Peter Maydell , qemu-stable@nongnu.org Subject: [PATCH 1/2] migration/savevm: Remove extra load cleanup calls Date: Fri, 13 Sep 2024 19:05:41 -0300 Message-Id: <20240913220542.18305-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240913220542.18305-1-farosas@suse.de> References: <20240913220542.18305-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.98%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo]; RCVD_TLS_ALL(0.00)[] 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=2a07:de40:b251:101:10:150:64:2; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1726265211268116600 Content-Type: text/plain; charset="utf-8" There are two qemu_loadvm_state_cleanup() calls that were introduced when qemu_loadvm_state_setup() was still called before loading the configuration section, so there was state to be cleaned up if the header checks failed. However, commit 9e14b84908 ("migration/savevm: load_header before load_setup") has moved that configuration section part to qemu_loadvm_state_header() which now happens before qemu_loadvm_state_setup(). Remove the cleanup calls that are now misplaced. CC: qemu-stable@nongnu.org Fixes: 9e14b84908 ("migration/savevm: load_header before load_setup") Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- migration/savevm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index d500eae979..d0759694fd 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2732,13 +2732,11 @@ static int qemu_loadvm_state_header(QEMUFile *f) if (migrate_get_current()->send_configuration) { if (qemu_get_byte(f) !=3D QEMU_VM_CONFIGURATION) { error_report("Configuration section missing"); - qemu_loadvm_state_cleanup(); return -EINVAL; } ret =3D vmstate_load_state(f, &vmstate_configuration, &savevm_stat= e, 0); =20 if (ret) { - qemu_loadvm_state_cleanup(); return ret; } } --=20 2.35.3 From nobody Sun Nov 24 03:25:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1726265214; cv=none; d=zohomail.com; s=zohoarc; b=X4t9+iwfwS5w42EmmeVGZg/RPrGVkUVJ+FYmo4VzUAMitzovNF+JIFAUN+cCm9TbnaJnDkNdJI54ac4vygDW3nItbCbgyTa1dbagbPG5uTccaxGEQ0PGqsyNomE60YD03pNjx6v+6MyS9CfMpPp13cmGmMbqY8l835lJwEZQdhc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1726265214; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iNFQpeR9INnn8cumJTZGZ7/QN8DrjHGu76QMvcMd+Bo=; b=OyVWqSn9tpneOVckyURad49Qm3yUUz3pssV/AXNUcv9XWNUOGoq3T+GonlcSqrPrr1j9mfzFG7fszFkfr5hPasrYm1aZqGzcGGWdyM4/NE56FQIO9h3CIUKrp3aGevEtO6KmYdVxenukV9J6GuuVk2qQ3ybNDex1WNlIIOxcW5c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1726265214470390.7357403386901; Fri, 13 Sep 2024 15:06:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1spEQO-00015u-DY; Fri, 13 Sep 2024 18:05:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1spEQL-0000vY-SG; Fri, 13 Sep 2024 18:05:53 -0400 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1spEQK-0002G3-6g; Fri, 13 Sep 2024 18:05:53 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id EB9A8219BA; Fri, 13 Sep 2024 22:05:49 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 8B4B113A72; Fri, 13 Sep 2024 22:05:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id qERyFDy35GaQQgAAD6G6ig (envelope-from ); Fri, 13 Sep 2024 22:05:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1726265150; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iNFQpeR9INnn8cumJTZGZ7/QN8DrjHGu76QMvcMd+Bo=; b=Qv2jbnu0Ya4qivo0PNSrGmJ8vAvFxobHIJBQePdN1FUaqntpLTAwCfEJbBgdBTXgK5CHxW sG4YBa1Ugevt4YnbF4gfjan6HQiOrwrzCV9dqCw+83Ubg4IiSr9lc9T9kqfIqHo3XLbaaO ZLcRyaWvN3GBH0Atrf9bgLjZrqoj2YY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1726265150; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iNFQpeR9INnn8cumJTZGZ7/QN8DrjHGu76QMvcMd+Bo=; b=lp3Yuk/p5FtayjI7amnXa3qQCbFNUaeRh+Z62EWzsVie8+W0xMZl0H2M5C0dyO6udZ3ktN anVGzNFnraJY6wCw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1726265149; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iNFQpeR9INnn8cumJTZGZ7/QN8DrjHGu76QMvcMd+Bo=; b=l1MV51RtS0cGcHT8TbGbSIZtuXTUvxgH0yRPHzZdOmCiCt9ZCfNSC9Xqp2qzvGM2oRG8wf 0q7obuLGkpQT4o4erZHuWVlTua8bVHX9lbfMQylgo3CIcCKhBwFeeGOa2hCM8Pim+EBoZb baEyokjulGMclof1sTlwMGcirCnCcBY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1726265149; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iNFQpeR9INnn8cumJTZGZ7/QN8DrjHGu76QMvcMd+Bo=; b=8IQZuRfEYjpNgTheWEMyW8J33+d+FIZDE5O2vW+vMw+ndmcabACb/zLUFtXrcf+NlzhVTD 3kGP2pNAz5frGTCw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Peter Maydell , qemu-stable@nongnu.org Subject: [PATCH 2/2] migration/multifd: Fix rb->receivedmap cleanup race Date: Fri, 13 Sep 2024 19:05:42 -0300 Message-Id: <20240913220542.18305-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240913220542.18305-1-farosas@suse.de> References: <20240913220542.18305-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:email,suse.de:mid]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 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=2a07:de40:b251:101:10:150:64:1; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) (identity @suse.de) X-ZM-MESSAGEID: 1726265214907116600 Content-Type: text/plain; charset="utf-8" Fix a segmentation fault in multifd when rb->receivedmap is cleared too early. After commit 5ef7e26bdb ("migration/multifd: solve zero page causing multiple page faults"), multifd started using the rb->receivedmap bitmap, which belongs to ram.c and is initialized and *freed* from the ram SaveVMHandlers. Multifd threads are live until migration_incoming_state_destroy(), which is called after qemu_loadvm_state_cleanup(), leading to a crash when accessing rb->receivedmap. process_incoming_migration_co() ... qemu_loadvm_state() multifd_nocomp_recv() qemu_loadvm_state_cleanup() ramblock_recv_bitmap_set_offset() rb->receivedmap =3D NULL set_bit_atomic(..., rb->receiv= edmap) ... migration_incoming_state_destroy() multifd_recv_cleanup() multifd_recv_terminate_threads(NULL) Move the loadvm cleanup into migration_incoming_state_destroy(), after multifd_recv_cleanup() to ensure multifd thread have already exited when rb->receivedmap is cleared. The have_listen_thread logic can now be removed because its purpose was to delay cleanup until postcopy_ram_listen_thread() had finished. CC: qemu-stable@nongnu.org Fixes: 5ef7e26bdb ("migration/multifd: solve zero page causing multiple pag= e faults") Signed-off-by: Fabiano Rosas --- migration/migration.c | 1 + migration/migration.h | 1 - migration/savevm.c | 9 --------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 3dea06d577..b190a574b1 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -378,6 +378,7 @@ void migration_incoming_state_destroy(void) struct MigrationIncomingState *mis =3D migration_incoming_get_current(= ); =20 multifd_recv_cleanup(); + qemu_loadvm_state_cleanup(); =20 if (mis->to_src_file) { /* Tell source that we are done */ diff --git a/migration/migration.h b/migration/migration.h index 38aa1402d5..20b0a5b66e 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -101,7 +101,6 @@ struct MigrationIncomingState { /* Set this when we want the fault thread to quit */ bool fault_thread_quit; =20 - bool have_listen_thread; QemuThread listen_thread; =20 /* For the kernel to send us notifications */ diff --git a/migration/savevm.c b/migration/savevm.c index d0759694fd..532ee5e4b0 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2076,10 +2076,8 @@ static void *postcopy_ram_listen_thread(void *opaque) * got a bad migration state). */ migration_incoming_state_destroy(); - qemu_loadvm_state_cleanup(); =20 rcu_unregister_thread(); - mis->have_listen_thread =3D false; postcopy_state_set(POSTCOPY_INCOMING_END); =20 object_unref(OBJECT(migr)); @@ -2130,7 +2128,6 @@ static int loadvm_postcopy_handle_listen(MigrationInc= omingState *mis) return -1; } =20 - mis->have_listen_thread =3D true; postcopy_thread_create(mis, &mis->listen_thread, "mig/dst/listen", postcopy_ram_listen_thread, QEMU_THREAD_DETACHE= D); trace_loadvm_postcopy_handle_listen("return"); @@ -2978,11 +2975,6 @@ int qemu_loadvm_state(QEMUFile *f) =20 trace_qemu_loadvm_state_post_main(ret); =20 - if (mis->have_listen_thread) { - /* Listen thread still going, can't clean up yet */ - return ret; - } - if (ret =3D=3D 0) { ret =3D qemu_file_get_error(f); } @@ -3022,7 +3014,6 @@ int qemu_loadvm_state(QEMUFile *f) } } =20 - qemu_loadvm_state_cleanup(); cpu_synchronize_all_post_init(); =20 return ret; --=20 2.35.3