From nobody Mon Feb 9 08:56:43 2026 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.zoho.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 1491207994564301.9766796089659; Mon, 3 Apr 2017 01:26:34 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 463E47E9D9; Mon, 3 Apr 2017 08:26:15 +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 17F9084DA4; Mon, 3 Apr 2017 08:26:15 +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 B7AB418523CC; Mon, 3 Apr 2017 08:26:14 +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 v338PZWR001049 for ; Mon, 3 Apr 2017 04:25:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 89ACE17967; Mon, 3 Apr 2017 08:25:34 +0000 (UTC) Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8259917ACD for ; Mon, 3 Apr 2017 08:25:33 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1FEDDC0567A1 for ; Mon, 3 Apr 2017 08:25:00 +0000 (UTC) Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v338ItDg017913 for ; Mon, 3 Apr 2017 04:24:53 -0400 Received: from e06smtp13.uk.ibm.com (e06smtp13.uk.ibm.com [195.75.94.109]) by mx0b-001b2d01.pphosted.com with ESMTP id 29k4abtt1t-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 03 Apr 2017 04:24:53 -0400 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 3 Apr 2017 09:24:51 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 3 Apr 2017 09:24:47 +0100 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v338OkqI26738852; Mon, 3 Apr 2017 08:24:46 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 16089A405B; Mon, 3 Apr 2017 09:24:09 +0100 (BST) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 002D5A406D; Mon, 3 Apr 2017 09:24:09 +0100 (BST) Received: from marc-ibm.boeblingen.de.ibm.com (unknown [9.152.224.184]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 3 Apr 2017 09:24:08 +0100 (BST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 463E47E9D9 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: ext-mx02.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 463E47E9D9 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1FEDDC0567A1 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=none smtp.mailfrom=mhartmay@linux.vnet.ibm.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 1FEDDC0567A1 From: Marc Hartmayer To: Libvirt Mailing List Date: Mon, 3 Apr 2017 10:24:39 +0200 In-Reply-To: <20170403082439.10180-1-mhartmay@linux.vnet.ibm.com> References: <20170403082439.10180-1-mhartmay@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17040308-0012-0000-0000-000004FD076E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17040308-0013-0000-0000-000017E022A3 Message-Id: <20170403082439.10180-6-mhartmay@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-04-03_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1704030076 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 203 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 03 Apr 2017 08:25:04 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 03 Apr 2017 08:25:04 +0000 (UTC) for IP:'148.163.158.5' DOMAIN:'mx0b-001b2d01.pphosted.com' HELO:'mx0a-001b2d01.pphosted.com' FROM:'mhartmay@linux.vnet.ibm.com' RCPT:'' X-RedHat-Spam-Score: -2.7 (BAYES_50, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2) 148.163.158.5 mx0b-001b2d01.pphosted.com 148.163.158.5 mx0b-001b2d01.pphosted.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Marc Hartmayer Subject: [libvirt] [PATCH 5/5] refactoring: Use the return value of virObjectRef directly 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 03 Apr 2017 08:26:33 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use the return value of virObjectRef directly. This way, it's easier for another reader to identify the reason why the additional reference is required. Signed-off-by: Marc Hartmayer Reviewed-by: Bjoern Walk --- src/datatypes.c | 6 ++---- src/rpc/virnetclientstream.c | 4 +--- src/rpc/virnetserver.c | 9 +++------ tests/qemumonitortestutils.c | 3 +-- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 3e3148d..59ba956 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -196,8 +196,7 @@ void virConnectCloseCallbackDataRegister(virConnectClos= eCallbackDataPtr closeDat return; } =20 - closeData->conn =3D conn; - virObjectRef(closeData->conn); + closeData->conn =3D virObjectRef(conn); closeData->callback =3D cb; closeData->opaque =3D opaque; closeData->freeCallback =3D freecb; @@ -985,8 +984,7 @@ virAdmConnectCloseCallbackDataRegister(virAdmConnectClo= seCallbackDataPtr cbdata, goto cleanup; } =20 - virObjectRef(conn); - cbdata->conn =3D conn; + cbdata->conn =3D virObjectRef(conn); cbdata->callback =3D cb; cbdata->opaque =3D opaque; cbdata->freeCallback =3D freecb; diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index 34989a9..2105bd0 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -145,12 +145,10 @@ virNetClientStreamPtr virNetClientStreamNew(virNetCli= entProgramPtr prog, if (!(st =3D virObjectLockableNew(virNetClientStreamClass))) return NULL; =20 - st->prog =3D prog; + st->prog =3D virObjectRef(prog); st->proc =3D proc; st->serial =3D serial; =20 - virObjectRef(prog); - return st; } =20 diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index f06643a..c02db74 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -213,8 +213,7 @@ static int virNetServerDispatchNewMessage(virNetServerC= lientPtr client, job->msg =3D msg; =20 if (prog) { - virObjectRef(prog); - job->prog =3D prog; + job->prog =3D virObjectRef(prog); priority =3D virNetServerProgramGetPriority(prog, msg->header.= proc); } =20 @@ -284,8 +283,7 @@ int virNetServerAddClient(virNetServerPtr srv, =20 if (VIR_EXPAND_N(srv->clients, srv->nclients, 1) < 0) goto error; - srv->clients[srv->nclients-1] =3D client; - virObjectRef(client); + srv->clients[srv->nclients-1] =3D virObjectRef(client); =20 if (virNetServerClientNeedAuth(client)) virNetServerTrackPendingAuthLocked(srv); @@ -695,8 +693,7 @@ int virNetServerAddService(virNetServerPtr srv, } } =20 - srv->services[srv->nservices-1] =3D svc; - virObjectRef(svc); + srv->services[srv->nservices-1] =3D virObjectRef(svc); =20 virNetServerServiceSetDispatcher(svc, virNetServerDispatchNewClient, diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 89857a6..5e30fb0 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1064,8 +1064,7 @@ qemuMonitorCommonTestNew(virDomainXMLOptionPtr xmlopt, goto error; =20 if (vm) { - virObjectRef(vm); - test->vm =3D vm; + test->vm =3D virObjectRef(vm); } else { test->vm =3D virDomainObjNew(xmlopt); if (!test->vm) --=20 2.5.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list