Re: [PATCH] util: Remove '\n' from vhostuser ifname

[Michal Privoznik]

On 2/5/21 4:10 AM, Yalei Li wrote:

When deleting the vhostuserclient interface, OVS prompts that the interface 
does not exist,
Through the XML file, I found that the "target dev" has a '\n', results in an 
XML parsing error.

XML file:



That is because 'ovs-vsctl' returns a newline result, always come with a '\n',
and the vircommandrun function puts it in ifname.

So virNetDevOpenvswitchGetVhostuserIfname should remove '\n' from ifname.

Signed-off-by: Yalei Li 
---
  src/util/virnetdevopenvswitch.c | 1 +
  1 file changed, 1 insertion(+)


Oh sorry, I saw you posted this two weeks ago and had it marked for 
review but then got distracted. I've added Daniel's reviewed by tag, 
added mine and pushed.


Reviewed-by: Michal Privoznik 

Congratulations on your first libvirt contribution!

Michal

[PATCH] util: Remove '\n' from vhostuser ifname

[Yalei Li]

When deleting the vhostuserclient interface, OVS prompts that the interface 
does not exist,
Through the XML file, I found that the "target dev" has a '\n', results in an 
XML parsing error.

XML file:



That is because 'ovs-vsctl' returns a newline result, always come with a '\n',
and the vircommandrun function puts it in ifname.

So virNetDevOpenvswitchGetVhostuserIfname should remove '\n' from ifname.

Signed-off-by: Yalei Li 
---
 src/util/virnetdevopenvswitch.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index f9b3369b2a..bd840bd3b7 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -575,6 +575,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
 return 0;
 }
 
+virStringTrimOptionalNewline(*ifname);
 if (virNetDevOpenvswitchMaybeUnescapeReply(*ifname) < 0) {
 VIR_FREE(*ifname);
 return -1;
-- 
2.27.0