From nobody Sun Apr 28 20:03: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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1499722688373872.1910709319178; Mon, 10 Jul 2017 14:38:08 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AAA8E4E4C3; Mon, 10 Jul 2017 21:38:04 +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 42FBC60DD7; Mon, 10 Jul 2017 21:38:04 +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 32286262; Mon, 10 Jul 2017 21:38:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v6ALc1lE015106 for ; Mon, 10 Jul 2017 17:38:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0BB3017DD8; Mon, 10 Jul 2017 21:38:01 +0000 (UTC) Received: from worklaptop.redhat.com (ovpn-116-67.phx2.redhat.com [10.3.116.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E91F60617; Mon, 10 Jul 2017 21:37:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AAA8E4E4C3 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com AAA8E4E4C3 From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 10 Jul 2017 17:37:43 -0400 Message-Id: <6acc865c1ca03441606478105bf6d5cac6e4933b.1499722639.git.crobinso@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Andrea Bolognani Subject: [libvirt] [PATCH] qemu: process: Remove unused qemuCaps 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 10 Jul 2017 21:38:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" After 405c0f07f5 qemuCaps is unused here, remove it from the call stack Signed-off-by: Cole Robinson Reviewed-by: Andrea Bolognani --- src/qemu/qemu_process.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e6522a294..34974c6e5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1877,9 +1877,7 @@ qemuProcessMonitorReportLogError(qemuMonitorPtr mon A= TTRIBUTE_UNUSED, =20 =20 static int -qemuProcessLookupPTYs(virDomainDefPtr def ATTRIBUTE_UNUSED, - virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED, - virDomainChrDefPtr *devices, +qemuProcessLookupPTYs(virDomainChrDefPtr *devices, int count, virHashTablePtr info) { @@ -1927,24 +1925,18 @@ qemuProcessLookupPTYs(virDomainDefPtr def ATTRIBUTE= _UNUSED, =20 static int qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, - virQEMUCapsPtr qemuCaps, virHashTablePtr info) { size_t i =3D 0; =20 - if (qemuProcessLookupPTYs(vm->def, qemuCaps, - vm->def->serials, vm->def->nserials, - info) < 0) + if (qemuProcessLookupPTYs(vm->def->serials, vm->def->nserials, info) <= 0) return -1; =20 - if (qemuProcessLookupPTYs(vm->def, qemuCaps, - vm->def->parallels, vm->def->nparallels, + if (qemuProcessLookupPTYs(vm->def->parallels, vm->def->nparallels, info) < 0) return -1; =20 - if (qemuProcessLookupPTYs(vm->def, qemuCaps, - vm->def->channels, vm->def->nchannels, - info) < 0) + if (qemuProcessLookupPTYs(vm->def->channels, vm->def->nchannels, info)= < 0) return -1; /* For historical reasons, console[0] can be just an alias * for serial[0]. That's why we need to update it as well. */ @@ -1962,8 +1954,7 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr = vm, } } =20 - if (qemuProcessLookupPTYs(vm->def, qemuCaps, - vm->def->consoles + i, vm->def->nconsoles - = i, + if (qemuProcessLookupPTYs(vm->def->consoles + i, vm->def->nconsoles - = i, info) < 0) return -1; =20 @@ -2111,7 +2102,6 @@ static int qemuProcessWaitForMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob, - virQEMUCapsPtr qemuCaps, qemuDomainLogContextPtr logCtxt) { int ret =3D -1; @@ -2135,8 +2125,7 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, ret =3D -1; =20 if (ret =3D=3D 0) { - if ((ret =3D qemuProcessFindCharDevicePTYsMonitor(vm, qemuCaps, - info)) < 0) + if ((ret =3D qemuProcessFindCharDevicePTYsMonitor(vm, info)) < 0) goto cleanup; =20 if ((ret =3D qemuProcessRefreshChannelVirtioState(driver, vm, info, @@ -5870,7 +5859,7 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; =20 VIR_DEBUG("Waiting for monitor to show up"); - if (qemuProcessWaitForMonitor(driver, vm, asyncJob, priv->qemuCaps, lo= gCtxt) < 0) + if (qemuProcessWaitForMonitor(driver, vm, asyncJob, logCtxt) < 0) goto cleanup; =20 if (qemuConnectAgent(driver, vm) < 0) @@ -6724,7 +6713,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UN= USED, qemuDomainObjTaint(driver, vm, VIR_DOMAIN_TAINT_EXTERNAL_LAUNCH, logCt= xt); =20 VIR_DEBUG("Waiting for monitor to show up"); - if (qemuProcessWaitForMonitor(driver, vm, QEMU_ASYNC_JOB_NONE, priv->q= emuCaps, NULL) < 0) + if (qemuProcessWaitForMonitor(driver, vm, QEMU_ASYNC_JOB_NONE, NULL) <= 0) goto error; =20 if (qemuConnectAgent(driver, vm) < 0) --=20 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list