A new element is introduced to XML that allows to control state of virtual network interfaces in hypervisors. Live modification of the link state allows networking tools propagate topology changes to guest OS or testing of scenarios in complex (virtual) networks. This patch adds elements to XML grammars and parsing and generating code. docs/formatdomain.html.in - Documentation of new element docs/schemas/domain.rng - Grammar for the new element src/conf/domain_conf.c - Parsing and generating code src/conf/domain_conf.h - Enum of available link states --- docs/formatdomain.html.in | 21 +++++++++++++++++++++ docs/schemas/domain.rng | 11 +++++++++++ src/conf/domain_conf.c | 24 ++++++++++++++++++++++++ src/conf/domain_conf.h | 11 +++++++++++ 4 files changed, 67 insertions(+), 0 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f46771d..47cf0e6 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2024,6 +2024,27 @@ qemu-kvm -net nic,model=? /dev/null <span class="since">Since 0.9.4</span> </p> + <h5><a name="elementLink">Modyfing virtual link state</a></h5> +<pre> + ... + &lt;devices&gt; + &lt;interface type='network'&gt; + &lt;source network='default'/&gt; + &lt;target dev='vnet0'/&gt; + <b>&lt;link state='down'/&gt;</b> + &lt;/interface&gt; + &lt;devices&gt; + ...</pre> + + <p> + This element provides means of setting state of the virtual network link. + Possible values for attribute <code>state</code> are <code>up</code> and + <code>down</code>. If <code>down</code> is specified as the value, the interface + behaves as if it had the network cable disconnected. Default behavior if this + element is unspecified is to have the link state <code>up</code>. + <span class="since">Since 0.9.5</span> + </p> + <h4><a name="elementsInput">Input devices</a></h4> <p> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index dd8c41a..d2b73ac 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1206,6 +1206,17 @@ <optional> <ref name="bandwidth"/> </optional> + <optional> + <element name="link"> + <attribute name="state"> + <choice> + <value>up</value> + <value>down</value> + </choice> + </attribute> + <empty/> + </element> + </optional> </interleave> </define> <!-- diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 44212cf..f480f37 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -235,6 +235,11 @@ VIR_ENUM_IMPL(virDomainNetVirtioTxMode, VIR_DOMAIN_NET_VIRTIO_TX_MODE_LAST, "iothread", "timer") +VIR_ENUM_IMPL(virDomainNetInterfaceLinkState, VIR_DOMAIN_NET_INTERFACE_LINK_STATE_LAST, + "default", + "up", + "down") + VIR_ENUM_IMPL(virDomainChrChannelTarget, VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST, "guestfwd", @@ -2774,6 +2779,7 @@ virDomainNetDefParseXML(virCapsPtr caps, char *internal = NULL; char *devaddr = NULL; char *mode = NULL; + char *linkstate = NULL; virNWFilterHashTablePtr filterparams = NULL; virVirtualPortProfileParamsPtr virtPort = NULL; virDomainActualNetDefPtr actual = NULL; @@ -2850,6 +2856,9 @@ virDomainNetDefParseXML(virCapsPtr caps, /* An auto-generated target name, blank it out */ VIR_FREE(ifname); } + } else if ((linkstate == NULL) && + xmlStrEqual(cur->name, BAD_CAST "link")) { + linkstate = virXMLPropString(cur, "state"); } else if ((script == NULL) && (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET || def->type == VIR_DOMAIN_NET_TYPE_BRIDGE) && @@ -3114,6 +3123,16 @@ virDomainNetDefParseXML(virCapsPtr caps, } } + def->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DEFAULT; + if (linkstate != NULL) { + if ((def->linkstate = virDomainNetInterfaceLinkStateTypeFromString(linkstate)) <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown interface link state '%s'"), + linkstate); + goto error; + } + } + if (filter != NULL) { switch (def->type) { case VIR_DOMAIN_NET_TYPE_ETHERNET: @@ -3161,6 +3180,7 @@ cleanup: VIR_FREE(internal); VIR_FREE(devaddr); VIR_FREE(mode); + VIR_FREE(linkstate); virNWFilterHashTableFree(filterparams); return def; @@ -9057,6 +9077,10 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAddLit(buf, " </tune>\n"); } + if (def->linkstate) + virBufferAsprintf(buf, " <link state='%s'/>\n", + virDomainNetInterfaceLinkStateTypeToString(def->linkstate)); + if (virBandwidthDefFormat(buf, def->bandwidth, " ") < 0) return -1; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8382d28..6e0c8fe 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -352,6 +352,15 @@ enum virDomainNetVirtioTxModeType { VIR_DOMAIN_NET_VIRTIO_TX_MODE_LAST, }; +/* link interface states */ +enum virDomainNetInterfaceLinkState { + VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DEFAULT = 0, /* Default link state (up) */ + VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP, /* Link is up. ("cable" connected) */ + VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN , /* Link is down. ("cable" disconnected) */ + + VIR_DOMAIN_NET_INTERFACE_LINK_STATE_LAST +}; + /* Config that was actually used to bring up interface, after * resolving network reference. This is private data, only used within * libvirt, but still must maintain backward compatibility, because @@ -437,6 +446,7 @@ struct _virDomainNetDef { char *filter; virNWFilterHashTablePtr filterparams; virBandwidthPtr bandwidth; + int linkstate; }; /* Used for prefix of ifname of any network name generated dynamically @@ -1681,6 +1691,7 @@ VIR_ENUM_DECL(virDomainFSAccessMode) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainNetBackend) VIR_ENUM_DECL(virDomainNetVirtioTxMode) +VIR_ENUM_DECL(virDomainNetInterfaceLinkState) VIR_ENUM_DECL(virDomainChrDevice) VIR_ENUM_DECL(virDomainChrChannelTarget) VIR_ENUM_DECL(virDomainChrConsoleTarget) -- 1.7.3.4

This patch enables modifying network device configuration using the virUpdateDeviceFlags API method. Matching of devices is accomplished using MAC addresses. While updating live configuration of a running domain, the user is allowed only to change link state of the interface. Additional modifications may be added later. For now the code checks for unsupported changes and tereafer changes the link state, if applicable. When updating persistent configuration of guest's network interface the whole configuration (except for the MAC address) may be modified and is stored for the next startup. src/qemu/qemu_driver.c - Add dispatching of virUpdateDevice for network devices update (live/config) src/qemu/qemu_hotplug.c - add setting of initial link state on live device addition - add function to change network device configuration. By now it supports only changing of link state src/qemu/qemu_hotplug.h - Headers to above functions src/qemu/qemu_process.c - set link states before virtual machine start. Qemu does not support setting of this on the command line. --- src/qemu/qemu_driver.c | 24 +++++++ src/qemu/qemu_hotplug.c | 176 +++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.h | 8 ++ src/qemu/qemu_process.c | 47 ++++++++++++- 4 files changed, 254 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f21122d..6013fe3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5073,6 +5073,9 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_GRAPHICS: ret = qemuDomainChangeGraphics(driver, vm, dev->data.graphics); break; + case VIR_DOMAIN_DEVICE_NET: + ret = qemuDomainChangeNet(driver, vm, dom, dev->data.net); + break; default: qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("device type '%s' cannot be updated"), @@ -5207,6 +5210,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) { virDomainDiskDefPtr orig, disk; + virDomainNetDefPtr net; int pos; switch (dev->type) { @@ -5245,6 +5249,26 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, } disk->src = NULL; break; + + case VIR_DOMAIN_DEVICE_NET: + net = dev->data.net; + if ((pos = virDomainNetIndexByMac(vmdef, net->mac)) < 0) { + char macbuf[VIR_MAC_STRING_BUFLEN]; + virFormatMacAddr(net->mac, macbuf); + qemuReportError(VIR_ERR_INVALID_ARG, + _("mac %s doesn't exist"), macbuf); + return -1; + } + + VIR_FREE(vmdef->nets[pos]); + + vmdef->nets[pos] = net; + dev->data.net = NULL; + + if (qemuDomainAssignPCIAddresses(vmdef) < 0) + return -1; + break; + default: qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("persistent update of device is not supported")); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b7fdfa0..02d1dda 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -743,6 +743,30 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } qemuDomainObjExitMonitorWithDriver(driver, vm); + /* set link state */ + if (net->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN) { + if (!net->info.alias) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("device alias not found: cannot set link state to down")); + } else { + qemuDomainObjEnterMonitorWithDriver(driver, vm); + + if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV)) { + if (qemuMonitorSetLink(priv->mon, net->info.alias, VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); + virDomainAuditNet(vm, NULL, net, "attach", false); + goto try_remove; + } + } else { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("setting of link state not supported: Link is up")); + } + + qemuDomainObjExitMonitorWithDriver(driver, vm); + } + /* link set to down */ + } + virDomainAuditNet(vm, NULL, net, "attach", true); ret = 0; @@ -1031,6 +1055,158 @@ error: return -1; } +static virDomainNetDefPtr qemuDomainFindNet(virDomainObjPtr vm, + virDomainNetDefPtr dev) +{ + int i; + + for (i = 0; i < vm->def->nnets; i++) { + if (memcmp(vm->def->nets[i]->mac, dev->mac, VIR_MAC_BUFLEN) == 0) + return vm->def->nets[i]; + } + + return NULL; +} + +int qemuDomainChangeNetLinkState(struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainNetDefPtr dev, + int linkstate) +{ + int ret = -1; + qemuDomainObjPrivatePtr priv = vm->privateData; + + VIR_DEBUG("dev: %s, state: %d", dev->info.alias, linkstate); + + if (!dev->info.alias) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("can't change link state: device alias not found")); + return -1; + } + + qemuDomainObjEnterMonitorWithDriver(driver, vm); + + ret = qemuMonitorSetLink(priv->mon, dev->info.alias, linkstate); + if (ret < 0) + goto cleanup; + + /* modify the device configuration */ + dev->linkstate = linkstate; + +cleanup: + qemuDomainObjExitMonitorWithDriver(driver, vm); + + return ret; +} + +int qemuDomainChangeNet(struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainPtr dom ATTRIBUTE_UNUSED, + virDomainNetDefPtr dev) + +{ + virDomainNetDefPtr olddev = qemuDomainFindNet(vm, dev); + int ret = 0; + + if (!olddev) { + qemuReportError(VIR_ERR_NO_SUPPORT, + _("cannot find existing network device to modify")); + return -1; + } + + if (olddev->type != dev->type) { + qemuReportError(VIR_ERR_NO_SUPPORT, + _("cannot change network interface type")); + return -1; + } + + switch (olddev->type) { + case VIR_DOMAIN_NET_TYPE_USER: + break; + + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (STRNEQ_NULLABLE(olddev->data.ethernet.dev, dev->data.ethernet.dev) || + STRNEQ_NULLABLE(olddev->data.ethernet.script, dev->data.ethernet.script) || + STRNEQ_NULLABLE(olddev->data.ethernet.ipaddr, dev->data.ethernet.ipaddr)) { + qemuReportError(VIR_ERR_NO_SUPPORT, + _("cannot modify ethernet network device configuration")); + return -1; + } + break; + + case VIR_DOMAIN_NET_TYPE_SERVER: + case VIR_DOMAIN_NET_TYPE_CLIENT: + case VIR_DOMAIN_NET_TYPE_MCAST: + if (STRNEQ_NULLABLE(olddev->data.socket.address, dev->data.socket.address) || + olddev->data.socket.port != dev->data.socket.port) { + qemuReportError(VIR_ERR_NO_SUPPORT, + _("cannot modify network socket device configuration")); + return -1; + } + break; + + case VIR_DOMAIN_NET_TYPE_NETWORK: + if (STRNEQ_NULLABLE(olddev->data.network.name, dev->data.network.name) || + STRNEQ_NULLABLE(olddev->data.network.portgroup, dev->data.network.portgroup) || + !virVirtualPortProfileEqual(olddev->data.network.virtPortProfile, dev->data.network.virtPortProfile)) { + qemuReportError(VIR_ERR_NO_SUPPORT, + _("cannot modify network device configuration")); + return -1; + } + + break; + + case VIR_DOMAIN_NET_TYPE_INTERNAL: + if (STRNEQ_NULLABLE(olddev->data.internal.name, dev->data.internal.name)) { + qemuReportError(VIR_ERR_NO_SUPPORT, + _("cannot modify internal network device configuration")); + return -1; + } + break; + + case VIR_DOMAIN_NET_TYPE_DIRECT: + if (STRNEQ_NULLABLE(olddev->data.direct.linkdev, dev->data.direct.linkdev) || + olddev->data.direct.mode != dev->data.direct.mode || + !virVirtualPortProfileEqual(olddev->data.direct.virtPortProfile, dev->data.direct.virtPortProfile)) { + qemuReportError(VIR_ERR_NO_SUPPORT, + _("cannot modify direct network device configuration")); + return -1; + } + break; + + default: + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to change config on '%s' network type"), + virDomainNetTypeToString(dev->type)); + break; + + } + + /* all other unmodifiable parameters */ + if (STRNEQ_NULLABLE(olddev->model, dev->model) || + STRNEQ_NULLABLE(olddev->filter, dev->filter)) { + qemuReportError(VIR_ERR_NO_SUPPORT, + _("cannot modify network device configuration")); + return -1; + } + + /* check if device name has been set, if no, retain the autogenerated one */ + if (dev->ifname && + STRNEQ_NULLABLE(olddev->ifname, dev->ifname)) { + qemuReportError(VIR_ERR_NO_SUPPORT, + _("cannot modify network device configuration")); + return -1; + } + + if (olddev->linkstate != dev->linkstate) { + if ((ret = qemuDomainChangeNetLinkState(driver, vm, olddev, dev->linkstate)) < 0) + return ret; + } + + return ret; +} + + static virDomainGraphicsDefPtr qemuDomainFindGraphics(virDomainObjPtr vm, virDomainGraphicsDefPtr dev) diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 009f1f6..f564f3c 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -64,6 +64,14 @@ int qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, int type, virDomainGraphicsAuthDefPtr auth, const char *defaultPasswd); +int qemuDomainChangeNet(struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainPtr dom, + virDomainNetDefPtr dev); +int qemuDomainChangeNetLinkState(struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainNetDefPtr dev, + int linkstate); int qemuDomainDetachPciDiskDevice(struct qemud_driver *driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 58b4d36..6398c7b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1443,7 +1443,40 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm) return 0; } -/* Set CPU affinites for vcpus if vcpupin xml provided. */ +/* set link states to down on interfaces at qemu start */ +static int +qemuProcessSetLinkStates(virDomainObjPtr vm) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + virDomainDefPtr def = vm->def; + int i; + int ret = 0; + + for (i = 0; i < def->nnets; i++) { + if (def->nets[i]->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN) { + VIR_DEBUG("Setting link state: %s", def->nets[i]->info.alias); + + if (!qemuCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV)) { + qemuReportError(VIR_ERR_NO_SUPPORT, + _("Setting of link state is not supported by this qemu")); + return -1; + } + + ret = qemuMonitorSetLink(priv->mon, + def->nets[i]->info.alias, + VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN); + if (ret != 0) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("Couldn't set link state on interface: %s"), def->nets[i]->info.alias); + break; + } + } + } + + return ret; +} + +/* Set CPU affinities for vcpus if vcpupin xml provided. */ static int qemuProcessSetVcpuAffinites(virConnectPtr conn, virDomainObjPtr vm) @@ -2976,6 +3009,18 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; } + /* set default link states */ + /* qemu doesn't support setting this on the command line, so + * enter the monitor */ + VIR_DEBUG("Setting network link states"); + qemuDomainObjEnterMonitorWithDriver(driver, vm); + if (qemuProcessSetLinkStates(vm) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); + goto cleanup; + } + + qemuDomainObjExitMonitorWithDriver(driver, vm); + /* Technically, qemuProcessStart can be called from inside * QEMU_ASYNC_JOB_MIGRATION_IN, but we are okay treating this like * a sync job since no other job can call into the domain until -- 1.7.3.4