From nobody Sun May 19 00:47:34 2024 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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1564983174; cv=none; d=zoho.com; s=zohoarc; b=PYujPmPpq9jqMcqbqC0pwYCRB3ZwXtyXix0kwqIJc2yQkQdZY/4bd+7pA6u2Vn223vVAjVE+wt5Jh81PezUiF6PcT9YZkEBuqr4mOgGJ7gXnjX3PF0FIUSbGgA+tXFMQwhwns1hppc3grRAjd/6RFj2gRQoCJ7/3vfWLZRrSHbc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564983174; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=FAEQNRynFj4rcgwB93xSB0M9odOBVrsdlY6oaA29F0Q=; b=J5cDcYCedrpf4CLO3qTBYScIFUB9f3Zfq3A2vMGK8317ys5Yw388hDWYY8e6EHGx++JbPzXM/pG0+3xWaJHGVuc4DjnjqCgeUEfDdAULCaO+zpdBRma4GApCJbK6II/R61FGaYXuuo2AmlrDqcVCON5lKsIJbeYefVl5tOXu9bc= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564983173997956.0214455846178; Sun, 4 Aug 2019 22:32:53 -0700 (PDT) Received: from localhost ([::1]:50732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1huVbw-0000sm-9u for importer@patchew.org; Mon, 05 Aug 2019 01:32:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48849) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1huVbY-0000SS-Mc for qemu-devel@nongnu.org; Mon, 05 Aug 2019 01:32:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1huVbX-0001qr-OO for qemu-devel@nongnu.org; Mon, 05 Aug 2019 01:32:20 -0400 Received: from mga17.intel.com ([192.55.52.151]:51590) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1huVbX-0001q1-GK for qemu-devel@nongnu.org; Mon, 05 Aug 2019 01:32:19 -0400 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Aug 2019 22:32:17 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga005.fm.intel.com with ESMTP; 04 Aug 2019 22:32:16 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,348,1559545200"; d="scan'208";a="372966663" From: Wei Yang To: qemu-devel@nongnu.org Date: Mon, 5 Aug 2019 13:31:46 +0800 Message-Id: <20190805053146.32326-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.151 Subject: [Qemu-devel] [PATCH v3] migration/postcopy: use mis->bh instead of allocating a QEMUBH 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: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For migration incoming side, it either quit in precopy or postcopy. It is safe to use the mis->bh for both instead of allocating a dedicated QEMUBH for postcopy. Signed-off-by: Wei Yang Reviewed-by: Dr. David Alan Gilbert --- v3: rebase on latest upstream v2: fix a typo in change log --- migration/savevm.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 621b6c0465..9bf9d2e5fe 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1867,16 +1867,10 @@ static int loadvm_postcopy_handle_listen(MigrationI= ncomingState *mis) return 0; } =20 - -typedef struct { - QEMUBH *bh; -} HandleRunBhData; - static void loadvm_postcopy_handle_run_bh(void *opaque) { Error *local_err =3D NULL; - HandleRunBhData *data =3D opaque; - MigrationIncomingState *mis =3D migration_incoming_get_current(); + MigrationIncomingState *mis =3D opaque; =20 /* TODO we should move all of this lot into postcopy_ram.c or a shared= code * in migration.c @@ -1908,15 +1902,13 @@ static void loadvm_postcopy_handle_run_bh(void *opa= que) runstate_set(RUN_STATE_PAUSED); } =20 - qemu_bh_delete(data->bh); - g_free(data); + qemu_bh_delete(mis->bh); } =20 /* After all discards we can start running and asking for pages */ static int loadvm_postcopy_handle_run(MigrationIncomingState *mis) { PostcopyState ps =3D postcopy_state_set(POSTCOPY_INCOMING_RUNNING); - HandleRunBhData *data; =20 trace_loadvm_postcopy_handle_run(); if (ps !=3D POSTCOPY_INCOMING_LISTENING) { @@ -1924,9 +1916,8 @@ static int loadvm_postcopy_handle_run(MigrationIncomi= ngState *mis) return -1; } =20 - data =3D g_new(HandleRunBhData, 1); - data->bh =3D qemu_bh_new(loadvm_postcopy_handle_run_bh, data); - qemu_bh_schedule(data->bh); + mis->bh =3D qemu_bh_new(loadvm_postcopy_handle_run_bh, mis); + qemu_bh_schedule(mis->bh); =20 /* We need to finish reading the stream from the package * and also stop reading anything more from the stream that loaded the --=20 2.17.1