From nobody Wed Apr 29 20:23:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1745925661; cv=none; d=zohomail.com; s=zohoarc; b=aqddd1Atspj8P3oPzy0rJmReMFgXCE/71gw0pQtNSvf6bbtXsgGRxzi12Ck+doxxLLluHx1tqYn36vVRY7+Okt+V9UkTAOfp985s/7II3RsAgepwXjqNe1GwAki/nY93Ik8raw0aiJj9ZtpDbFf2SMgHtb3V73UCDK6WLi6t5hs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745925661; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=D0YMPd823ui7izAna/BUfQR5yMq+NVNi8SsDV3OnKCw=; b=MESS6n0Vx/uCcaoIdLDQllzA3jZcO2c4zBVG6SIQ7Twva9yL5YVGnHwDDTkFX6/KkTdj3ovkKVdi0AiBDwxru86ogaVI9LtOEJmQxYby8+od6v0TF4iqzlLqcmQGhPGkSr/PHjFLZeZEJMzlY5UJu7kEzbsOz0L3bttp+6VQ1/g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1745925661348905.6652070315756; Tue, 29 Apr 2025 04:21:01 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 61CA013F8; Tue, 29 Apr 2025 07:21:00 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A2CED1453; Tue, 29 Apr 2025 07:15:16 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0DFED145A; Tue, 29 Apr 2025 07:15:07 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D37AB141C for ; Tue, 29 Apr 2025 07:14:42 -0400 (EDT) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-517-GnF4S7w1NcunGV-9XfN9EA-1; Tue, 29 Apr 2025 07:14:41 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5E13C1955DC5 for ; Tue, 29 Apr 2025 11:14:40 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.98]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 43219195608D; Tue, 29 Apr 2025 11:14:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745925282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0ZG7bzrKG7kwcnpPGi5+wn3C4OoxB5LR5z2lhUSAkCU=; b=CLhpqCy8C9QgzOTDwBaJLvw5dPRrmlJc597CKs0Pr+YQ+0zluxbn4QhTRCOyS4BqqqvDhh tnExkLL+zf8FfSFb05bkg9d4EMvAwce/p+cO46V8Ai+Z21GT/aN1Dbtybg4NaOwcYeswX7 djhzMg+mr88KQAUUgteLptkd5ayqrYQ= X-MC-Unique: GnF4S7w1NcunGV-9XfN9EA-1 X-Mimecast-MFC-AGG-ID: GnF4S7w1NcunGV-9XfN9EA_1745925280 To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 15/20] util: remove use hardcoded OVS_VSCTL path Date: Tue, 29 Apr 2025 12:14:15 +0100 Message-ID: <20250429111420.1748521-16-berrange@redhat.com> In-Reply-To: <20250429111420.1748521-1-berrange@redhat.com> References: <20250429111420.1748521-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: pnM38IbxBEpo9WXBLJ2Zg5_VA6ph_VtAPppeMm5lR4A_1745925280 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: R7SONYYFAY5TQPEN6VQH4CBTO4G7OOWJ X-Message-ID-Hash: R7SONYYFAY5TQPEN6VQH4CBTO4G7OOWJ X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1745925664649019100 Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 Allow virCommand to find 'ovs-vsctl' in $PATH. This command is only used when running privileged in which case both 'bin' and 'sbin' dirs will be in $PATH, so virFindFileInPath will do the right thing to find it. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Krempa --- meson.build | 1 - src/util/virnetdevopenvswitch.c | 4 +- tests/virnetdevbandwidthtest.c | 52 +++++++++++----------- tests/virnetdevopenvswitchtest.c | 74 ++++++++++++++++---------------- 4 files changed, 65 insertions(+), 66 deletions(-) diff --git a/meson.build b/meson.build index 3022f0b984..0515820cdd 100644 --- a/meson.build +++ b/meson.build @@ -854,7 +854,6 @@ optional_test_programs =3D [ ] =20 optional_programs =3D [ - 'ovs-vsctl', 'tc', ] + optional_test_programs =20 diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitc= h.c index 0f5d23b794..868d6d26ba 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -56,7 +56,7 @@ virNetDevOpenvswitchSetTimeout(unsigned int timeout) static virCommand * virNetDevOpenvswitchCreateCmd(char **errbuf) { - virCommand *cmd =3D virCommandNew(OVS_VSCTL); + virCommand *cmd =3D virCommandNew("ovs-vsctl"); =20 virCommandAddArgFormat(cmd, "--timeout=3D%u", virNetDevOpenvswitchTime= out); if (errbuf) @@ -552,7 +552,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, g_autofree char *absoluteOvsVsctlPath =3D NULL; int status; =20 - if (!(absoluteOvsVsctlPath =3D virFindFileInPath(OVS_VSCTL))) { + if (!(absoluteOvsVsctlPath =3D virFindFileInPath("ovs-vsctl"))) { /* If there is no 'ovs-vsctl' then the interface is * probably not an OpenVSwitch interface and the @path to * socket was created by some DPDK testing script (e.g. diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 31aa7f469d..b7cf546d9f 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -152,13 +152,13 @@ mymain(void) TC " class add dev eth0 parent 1: classid 1:1 htb rate 102= 4kbps quantum 87\n" TC " qdisc add dev eth0 parent 1:1 handle 2: sfq perturb 1= 0\n" TC " filter add dev eth0 parent 1:0 protocol all prio 1 ha= ndle 1 fw flowid 1\n", - OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid f= ind queue 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"et= h0\"'\n" - OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid f= ind qos 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0= \"'\n" - OVS_VSCTL " --timeout=3D5 set port eth0 qos=3D@qos1 'exter= nal-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0\"' --" - " --id=3D@qos1 create qos type=3Dlinux-htb other= _config:min-rate=3D8192000 queues:0=3D@queue0 'external-ids:vm-id=3D\"" VMU= UID "\"'" - " 'external-ids:ifname=3D\"eth0\"' --" - " --id=3D@queue0 create queue other_config:min-r= ate=3D8192000 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D= \"eth0\"'\n" - OVS_VSCTL " --timeout=3D5 set Interface eth0 ingress_polic= ing_rate=3D0 ingress_policing_burst=3D0\n"); + "ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid fi= nd queue 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth= 0\"'\n" + "ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid fi= nd qos 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0\= "'\n" + "ovs-vsctl --timeout=3D5 set port eth0 qos=3D@qos1 'extern= al-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0\"' --" + " --id=3D@qos1 create qos type=3Dlinux-htb other_= config:min-rate=3D8192000 queues:0=3D@queue0 'external-ids:vm-id=3D\"" VMUU= ID "\"'" + " 'external-ids:ifname=3D\"eth0\"' --" + " --id=3D@queue0 create queue other_config:min-ra= te=3D8192000 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\= "eth0\"'\n" + "ovs-vsctl --timeout=3D5 set Interface eth0 ingress_polici= ng_rate=3D0 ingress_policing_burst=3D0\n"); =20 DO_TEST_SET("" " " @@ -168,9 +168,9 @@ mymain(void) TC " qdisc add dev eth0 ingress\n" TC " filter add dev eth0 parent ffff: protocol all u32 mat= ch u32 0 0" " police rate 1024kbps burst 1024kb mtu 64kb drop flowi= d :1\n", - OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid f= ind queue 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"et= h0\"'\n" - OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid f= ind qos 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0= \"'\n" - OVS_VSCTL " --timeout=3D5 set Interface eth0 ingress_polic= ing_rate=3D8192\n"); + "ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid fi= nd queue 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth= 0\"'\n" + "ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid fi= nd qos 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0\= "'\n" + "ovs-vsctl --timeout=3D5 set Interface eth0 ingress_polici= ng_rate=3D8192\n"); =20 DO_TEST_SET("" " " @@ -186,14 +186,14 @@ mymain(void) TC " qdisc add dev eth0 ingress\n" TC " filter add dev eth0 parent ffff: protocol all u32 mat= ch u32 0 0" " police rate 5kbps burst 7kb mtu 64kb drop flowid :1\n= ", - OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid f= ind queue 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"et= h0\"'\n" - OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid f= ind qos 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0= \"'\n" - OVS_VSCTL " --timeout=3D5 set port eth0 qos=3D@qos1 'exter= nal-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0\"' --" - " --id=3D@qos1 create qos type=3Dlinux-htb other= _config:min-rate=3D8000 other_config:burst=3D32768 other_config:max-rate=3D= 16000" - " queues:0=3D@queue0 'external-ids:vm-id=3D\""= VMUUID "\"' 'external-ids:ifname=3D\"eth0\"' --" - " --id=3D@queue0 create queue other_config:min-r= ate=3D8000 other_config:burst=3D32768 other_config:max-rate=3D16000" - " 'external-ids:vm-id=3D\"" VMUUID "\"' 'exter= nal-ids:ifname=3D\"eth0\"'\n" - OVS_VSCTL " --timeout=3D5 set Interface eth0 ingress_polic= ing_rate=3D40 ingress_policing_burst=3D56\n"); + "ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid fi= nd queue 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth= 0\"'\n" + "ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid fi= nd qos 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0\= "'\n" + "ovs-vsctl --timeout=3D5 set port eth0 qos=3D@qos1 'extern= al-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0\"' --" + " --id=3D@qos1 create qos type=3Dlinux-htb other_= config:min-rate=3D8000 other_config:burst=3D32768 other_config:max-rate=3D1= 6000" + " queues:0=3D@queue0 'external-ids:vm-id=3D\"" = VMUUID "\"' 'external-ids:ifname=3D\"eth0\"' --" + " --id=3D@queue0 create queue other_config:min-ra= te=3D8000 other_config:burst=3D32768 other_config:max-rate=3D16000" + " 'external-ids:vm-id=3D\"" VMUUID "\"' 'extern= al-ids:ifname=3D\"eth0\"'\n" + "ovs-vsctl --timeout=3D5 set Interface eth0 ingress_polici= ng_rate=3D40 ingress_policing_burst=3D56\n"); =20 DO_TEST_SET("" " " @@ -210,14 +210,14 @@ mymain(void) TC " filter add dev eth0 parent ffff: protocol all u32 mat= ch" " u32 0 0 police rate 4294967295kbps burst 4194303kb mt= u 64kb" " drop flowid :1\n", - OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid f= ind queue 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"et= h0\"'\n" - OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid f= ind qos 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0= \"'\n" - OVS_VSCTL " --timeout=3D5 set port eth0 qos=3D@qos1 'exter= nal-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0\"' --" - " --id=3D@qos1 create qos type=3Dlinux-htb other= _config:min-rate=3D34359738360000" - " queues:0=3D@queue0 'external-ids:vm-id=3D\""= VMUUID "\"' 'external-ids:ifname=3D\"eth0\"' --" - " --id=3D@queue0 create queue other_config:min-r= ate=3D34359738360000 'external-ids:vm-id=3D\"" VMUUID "\"'" - " 'external-ids:ifname=3D\"eth0\"'\n" - OVS_VSCTL " --timeout=3D5 set Interface eth0 ingress_polic= ing_rate=3D34359738360\n"); + "ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid fi= nd queue 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth= 0\"'\n" + "ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid fi= nd qos 'external-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0\= "'\n" + "ovs-vsctl --timeout=3D5 set port eth0 qos=3D@qos1 'extern= al-ids:vm-id=3D\"" VMUUID "\"' 'external-ids:ifname=3D\"eth0\"' --" + " --id=3D@qos1 create qos type=3Dlinux-htb other_= config:min-rate=3D34359738360000" + " queues:0=3D@queue0 'external-ids:vm-id=3D\"" = VMUUID "\"' 'external-ids:ifname=3D\"eth0\"' --" + " --id=3D@queue0 create queue other_config:min-ra= te=3D34359738360000 'external-ids:vm-id=3D\"" VMUUID "\"'" + " 'external-ids:ifname=3D\"eth0\"'\n" + "ovs-vsctl --timeout=3D5 set Interface eth0 ingress_polici= ng_rate=3D34359738360\n"); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/virnetdevopenvswitchtest.c b/tests/virnetdevopenvswitcht= est.c index 6e93f5e65a..ffd75ad044 100644 --- a/tests/virnetdevopenvswitchtest.c +++ b/tests/virnetdevopenvswitchtest.c @@ -259,22 +259,22 @@ mymain(void) DO_TEST_SET(("" " " ""), - (OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid = find queue" - " 'external-ids:vm-id=3D\"66616b65-7575-6964-00= 00-000000000000\"'" - " 'external-ids:ifname=3D\"tap-fake\"'\n" - OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid = find qos" - " 'external-ids:vm-id=3D\"66616b65-7575-6964-00= 00-000000000000\"'" - " 'external-ids:ifname=3D\"tap-fake\"'\n" - OVS_VSCTL " --timeout=3D5 set port tap-fake qos=3D@qos1" - " 'external-ids:vm-id=3D\"66616b65-7575-6964-00= 00-000000000000\"'" - " 'external-ids:ifname=3D\"tap-fake\"'" - " -- --id=3D@qos1 create qos type=3Dlinux-htb o= ther_config:min-rate=3D160000000" - " queues:0=3D@queue0 'external-ids:vm-id=3D\"66= 616b65-7575-6964-0000-000000000000\"'" - " 'external-ids:ifname=3D\"tap-fake\"'" - " -- --id=3D@queue0 create queue other_config:m= in-rate=3D160000000 " - "'external-ids:vm-id=3D\"66616b65-7575-6964-000= 0-000000000000\"'" - " 'external-ids:ifname=3D\"tap-fake\"'\n" - OVS_VSCTL " --timeout=3D5 set Interface tap-fake ingress_= policing_rate=3D0 ingress_policing_burst=3D0\n")); + ("ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid f= ind queue" + " 'external-ids:vm-id=3D\"66616b65-7575-6964-000= 0-000000000000\"'" + " 'external-ids:ifname=3D\"tap-fake\"'\n" + "ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid f= ind qos" + " 'external-ids:vm-id=3D\"66616b65-7575-6964-000= 0-000000000000\"'" + " 'external-ids:ifname=3D\"tap-fake\"'\n" + "ovs-vsctl --timeout=3D5 set port tap-fake qos=3D@qos1" + " 'external-ids:vm-id=3D\"66616b65-7575-6964-000= 0-000000000000\"'" + " 'external-ids:ifname=3D\"tap-fake\"'" + " -- --id=3D@qos1 create qos type=3Dlinux-htb ot= her_config:min-rate=3D160000000" + " queues:0=3D@queue0 'external-ids:vm-id=3D\"666= 16b65-7575-6964-0000-000000000000\"'" + " 'external-ids:ifname=3D\"tap-fake\"'" + " -- --id=3D@queue0 create queue other_config:mi= n-rate=3D160000000 " + "'external-ids:vm-id=3D\"66616b65-7575-6964-0000= -000000000000\"'" + " 'external-ids:ifname=3D\"tap-fake\"'\n" + "ovs-vsctl --timeout=3D5 set Interface tap-fake ingress_p= olicing_rate=3D0 ingress_policing_burst=3D0\n")); =20 DO_TEST_SET(NULL, NULL); =20 @@ -283,25 +283,25 @@ mymain(void) DO_TEST_SET(("" " " ""), - (OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid = find queue" - " 'external-ids:vm-id=3D\"66616b65-7575-6964-00= 00-000000000000\"'" - " 'external-ids:ifname=3D\"tap-fake\"'\n" - OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid = find qos" - " 'external-ids:vm-id=3D\"66616b65-7575-6964-00= 00-000000000000\"'" - " 'external-ids:ifname=3D\"tap-fake\"'\n" - OVS_VSCTL " --timeout=3D5 set Interface tap-fake ingress_= policing_rate=3D0 ingress_policing_burst=3D0\n")); + ("ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid f= ind queue" + " 'external-ids:vm-id=3D\"66616b65-7575-6964-000= 0-000000000000\"'" + " 'external-ids:ifname=3D\"tap-fake\"'\n" + "ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid f= ind qos" + " 'external-ids:vm-id=3D\"66616b65-7575-6964-000= 0-000000000000\"'" + " 'external-ids:ifname=3D\"tap-fake\"'\n" + "ovs-vsctl --timeout=3D5 set Interface tap-fake ingress_p= olicing_rate=3D0 ingress_policing_burst=3D0\n")); =20 DO_TEST_SET(("" " " " " ""), - (OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid = find queue" - " 'external-ids:vm-id=3D\"66616b65-7575-6964-00= 00-000000000000\"'" - " 'external-ids:ifname=3D\"tap-fake\"'\n" - OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D_uuid = find qos" - " 'external-ids:vm-id=3D\"66616b65-7575-6964-00= 00-000000000000\"'" - " 'external-ids:ifname=3D\"tap-fake\"'\n" - OVS_VSCTL " --timeout=3D5 set Interface tap-fake ingress_= policing_rate=3D40000\n")); + ("ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid f= ind queue" + " 'external-ids:vm-id=3D\"66616b65-7575-6964-000= 0-000000000000\"'" + " 'external-ids:ifname=3D\"tap-fake\"'\n" + "ovs-vsctl --timeout=3D5 --no-heading --columns=3D_uuid f= ind qos" + " 'external-ids:vm-id=3D\"66616b65-7575-6964-000= 0-000000000000\"'" + " 'external-ids:ifname=3D\"tap-fake\"'\n" + "ovs-vsctl --timeout=3D5 set Interface tap-fake ingress_p= olicing_rate=3D40000\n")); =20 #define DO_TEST_CLEAR_QOS(Iface, Vmid, Exp_cmd, ...) \ do { \ @@ -316,13 +316,13 @@ mymain(void) } while (0) =20 DO_TEST_CLEAR_QOS(("fake-iface"), vm_id, - (OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D= _uuid find queue" - " 'external-ids:vm-id=3D\"66616b65-7575-6= 964-0000-000000000000\"'" - " 'external-ids:ifname=3D\"fake-iface\"'\= n" - OVS_VSCTL " --timeout=3D5 --no-heading --columns=3D= _uuid find qos" - " 'external-ids:vm-id=3D\"66616b65-7575-6= 964-0000-000000000000\"'" - " 'external-ids:ifname=3D\"fake-iface\"'\= n" - OVS_VSCTL " --timeout=3D5 set Interface fake-iface = ingress_policing_rate=3D0 ingress_policing_burst=3D0\n")); + ("ovs-vsctl --timeout=3D5 --no-heading --columns=3D_= uuid find queue" + " 'external-ids:vm-id=3D\"66616b65-7575-69= 64-0000-000000000000\"'" + " 'external-ids:ifname=3D\"fake-iface\"'\n" + "ovs-vsctl --timeout=3D5 --no-heading --columns=3D_= uuid find qos" + " 'external-ids:vm-id=3D\"66616b65-7575-69= 64-0000-000000000000\"'" + " 'external-ids:ifname=3D\"fake-iface\"'\n" + "ovs-vsctl --timeout=3D5 set Interface fake-iface i= ngress_policing_rate=3D0 ingress_policing_burst=3D0\n")); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } --=20 2.49.0