From nobody Fri Mar 29 05:44:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) client-ip=63.128.21.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1584688623; cv=none; d=zohomail.com; s=zohoarc; b=FHdf/T9DgZlyV26qt5ib563bDi28wdmL0kTp9WSSqUYGzUQ0ucdjpSoWF8LCN2lXWqYssmmlNylguOXpdB/3W8mPpSHEUIbmG36hbL/xdK6Qgw93PfZtNEdG4fR6Bbi/GIEHoFc9sy8DFT47/RbRxsgks0tjIk41LwTYbMtAI8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584688623; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=DcQPWOTlAWx3ueoMOWV+nlNRn4jm8jytVrDAi33hVPw=; b=MUCoLDnE9ifmlTGrlqL1WBia+He31Z6AbgKkO/XM9bO/OG3PaWBSb+pGA2VmgiiC/dbWtHzFxbFtu1IwKp2QrgWjQC2gLH1+VJTp8tsFWqxKQk5U3T4p/bqke4gQAJM8vPkD0dF+SJx7372t00rOtERQOtmvvKD34kV11bRgzmI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by mx.zohomail.com with SMTPS id 1584688623482965.4344763759455; Fri, 20 Mar 2020 00:17:03 -0700 (PDT) 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-64-V-3BbbNqO8KPy0-7a0T6ow-1; Fri, 20 Mar 2020 03:16:59 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4243C1005510; Fri, 20 Mar 2020 07:16:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C5225D9CA; Fri, 20 Mar 2020 07:16:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1447218089CE; Fri, 20 Mar 2020 07:16:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02K7Gh5P007703 for ; Fri, 20 Mar 2020 03:16:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5BEC8163CE8; Fri, 20 Mar 2020 07:16:43 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 58652141755 for ; Fri, 20 Mar 2020 07:16:41 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8534B8F68F1 for ; Fri, 20 Mar 2020 07:16:41 +0000 (UTC) Received: from relay.sw.ru (relay.sw.ru [185.231.240.75]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-230-siiOBWiUOaWUBrVHJg0V3g-1; Fri, 20 Mar 2020 03:16:38 -0400 Received: from [10.94.3.220] (helo=dim-vz7.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1jFBtT-0006Bu-55 for libvir-list@redhat.com; Fri, 20 Mar 2020 10:16:35 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584688622; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=DcQPWOTlAWx3ueoMOWV+nlNRn4jm8jytVrDAi33hVPw=; b=gmu8rDqVTezwJA1coSrTfEbS8+GUMUTLxL0w60ue+uLfs209R4BwjevRVMzTRIkwtas26L SR1tlL0DhPDPBR6MpExpzevmx0snFkrxKDQXenOxONNRxReJaOLykKpnJ8dEIkesHl8/q7 kQlP+ea50tcrTdgLwI/UnErMzMUtykM= X-MC-Unique: V-3BbbNqO8KPy0-7a0T6ow-1 X-MC-Unique: siiOBWiUOaWUBrVHJg0V3g-1 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH] qemu: reset await_event in all error paths in qemuAgentCommand Date: Fri, 20 Mar 2020 10:16:23 +0300 Message-Id: <1584688583-189965-1-git-send-email-nshirokovskiy@virtuozzo.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02K7Gh5P007703 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" A fixup to patch [1]. We need to reset await_event in all error paths. [1] 52532073d : qemu: remove redundant needReply argument of qemuAgentComma= nd Signed-off-by: Nikolay Shirokovskiy Reviewed-by: Michal Privoznik --- src/qemu/qemu_agent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 9ea2c59..6ff5b11 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1113,7 +1113,7 @@ qemuAgentCommand(qemuAgentPtr agent, } =20 if (qemuAgentGuestSync(agent) < 0) - return -1; + goto cleanup; =20 if (!(cmdstr =3D virJSONValueToString(cmd, false))) goto cleanup; --=20 1.8.3.1