From nobody Sat May 4 23:46:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1536350511091753.810639658948; Fri, 7 Sep 2018 13:01:51 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 66287307D858; Fri, 7 Sep 2018 20:01:49 +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 272E35D970; Fri, 7 Sep 2018 20:01:49 +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 C94A3181A130; Fri, 7 Sep 2018 20:01:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w87K1Xsf012200 for ; Fri, 7 Sep 2018 16:01:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id D089F171EF; Fri, 7 Sep 2018 20:01:33 +0000 (UTC) Received: from unknown54ee7586bd10.attlocal.net.com (ovpn-118-71.phx2.redhat.com [10.3.118.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C6A75C886 for ; Fri, 7 Sep 2018 20:01:33 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Fri, 7 Sep 2018 16:01:26 -0400 Message-Id: <20180907200127.22141-2-jferlan@redhat.com> In-Reply-To: <20180907200127.22141-1-jferlan@redhat.com> References: <20180907200127.22141-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] qemu: Remove duplicated qemuAgentCheckError 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 07 Sep 2018 20:01:50 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit 5b3492fadb moved qemuAgentCheckError calls into qemuAgentCommand for various reasons; however, subsequent commit b1aa91e14 restored the call. So let's just remove the duplicitous call from qemuAgentSetVCPUsCommand. Signed-off-by: John Ferlan --- src/qemu/qemu_agent.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 0a1f3195dd..102ac36f0f 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1544,9 +1544,6 @@ qemuAgentSetVCPUsCommand(qemuAgentPtr mon, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; =20 - if (qemuAgentCheckError(cmd, reply) < 0) - goto cleanup; - /* All negative values are invalid. Return of 0 is bogus since we woul= dn't * call the guest agent so that 0 cpus would be set successfully. Repo= rting * more successfully set vcpus that we've asked for is invalid. */ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 23:46:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1536350516243959.1328730713672; Fri, 7 Sep 2018 13:01:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 616EEC047B94; Fri, 7 Sep 2018 20:01:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 28E635B68E; Fri, 7 Sep 2018 20:01:54 +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 B76E74BB75; Fri, 7 Sep 2018 20:01:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w87K1YRZ012206 for ; Fri, 7 Sep 2018 16:01:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4BFF5171EF; Fri, 7 Sep 2018 20:01:34 +0000 (UTC) Received: from unknown54ee7586bd10.attlocal.net.com (ovpn-118-71.phx2.redhat.com [10.3.118.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 071F75C886 for ; Fri, 7 Sep 2018 20:01:33 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Fri, 7 Sep 2018 16:01:27 -0400 Message-Id: <20180907200127.22141-3-jferlan@redhat.com> In-Reply-To: <20180907200127.22141-1-jferlan@redhat.com> References: <20180907200127.22141-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] qemu: Remove duplicated qemuAgentCheckError 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 07 Sep 2018 20:01:55 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit 5b3492fadb moved qemuAgentCheckError calls into qemuAgentCommand for various reasons; however, subsequent commit 0977b8aa0 adding a new command made call again So let's just remove the duplicitous call from qemuAgentGetInterfaces. Signed-off-by: John Ferlan --- src/qemu/qemu_agent.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 102ac36f0f..313362ac0f 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2035,10 +2035,9 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, if (!(cmd =3D qemuAgentMakeCommand("guest-network-get-interfaces", NUL= L))) goto cleanup; =20 - if (qemuAgentCommand(mon, cmd, &reply, false, VIR_DOMAIN_QEMU_AGENT_CO= MMAND_BLOCK) < 0 || - qemuAgentCheckError(cmd, reply) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, false, + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; - } =20 if (!(ret_array =3D virJSONValueObjectGet(reply, "return"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list