From nobody Fri Dec 19 20:52:28 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593790339; cv=none; d=zohomail.com; s=zohoarc; b=jNRJc2pYLPpxr8Y7TYR2nclgvQt3Obyl0XZjRF+1CO9T9WSn0exUR8Rh+b4yMZGuUF+/8QpXlJb588TFYOmphsdTN41PHD0JIEA+IrfFVMsbsVdJfXPhLU+gozVxSkp95uQ5ufVR2hyzxtBdRKJN9an5Oihx0bXmQV0QwXDRSFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593790339; h=Content-Type:Content-Transfer-Encoding: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=n1C5a7JztNWosbsqPUhwZhKiIAVmAdulGlfADd5r4eg=; b=G/fdi/kMfIRwZ5+VtS2CXNLNaN26VCntBTHH0ZCvAWHo6ItAwfO+EgDIRc2WBP34aM6LEjATXGrk6CzEOWELbaZHlHJYE4GVRKCs6XLaNPs/QMUkAwASJOJs7HHy5ieMFUte0hGdSBcP0XpUoxa1+VaPjZOGddgxocDQVtCPufU= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593790339018563.127264094749; Fri, 3 Jul 2020 08:32:19 -0700 (PDT) Received: from localhost ([::1]:51356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrNfl-0003gE-Kv for importer@patchew.org; Fri, 03 Jul 2020 11:32:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrNbl-00075w-Js for qemu-devel@nongnu.org; Fri, 03 Jul 2020 11:28:09 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:59688 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 1jrNbi-0006f8-UG for qemu-devel@nongnu.org; Fri, 03 Jul 2020 11:28:09 -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-355-qF00r_0TPKiWm5NAi0_UDA-1; Fri, 03 Jul 2020 11:27:59 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89C0F1054F8B; Fri, 3 Jul 2020 15:27:58 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-207.ams2.redhat.com [10.36.114.207]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D3782DE72; Fri, 3 Jul 2020 15:27:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593790085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n1C5a7JztNWosbsqPUhwZhKiIAVmAdulGlfADd5r4eg=; b=HPIvE6MTOfHChGE5tMrzYCK/4F2Ti4/yn/lOfrZsZXGGjc/GRglapWSQgOO39oQJ7tRWq5 vsI3BCannlpcRTqXDaslm6/SCm/GRAJ4LVH5lSV4eMFPrca6KkR6S2XDxWqsiA0SA3f+/j YPmTCka8REmlfwLu8qkDB+3iB3RTZV4= X-MC-Unique: qF00r_0TPKiWm5NAi0_UDA-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, quintela@redhat.com, zhukeqian1@huawei.com, stefanha@redhat.com Subject: [PULL 4/5] migration: postcopy take proper error return Date: Fri, 3 Jul 2020 16:27:47 +0100 Message-Id: <20200703152748.277255-5-dgilbert@redhat.com> In-Reply-To: <20200703152748.277255-1-dgilbert@redhat.com> References: <20200703152748.277255-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com 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=dgilbert@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/03 02:53:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" This function returns a boolean success and we're returning -1; lets just use the 'out' error path. Signed-off-by: Dr. David Alan Gilbert Fixes: 58b7c17e226 ("Disable mlock around incoming postcopy") Buglink: https://bugs.launchpad.net/qemu/+bug/1885720 Message-Id: <20200701093557.130096-1-dgilbert@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Dr. David Alan Gilbert --- migration/postcopy-ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index a36402722b..bef2a3afed 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -389,7 +389,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingSt= ate *mis) */ if (munlockall()) { error_report("%s: munlockall: %s", __func__, strerror(errno)); - return -1; + goto out; } =20 /* --=20 2.26.2