On Wed, Jun 07, 2017 at 05:41:30PM +0200, Michal Privoznik wrote:
https://bugzilla.redhat.com/show_bug.cgi?id=1459091
Currently, we are querying for vhostuser interface name in post
parse callback. It doesn't hurt much, but at that time interface
s/It doesn't hurt much, but a/A/
It hurts me.
Ideally XML parsing would not depend on host state. It's bad enough
we have to probe QEMU capabilities.
might not yet exist. However, it has to exist when starting
domain. Therefore it makes more sense to query its name at that
point.
It would be nice to mention that this partially reverts commit 57b5e27
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_command.c | 4 +++
src/qemu/qemu_domain.c | 20 ++++---------
src/util/virnetdevopenvswitch.c | 1 +
tests/Makefile.am | 7 -----
tests/qemuxml2xmlmock.c | 33 ----------------------
.../qemuxml2xmlout-net-vhostuser.xml | 2 --
tests/qemuxml2xmltest.c | 2 +-
7 files changed, 12 insertions(+), 57 deletions(-)
delete mode 100644 tests/qemuxml2xmlmock.c
diff --git a/src/util/virnetdevopenvswitch.c
b/src/util/virnetdevopenvswitch.c
index 42abcb4bb..8f7215e06 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -444,6 +444,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
goto cleanup;
}
+ tmpIfname++;
cmd = virCommandNew(OVSVSCTL);
virNetDevOpenvswitchAddTimeout(cmd);
virCommandAddArgList(cmd, "get", "Interface", tmpIfname,
"name", NULL);
Unrelated hunk. If it's necessary, please resend it separately.
ACK with the hunk removed
Jan