From nobody Thu May 2 10:15:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573823168; cv=none; d=zoho.com; s=zohoarc; b=MP0IO0p3tY/78+co+TRcA5spCIbP1AcG5UyaA9moUKlJMSUD8zdx7Zsx+WPIiNFmnQ+PbFra1DJwUguGG4Kb+dg/VoXRIGE5imuUyRFlolIz+OXTc6ctoA9KgJ55mFwVuLqWxYOtc6DP+paFA0feUxVr0OGLWR6n0uftHGGgBc4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573823168; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Mt4llKDiQkTfBgbjgp8j9Ky11FrNXbf/uJYRHXqj1ho=; b=d8vSckOUb6XlGduzUykrDHDQbSmSNGYP9FCiYfbjjOt/bqr4ZXs+KNZHRFHXXX6D0UdAyzvbGic4sJ/m0pWRAsr/WtYg/0PE2PjscT+u6426TS11aZbl/TI5+0U53BhvJb/V1jNXMKu+IHbny1AzUZ352tj+yMKjWI7+plxtCuc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1573823168395716.5577250377241; Fri, 15 Nov 2019 05:06:08 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-304-gHBeVLceNuSBtV737eiQbg-1; Fri, 15 Nov 2019 08:06:05 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B88168C321E; Fri, 15 Nov 2019 13:06:00 +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 9B01E1036C8E; Fri, 15 Nov 2019 13:05:59 +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 43D731832E38; Fri, 15 Nov 2019 13:05:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAFD5Wg5029698 for ; Fri, 15 Nov 2019 08:05:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id AD96610E51B0; Fri, 15 Nov 2019 13:05:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A8B6D10E60F6 for ; Fri, 15 Nov 2019 13:05:30 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1778F900A82 for ; Fri, 15 Nov 2019 13:05:30 +0000 (UTC) Received: from mail.univention.de (mail.univention.de [82.198.197.8]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-344-mnfLdSjXPlWmYnmXHgNbTw-1; Fri, 15 Nov 2019 08:05:27 -0500 Received: from localhost (localhost [127.0.0.1]) by solig.knut.univention.de (Postfix) with ESMTP id B80D0774B63A for ; Fri, 15 Nov 2019 14:05:25 +0100 (CET) Received: from mail.univention.de ([127.0.0.1]) by localhost (solig.knut.univention.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 78AXclgsYDi0; Fri, 15 Nov 2019 14:05:24 +0100 (CET) Received: from fixa.knut.univention.de (p5B21E335.dip0.t-ipconnect.de [91.33.227.53]) by solig.knut.univention.de (Postfix) with ESMTPSA id 574F0774B618; Fri, 15 Nov 2019 14:05:23 +0100 (CET) Received: by fixa.knut.univention.de (Postfix, from userid 2260) id A2A3316184A; Fri, 15 Nov 2019 14:05:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573823167; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Mt4llKDiQkTfBgbjgp8j9Ky11FrNXbf/uJYRHXqj1ho=; b=XhYXPuXVI3DbH65SLs8J72ns9BVwJ280ZjD+nSOFvM6feCdhPWv6LycKjV0Hc3G1aZwE14 T0LvA/a7qeYR4m0rDMpfTBuxwjiFcDbZtol64U5EeH9mi/F6bH6Kugz8Gc4rcJlhB5lHR2 Vqal+WB30w+jVBlD2JmCibxH7YICHno= X-Virus-Scanned: by amavisd-new-2.10.1 (20141025) (Debian) at knut.univention.de From: Philipp Hahn To: libvir-list@redhat.com Date: Fri, 15 Nov 2019 14:05:12 +0100 Message-Id: <4e1bfd831fcc676e1876ddd2741856b3997de5c0.1573821545.git.hahn@univention.de> In-Reply-To: References: MIME-Version: 1.0 X-MC-Unique: mnfLdSjXPlWmYnmXHgNbTw-1 X-MC-Unique: gHBeVLceNuSBtV737eiQbg-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xAFD5Wg5029698 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH console-proxy 1/6] Adapt to API change for dom.Devices.Graphics 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Follow > commit 4772b681e87a8d0dcee011b8e43813e851e4f934 > Author: Daniel P. Berrange > Date: Fri Nov 24 16:15:30 2017 +0000 > > Add remaining graphics configuration options Signed-off-by: Philipp Hahn --- cmd/virtconsoleresolveradm/cmd/enable.go | 6 ++---- pkg/resolver/server.go | 26 ++++++++++++++++-------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/cmd/virtconsoleresolveradm/cmd/enable.go b/cmd/virtconsolereso= lveradm/cmd/enable.go index 04ca80b..dd95e9e 100644 --- a/cmd/virtconsoleresolveradm/cmd/enable.go +++ b/cmd/virtconsoleresolveradm/cmd/enable.go @@ -164,15 +164,13 @@ func doEnable(cmd *cobra.Command, args []string) { meta =3D &resolver.ConsoleServerProxyMetadata{} =20 for _, graphics :=3D range domcfg.Devices.Graphics { - switch graphics.Type { - case "spice": + if graphics.Spice !=3D nil { meta.Consoles =3D append(meta.Consoles, createConsole("spice", 0, conn, domname, domuuid)) - case "vnc": + } else if graphics.VNC !=3D nil { meta.Consoles =3D append(meta.Consoles, createConsole("vnc", 0, conn, domname, domuuid)) } - } =20 for idx, chardev :=3D range domcfg.Devices.Serials { diff --git a/pkg/resolver/server.go b/pkg/resolver/server.go index 115d75d..eefdad7 100644 --- a/pkg/resolver/server.go +++ b/pkg/resolver/server.go @@ -86,13 +86,19 @@ type ConsoleServer struct { =20 const tokenpath =3D "/consoleresolver/token/" =20 +func isListenAddress(listen string) bool { + return listen !=3D "" && listen !=3D "0.0.0.0" && listen !=3D "::" +} + func getListener(dom libvirtxml.Domain, gtype string, insecure bool, conso= leHost, defaultHost string) (string, error) { if dom.Devices =3D=3D nil { return "", errors.New("No devices present") } =20 for _, graphics :=3D range dom.Devices.Graphics { - if graphics.Type !=3D gtype { + if gtype =3D=3D "vnc" && graphics.VNC !=3D nil { + } else if gtype =3D=3D "spice" && graphics.Spice !=3D nil { + } else { continue } =20 @@ -100,21 +106,25 @@ func getListener(dom libvirtxml.Domain, gtype string,= insecure bool, consoleHost if consoleHost !=3D "" { host =3D consoleHost } else { - if graphics.Listen !=3D "" && graphics.Listen !=3D "0.0.0.0" && graphic= s.Listen !=3D "::" { - host =3D graphics.Listen + if graphics.VNC !=3D nil && isListenAddress(graphics.VNC.Listen) { + host =3D graphics.VNC.Listen + } else if graphics.Spice !=3D nil && isListenAddress(graphics.Spice.Lis= ten) { + host =3D graphics.Spice.Listen } else { host =3D defaultHost } } =20 var port int - if graphics.Type =3D=3D "spice" && !insecure { - port =3D graphics.TLSPort - } else { - port =3D graphics.Port + if graphics.Spice !=3D nil && !insecure { + port =3D graphics.Spice.TLSPort + } else if graphics.Spice !=3D nil { + port =3D graphics.Spice.Port + } else if graphics.VNC !=3D nil { + port =3D graphics.VNC.Port } glog.V(1).Infof("Got port %d\n", port) - if graphics.Port =3D=3D 0 || graphics.Port =3D=3D -1 { + if port =3D=3D 0 || port =3D=3D -1 { return "", errors.New("Missing port for graphics") } =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 10:15:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573823145; cv=none; d=zoho.com; s=zohoarc; b=QkP7fEvnbqyxIieSLwqdHqfcgpUQ1aCZFoKf/DXANM4Sfv060Q9WzSVi4sDxg7/X6wseVz+3YO2Re7E1PVJzi5K0TEuzweLUQbxt5Psif02m7MZtP2u6sJoX3WYLZ4f6DXnYxtsiTFXhHqPsA2Or0wOw7Msv1JDcJnE550DT9fo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573823145; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4nngK57otnwsijUKQKMu4jsDSik29Si+Q6FRSmt1WZ0=; b=hvmZ9pEgnaqM28QmvFUsVvR8lMz8KII+GkoPxcGV/Sl0sVCs9tIICcQsZ82inaPTnzFYyy6xqtChrmw29yNNixs5yXZzSVRvc4gw+HM9LNHKlxSjIxZqSO2r9+6UCb8e0kUX0Oqp50fKeCCNdQEFw0ZtgN6HTSrIDb7uX4rJk/o= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1573823145695829.9040327806803; Fri, 15 Nov 2019 05:05:45 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-225-BuJHRxUlPleC1kbz5GygkA-1; Fri, 15 Nov 2019 08:05:42 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3066285B6F8; Fri, 15 Nov 2019 13:05:36 +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 08AF26013A; Fri, 15 Nov 2019 13:05:36 +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 B695E4BB78; Fri, 15 Nov 2019 13:05:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAFD5W46029697 for ; Fri, 15 Nov 2019 08:05:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id AF8BB10E51B2; Fri, 15 Nov 2019 13:05:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A8ABC10E60F5 for ; Fri, 15 Nov 2019 13:05:30 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0550E900A87 for ; Fri, 15 Nov 2019 13:05:30 +0000 (UTC) Received: from mail.univention.de (mail.univention.de [82.198.197.8]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-118-LY5_iFPHO_6tv7P5rJlo3w-1; Fri, 15 Nov 2019 08:05:26 -0500 Received: from localhost (localhost [127.0.0.1]) by solig.knut.univention.de (Postfix) with ESMTP id 77FDE774B627 for ; Fri, 15 Nov 2019 14:05:24 +0100 (CET) Received: from mail.univention.de ([127.0.0.1]) by localhost (solig.knut.univention.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vR8PcuPBP4RS; Fri, 15 Nov 2019 14:05:23 +0100 (CET) Received: from fixa.knut.univention.de (p5B21E335.dip0.t-ipconnect.de [91.33.227.53]) by solig.knut.univention.de (Postfix) with ESMTPSA id 48F03774B616; Fri, 15 Nov 2019 14:05:23 +0100 (CET) Received: by fixa.knut.univention.de (Postfix, from userid 2260) id A450816187E; Fri, 15 Nov 2019 14:05:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573823144; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=4nngK57otnwsijUKQKMu4jsDSik29Si+Q6FRSmt1WZ0=; b=AmseodjMUds7f7TxTUcWIewwNMDFa9KYqCK5Be/Tuszn+1HFzM1lL79j3fleS8CYI4gy5a qQ7Jf788eLtUWUTb9618cjrvFhe6dxz7vth0eTvsd7EwbQiSHn0GZ26W8y6sRbGjUf1FDl YJP+gjbwKauA3UfeWFVcCw1IwRJqRGo= X-Virus-Scanned: by amavisd-new-2.10.1 (20141025) (Debian) at knut.univention.de From: Philipp Hahn To: libvir-list@redhat.com Date: Fri, 15 Nov 2019 14:05:13 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-MC-Unique: LY5_iFPHO_6tv7P5rJlo3w-1 X-MC-Unique: BuJHRxUlPleC1kbz5GygkA-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xAFD5W46029697 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH console-proxy 2/6] Adapt to uuid API change 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: , 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-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" > commit 0ef6afb2f6cdd6cdaeee3885a95099c63f18fc8c > Author: Maxim Bublis > Date: Wed Jan 3 16:02:28 2018 +0000 > > Return enthropy errors from UUID generation. > > This commit changes signature for `NewV1`, `NewV2` and `NewV4` functi= ons > which from now will return `(UUID, error)` instead of `UUID`. > To emulate old behavior of panicking on enthropy errors one can wrap > a call into `Must` helper similar to: > ``` > u :=3D uuid.Must(uuid.NewV4()) Signed-off-by: Philipp Hahn --- cmd/virtconsoleresolveradm/cmd/enable.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/virtconsoleresolveradm/cmd/enable.go b/cmd/virtconsolereso= lveradm/cmd/enable.go index dd95e9e..1a4a12d 100644 --- a/cmd/virtconsoleresolveradm/cmd/enable.go +++ b/cmd/virtconsoleresolveradm/cmd/enable.go @@ -49,8 +49,8 @@ var ( ) =20 func createConsole(ctype string, index int, conn *libvirt.Connect, domname= , domuuid string) resolver.ConsoleServerProxyMetadataConsole { - tokenID :=3D uuid.NewV4() - tokenValue :=3D uuid.NewV4() + tokenID :=3D uuid.Must(uuid.NewV4()) + tokenValue :=3D uuid.Must(uuid.NewV4()) console :=3D resolver.ConsoleServerProxyMetadataConsole{ Token: tokenID.String(), Type: ctype, --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 10:15:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573823156; cv=none; d=zoho.com; s=zohoarc; b=hcgPKuGb08qiS84BYI5Zgg4L4ywK7FGrQWST2clp753NL+DtIDqxNgMqIBDp12cRGLBWobENJZ3rYXSvS5BdJyXGoXshO816BkSrSa/5madXU1q/0ikwf96tcoIg9Y3RjxYb3c5CHAm+Q+3QJnfcNFdPZ2VEZRyY5X7cHfAuEcQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573823156; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LjUGpJsliJX2ZGnCRcIrRKhpoLwiMWcNXs4lqiYoIlc=; b=OBHxDjNhp7zGqZu6iCfJuH3moO/pkCgyXz5KDeimDOKdMa9dx0nQcNcl4M/Bq3skhD4gY9ABZL8iS7T0mNw3dCyMJAr7NrX6OZii+AfugFfdM44T5cd9/NwZ0346FFuH//zKX2dtVcQrFhMMjz32CnIx5iFNxPw9kDac+/tSvCc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1573823155975369.62662909833796; Fri, 15 Nov 2019 05:05:55 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-173-jDvK3NRuNW6iRumdJ2szPQ-1; Fri, 15 Nov 2019 08:05:52 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3EE3018B9F54; Fri, 15 Nov 2019 13:05:45 +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 190A55C21B; Fri, 15 Nov 2019 13:05:45 +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 CC3C61832E37; Fri, 15 Nov 2019 13:05:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAFD5Wwi029696 for ; Fri, 15 Nov 2019 08:05:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id AD72D10E60FA; Fri, 15 Nov 2019 13:05:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A879310E60F4 for ; Fri, 15 Nov 2019 13:05:30 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5EA0488260E for ; Fri, 15 Nov 2019 13:05:30 +0000 (UTC) Received: from mail.univention.de (mail.univention.de [82.198.197.8]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-30-_sP6PfylPhyo5HqbiyHdrg-1; Fri, 15 Nov 2019 08:05:27 -0500 Received: from localhost (localhost [127.0.0.1]) by solig.knut.univention.de (Postfix) with ESMTP id 1444E774B643 for ; Fri, 15 Nov 2019 14:05:26 +0100 (CET) Received: from mail.univention.de ([127.0.0.1]) by localhost (solig.knut.univention.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Wql6YKTNq872; Fri, 15 Nov 2019 14:05:24 +0100 (CET) Received: from fixa.knut.univention.de (p5B21E335.dip0.t-ipconnect.de [91.33.227.53]) by solig.knut.univention.de (Postfix) with ESMTPSA id 5B833774B619; Fri, 15 Nov 2019 14:05:23 +0100 (CET) Received: by fixa.knut.univention.de (Postfix, from userid 2260) id A986C1618DC; Fri, 15 Nov 2019 14:05:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573823154; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=LjUGpJsliJX2ZGnCRcIrRKhpoLwiMWcNXs4lqiYoIlc=; b=E+p9jJG8mwpOsw4jaO7JvSz7T4mLUUxP/J64TarEQXQ9toLs4pXvhAFS1uMXv0S0BaFft/ LyqRUL+xEzuCFRm6taDTbY7sj88zqKo7oFDRqonUv7F8X6Ri+8Sy1fg55CHIXZ62c69cWV sSJ9gGXR7pz33LJj+XIR4DKLqchwYHI= X-Virus-Scanned: by amavisd-new-2.10.1 (20141025) (Debian) at knut.univention.de From: Philipp Hahn To: libvir-list@redhat.com Date: Fri, 15 Nov 2019 14:05:14 +0100 Message-Id: <2a19ef944342f317711cf8cb122d8e444ea788a2.1573821545.git.hahn@univention.de> In-Reply-To: References: MIME-Version: 1.0 X-MC-Unique: _sP6PfylPhyo5HqbiyHdrg-1 X-MC-Unique: jDvK3NRuNW6iRumdJ2szPQ-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xAFD5Wwi029696 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH console-proxy 3/6] Adapt to API change for dom.Devices.{Serials, Console} 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Follow > commit d44fdf9badbb798949ab9f82ef516a2fd36d8b55 > Author: Daniel P. Berrange > Date: Tue Nov 28 11:50:06 2017 +0000 > > Generalize protocol handling for chardev sources Signed-off-by: Philipp Hahn --- cmd/virtconsoleresolveradm/cmd/enable.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/virtconsoleresolveradm/cmd/enable.go b/cmd/virtconsolereso= lveradm/cmd/enable.go index 1a4a12d..ebad497 100644 --- a/cmd/virtconsoleresolveradm/cmd/enable.go +++ b/cmd/virtconsoleresolveradm/cmd/enable.go @@ -174,14 +174,14 @@ func doEnable(cmd *cobra.Command, args []string) { } =20 for idx, chardev :=3D range domcfg.Devices.Serials { - if chardev.Type =3D=3D "tcp" { + if chardev.Source.TCP !=3D nil { meta.Consoles =3D append(meta.Consoles, createConsole("serial", idx, conn, domname, domuuid)) } } =20 for idx, chardev :=3D range domcfg.Devices.Consoles { - if chardev.Type =3D=3D "tcp" { + if chardev.Source.TCP !=3D nil { meta.Consoles =3D append(meta.Consoles, createConsole("console", idx, conn, domname, domuuid)) } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 10:15:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573823145; cv=none; d=zoho.com; s=zohoarc; b=XdiLrRhwDS3havZ2FbC28u6Ubuj4RMSEP9yPROp4SCq+vOjUnB7XLTwt9JvjLEG67XbYDudzc9yfaJ6ipphfWX29DNvXxQDB9m3KXkNNEXx+u6eBtwxvR5ul+SEuZfazgyeUVWw37n9ovyOHuY1a6A5+RZKKlkJqiUThHrw/cXI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573823145; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K9wZ8iSaF5mzj13rka8/iLhYzkZyGm/FZGnSaGjry70=; b=hHMsbOy8qI4NU1QwYYFPaSJtgbGEJnfqOv3dY+NHT2MBzlxga690BIH2E2oza1+aQExpZg9hNU0bPgQEhAHntsOaP2lhVlUpQVAoVSGH3r1+WcS7FSEhSsi7foy/V6LhRvOmIu2IvNt5l/Q6Uy8IqeDv3pDVPzoPMQQKmwkc8ss= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 15738231455047.621475141639735; Fri, 15 Nov 2019 05:05:45 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-155-0H93a3aaOyuZWL7kNHr5kQ-1; Fri, 15 Nov 2019 08:05:41 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9FD1618B5FC6; Fri, 15 Nov 2019 13:05:35 +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 DF9FD7BF98; Fri, 15 Nov 2019 13:05:34 +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 C850D1832E26; Fri, 15 Nov 2019 13:05:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAFD5Vst029685 for ; Fri, 15 Nov 2019 08:05:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id 884711C66A; Fri, 15 Nov 2019 13:05:31 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8303353D3 for ; Fri, 15 Nov 2019 13:05:31 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6BCDB1065053 for ; Fri, 15 Nov 2019 13:05:31 +0000 (UTC) Received: from mail.univention.de (mail.univention.de [82.198.197.8]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-170-RMBCHoK3PYmuvxwkn6BUAg-1; Fri, 15 Nov 2019 08:05:29 -0500 Received: from localhost (localhost [127.0.0.1]) by solig.knut.univention.de (Postfix) with ESMTP id C2942774B64E for ; Fri, 15 Nov 2019 14:05:27 +0100 (CET) Received: from mail.univention.de ([127.0.0.1]) by localhost (solig.knut.univention.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lqe_T_jA8dNY; Fri, 15 Nov 2019 14:05:25 +0100 (CET) Received: from fixa.knut.univention.de (p5B21E335.dip0.t-ipconnect.de [91.33.227.53]) by solig.knut.univention.de (Postfix) with ESMTPSA id 5E34F774B61A; Fri, 15 Nov 2019 14:05:23 +0100 (CET) Received: by fixa.knut.univention.de (Postfix, from userid 2260) id AE7D61618EC; Fri, 15 Nov 2019 14:05:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573823144; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=K9wZ8iSaF5mzj13rka8/iLhYzkZyGm/FZGnSaGjry70=; b=X12oMwHGTBp/jzS/vg4L+UIb3r3OW45OBIPvP79LW9J1f+N8KP7HDNbF2yykefACmvacSD ohejI3Q+rqbNCtDBxJKwqVYV6ErdoyK+JqrzLlJ5syrNiEAEtF66bla+sqLu4FcY1kAH+L E3Xca8DQ91ibuWB03WPxBNqudB/NK3o= X-Virus-Scanned: by amavisd-new-2.10.1 (20141025) (Debian) at knut.univention.de From: Philipp Hahn To: libvir-list@redhat.com Date: Fri, 15 Nov 2019 14:05:15 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-MC-Unique: RMBCHoK3PYmuvxwkn6BUAg-1 X-MC-Unique: 0H93a3aaOyuZWL7kNHr5kQ-1 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xAFD5Vst029685 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH console-proxy 4/6] virtconsoleresolveradm: Require sub-command 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: , 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-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Philipp Hahn --- cmd/virtconsoleresolveradm/cmd/root.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/virtconsoleresolveradm/cmd/root.go b/cmd/virtconsoleresolv= eradm/cmd/root.go index 76e1203..7aaca47 100644 --- a/cmd/virtconsoleresolveradm/cmd/root.go +++ b/cmd/virtconsoleresolveradm/cmd/root.go @@ -34,6 +34,7 @@ var RootCmd =3D &cobra.Command{ Short: "Libvirt console resolver admin", Long: "Libvirt console resolver administration tool", Run: func(cmd *cobra.Command, args []string) {}, + Args: cobra.MinimumNArgs(1), } =20 var ( --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 10:15:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573823157; cv=none; d=zoho.com; s=zohoarc; b=kqStd1Mk25JxqxuPSdRUWa3nU05UGfGPi5W5f9tD4dZo81BkGMisgcfcKeiFwnkjFizJka3aju1ZqVc/6b/hfhtHpDKZJkL0DzS99SyFzb3iY2EO7utgxgDbtpYtcbNPd3vcgYm++lw0qlBUtcNf5AziOerlVHrKKGbmXZAgt5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573823157; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EtTJ86OYVuRMDAJgXj5LPb89ScLjBzR9Jk6Wy/Pp8Kk=; b=jliEU4tvSdeCil29du6b6WiNdY/2UkgjWHBC2CDDpH2ZwYs8MnCgVbmwJUfpb09z9d562WJIPKqLnYiilpH+5z+Mtm/fK1u3UAGb2Q7kNcP/dmpW464NytyF95MpEuMpZ/us7bdGrWpWAWW6dJpu/1x6dMmAdH8bjP0/V3EpD+4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1573823157986260.4826993663348; Fri, 15 Nov 2019 05:05:57 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-283-Ihv1GFAhNn2tDVCsPNxcXw-1; Fri, 15 Nov 2019 08:05:55 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 006B21007276; Fri, 15 Nov 2019 13:05:49 +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 CA0296055E; Fri, 15 Nov 2019 13:05:48 +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 7E4285FBEE; Fri, 15 Nov 2019 13:05:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAFD5Zu6029727 for ; Fri, 15 Nov 2019 08:05:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 20A487D551; Fri, 15 Nov 2019 13:05:35 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1C70053D3 for ; Fri, 15 Nov 2019 13:05:35 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED08B1065054 for ; Fri, 15 Nov 2019 13:05:34 +0000 (UTC) Received: from mail.univention.de (mail.univention.de [82.198.197.8]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-367-DGDo2dXMOoagqpTyVS1Dsw-1; Fri, 15 Nov 2019 08:05:30 -0500 Received: from localhost (localhost [127.0.0.1]) by solig.knut.univention.de (Postfix) with ESMTP id 04192774B656 for ; Fri, 15 Nov 2019 14:05:29 +0100 (CET) Received: from mail.univention.de ([127.0.0.1]) by localhost (solig.knut.univention.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f4CjR07JzcvL; Fri, 15 Nov 2019 14:05:26 +0100 (CET) Received: from fixa.knut.univention.de (p5B21E335.dip0.t-ipconnect.de [91.33.227.53]) by solig.knut.univention.de (Postfix) with ESMTPSA id B6AED774B622; Fri, 15 Nov 2019 14:05:23 +0100 (CET) Received: by fixa.knut.univention.de (Postfix, from userid 2260) id B42E1161908; Fri, 15 Nov 2019 14:05:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573823156; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=EtTJ86OYVuRMDAJgXj5LPb89ScLjBzR9Jk6Wy/Pp8Kk=; b=QoBDAH58FSiuD4aZP2u1nesrk2HRuX2NmQCq3He7VfqhykDtps9XojtzLEV4sVfpieDayL se6hNYJ2ZqM+NA9Z2IWA3os8aIxcUOC+hnMvet9F7ldq9jLlZDQ03MaIBWOU6XICfBpq4+ IuTZX3oGhds8oSLa1g5DDfiKjmThPNs= X-Virus-Scanned: by amavisd-new-2.10.1 (20141025) (Debian) at knut.univention.de From: Philipp Hahn To: libvir-list@redhat.com Date: Fri, 15 Nov 2019 14:05:16 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-MC-Unique: DGDo2dXMOoagqpTyVS1Dsw-1 X-MC-Unique: Ihv1GFAhNn2tDVCsPNxcXw-1 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xAFD5Zu6029727 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH console-proxy 5/6] virtconsoleresolveradm: Simplify argument parsing 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: , 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-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Use ExactArgs(1) to check for exactly one positional argument. Signed-off-by: Philipp Hahn --- cmd/virtconsoleresolveradm/cmd/disable.go | 6 +----- cmd/virtconsoleresolveradm/cmd/enable.go | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cmd/virtconsoleresolveradm/cmd/disable.go b/cmd/virtconsoleres= olveradm/cmd/disable.go index 2d41874..aab3047 100644 --- a/cmd/virtconsoleresolveradm/cmd/disable.go +++ b/cmd/virtconsoleresolveradm/cmd/disable.go @@ -40,14 +40,10 @@ var disableCmd =3D &cobra.Command{ Short: "Disable consoles for a domain", Long: "Disable access to consoles for a domain", Run: doDisable, + Args: cobra.ExactArgs(1), } =20 func doDisable(cmd *cobra.Command, args []string) { - if len(args) !=3D 1 { - fmt.Fprintln(os.Stderr, "Missing domain name/uuid") - os.Exit(1) - } - conn, err :=3D libvirt.NewConnect(connect) if err !=3D nil { fmt.Fprintf(os.Stderr, "Cannot connect to hypervisor '%s': %s\n", diff --git a/cmd/virtconsoleresolveradm/cmd/enable.go b/cmd/virtconsolereso= lveradm/cmd/enable.go index ebad497..49897ef 100644 --- a/cmd/virtconsoleresolveradm/cmd/enable.go +++ b/cmd/virtconsoleresolveradm/cmd/enable.go @@ -43,6 +43,7 @@ var ( Short: "Enable consoles for a domain", Long: "Enable consoles for a domain", Run: doEnable, + Args: cobra.ExactArgs(1), } insecure *bool host *string @@ -99,11 +100,6 @@ func createConsole(ctype string, index int, conn *libvi= rt.Connect, domname, domu } =20 func doEnable(cmd *cobra.Command, args []string) { - if len(args) !=3D 1 { - fmt.Fprintln(os.Stderr, "Missing domain name/uuid") - os.Exit(1) - } - conn, err :=3D libvirt.NewConnect(connect) if err !=3D nil { fmt.Fprintf(os.Stderr, "Cannot connect to hypervisor '%s': %s\n", --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 10:15:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573823176; cv=none; d=zoho.com; s=zohoarc; b=VJqKCtaSsclMYrkHHLFadeblRTgSnK4FK74CvFt1A/YjUdIM93jPzB5HMwAYz3ldJZ+iFknN+r2VW5LtoTXVefwYxvChI7ckgn+TGFE6NYXMjmUYu+wWx2y0apWNRyJPJU8wrpYmaPJNzB9/Ri3yYytb1P3rH7Hgk+9zsSnRxTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573823176; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/VxtcpdyTVQIiflXFDXevYz9Js2oKxuVvACZC08d7g8=; b=c3S1G2TFO1ug0/HhdA/5CxS2F1juLWnvXbu/i9/Xk5XnLajH+oDgAcGRdkGyMk/6Jvu2dBFF29QVy5UOY0SUezmGqUD6PFoV1nxXnFueNWUse04BScgxHQEYFbMOz7dAOcnFW6te7UDl1QPn8pKDAVsxM+YW2rEIRWennRdnFis= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1573823176658194.89269940981296; Fri, 15 Nov 2019 05:06:16 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-362-Gbuw_9c6O4KfmemQirHboQ-1; Fri, 15 Nov 2019 08:06:14 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D5AE218A2720; Fri, 15 Nov 2019 13:06:08 +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 4368E63B83; Fri, 15 Nov 2019 13:06:08 +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 E2CC91832E38; Fri, 15 Nov 2019 13:06:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAFD5Y1r029722 for ; Fri, 15 Nov 2019 08:05:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id D04EE2157F47; Fri, 15 Nov 2019 13:05:34 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CBF452157F46 for ; Fri, 15 Nov 2019 13:05:32 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9E81E801024 for ; Fri, 15 Nov 2019 13:05:32 +0000 (UTC) Received: from mail.univention.de (mail.univention.de [82.198.197.8]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-245-02t8BZ8dPmSlP7NNIrisHg-1; Fri, 15 Nov 2019 08:05:30 -0500 Received: from localhost (localhost [127.0.0.1]) by solig.knut.univention.de (Postfix) with ESMTP id 38A4A774B65C for ; Fri, 15 Nov 2019 14:05:29 +0100 (CET) Received: from mail.univention.de ([127.0.0.1]) by localhost (solig.knut.univention.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2a_h5heMqQCh; Fri, 15 Nov 2019 14:05:27 +0100 (CET) Received: from fixa.knut.univention.de (p5B21E335.dip0.t-ipconnect.de [91.33.227.53]) by solig.knut.univention.de (Postfix) with ESMTPSA id B8B92774B623; Fri, 15 Nov 2019 14:05:23 +0100 (CET) Received: by fixa.knut.univention.de (Postfix, from userid 2260) id B9F5F16191B; Fri, 15 Nov 2019 14:05:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573823175; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/VxtcpdyTVQIiflXFDXevYz9Js2oKxuVvACZC08d7g8=; b=OhvOqCei0PBNmKGkGZGjDLha2tRHiA3ONLN0Aw4PNjoTRTQaBF2KdrvvmqxJcSwolWnejN IgcOYTbktfTo9NN+f1e1aHDR37OJm9/1CCuVUxB//orThcB3gAcUN7jGOvxKmGfiuT+He5 /4tFqo5YX16H2Vs1dcGSTYjhASoWZJA= X-Virus-Scanned: by amavisd-new-2.10.1 (20141025) (Debian) at knut.univention.de From: Philipp Hahn To: libvir-list@redhat.com Date: Fri, 15 Nov 2019 14:05:17 +0100 Message-Id: <06a3f07933f39ff610f613772340e29d64a8b2dd.1573821545.git.hahn@univention.de> In-Reply-To: References: MIME-Version: 1.0 X-MC-Unique: 02t8BZ8dPmSlP7NNIrisHg-1 X-MC-Unique: Gbuw_9c6O4KfmemQirHboQ-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xAFD5Y1r029722 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH console-proxy 6/6] virtconsoleresolveradm: Fix -c handling 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: , 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-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" -c / --connect does not work: > $ build/virtconsoleresolveradm -c qemu:///session enable $VM > Error: unknown shorthand flag: 'c' in -c Signed-off-by: Philipp Hahn --- cmd/virtconsoleresolveradm/cmd/root.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/virtconsoleresolveradm/cmd/root.go b/cmd/virtconsoleresolv= eradm/cmd/root.go index 7aaca47..d4001e4 100644 --- a/cmd/virtconsoleresolveradm/cmd/root.go +++ b/cmd/virtconsoleresolveradm/cmd/root.go @@ -42,5 +42,5 @@ var ( ) =20 func init() { - RootCmd.Flags().StringVarP(&connect, "connect", "c", "qemu:///system", "L= ibvirt connection URI") + RootCmd.PersistentFlags().StringVarP(&connect ,"connect", "c", "qemu:///s= ystem", "Libvirt connection URI") } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list