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 might not yet exist. However, it has to exist when starting domain. Therefore it makes more sense to query its name at that point. Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- 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/qemu/qemu_command.c b/src/qemu/qemu_command.c index 015af1036..44f778b7b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -52,6 +52,7 @@ #include "secret_conf.h" #include "network/bridge_driver.h" #include "virnetdevtap.h" +#include "virnetdevopenvswitch.h" #include "device_conf.h" #include "virstoragefile.h" #include "virtpm.h" @@ -8310,6 +8311,9 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, NULL, 0, NULL, 0))) goto error; + if (virNetDevOpenvswitchGetVhostuserIfname(net->data.vhostuser->data.nix.path, + &net->ifname) < 0) + goto error; virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, chardev); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 698632489..2d668f616 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3473,20 +3473,12 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, def->emulator); } - if (dev->type == VIR_DOMAIN_DEVICE_NET) { - if (dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && - !dev->data.net->model) { - if (VIR_STRDUP(dev->data.net->model, - qemuDomainDefaultNetModel(def, qemuCaps)) < 0) - goto cleanup; - } - if (dev->data.net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && - !dev->data.net->ifname) { - if (virNetDevOpenvswitchGetVhostuserIfname( - dev->data.net->data.vhostuser->data.nix.path, - &dev->data.net->ifname) < 0) - goto cleanup; - } + if (dev->type == VIR_DOMAIN_DEVICE_NET && + dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && + !dev->data.net->model) { + if (VIR_STRDUP(dev->data.net->model, + qemuDomainDefaultNetModel(def, qemuCaps)) < 0) + goto cleanup; } /* set default disk types and drivers */ 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); diff --git a/tests/Makefile.am b/tests/Makefile.am index 7673329f2..19986dc99 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -288,7 +288,6 @@ test_helpers += qemucapsprobe test_libraries += libqemumonitortestutils.la \ libqemutestdriver.la \ qemuxml2argvmock.la \ - qemuxml2xmlmock.la \ qemucaps2xmlmock.la \ qemucapsprobemock.la \ qemucpumock.la \ @@ -575,12 +574,6 @@ qemuxml2argvmock_la_CFLAGS = $(AM_CFLAGS) qemuxml2argvmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) qemuxml2argvmock_la_LIBADD = $(MOCKLIBS_LIBS) -qemuxml2xmlmock_la_SOURCES = \ - qemuxml2xmlmock.c -qemuxml2xmlmock_la_CFLAGS = $(AM_CFLAGS) -qemuxml2xmlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) -qemuxml2xmlmock_la_LIBADD = $(MOCKLIBS_LIBS) - qemuxml2xmltest_SOURCES = \ qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h diff --git a/tests/qemuxml2xmlmock.c b/tests/qemuxml2xmlmock.c deleted file mode 100644 index 0d3e6f2bd..000000000 --- a/tests/qemuxml2xmlmock.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2016 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - * - * Author: Michal Privoznik <mprivozn@xxxxxxxxxx> - */ - -#include <config.h> - -#include "virnetdevopenvswitch.h" -#include "virstring.h" - -#define VIR_FROM_THIS VIR_FROM_NONE - -int -virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED, - char **ifname) -{ - return VIR_STRDUP(*ifname, "vhost-user0"); -} diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml index a4f4e4142..b7f1bdc57 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml @@ -30,14 +30,12 @@ <interface type='vhostuser'> <mac address='52:54:00:ee:96:6b'/> <source type='unix' path='/tmp/vhost0.sock' mode='server'/> - <target dev='vhost-user0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6c'/> <source type='unix' path='/tmp/vhost1.sock' mode='client'/> - <target dev='vhost-user0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </interface> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index fff13e236..6aececb59 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1142,7 +1142,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemuxml2xmlmock.so") +VIR_TEST_MAIN(mymain) #else -- 2.13.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
