From nobody Thu May 2 20:22:41 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 209.132.183.28 is neither permitted nor denied by domain of redhat.com) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 209.132.183.28 is neither permitted nor denied by domain of redhat.com) 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 1504093256582851.1110876376845; Wed, 30 Aug 2017 04:40:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A833267F8; Wed, 30 Aug 2017 11:40:54 +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 4D44891728; Wed, 30 Aug 2017 11:40:54 +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 0AE8B1800C8A; Wed, 30 Aug 2017 11:40:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v7UBeOtR009128 for ; Wed, 30 Aug 2017 07:40:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id E09099155A; Wed, 30 Aug 2017 11:40:24 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 695FA91549 for ; Wed, 30 Aug 2017 11:40:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6A833267F8 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 30 Aug 2017 13:40:14 +0200 Message-Id: <59235b7eded73544cd700e851f7c21eaf4bec961.1504093198.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/5] tests: remove unused file 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 30 Aug 2017 11:40:54 +0000 (UTC) X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Introduced by 95fd63b1700d. Signed-off-by: Pavel Hrdina --- .../qemuxml2argv-channel-reconnect.args | 31 ------------------= ---- 1 file changed, 31 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-reconnect.a= rgs diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-reconnect.args b/t= ests/qemuxml2argvdata/qemuxml2argv-channel-reconnect.args deleted file mode 100644 index 43a5d5bb3e..0000000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-reconnect.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --nodefconfig \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ -server,nowait \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ --boot c \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x3 \ --usb \ --chardev socket,id=3Dcharchannel0,host=3Dlocalhost,port=3D1234,reconnect= =3D10 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,\ -id=3Dchannel0,name=3Dasdf \ --chardev socket,id=3Dcharchannel1,path=3D/tmp/channel/domain--1-QEMUGuest1= /fdsa,\ -server,nowait,reconnect=3D10 \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel= 1,\ -id=3Dchannel1,name=3Dfdsa --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 20:22:41 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 209.132.183.28 is neither permitted nor denied by domain of redhat.com) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 209.132.183.28 is neither permitted nor denied by domain of redhat.com) 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 1504093230615978.054728573333; Wed, 30 Aug 2017 04:40:30 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 822EB80F97; Wed, 30 Aug 2017 11:40:28 +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 2D56698146; Wed, 30 Aug 2017 11:40:28 +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 4EF6B3FC74; Wed, 30 Aug 2017 11:40:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v7UBePMV009136 for ; Wed, 30 Aug 2017 07:40:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id B19489152F; Wed, 30 Aug 2017 11:40:25 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A34E91549 for ; Wed, 30 Aug 2017 11:40:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 822EB80F97 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 30 Aug 2017 13:40:15 +0200 Message-Id: <393543910db45e0174cd24cf27f20625e45da871.1504093198.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/5] conf: add reconnect to virDomainChrSourceDef(Copy|IsEqual) 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 30 Aug 2017 11:40:29 +0000 (UTC) X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Missed by 9aa72a6dd5b3. Signed-off-by: Pavel Hrdina --- src/conf/domain_conf.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d97aab4834..f7574d77b6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2180,11 +2180,17 @@ virDomainChrSourceDefCopy(virDomainChrSourceDefPtr = dest, =20 dest->data.tcp.haveTLS =3D src->data.tcp.haveTLS; dest->data.tcp.tlsFromConfig =3D src->data.tcp.tlsFromConfig; + + dest->data.tcp.reconnect.enabled =3D src->data.tcp.reconnect.enabl= ed; + dest->data.tcp.reconnect.timeout =3D src->data.tcp.reconnect.timeo= ut; break; =20 case VIR_DOMAIN_CHR_TYPE_UNIX: if (VIR_STRDUP(dest->data.nix.path, src->data.nix.path) < 0) return -1; + + dest->data.nix.reconnect.enabled =3D src->data.nix.reconnect.enabl= ed; + dest->data.nix.reconnect.timeout =3D src->data.nix.reconnect.timeo= ut; break; =20 case VIR_DOMAIN_CHR_TYPE_NMDM: @@ -2259,11 +2265,15 @@ virDomainChrSourceDefIsEqual(const virDomainChrSour= ceDef *src, return src->data.tcp.listen =3D=3D tgt->data.tcp.listen && src->data.tcp.protocol =3D=3D tgt->data.tcp.protocol && STREQ_NULLABLE(src->data.tcp.host, tgt->data.tcp.host) && - STREQ_NULLABLE(src->data.tcp.service, tgt->data.tcp.service); + STREQ_NULLABLE(src->data.tcp.service, tgt->data.tcp.service) && + src->data.tcp.reconnect.enabled =3D=3D tgt->data.tcp.reconnect= .enabled && + src->data.tcp.reconnect.timeout =3D=3D tgt->data.tcp.reconnect= .timeout; break; case VIR_DOMAIN_CHR_TYPE_UNIX: return src->data.nix.listen =3D=3D tgt->data.nix.listen && - STREQ_NULLABLE(src->data.nix.path, tgt->data.nix.path); + STREQ_NULLABLE(src->data.nix.path, tgt->data.nix.path) && + src->data.nix.reconnect.enabled =3D=3D tgt->data.nix.reconnect= .enabled && + src->data.nix.reconnect.timeout =3D=3D tgt->data.nix.reconnect= .timeout; break; =20 case VIR_DOMAIN_CHR_TYPE_SPICEPORT: --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 20:22:41 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 209.132.183.28 is neither permitted nor denied by domain of redhat.com) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 209.132.183.28 is neither permitted nor denied by domain of redhat.com) 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 1504093256731757.5997866405834; Wed, 30 Aug 2017 04:40:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7AB7B6146E; Wed, 30 Aug 2017 11:40:54 +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 5323C9B517; Wed, 30 Aug 2017 11:40:54 +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 1486A1806107; Wed, 30 Aug 2017 11:40:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v7UBeQS1009143 for ; Wed, 30 Aug 2017 07:40:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8253B9152F; Wed, 30 Aug 2017 11:40:26 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AC4291549 for ; Wed, 30 Aug 2017 11:40:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7AB7B6146E Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 30 Aug 2017 13:40:16 +0200 Message-Id: <8646b1253cad692a5ff0c10aeaa89b02cd0df25b.1504093198.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/5] tests: don't use unix socket path that matches auto-generated path 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 30 Aug 2017 11:40:55 +0000 (UTC) X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The test was introduced by 60135b22db6d. The auto-generated path is removed by post-parse callback which also changes the mode from "connect" to "bind" since the auto-generated path makes sense only for "bind" mode. Signed-off-by: Pavel Hrdina --- tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args | 6 ++---- tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.xml | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args b/t= ests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args index 133a2c6039..8c6586e483 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args @@ -23,14 +23,12 @@ server,nowait \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x3 \ -device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ -usb \ --chardev socket,id=3Dcharsmartcard0,path=3D/tmp/channel/domain-oldname/asd= f,\ -reconnect=3D20 \ +-chardev socket,id=3Dcharsmartcard0,path=3D/tmp/channel/asdf,reconnect=3D2= 0 \ -device ccid-card-passthru,chardev=3Dcharsmartcard0,id=3Dsmartcard0,bus=3D= ccid0.0 \ -chardev socket,id=3Dcharchannel0,host=3Dlocalhost,port=3D1234,reconnect= =3D10 \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,\ id=3Dchannel0,name=3Dasdf \ --chardev socket,id=3Dcharchannel1,path=3D/tmp/channel/domain--1-QEMUGuest1= /fdsa,\ -server,nowait,reconnect=3D0 \ +-chardev socket,id=3Dcharchannel1,path=3D/tmp/channel/fdsa,reconnect=3D0 \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel= 1,\ id=3Dchannel1,name=3Dfdsa \ -chardev socket,id=3Dcharredir0,host=3Dlocalhost,port=3D3456,reconnect=3D1= 5 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.xml b/te= sts/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.xml index e0664b2a95..41ee248db3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.xml @@ -18,7 +18,7 @@ - + @@ -29,7 +29,7 @@ - + --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 20:22:41 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 209.132.183.28 is neither permitted nor denied by domain of redhat.com) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 209.132.183.28 is neither permitted nor denied by domain of redhat.com) 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 1504093279761304.7401650817229; Wed, 30 Aug 2017 04:41:19 -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 A88497E445; Wed, 30 Aug 2017 11:41:17 +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 85C5A8F345; Wed, 30 Aug 2017 11:41:17 +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 4FFAB3FC75; Wed, 30 Aug 2017 11:41:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v7UBeR9X009149 for ; Wed, 30 Aug 2017 07:40:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 544A89155C; Wed, 30 Aug 2017 11:40:27 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFBF79155A for ; Wed, 30 Aug 2017 11:40:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A88497E445 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 30 Aug 2017 13:40:17 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/5] conf: make sure that chardev reconnect is formatted only for connect mode 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.27]); Wed, 30 Aug 2017 11:41:18 +0000 (UTC) X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/conf/domain_conf.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f7574d77b6..7f443e5b4d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -23257,8 +23257,9 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virBufferAsprintf(&attrBuf, " tlsFromConfig=3D'%d'", def->data.tcp.tlsFromConfig); =20 - virDomainChrSourceReconnectDefFormat(&childBuf, - &def->data.tcp.reconnect); + if (!def->data.tcp.listen) + virDomainChrSourceReconnectDefFormat(&childBuf, + &def->data.tcp.reconnect); =20 if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) goto error; @@ -23276,8 +23277,9 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virDomainSourceDefFormatSeclabel(&childBuf, def->nseclabels, def->seclabels, flags); =20 - virDomainChrSourceReconnectDefFormat(&childBuf, - &def->data.nix.reconnect); + if (!def->data.nix.listen) + virDomainChrSourceReconnectDefFormat(&childBuf, + &def->data.nix.reconn= ect); =20 if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < = 0) goto error; --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 20:22:41 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 209.132.183.28 is neither permitted nor denied by domain of redhat.com) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 209.132.183.28 is neither permitted nor denied by domain of redhat.com) 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 1504093301063208.35316972690543; Wed, 30 Aug 2017 04:41:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C21C1C0587DB; Wed, 30 Aug 2017 11:41:38 +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 9DC5887F80; Wed, 30 Aug 2017 11:41:38 +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 668573FACF; Wed, 30 Aug 2017 11:41:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v7UBeS9M009161 for ; Wed, 30 Aug 2017 07:40:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2481F91549; Wed, 30 Aug 2017 11:40:28 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id A12319152F for ; Wed, 30 Aug 2017 11:40:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C21C1C0587DB Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 30 Aug 2017 13:40:18 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/5] qemu: make sure that chardev reconnect is formatted only for connect mode 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 30 Aug 2017 11:41:39 +0000 (UTC) X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/qemu/qemu_command.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9a27987d4a..2bc6bea888 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5159,8 +5159,8 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, =20 if (dev->data.tcp.listen) virBufferAdd(&buf, nowait ? ",server,nowait" : ",server", -1); - - qemuBuildChrChardevReconnectStr(&buf, &dev->data.tcp.reconnect); + else + qemuBuildChrChardevReconnectStr(&buf, &dev->data.tcp.reconnect= ); =20 if (dev->data.tcp.haveTLS =3D=3D VIR_TRISTATE_BOOL_YES) { qemuDomainChrSourcePrivatePtr chrSourcePriv =3D @@ -5195,8 +5195,8 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, virQEMUBuildBufferEscapeComma(&buf, dev->data.nix.path); if (dev->data.nix.listen) virBufferAdd(&buf, nowait ? ",server,nowait" : ",server", -1); - - qemuBuildChrChardevReconnectStr(&buf, &dev->data.nix.reconnect); + else + qemuBuildChrChardevReconnectStr(&buf, &dev->data.nix.reconnect= ); break; =20 case VIR_DOMAIN_CHR_TYPE_SPICEVMC: --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list