]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
util: Remove '\n' from vhostuser ifname
authorYalei Li <274268859@qq.com>
Fri, 5 Feb 2021 03:10:51 +0000 (11:10 +0800)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 5 Feb 2021 08:57:14 +0000 (09:57 +0100)
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:

<target dev='vm-20ac9c030a47
'/>

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 <liyl43@chinatelecom.cn>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/util/virnetdevopenvswitch.c

index f9b3369b2a5aff91f08188bfe93d4d31d5d55b27..bd840bd3b78d074108773e8dd54c5eeaccb534a8 100644 (file)
@@ -575,6 +575,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
         return 0;
     }
 
+    virStringTrimOptionalNewline(*ifname);
     if (virNetDevOpenvswitchMaybeUnescapeReply(*ifname) < 0) {
         VIR_FREE(*ifname);
         return -1;