From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60A08C3F2D0 for ; Fri, 28 Feb 2020 09:33:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2AEA124695 for ; Fri, 28 Feb 2020 09:33:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Mv5nkube" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2AEA124695 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7c0y-000491-Cq for qemu-devel@archiver.kernel.org; Fri, 28 Feb 2020 04:33:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50776) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7bu7-0000zv-65 for qemu-devel@nongnu.org; Fri, 28 Feb 2020 04:25:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7bu6-0004Gh-3C for qemu-devel@nongnu.org; Fri, 28 Feb 2020 04:25:55 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:42999 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j7bu6-0004GP-0B for qemu-devel@nongnu.org; Fri, 28 Feb 2020 04:25:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582881953; 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=4bo+MP6i40tZaaVcbsbTlXwrB0dZjErp3C+gHsABICw=; b=Mv5nkubeGFPQL5O8PaOeV/RGZfHs1pPER/6lF9HnJeArG7kSqpXZNHpbsE1maJUik6A45G BaU1ZidDPOKSY5PXcz9PK5ynvUewRILYwoB+7wRhmNBFtWe7f0fkMtNVBOEtJjSNcaC6g2 aqAKW2hZ5bIDQhPmni/pX7usRxuMwyM= 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-368-4g0pRgORObuQBcTi80oXUA-1; Fri, 28 Feb 2020 04:25:51 -0500 X-MC-Unique: 4g0pRgORObuQBcTi80oXUA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F486100550E; Fri, 28 Feb 2020 09:25:50 +0000 (UTC) Received: from secure.mitica (ovpn-116-211.ams2.redhat.com [10.36.116.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id B087B60BE0; Fri, 28 Feb 2020 09:25:44 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 15/15] savevm: Don't call colo_init_ram_cache twice Date: Fri, 28 Feb 2020 10:24:20 +0100 Message-Id: <20200228092420.103757-16-quintela@redhat.com> In-Reply-To: <20200228092420.103757-1-quintela@redhat.com> References: <20200228092420.103757-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Laurent Vivier , Fam Zheng , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-block@nongnu.org, Juan Quintela , "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefan Hajnoczi , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hailiang Zhang Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: zhanghailiang This helper has been called twice which is wrong. Left the one where called while get COLO enable message from source side. Signed-off-by: zhanghailiang Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/migration.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 92272250f4..0b2045ccbd 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -489,11 +489,6 @@ static void process_incoming_migration_co(void *opaque= ) goto fail; } =20 - if (colo_init_ram_cache() < 0) { - error_report("Init ram cache failed"); - goto fail; - } - qemu_thread_create(&mis->colo_incoming_thread, "COLO incoming", colo_process_incoming_thread, mis, QEMU_THREAD_JOINABLE); mis->have_colo_incoming_thread =3D true; --=20 2.24.1