From nobody Mon Dec 15 23:14:02 2025 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 1520511686513669.5718748887471; Thu, 8 Mar 2018 04:21:26 -0800 (PST) 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 BB65013A4E; Thu, 8 Mar 2018 12:21:24 +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 3450A4384; Thu, 8 Mar 2018 12:21:24 +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 B125C4CAA7; Thu, 8 Mar 2018 12:21:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w28CLBns016932 for ; Thu, 8 Mar 2018 07:21:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id 085BB60F90; Thu, 8 Mar 2018 12:21:11 +0000 (UTC) Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0132A53B1A for ; Thu, 8 Mar 2018 12:21:10 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 7AB0461D0F for ; Thu, 8 Mar 2018 12:21:08 +0000 (UTC) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w28CKwi5088418 for ; Thu, 8 Mar 2018 07:21:08 -0500 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 2gk2qr65rj-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Thu, 08 Mar 2018 07:21:07 -0500 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Mar 2018 12:21:05 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 8 Mar 2018 12:21:04 -0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w28CL37r44630184 for ; Thu, 8 Mar 2018 12:21:03 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1FA1EA404D for ; Thu, 8 Mar 2018 12:13:59 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 01081A4040 for ; Thu, 8 Mar 2018 12:13:59 +0000 (GMT) Received: from marc-ibm.boeblingen.de.ibm.com (unknown [9.152.224.51]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Thu, 8 Mar 2018 12:13:58 +0000 (GMT) From: Marc Hartmayer To: Date: Thu, 8 Mar 2018 13:20:38 +0100 In-Reply-To: <20180308122043.15608-1-mhartmay@linux.vnet.ibm.com> References: <20180308122043.15608-1-mhartmay@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18030812-0040-0000-0000-0000041C61D1 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18030812-0041-0000-0000-0000261F7CA1 Message-Id: <20180308122043.15608-16-mhartmay@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-08_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803080146 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 08 Mar 2018 12:21:08 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 08 Mar 2018 12:21:08 +0000 (UTC) for IP:'148.163.156.1' DOMAIN:'mx0a-001b2d01.pphosted.com' HELO:'mx0a-001b2d01.pphosted.com' FROM:'mhartmay@linux.vnet.ibm.com' RCPT:'' X-RedHat-Spam-Score: -0.701 (RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2) 148.163.156.1 mx0a-001b2d01.pphosted.com 148.163.156.1 mx0a-001b2d01.pphosted.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 15/20] stream: Access stream->prog instead of a hard-coded global variable 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.29]); Thu, 08 Mar 2018 12:21:25 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use stream->prog instead of a hard-coded virNetServerProgram. Especially since these functions are intended as generic helpers for streams. Signed-off-by: Marc Hartmayer Reviewed-by: Bjoern Walk Reviewed-by: Boris Fiuczynski Reviewed-by: John Ferlan --- src/remote/remote_daemon_stream.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_s= tream.c index 4dd3af9e0d59..21f0ecd53844 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -213,7 +213,7 @@ daemonStreamEvent(virStreamPtr st, int events, void *op= aque) msg->cb =3D daemonStreamMessageFinished; msg->opaque =3D stream; stream->refs++; - if (virNetServerProgramSendStreamData(remoteProgram, + if (virNetServerProgramSendStreamData(stream->prog, client, msg, stream->procedure, @@ -253,7 +253,7 @@ daemonStreamEvent(virStreamPtr st, int events, void *op= aque) if (!msg) { ret =3D -1; } else { - ret =3D virNetServerProgramSendStreamError(remoteProgram, + ret =3D virNetServerProgramSendStreamError(stream->prog, client, msg, &rerr, @@ -644,7 +644,7 @@ daemonStreamHandleAbort(virNetServerClientPtr client, if (raise_error) { virNetMessageError rerr; memset(&rerr, 0, sizeof(rerr)); - return virNetServerProgramSendReplyError(remoteProgram, + return virNetServerProgramSendReplyError(stream->prog, client, msg, &rerr, @@ -839,7 +839,7 @@ daemonStreamHandleRead(virNetServerClientPtr client, VIR_DEBUG("rv=3D%d inData=3D%d length=3D%lld", rv, inData, length); =20 if (rv < 0) { - if (virNetServerProgramSendStreamError(remoteProgram, + if (virNetServerProgramSendStreamError(stream->prog, client, msg, &rerr, @@ -856,7 +856,7 @@ daemonStreamHandleRead(virNetServerClientPtr client, msg->cb =3D daemonStreamMessageFinished; msg->opaque =3D stream; stream->refs++; - if (virNetServerProgramSendStreamHole(remoteProgram, + if (virNetServerProgramSendStreamHole(stream->prog, client, msg, stream->procedure, @@ -887,7 +887,7 @@ daemonStreamHandleRead(virNetServerClientPtr client, /* Should never get this, since we're only called when we know * we're readable, but hey things change... */ } else if (rv < 0) { - if (virNetServerProgramSendStreamError(remoteProgram, + if (virNetServerProgramSendStreamError(stream->prog, client, msg, &rerr, @@ -906,7 +906,7 @@ daemonStreamHandleRead(virNetServerClientPtr client, msg->cb =3D daemonStreamMessageFinished; msg->opaque =3D stream; stream->refs++; - if (virNetServerProgramSendStreamData(remoteProgram, + if (virNetServerProgramSendStreamData(stream->prog, client, msg, stream->procedure, --=20 2.13.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list