[libvirt] [PATCH v3] network: Bring netdevs online later
Martin Kletzander
mkletzan at redhat.com
Thu Oct 2 11:52:05 UTC 2014
On Tue, Sep 16, 2014 at 04:50:53PM -0400, Matthew Rosato wrote:
>Currently, MAC registration occurs during device creation, which is
>early enough that, during live migration, you end up with duplicate
>MAC addresses on still-running source and target devices, even though
>the target device isn't actually being used yet.
>This patch proposes to defer MAC registration until right before
>the guest can actually use the device -- In other words, right
>before starting guest CPUs.
>
>Signed-off-by: Matthew Rosato <mjrosato at linux.vnet.ibm.com>
>---
>
>Associated BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1081461
>
>Changes for v3:
> * Some minor formatting fixes.
> * in qemuNetworkIfaceConnect, set VIR_NETDEV_TAP_CREATE_IFUP
> unconditionally.
> * in qemuDomainAttachNetDevice, call qemuInterfaceStartDevice only for
> VIR_DOMAIN_NET_TYPE_DIRECT, _BRIDGE and _NETWORK.
> * in qemuProcessStartCPUs, use 'reason' to determine whether or not
> qemuInterfaceStartDevices needs to be called. Basically, it needs
> to be called for any reason that the system would be initializing
> (or re-initializing).
>
To be honest, I must've looked at my previous reviews after reviewing
this patch and I saw I am hesitant in the same places I was last time.
Anyway, as I said, I'm not that certain with this part of the
codebase, so bear with me here :)
> src/Makefile.am | 3 +-
> src/conf/domain_conf.h | 2 ++
> src/lxc/lxc_process.c | 4 ++-
> src/qemu/qemu_command.c | 3 ++
> src/qemu/qemu_hotplug.c | 8 +++++
> src/qemu/qemu_interface.c | 78 +++++++++++++++++++++++++++++++++++++++++++
> src/qemu/qemu_interface.h | 32 ++++++++++++++++++
> src/qemu/qemu_process.c | 7 ++++
> src/util/virnetdevmacvlan.c | 8 +++--
> src/util/virnetdevmacvlan.h | 2 ++
> 10 files changed, 142 insertions(+), 5 deletions(-)
> create mode 100644 src/qemu/qemu_interface.c
> create mode 100644 src/qemu/qemu_interface.h
>
>diff --git a/src/Makefile.am b/src/Makefile.am
>index fa741a8..035120e 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -703,7 +703,8 @@ QEMU_DRIVER_SOURCES = \
> qemu/qemu_monitor_text.h \
> qemu/qemu_monitor_json.c \
> qemu/qemu_monitor_json.h \
>- qemu/qemu_driver.c qemu/qemu_driver.h
>+ qemu/qemu_driver.c qemu/qemu_driver.h \
>+ qemu/qemu_interface.c qemu/qemu_interface.h
>
> XENAPI_DRIVER_SOURCES = \
> xenapi/xenapi_driver.c xenapi/xenapi_driver.h \
>diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
>index 0862bd7..5f328cf 100644
>--- a/src/conf/domain_conf.h
>+++ b/src/conf/domain_conf.h
>@@ -951,6 +951,8 @@ struct _virDomainNetDef {
> virNetDevBandwidthPtr bandwidth;
> virNetDevVlan vlan;
> int linkstate;
>+ /* vmOp value saved if deferring interface start */
>+ virNetDevVPortProfileOp vmOp;
> };
>
> /* Used for prefix of ifname of any network name generated dynamically
>diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
>index ed30c37..b2256c0 100644
>--- a/src/lxc/lxc_process.c
>+++ b/src/lxc/lxc_process.c
>@@ -300,6 +300,7 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn,
> virNetDevBandwidthPtr bw;
> virNetDevVPortProfilePtr prof;
> virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver);
>+ unsigned int macvlan_create_flags = VIR_NETDEV_MACVLAN_CREATE_IFUP;
>
> /* XXX how todo bandwidth controls ?
> * Since the 'net-ifname' is about to be moved to a different
>@@ -336,7 +337,8 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn,
> &res_ifname,
> VIR_NETDEV_VPORT_PROFILE_OP_CREATE,
> cfg->stateDir,
>- virDomainNetGetActualBandwidth(net), 0) < 0)
>+ virDomainNetGetActualBandwidth(net),
>+ macvlan_create_flags) < 0)
> goto cleanup;
>
> ret = res_ifname;
>diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
>index e5270bd..229dff4 100644
>--- a/src/qemu/qemu_command.c
>+++ b/src/qemu/qemu_command.c
>@@ -199,6 +199,9 @@ qemuPhysIfaceConnect(virDomainDefPtr def,
> net->ifname = res_ifname;
> }
>
>+ /* Save vport profile op for later */
>+ net->vmOp = vmop;
>+
> virObjectUnref(cfg);
> return rc;
> }
>diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
>index 7bc19cd..530e6da 100644
>--- a/src/qemu/qemu_hotplug.c
>+++ b/src/qemu/qemu_hotplug.c
>@@ -30,6 +30,7 @@
> #include "qemu_domain.h"
> #include "qemu_command.h"
> #include "qemu_hostdev.h"
>+#include "qemu_interface.h"
> #include "domain_audit.h"
> #include "domain_nwfilter.h"
> #include "virlog.h"
>@@ -922,6 +923,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn,
> priv->qemuCaps, tapfd, &tapfdSize) < 0)
> goto cleanup;
> iface_connected = true;
>+ /* Set device online immediately */
>+ qemuInterfaceStartDevice(net);
> if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0)
> goto cleanup;
> } else if (actualType == VIR_DOMAIN_NET_TYPE_DIRECT) {
>@@ -937,6 +940,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn,
> VIR_NETDEV_VPORT_PROFILE_OP_CREATE)) < 0)
> goto cleanup;
> iface_connected = true;
>+ /* Set device online immediately */
>+ qemuInterfaceStartDevice(net);
> if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0)
> goto cleanup;
> } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) {
Why are you starting the device even if we didn't do that before?
Even if users attaching stopped devices on purpose don't concern me,
why not just call it for type DIRECT ?
>@@ -2070,6 +2075,9 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
> goto cleanup;
> }
>
>+ /* Set device online immediately */
>+ qemuInterfaceStartDevice(newdev);
>+
> newType = virDomainNetGetActualType(newdev);
>
> if (newType == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
And in this hunk it changes the interface up even though the function
can still fail. Either all three calls in this file make something
new, not related to what you describe in the commit message, or I
have missed something.
And we also never set them back to the original state which is not
very nice. Feel free to speak up, if there's a reason for doing this
than we can also adjust documentation.
>diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c
>new file mode 100644
>index 0000000..dccfcc4
>--- /dev/null
>+++ b/src/qemu/qemu_interface.c
>@@ -0,0 +1,78 @@
>+/*
>+ * qemu_interface.c: QEMU interface management
>+ *
>+ * Copyright IBM Corp. 2014
>+ *
>+ * 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/>.
>+ *
>+ * Authors:
>+ * Matthew J. Rosato <mjrosato at linux.vnet.ibm.com>
>+ */
>+
>+#include <config.h>
>+
>+#include "qemu_interface.h"
>+#include "virnetdev.h"
>+#include "virnetdevtap.h"
>+#include "virnetdevmacvlan.h"
>+#include "virnetdevvportprofile.h"
>+
>+/**
>+ * qemuInterfaceStartDevice:
>+ * @net: net device to start
>+ *
>+ * Based upon the type of device provided, perform the appropriate
>+ * work to set the device online.
>+ */
>+void
>+qemuInterfaceStartDevice(virDomainNetDefPtr net)
>+{
>+ switch (virDomainNetGetActualType(net)) {
>+ case VIR_DOMAIN_NET_TYPE_BRIDGE:
>+ case VIR_DOMAIN_NET_TYPE_NETWORK:
>+ if (virNetDevSetOnline(net->ifname, true) < 0) {
>+ ignore_value(virNetDevTapDelete(net->ifname));
>+ }
>+ break;
>+ case VIR_DOMAIN_NET_TYPE_DIRECT:
>+ if (virNetDevSetOnline(net->ifname, true) < 0) {
>+ ignore_value(virNetDevVPortProfileDisassociate(net->ifname,
>+ virDomainNetGetActualVirtPortProfile(net),
>+ &net->mac,
>+ virDomainNetGetActualDirectDev(net),
>+ -1,
>+ net->vmOp));
>+ }
>+ break;
>+ }
>+}
>+
If you fail setting the interface online you clean up, but the caller
cannot recognize whether you failed starting the device or not. That
means that you can, for example, start the domain, it will have the
device, but it won't just be down (maybe it'll be even up), but
disconnected from the bridge and we will be looking pretty long time
for the problem if a bug report with such criteria comes :)
>+/**
>+ * qemuInterfaceStartDevices:
>+ * @def: domain definition
>+ *
>+ * Set all ifaces associated with this domain to the online state.
>+ */
>+void
>+qemuInterfaceStartDevices(virDomainDefPtr def)
>+{
>+ size_t i;
>+
>+ for (i = 0; i < def->nnets; i++) {
>+ qemuInterfaceStartDevice(def->nets[i]);
>+ }
>+
>+ return;
>+}
>diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h
>new file mode 100644
>index 0000000..5810cda
>--- /dev/null
>+++ b/src/qemu/qemu_interface.h
>@@ -0,0 +1,32 @@
>+/*
>+ * qemu_interface.h: QEMU interface management
>+ *
>+ * Copyright IBM Corp. 2014
>+ *
>+ * 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/>.
>+ *
>+ * Authors:
>+ * Matthew J. Rosato <mjrosato at linux.vnet.ibm.com>
>+ */
>+
>+#ifndef __QEMU_INTERFACE_H__
>+# define __QEMU_INTERFACE_H__
>+
>+# include "domain_conf.h"
>+
>+void qemuInterfaceStartDevice(virDomainNetDefPtr net);
>+void qemuInterfaceStartDevices(virDomainDefPtr def);
>+
>+#endif /* __QEMU_INTERFACE_H__ */
>diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
>index f391743..3fc50a0 100644
>--- a/src/qemu/qemu_process.c
>+++ b/src/qemu/qemu_process.c
>@@ -42,6 +42,7 @@
> #include "qemu_hostdev.h"
> #include "qemu_hotplug.h"
> #include "qemu_migration.h"
>+#include "qemu_interface.h"
>
> #include "cpu/cpu.h"
> #include "datatypes.h"
>@@ -2947,6 +2948,12 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm,
> qemuDomainObjPrivatePtr priv = vm->privateData;
> virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
>
>+ /* Bring up netdevs before starting CPUs */
>+ if (reason != VIR_DOMAIN_RUNNING_UNPAUSED &&
>+ reason != VIR_DOMAIN_RUNNING_SAVE_CANCELED) {
>+ qemuInterfaceStartDevices(vm->def);
>+ }
>+
Again, I'm not sure we want to run this in so many cases, but looking
at the code, most of the cases are covered by this. Anyway...
You will not start the device when destination libvirtd is restarted
during QEMU_MIGRATION_PHASE_FINISH2 see the first call from
qemuProcessRecoverMigration().
It think it would be safest to run it only when resuming migration (or
the cases that are affected) and you cannot determine that based on
the @reason (unfortunately, because it looks clean). But it needs to
be called only on circa 4 places if I looked correctly.
> VIR_DEBUG("Using lock state '%s'", NULLSTR(priv->lockState));
> if (virDomainLockProcessResume(driver->lockManager, cfg->uri,
> vm, priv->lockState) < 0) {
>diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
>index c83341c..1edf3ae 100644
>--- a/src/util/virnetdevmacvlan.c
>+++ b/src/util/virnetdevmacvlan.c
>@@ -902,9 +902,11 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname,
> goto link_del_exit;
> }
>
>- if (virNetDevSetOnline(cr_ifname, true) < 0) {
>- rc = -1;
>- goto disassociate_exit;
>+ if (flags & VIR_NETDEV_MACVLAN_CREATE_IFUP) {
>+ if (virNetDevSetOnline(cr_ifname, true) < 0) {
>+ rc = -1;
>+ goto disassociate_exit;
>+ }
> }
>
> if (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) {
>diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h
>index 41aa4e2..41b4014 100644
>--- a/src/util/virnetdevmacvlan.h
>+++ b/src/util/virnetdevmacvlan.h
>@@ -44,6 +44,8 @@ typedef enum {
> VIR_NETDEV_MACVLAN_CREATE_NONE = 0,
> /* Create with a tap device */
> VIR_NETDEV_MACVLAN_CREATE_WITH_TAP = 1 << 0,
>+ /* Bring the interface up */
>+ VIR_NETDEV_MACVLAN_CREATE_IFUP = 1 << 1,
> } virNetDevMacVLanCreateFlags;
>
> int virNetDevMacVLanCreate(const char *ifname,
>--
>1.7.9.5
>
I still see very much unnecessary things being done in this patch and
that leads me to thinking I'm still missing something. Because I can
express myself better with code than sentences, I'd ask what would a
patch like the following one be missing (apart from the fact that I
haven't even tried it, so it might not work)?
diff --git i/src/conf/domain_conf.h w/src/conf/domain_conf.h
index ea201b3..514ff38 100644
--- i/src/conf/domain_conf.h
+++ w/src/conf/domain_conf.h
@@ -970,6 +970,8 @@ struct _virDomainNetDef {
virNetDevBandwidthPtr bandwidth;
virNetDevVlan vlan;
int linkstate;
+ /* vmOp value saved if deferring interface start */
+ virNetDevVPortProfileOp vmOp;
};
/* Used for prefix of ifname of any network name generated dynamically
diff --git i/src/lxc/lxc_process.c w/src/lxc/lxc_process.c
index ed30c37..5e2e998 100644
--- i/src/lxc/lxc_process.c
+++ w/src/lxc/lxc_process.c
@@ -336,7 +336,8 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn,
&res_ifname,
VIR_NETDEV_VPORT_PROFILE_OP_CREATE,
cfg->stateDir,
- virDomainNetGetActualBandwidth(net), 0) < 0)
+ virDomainNetGetActualBandwidth(net),
+ VIR_NETDEV_MACVLAN_CREATE_IFUP) < 0)
goto cleanup;
ret = res_ifname;
diff --git i/src/qemu/qemu_command.c w/src/qemu/qemu_command.c
index eb72451..8106fff 100644
--- i/src/qemu/qemu_command.c
+++ w/src/qemu/qemu_command.c
@@ -199,6 +199,9 @@ qemuPhysIfaceConnect(virDomainDefPtr def,
net->ifname = res_ifname;
}
+ /* Save vport profile op for later */
+ net->vmOp = vmop;
+
virObjectUnref(cfg);
return rc;
}
diff --git i/src/qemu/qemu_driver.c w/src/qemu/qemu_driver.c
index 5cf235b..1b68114 100644
--- i/src/qemu/qemu_driver.c
+++ w/src/qemu/qemu_driver.c
@@ -1903,7 +1903,7 @@ static int qemuDomainResume(virDomainPtr dom)
} else if (state == VIR_DOMAIN_PAUSED) {
if (qemuProcessStartCPUs(driver, vm, dom->conn,
VIR_DOMAIN_RUNNING_UNPAUSED,
- QEMU_ASYNC_JOB_NONE) < 0) {
+ QEMU_ASYNC_JOB_NONE, false) < 0) {
if (virGetLastError() == NULL)
virReportError(VIR_ERR_OPERATION_FAILED,
"%s", _("resume operation failed"));
@@ -3255,7 +3255,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom,
if (was_running && virDomainObjIsActive(vm)) {
rc = qemuProcessStartCPUs(driver, vm, dom->conn,
VIR_DOMAIN_RUNNING_SAVE_CANCELED,
- QEMU_ASYNC_JOB_SAVE);
+ QEMU_ASYNC_JOB_SAVE, false);
if (rc < 0) {
VIR_WARN("Unable to resume guest CPUs after save failure");
event = virDomainEventLifecycleNewFromObj(vm,
@@ -3760,7 +3760,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom,
if (resume && virDomainObjIsActive(vm)) {
if (qemuProcessStartCPUs(driver, vm, dom->conn,
VIR_DOMAIN_RUNNING_UNPAUSED,
- QEMU_ASYNC_JOB_DUMP) < 0) {
+ QEMU_ASYNC_JOB_DUMP, false) < 0) {
event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
@@ -3929,7 +3929,7 @@ static void processWatchdogEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, in
ret = qemuProcessStartCPUs(driver, vm, NULL,
VIR_DOMAIN_RUNNING_UNPAUSED,
- QEMU_ASYNC_JOB_DUMP);
+ QEMU_ASYNC_JOB_DUMP, false);
if (ret < 0)
virReportError(VIR_ERR_OPERATION_FAILED,
@@ -5644,7 +5644,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
if (header->was_running && !start_paused) {
if (qemuProcessStartCPUs(driver, vm, conn,
VIR_DOMAIN_RUNNING_RESTORED,
- QEMU_ASYNC_JOB_NONE) < 0) {
+ QEMU_ASYNC_JOB_NONE, true) < 0) {
if (virGetLastError() == NULL)
virReportError(VIR_ERR_OPERATION_FAILED,
"%s", _("failed to resume domain"));
@@ -12554,7 +12554,7 @@ qemuDomainSnapshotCreateActiveInternal(virConnectPtr conn,
if (resume && virDomainObjIsActive(vm) &&
qemuProcessStartCPUs(driver, vm, conn,
VIR_DOMAIN_RUNNING_UNPAUSED,
- QEMU_ASYNC_JOB_SNAPSHOT) < 0) {
+ QEMU_ASYNC_JOB_SNAPSHOT, false) < 0) {
event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
@@ -13418,7 +13418,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn,
if (resume && virDomainObjIsActive(vm) &&
qemuProcessStartCPUs(driver, vm, conn,
VIR_DOMAIN_RUNNING_UNPAUSED,
- QEMU_ASYNC_JOB_SNAPSHOT) < 0) {
+ QEMU_ASYNC_JOB_SNAPSHOT, false) < 0) {
event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
@@ -14349,7 +14349,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
}
rc = qemuProcessStartCPUs(driver, vm, snapshot->domain->conn,
VIR_DOMAIN_RUNNING_FROM_SNAPSHOT,
- QEMU_ASYNC_JOB_NONE);
+ QEMU_ASYNC_JOB_NONE, true);
if (rc < 0)
goto endjob;
virObjectUnref(event);
@@ -15117,7 +15117,7 @@ qemuDomainBlockPivot(virConnectPtr conn,
if (resume && virDomainObjIsActive(vm) &&
qemuProcessStartCPUs(driver, vm, conn,
VIR_DOMAIN_RUNNING_UNPAUSED,
- QEMU_ASYNC_JOB_NONE) < 0) {
+ QEMU_ASYNC_JOB_NONE, false) < 0) {
virObjectEventPtr event = NULL;
event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED,
diff --git i/src/qemu/qemu_migration.c w/src/qemu/qemu_migration.c
index 284cd5a..ea061b2 100644
--- i/src/qemu/qemu_migration.c
+++ w/src/qemu/qemu_migration.c
@@ -1314,7 +1314,7 @@ qemuMigrationRestoreDomainState(virConnectPtr conn, virDomainObjPtr vm)
/* we got here through some sort of failure; start the domain again */
if (qemuProcessStartCPUs(driver, vm, conn,
VIR_DOMAIN_RUNNING_MIGRATION_CANCELED,
- QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) {
+ QEMU_ASYNC_JOB_MIGRATION_OUT, false) < 0) {
/* Hm, we already know we are in error here. We don't want to
* overwrite the previous error, though, so we just throw something
* to the logs and hope for the best */
@@ -4919,7 +4919,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
*/
if (qemuProcessStartCPUs(driver, vm, dconn,
VIR_DOMAIN_RUNNING_MIGRATED,
- QEMU_ASYNC_JOB_MIGRATION_IN) < 0) {
+ QEMU_ASYNC_JOB_MIGRATION_IN, true) < 0) {
if (virGetLastError() == NULL)
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("resume operation failed"));
diff --git i/src/qemu/qemu_process.c w/src/qemu/qemu_process.c
index 712a25e..d2f4d31 100644
--- i/src/qemu/qemu_process.c
+++ w/src/qemu/qemu_process.c
@@ -593,7 +593,7 @@ qemuProcessFakeReboot(void *opaque)
if (qemuProcessStartCPUs(driver, vm, NULL,
reason,
- QEMU_ASYNC_JOB_NONE) < 0) {
+ QEMU_ASYNC_JOB_NONE, false) < 0) {
if (virGetLastError() == NULL)
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("resume operation failed"));
@@ -2944,7 +2944,7 @@ qemuProcessPrepareMonitorChr(virQEMUDriverConfigPtr cfg,
int
qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm,
virConnectPtr conn, virDomainRunningReason reason,
- qemuDomainAsyncJob asyncJob)
+ qemuDomainAsyncJob asyncJob, bool startDirectIfaces)
{
int ret = -1;
qemuDomainObjPrivatePtr priv = vm->privateData;
@@ -2961,6 +2961,32 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm,
}
VIR_FREE(priv->lockState);
+ if (startDirectIfaces) {
+ size_t i = 0;
+
+ for (i = 0; i < vm->def->nnets; i++){
+ virDomainNetDefPtr net = vm->def->nets[i];
+
+ if (virDomainNetGetActualType(net) != VIR_DOMAIN_NET_TYPE_DIRECT)
+ continue;
+
+ if (virNetDevSetOnline(net->ifname, true) < 0) {
+ const char *netdev = virDomainNetGetActualDirectDev(net);
+ virNetDevVPortProfilePtr vport =
+ virDomainNetGetActualVirtPortProfile(net);
+
+ ignore_value(virNetDevVPortProfileDisassociate(net->ifname,
+ vport,
+ &net->mac,
+ netdev,
+ -1,
+ net->vmOp));
+
+ return -1;
+ }
+ }
+ }
+
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
goto release;
@@ -3145,7 +3171,7 @@ qemuProcessRecoverMigration(virQEMUDriverPtr driver,
vm->def->name);
if (qemuProcessStartCPUs(driver, vm, conn,
VIR_DOMAIN_RUNNING_UNPAUSED,
- QEMU_ASYNC_JOB_NONE) < 0) {
+ QEMU_ASYNC_JOB_NONE, true) < 0) {
VIR_WARN("Could not resume domain %s", vm->def->name);
}
break;
@@ -3186,7 +3212,7 @@ qemuProcessRecoverMigration(virQEMUDriverPtr driver,
reason == VIR_DOMAIN_PAUSED_UNKNOWN)) {
if (qemuProcessStartCPUs(driver, vm, conn,
VIR_DOMAIN_RUNNING_UNPAUSED,
- QEMU_ASYNC_JOB_NONE) < 0) {
+ QEMU_ASYNC_JOB_NONE, false) < 0) {
VIR_WARN("Could not resume domain %s", vm->def->name);
}
}
@@ -3207,7 +3233,7 @@ qemuProcessRecoverMigration(virQEMUDriverPtr driver,
reason == VIR_DOMAIN_PAUSED_UNKNOWN)) {
if (qemuProcessStartCPUs(driver, vm, conn,
VIR_DOMAIN_RUNNING_UNPAUSED,
- QEMU_ASYNC_JOB_NONE) < 0) {
+ QEMU_ASYNC_JOB_NONE, false) < 0) {
VIR_WARN("Could not resume domain %s", vm->def->name);
}
}
@@ -3262,7 +3288,7 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver,
reason == VIR_DOMAIN_PAUSED_UNKNOWN)) {
if (qemuProcessStartCPUs(driver, vm, conn,
VIR_DOMAIN_RUNNING_UNPAUSED,
- QEMU_ASYNC_JOB_NONE) < 0) {
+ QEMU_ASYNC_JOB_NONE, false) < 0) {
VIR_WARN("Could not resume domain '%s' after migration to file",
vm->def->name);
}
@@ -4622,7 +4648,7 @@ int qemuProcessStart(virConnectPtr conn,
/* Allow the CPUS to start executing */
if (qemuProcessStartCPUs(driver, vm, conn,
VIR_DOMAIN_RUNNING_BOOTED,
- QEMU_ASYNC_JOB_NONE) < 0) {
+ QEMU_ASYNC_JOB_NONE, true) < 0) {
if (virGetLastError() == NULL)
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("resume operation failed"));
diff --git i/src/qemu/qemu_process.h w/src/qemu/qemu_process.h
index 5948ea4..6fce0a8 100644
--- i/src/qemu/qemu_process.h
+++ w/src/qemu/qemu_process.h
@@ -33,7 +33,8 @@ int qemuProcessStartCPUs(virQEMUDriverPtr driver,
virDomainObjPtr vm,
virConnectPtr conn,
virDomainRunningReason reason,
- qemuDomainAsyncJob asyncJob);
+ qemuDomainAsyncJob asyncJob,
+ bool startDirectIfaces);
int qemuProcessStopCPUs(virQEMUDriverPtr driver,
virDomainObjPtr vm,
virDomainPausedReason reason,
diff --git i/src/util/virnetdevmacvlan.c w/src/util/virnetdevmacvlan.c
index c83341c..3216b25 100644
--- i/src/util/virnetdevmacvlan.c
+++ w/src/util/virnetdevmacvlan.c
@@ -902,10 +902,9 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname,
goto link_del_exit;
}
- if (virNetDevSetOnline(cr_ifname, true) < 0) {
- rc = -1;
- goto disassociate_exit;
- }
+ if (flags & VIR_NETDEV_MACVLAN_CREATE_IFUP &&
+ (rc = virNetDevSetOnline(cr_ifname, true)) < 0)
+ goto disassociate_exit;
if (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) {
if ((rc = virNetDevMacVLanTapOpen(cr_ifname, 10)) < 0)
diff --git i/src/util/virnetdevmacvlan.h w/src/util/virnetdevmacvlan.h
index 41aa4e2..41b4014 100644
--- i/src/util/virnetdevmacvlan.h
+++ w/src/util/virnetdevmacvlan.h
@@ -44,6 +44,8 @@ typedef enum {
VIR_NETDEV_MACVLAN_CREATE_NONE = 0,
/* Create with a tap device */
VIR_NETDEV_MACVLAN_CREATE_WITH_TAP = 1 << 0,
+ /* Bring the interface up */
+ VIR_NETDEV_MACVLAN_CREATE_IFUP = 1 << 1,
} virNetDevMacVLanCreateFlags;
int virNetDevMacVLanCreate(const char *ifname,
--
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20141002/74d590cf/attachment-0001.sig>
More information about the libvir-list
mailing list