From patchwork Fri Jun 14 11:24:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 10995109 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 815C314C0 for ; Fri, 14 Jun 2019 11:29:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72430205FC for ; Fri, 14 Jun 2019 11:29:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65EDC28569; Fri, 14 Jun 2019 11:29:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 11587285A9 for ; Fri, 14 Jun 2019 11:29:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hbkMy-0008OY-Tv; Fri, 14 Jun 2019 11:27:44 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hbkMx-0008Nf-7z for xen-devel@lists.xenproject.org; Fri, 14 Jun 2019 11:27:43 +0000 X-Inumbo-ID: 6c23ec23-8e97-11e9-8980-bc764e045a96 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 6c23ec23-8e97-11e9-8980-bc764e045a96; Fri, 14 Jun 2019 11:27:42 +0000 (UTC) Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: fagq45aXva8k42F4MriKsdKADiAC2RapOtGX80yUmImUYzfQPqYVB+bgJdt1LgMMuZ/XRcbGOU IUFepxld7kiKGOkGoZQqOyK4CMer7iQyCUfoOdCF21jcGGuduwjld18rE9Dp2FD/2IKH7ABVPi gq4eac/jXA4mYze2vvQdRV3yYKYsN8GfWzbMgVZYqnVQwoAVAmTjU6FSFKcLJ4mY0cURc4EKP+ sB4uEShMPGBIk+f+qAh1QjhOZNZ+6xYA6IOPhdLKECycM3gQsXpSZ6mPefs1Eavcx/f/pUUQP5 T+w= X-SBRS: 2.7 X-MesageID: 1737598 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.63,373,1557201600"; d="scan'208";a="1737598" From: Anthony PERARD To: Date: Fri, 14 Jun 2019 12:24:41 +0100 Message-ID: <20190614112444.29980-13-anthony.perard@citrix.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190614112444.29980-1-anthony.perard@citrix.com> References: <20190614112444.29980-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 12/15] libxl_usb: Fix libxl_device_usbctrl_getinfo X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Anthony PERARD , Ian Jackson , Wei Liu Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP `usbctrl' is modified in this function which doesn't seems to be intended, and usbctrlinfo.backend_id was never modified. Take this opportunity to consify the argument `usbctrl' in libxl API to avoid similar mistake. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- tools/libxl/libxl.h | 2 +- tools/libxl/libxl_usb.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 9bacfb97f0..750ef1b7d0 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1950,7 +1950,7 @@ void libxl_device_usbctrl_list_free(libxl_device_usbctrl *list, int nr); int libxl_device_usbctrl_getinfo(libxl_ctx *ctx, uint32_t domid, - libxl_device_usbctrl *usbctrl, + const libxl_device_usbctrl *usbctrl, libxl_usbctrlinfo *usbctrlinfo); /* USB Devices */ diff --git a/tools/libxl/libxl_usb.c b/tools/libxl/libxl_usb.c index 694870a3c3..9851fe8468 100644 --- a/tools/libxl/libxl_usb.c +++ b/tools/libxl/libxl_usb.c @@ -641,7 +641,7 @@ libxl_device_usbctrl_list(libxl_ctx *ctx, uint32_t domid, int *num) } int libxl_device_usbctrl_getinfo(libxl_ctx *ctx, uint32_t domid, - libxl_device_usbctrl *usbctrl, + const libxl_device_usbctrl *usbctrl, libxl_usbctrlinfo *usbctrlinfo) { GC_INIT(ctx); @@ -678,7 +678,7 @@ int libxl_device_usbctrl_getinfo(libxl_ctx *ctx, uint32_t domid, be_path = READ_SUBPATH(libxl_path, "backend"); usbctrlinfo->backend = libxl__strdup(NOGC, be_path); rc = libxl__backendpath_parse_domid(gc, be_path, - &usbctrl->backend_domid); + &usbctrlinfo->backend_id); if (rc) goto out; usbctrlinfo->state = READ_SUBPATH_INT(fe_path, "state"); usbctrlinfo->evtch = READ_SUBPATH_INT(fe_path, "event-channel"); @@ -691,7 +691,7 @@ int libxl_device_usbctrl_getinfo(libxl_ctx *ctx, uint32_t domid, } else { usbctrlinfo->ports = READ_SUBPATH_INT(libxl_path, "num-ports"); usbctrlinfo->version = READ_SUBPATH_INT(libxl_path, "usb-ver"); - rc = libxl__get_domid(gc, &usbctrl->backend_domid); + rc = libxl__get_domid(gc, &usbctrlinfo->backend_id); if (rc) goto out; }