December 2018 - Devel - libvirt List Archives

Re: [libvirt] [Qemu-devel] [RFC 0/2] Attempt to implement the standby feature for assigned network devices
by Michael Roth 05 Dec '18

05 Dec '18

Quoting Sameeh Jubran (2018-10-25 13:01:10) > On Thu, Oct 25, 2018 at 5:06 PM Sameeh Jubran <sameeh(a)daynix.com> wrote: > > > > From: Sameeh Jubran <sjubran(a)redhat.com> > > > > Hi all, > > > > Background: > > > > There has been a few attempts to implement the standby feature for vfio > > assigned devices which aims to enable the migration of such devices. This > > is another attempt. > > > > The series implements an infrastructure for hiding devices from the bus > > upon boot. What it does is the following: > > > > * In the first patch the infrastructure for hiding the device is added > > for the qbus and qdev APIs. A "hidden" boolean is added to the device > > state and it is set based on a callback to the standby device which > > registers itself for handling the assessment: "should the primary device > > be hidden?" by cross validating the ids of the devices. > > > > * In the second patch the virtio-net uses the API to hide the vfio > > device and unhides it when the feature is acked. > > > > Disclaimers: > > > > * I have only scratch tested this and from qemu side, it seems to be > > working. > > * This is an RFC so it lacks some proper error handling in few cases > > and proper resource freeing. I wanted to get some feedback first > > before it is finalized. > > > > Command line example: > > > > /home/sameeh/Builds/failover/qemu/x86_64-softmmu/qemu-system-x86_64 \ > > -netdev tap,id=hostnet0,script=world_bridge_standalone.sh,downscript=no,ifname=cc1_71 \ > > -netdev tap,vhost=on,id=hostnet1,script=world_bridge_standalone.sh,downscript=no,ifname=cc1_72,queues=4 \ > > -device virtio-net,host_mtu=1500,netdev=hostnet1,id=cc1_72,vectors=10,mq=on,primary=cc1_71 \ > > -device e1000,netdev=hostnet0,id=cc1_71,standby=cc1_72 \ > > > > Migration support: > > > > Pre migration or during setup phase of the migration we should send an > > unplug request to the guest to unplug the primary device. I haven't had > > the chance to implement that part yet but should do soon. Do you know > > what's the best approach to do so? I wanted to have a callback to the > > virtio-net device which tries to send an unplug request to the guest and > > if succeeds then the migration continues. It needs to handle the case where > > the migration fails and then it has to replug the primary device back. > I think that the "add_migration_state_change_notifier" API call can be used > from within the virtio-net device to achieve this, what do you think? I think it would be good to hear from the libvirt folks (on Cc:) on this as having QEMU unplug a device without libvirt's involvement seems like it could cause issues. Personally I think it seems cleaner to just have QEMU handle the 'hidden' aspects of the device and leave it to QMP/libvirt to do the unplug beforehand. On the libvirt side I could imagine adding an option like virsh migrate --switch-to-standby-networking or something along that line to do it automatically (if we decide doing it automatically is even needed on that end). > > > > The following terms are used as interchangeable: > > standby - virtio-net > > primary - vfio-device - physical device - assigned device > > > > Please share your thoughts and suggestions, > > Thanks! > > > > Sameeh Jubran (2): > > qdev/qbus: Add hidden device support > > virtio-net: Implement VIRTIO_NET_F_STANDBY feature > > > > hw/core/qdev.c | 48 +++++++++++++++++++++++++--- > > hw/net/virtio-net.c | 25 +++++++++++++++ > > hw/pci/pci.c | 1 + > > include/hw/pci/pci.h | 2 ++ > > include/hw/qdev-core.h | 11 ++++++- > > include/hw/virtio/virtio-net.h | 5 +++ > > qdev-monitor.c | 58 ++++++++++++++++++++++++++++++++-- > > 7 files changed, 142 insertions(+), 8 deletions(-) > > > > -- > > 2.17.0 > > > > > -- > Respectfully, > Sameeh Jubran > Linkedin > Software Engineer @ Daynix. >

4 4

[libvirt] [PATCH] qemu: Add support for postcopy-requests migration statistics
by Jiri Denemark 05 Dec '18

05 Dec '18

QEMU can report how many times during post-copy migration the domain running on the destination host tried to access a page which has not been migrated yet. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- include/libvirt/libvirt-domain.h | 10 ++++++++++ src/qemu/qemu_domain.c | 5 ++++- src/qemu/qemu_migration_cookie.c | 5 +++++ src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 2 ++ tools/virsh-domain.c | 8 ++++++++ 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 71debd92b8..897b06e6d0 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -3378,6 +3378,16 @@ typedef enum { */ # define VIR_DOMAIN_JOB_MEMORY_ITERATION "memory_iteration" +/** + * VIR_DOMAIN_JOB_MEMORY_POSTCOPY_REQS: + * + * virDomainGetJobStats field: number page requests received from the + * destination host during post-copy migration, as VIR_TYPED_PARAM_ULLONG. + * This counter is incremented whenever the migrated domain tries to access + * a memory page which has not been transferred from the source host yet. + */ +# define VIR_DOMAIN_JOB_MEMORY_POSTCOPY_REQS "memory_postcopy_requests" + /** * VIR_DOMAIN_JOB_DISK_TOTAL: * diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fbe63e2e1d..3dbd9d47ca 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -609,7 +609,10 @@ qemuDomainMigrationJobInfoToParams(qemuDomainJobInfoPtr jobInfo, stats->ram_dirty_rate) < 0 || virTypedParamsAddULLong(&par, &npar, &maxpar, VIR_DOMAIN_JOB_MEMORY_ITERATION, - stats->ram_iteration) < 0) + stats->ram_iteration) < 0 || + virTypedParamsAddULLong(&par, &npar, &maxpar, + VIR_DOMAIN_JOB_MEMORY_POSTCOPY_REQS, + stats->ram_postcopy_reqs) < 0) goto error; if (stats->ram_page_size > 0 && diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 60df449d53..84f0101382 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -703,6 +703,9 @@ qemuMigrationCookieStatisticsXMLFormat(virBufferPtr buf, virBufferAsprintf(buf, "<%1$s>%2$llu</%1$s>\n", VIR_DOMAIN_JOB_MEMORY_ITERATION, stats->ram_iteration); + virBufferAsprintf(buf, "<%1$s>%2$llu</%1$s>\n", + VIR_DOMAIN_JOB_MEMORY_POSTCOPY_REQS, + stats->ram_postcopy_reqs); virBufferAsprintf(buf, "<%1$s>%2$llu</%1$s>\n", VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE, @@ -1102,6 +1105,8 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContextPtr ctxt) ctxt, &stats->ram_dirty_rate); virXPathULongLong("string(./" VIR_DOMAIN_JOB_MEMORY_ITERATION "[1])", ctxt, &stats->ram_iteration); + virXPathULongLong("string(./" VIR_DOMAIN_JOB_MEMORY_POSTCOPY_REQS "[1])", + ctxt, &stats->ram_postcopy_reqs); virXPathULongLong("string(./" VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE "[1])", ctxt, &stats->ram_page_size); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 48b142a4f4..3430426c4b 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -706,6 +706,7 @@ struct _qemuMonitorMigrationStats { unsigned long long ram_dirty_rate; unsigned long long ram_page_size; unsigned long long ram_iteration; + unsigned long long ram_postcopy_reqs; unsigned long long disk_transferred; unsigned long long disk_remaining; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3de298c9e2..4c151dd405 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3296,6 +3296,8 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, &stats->ram_page_size)); ignore_value(virJSONValueObjectGetNumberUlong(ram, "dirty-sync-count", &stats->ram_iteration)); + ignore_value(virJSONValueObjectGetNumberUlong(ram, "postcopy-requests", + &stats->ram_postcopy_reqs)); disk = virJSONValueObjectGetObject(ret, "disk"); if (disk) { diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 372bdb95d3..a71cc9d0be 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6233,6 +6233,14 @@ cmdDomjobinfo(vshControl *ctl, const vshCmd *cmd) } else if (rc) { vshPrint(ctl, "%-17s %-12llu\n", _("Iteration:"), value); } + + if ((rc = virTypedParamsGetULLong(params, nparams, + VIR_DOMAIN_JOB_MEMORY_POSTCOPY_REQS, + &value)) < 0) { + goto save_error; + } else if (rc) { + vshPrint(ctl, "%-17s %-12llu\n", _("Postcopy requests:"), value); + } } if (info.fileTotal || info.fileRemaining || info.fileProcessed) { -- 2.19.1

2 1

[libvirt] [PATCH 0/5] Various cleanups and fixes (blockdev-add saga)
by Peter Krempa 05 Dec '18

05 Dec '18

Few random patches extracted from my blockdev series. Peter Krempa (5): tests: qemuxml2xml: Add few debug statements for status XML testing util: xml: Always consume args of virXMLFormatElement qemu: domain: Initialize proper element in qemuDomainPrepareStorageSourceBlockdev conf: snapshot: Remove file format check from parser tests: qemuxml2argv: Remove disks from few tests which don't need them src/conf/domain_conf.c | 12 ++---------- src/conf/snapshot_conf.c | 12 +++--------- src/qemu/qemu_domain.c | 9 +++------ src/util/virxml.c | 16 ++++++++++++---- .../channel-unix-guestfwd.x86_64-2.5.0.args | 2 -- .../channel-unix-guestfwd.x86_64-latest.args | 2 -- tests/qemuxml2argvdata/channel-unix-guestfwd.xml | 5 ----- .../console-virtio-unix.x86_64-2.5.0.args | 2 -- .../console-virtio-unix.x86_64-latest.args | 2 -- tests/qemuxml2argvdata/console-virtio-unix.xml | 5 ----- tests/qemuxml2argvdata/net-vhostuser.args | 3 --- .../net-vhostuser.x86_64-2.5.0.args | 2 -- .../net-vhostuser.x86_64-latest.args | 2 -- tests/qemuxml2argvdata/net-vhostuser.xml | 6 ------ .../parallel-unix-chardev.x86_64-2.5.0.args | 2 -- .../parallel-unix-chardev.x86_64-latest.args | 2 -- tests/qemuxml2argvdata/parallel-unix-chardev.xml | 5 ----- tests/qemuxml2xmloutdata/net-vhostuser.xml | 6 ------ tests/qemuxml2xmltest.c | 9 ++++++--- 19 files changed, 26 insertions(+), 78 deletions(-) -- 2.19.2

2 6

[libvirt] [PATCH v2] qemuDomainRemoveRNGDevice: Remove associated chardev too
by Michal Privoznik 05 Dec '18

05 Dec '18

https://bugzilla.redhat.com/show_bug.cgi?id=1656014 An RNG device can consists of more devices than RND device itself. For instance, in case of EGD there is a chardev that connects to EGD daemon and feeds the qemu with random data. When doing RNG device removal we have to remove the associated chardev as well. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - Detach Extension Device too - Reoder the way in which devices are detached (as suggested in v1) src/qemu/qemu_hotplug.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5f756b7267..f5f8cec59e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4814,7 +4814,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; ssize_t idx; int ret = -1; - int rc; + int rc = 0; VIR_DEBUG("Removing RNG device %s from domain %p %s", rng->info.alias, vm, vm->def->name); @@ -4828,7 +4828,17 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); - rc = qemuMonitorDelObject(priv->mon, objAlias); + if (qemuDomainDetachExtensionDevice(priv->mon, &rng->info) < 0) + rc = -1; + + if (rc == 0 && + qemuMonitorDelObject(priv->mon, objAlias) < 0) + rc = -1; + + if (rng->backend == VIR_DOMAIN_RNG_BACKEND_EGD && + rc == 0 && + qemuMonitorDetachCharDev(priv->mon, charAlias) < 0) + rc = -1; if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; @@ -4837,7 +4847,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, rc == 0 && qemuDomainDelChardevTLSObjects(driver, vm, rng->source.chardev, charAlias) < 0) - goto cleanup; + rc = -1; virDomainAuditRNG(vm, rng, NULL, "detach", rc == 0); -- 2.19.2

2 1

[libvirt] [PATCH libvirt-python] virNodeInfo.memory is in KiB
by Philipp Hahn 05 Dec '18

05 Dec '18

but the Python library does an extra left shift of 10 bits returning MiB instead: > # cat y.c > #include <stdlib.h> > #include <stdio.h> > #include <libvirt.h> > int main(void) { > virConnectPtr conn = virConnectOpen("qemu:///system"); > virNodeInfo info; > int rv = virNodeGetInfo(conn, &info); > printf("%ld\n", info.memory); > return rv; > } > # gcc y.c -I/usr/include/libvirt -lvirt > # ./a.out > 4041088 > # python -c 'import libvirt;c=libvirt.open("qemu:///system");print(c.getInfo()[1])' > 3946 Fixes: 197153c6 Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- libvirt-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index f7b2f6b..616fa1c 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -2740,7 +2740,7 @@ libvirt_virNodeGetInfo(PyObject *self ATTRIBUTE_UNUSED, VIR_PY_LIST_SET_GOTO(py_retval, 0, libvirt_constcharPtrWrap(&info.model[0]), error); VIR_PY_LIST_SET_GOTO(py_retval, 1, - libvirt_longWrap((long) info.memory >> 10), error); + libvirt_longWrap((long) info.memory), error); VIR_PY_LIST_SET_GOTO(py_retval, 2, libvirt_intWrap((int) info.cpus), error); VIR_PY_LIST_SET_GOTO(py_retval, 3, libvirt_intWrap((int) info.mhz), error); VIR_PY_LIST_SET_GOTO(py_retval, 4, libvirt_intWrap((int) info.nodes), error); -- 2.11.0

2 2

[libvirt] [PATCH RFC v2] qemu: fix deadlock when waiting in non async jobs
by Nikolay Shirokovskiy 05 Dec '18

05 Dec '18

Block job abort operation can not handle properly qemu crashes when waiting for abort/pivot completion. Deadlock scenario is next: - qemuDomainBlockJobAbort waits for pivot/abort completion - qemu crashes, then qemuProcessBeginStopJob broadcasts for VM condition and then waits for job condition (taken by qemuDomainBlockJobAbort) - qemuDomainBlockJobAbort awakes but nothing really changed, VM is still active (vm->def->id != -1) so thread starts waiting for completion again. Now two threads are in deadlock. First let's remove broadcast in qemuProcessBeginStopJob. It is simply wrong because it is not set any condition before broadcast so that awaked threads can not detect any changes. Crashing domain during async job will continue to be handled properly because destroy job can run concurrently with async job and destroy job calls qemuProcessStop which sets vm->def->id to -1 and broadcasts. Second let's introduce flag that EOF is received and broadcast after that. Now non async jobs can check this flag in wait loop. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- Diff from v1: - patches 1 and 2 are already merged - don't bother with reporting monitor EOF reason to user as most of time it is simply "unexpected eof" (this implies dropping patch 3) - drop patch 5 as we now always report "domain is being stopped" in qemuDomainObjWait - don't signal on monitor error for simplicity (otherwise we need to report something more elaborate that "domain is being stopped" as we don't kill domain on monitor errors. On the other hand I guess monitor error is rare case to handle it right now) - keep virDomainObjWait for async jobs It's a bit uneven that for async jobs domain is destroyed concurrently and for non async jobs it will be actually destroyed after job get completed. Also if non async job needs issuing commands to qemu on cleanup then we will send these commands in vain polluting logs etc because qemu process in not running at this moment but typical check (virDomainObjIsActive) will think it is still running. Domain is destroyed (qemuProcessStop) in a job due to patches [1] and [2]. However AFAIU it is not neccessary. If qemuProcessStop does not drop VM lock then we don't need extra job to make qemuProcessStop and main job not interleave. And we can drop the lock now only in qemuDomainObjBeginNestedJob in qemuProcessStop which is introduced in [2]. AFAIU we can fix issues mentioned in [2] the other way for example like it is done for qemu agent - we save agent monitor reference on stack for entering/exiting agent monitor. So I wonder can we instead of this fix remove job for qemuProcessStop and run destroying domain cuncurrently for non async jobs too. [1] commit 8c9ff9960b29d4703a99efdd1cadcf6f48799cc0 Author: Jiri Denemark <jdenemar(a)redhat.com> Date: Thu Feb 11 15:32:48 2016 +0100 qemu: Process monitor EOF in a job [2] commit 81f50cb92d16643bcd749e3ab5b404b8b7cec643 Author: Jiri Denemark <jdenemar(a)redhat.com> Date: Thu Feb 11 11:20:28 2016 +0100 qemu: Avoid calling qemuProcessStop without a job src/qemu/qemu_domain.c | 39 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 4 ++++ src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_process.c | 9 +++++---- 5 files changed, 51 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 939b2a3..aead72b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -13534,3 +13534,42 @@ qemuDomainRunningReasonToResumeEvent(virDomainRunningReason reason) return VIR_DOMAIN_EVENT_RESUMED_UNPAUSED; } + + +/** + * Waits for domain condition to be triggered for a specific period of time. + * if @until is 0 then waits indefinetely. + * + * Returns: + * -1 on error + * 0 on success + * 1 on timeout + */ +int +qemuDomainObjWait(virDomainObjPtr vm, unsigned long long until) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + int rc; + + if (until) + rc = virCondWaitUntil(&vm->cond, &vm->parent.lock, until); + else + rc = virCondWait(&vm->cond, &vm->parent.lock); + + if (rc < 0) { + if (until && errno == ETIMEDOUT) + return 1; + + virReportSystemError(errno, "%s", + _("failed to wait for domain condition")); + return -1; + } + + if (priv->monEOF) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("domain is being stopped")); + return -1; + } + + return 0; +} diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 2f8a1bf..36ab294 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -281,6 +281,7 @@ struct _qemuDomainObjPrivate { virDomainChrSourceDefPtr monConfig; bool monJSON; bool monError; + bool monEOF; unsigned long long monStart; qemuAgentPtr agent; @@ -1085,4 +1086,7 @@ void qemuDomainStorageIdReset(qemuDomainObjPrivatePtr priv); virDomainEventResumedDetailType qemuDomainRunningReasonToResumeEvent(virDomainRunningReason reason); +int +qemuDomainObjWait(virDomainObjPtr vm, unsigned long long until); + #endif /* __QEMU_DOMAIN_H__ */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b238309..f4250da 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17142,7 +17142,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); qemuBlockJobUpdate(vm, QEMU_ASYNC_JOB_NONE, disk, NULL); while (diskPriv->blockjob) { - if (virDomainObjWait(vm) < 0) { + if (qemuDomainObjWait(vm, 0) < 0) { ret = -1; goto endjob; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4558a3c..8189629 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -165,7 +165,7 @@ qemuHotplugWaitForTrayEject(virDomainObjPtr vm, return -1; while (disk->tray_status != VIR_DOMAIN_DISK_TRAY_OPEN) { - if ((rc = virDomainObjWaitUntil(vm, now + CHANGE_MEDIA_TIMEOUT)) < 0) + if ((rc = qemuDomainObjWait(vm, now + CHANGE_MEDIA_TIMEOUT)) < 0) return -1; if (rc > 0) { @@ -5002,7 +5002,7 @@ qemuDomainWaitForDeviceRemoval(virDomainObjPtr vm) until += qemuDomainRemoveDeviceWaitTime; while (priv->unplug.alias) { - if ((rc = virDomainObjWaitUntil(vm, until)) == 1) + if ((rc = qemuDomainObjWait(vm, until)) == 1) return 0; if (rc < 0) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 29b0ba1..dd03269 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -290,9 +290,12 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon, virObjectLock(vm); + priv = vm->privateData; + priv->monEOF = true; + virDomainObjBroadcast(vm); + VIR_DEBUG("Received EOF on %p '%s'", vm, vm->def->name); - priv = vm->privateData; if (priv->beingDestroyed) { VIR_DEBUG("Domain is being destroyed, EOF is expected"); goto cleanup; @@ -5996,6 +5999,7 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, priv->monJSON = true; priv->monError = false; + priv->monEOF = false; priv->monStart = 0; priv->gotShutdown = false; priv->runningReason = VIR_DOMAIN_RUNNING_UNKNOWN; @@ -6965,9 +6969,6 @@ qemuProcessBeginStopJob(virQEMUDriverPtr driver, if (qemuProcessKill(vm, killFlags) < 0) goto cleanup; - /* Wake up anything waiting on domain condition */ - virDomainObjBroadcast(vm); - if (qemuDomainObjBeginJob(driver, vm, job) < 0) goto cleanup; -- 1.8.3.1

2 5

[libvirt] [PATCH] Fix minor typos in messages and docs
by Yuri Chornoivan 05 Dec '18

05 Dec '18

Hi, Please find the attached patch with minor fixes. Many thanks in advance for reviewing it. Best regards, Yuri

2 1

[libvirt] [PATCH 0/2] qemuDomainRemoveRNGDevice: Remove associated chardev too
by Michal Privoznik 04 Dec '18

04 Dec '18

*** BLURB HERE *** Michal Prívozník (2): qemuBuildRNGBackendChrdevStr: Fix formatting qemuDomainRemoveRNGDevice: Remove associated chardev too src/qemu/qemu_command.c | 6 ++++-- src/qemu/qemu_hotplug.c | 23 +++++++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) -- 2.19.2

2 4

[libvirt] [PATCH] util: Fix the build on MinGW because of missing DT_CHR dirent type
by Erik Skultety 04 Dec '18

04 Dec '18

Caused by commit 39480969 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed under the build breaker rule. src/util/virutil.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index da12a11e04..279e6aedc0 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2172,9 +2172,6 @@ virHostGetDRMRenderNode(void) return NULL; while ((dirErr = virDirRead(driDir, &ent, driPath)) > 0) { - if (ent->d_type != DT_CHR) - continue; - if (STRPREFIX(ent->d_name, "renderD")) { have_rendernode = true; break; -- 2.19.2

1 0

[libvirt] [PATCH 0/2] syncNicRxFilterMultiMode: Trivial fixes
by Michal Privoznik 04 Dec '18

04 Dec '18

Pushed under trivial rule. Michal Prívozník (2): syncNicRxFilterMultiMode: Check for helper's retval properly syncNicRxFilterMultiMode: Fix indentation src/qemu/qemu_driver.c | 80 +++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 40 deletions(-) -- 2.19.2

1 2

Re: [libvirt] [PATCH] qemu: Qemu process unexpectedly killed in repeated reboot
by Wangjing (King) 04 Dec '18

04 Dec '18

On 11/30/18 9:53 AM, Wang King wrote: >> The issue occurs when I make repeated calls to virDomainReboot with >> VIR_DOMAIN_REBOOT_DEFAULT flag. In the first call to reboot domain, >> the qemu driver chose ACPI path, and set priv->fakeReboot to true. >> Then in a second call, qemu driver chose agent to reboot which set >> fakeReboot to false. But because the guest already responded to ACPI >> shut down, libvirtd daemon will process a SHUTDOWN event in >> qemuProcessShutdownOrReboot and checks priv->fakeReboot. Since the >> fakeReboot flag is now false, qemu process is unexpectedly killed. >> > >This sounds fishy. Looking at the code libvirt decides whether to use agent or ACPI based on: > >a) flags (but since you're passing 0 this is out of the picture), >b) guest agent being available, > >This means that agent must have connected between two virDomainReboot() calls. Otherwise libvirt would make the same choice. > >> I have no idea how to fix it. > >Well, the qemuDomainSetFakeReboot(false) call was added in b0c144c5792 which points to: > > https://www.redhat.com/archives/libvir-list/2015-April/msg00732.html > >I think the patch proposed there is actually right and not the one that was merged. > >Michal The problem: Consider this scenario: firstly, call virDomainReboot() with mode ACPI to a domain, then immediately call virDomainReboot() again with mode “agent”. Supposedly, this sequence will reboot the domain (hereinafter referred to as DOM1). Instead, however, the current version of libvirt code will *KILL* the QEMU process associated with the domain. How to reproduce this problem: Simply make a ACPI-mode reboot call to the domain, and immediately make an agent-mode reboot call. You will see that the domain is killed straight away. Root cause: The unexpected SIGKILL comes from Libvirt seeing fakeReboot flag set to *FALSE* when it received an SHUTDOWN event as a result of calling ACPI virDomainReboot(). This happens when DOM1 is already rebooting, yet its guest agent is still available, thus the second agent-mode virDomainReboot() was able to pass the check and set fakeReboot flag to *FALSE* (its “guest-shutdown” command is also sent, which is out of the scope of this email). Finally, DOM1 shut down as part of the reboot process, its QEMU process sent SHUTDOWN event to Libvirt. Libvirt checked fakeReboot flag and saw it being *FALSE*, forcefully kills the QEMU process as a result. Analysis: Say that we make two calls to shutdown/reboot DOM1. DOM1 will eventually respond to only one of the two calls. For another call, only two scenarios happen: DOM1 accepts the second call but do not execute it (meaning only fakeReboot flag is modified on Libvirt side), or DOM1 accepts the second call and overrides the first one. In the second scenario, it is the same situation as first scenario but reversed (DOM1 responds to first call and sets flag with second call vs DOM1 responds to second call and sets flag with first call). Therefore, we hereby simplify the problem to that DOM1 always responds to first call, and the second call is also accepted, but it only serves to change the fakeReboot flag. As you will see, there is what we expect to happen versus what actually happens. The questionable result is marked with tilde(~) and the faulted result is marked with emphasis(*). If you see the chart below, you will see that how the domain should react to shutdown/reboot calls in different order: ----------------------------------------------------------------------------------------------------------- |First Command |Second Command(set flags only) |Expected Result |Actual Result |After Fix | ----------------------------------------------------------------------------------------------------------- |ACPI SHUTDOWN |ACPI SHUTDOWN |SHUTDOWN |SHUTDOWN |SHUTDOWN | |ACPI REBOOT |ACPI SHUTDOWN |REBOOT |~SHUTDOWN~ |~SHUTDOWN~ | |AGENT SHUTDOWN |ACPI SHUTDOWN |SHUTDOWN |SHUTDOWN |SHUTDOWN | |AGENT REBOOT |ACPI SHUTDOWN |REBOOT |REBOOT |REBOOT | |ACPI SHUTDOWN |ACPI REBOOT |SHUTDOWN |~REBOOT~ |~REBOOT~ | |ACPI REBOOT |ACPI REBOOT |REBOOT |REBOOT |REBOOT | |AGENT SHUTDOWN |ACPI REBOOT |SHUTDOWN |~REBOOT~ |~REBOOT~ | |AGENT REBOOT |ACPI REBOOT |REBOOT |REBOOT |REBOOT | |ACPI SHUTDOWN |AGENT SHUTDOWN |SHUTDOWN |SHUTDOWN |SHUTDOWN | |ACPI REBOOT |AGENT SHUTDOWN |REBOOT |~SHUTDOWN~ |~SHUTDOWN~ | |AGENT SHUTDOWN |AGENT SHUTDOWN |SHUTDOWN |SHUTDOWN |SHUTDOWN | |AGENT REBOOT |AGENT SHUTDOWN |REBOOT |REBOOT |REBOOT | |ACPI SHUTDOWN |AGENT REBOOT |SHUTDOWN |SHUTDOWN |SHUTDOWN | |ACPI REBOOT |AGENT REBOOT |REBOOT |**SHUTDOWN** |**REBOOT** | |AGENT SHUTDOWN |AGENT REBOOT |SHUTDOWN |SHUTDOWN |SHUTDOWN | |AGENT REBOOT |AGENT REBOOT |REBOOT |REBOOT |REBOOT | ---------------------------------------------------------------------------------------------------------- As you can see, when DOM1 reboots with ACPI and immediately receives agent-mode reboot. It will *SHUTDOWN* instead. (Certainly, there are questionable results in other combos, but we think they cause less confusions in real-life situations so we are not discussing them here) Fix: The fix is to revert the changes added by b0c144c5792 commit, which introduced setting fakeReboot to False in agent-mode reboot. This should, at least, avoid killing QEMU process during successive reboot calls. Nonetheless, shutdown/reboot process still needs some optimizations to be done. I will leave it to the analysis above. What do you think about this? Should we revert the commit first or find an all-fix solution to this problem?

1 0

[libvirt] Release of libvirt-4.10.0
by Daniel Veillard 03 Dec '18

03 Dec '18

As planned I tagged the release in git earlier today and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ I also pushed the python bindings at ftp://libvirt.org/libvirt/python This release seems to be very heavy on new features, but under the hood there is as usuall a number of bug fixes and refactoring patches: New features: - qemu: Add Hyper-V PV IPI and Enlightened VMCS support The QEMU driver now has support for Hyper-V PV IPI and Enlightened VMCS for Windows and Hyper-V guests. - qemu: Added support for PCI devices on S390 PCI addresses can now include the new zpci element which contains uid (user-defined identifier) and fid (PCI function identifier) attributes and makes the corresponding devices usable by S390 guests. - Support changing IOThread polling parameters for a live guest Introduced virDomainSetIOThreadParams which allows dynamically setting the IOThread polling parameters used by QEMU to manage the thread polling interval and the algorithm for growth or shrink of the polling time. The values only affect a running guest with IOThreads. The guest's IOThread polling values can be viewed via the domain statistics. - Xen: Add support for PVH The libxl driver now supports Xen's PVH virtual machine type. PVH machines are enabled with the new "xenpvh" OS type, e.g. <os><type>xenpvh</type></os> - qemu: Added support for CMT (Cache Monitoring Technology) Introduced cache monitoring using the monitor element in cachetune for vCPU threads. Added interfaces to get and display the cache utilization statistics through the command 'virsh domstats' via the virConnectGetAllDomainStats API. - qemu: Add support for nested HV for pSeries guests Nested HV support makes it possible to run nested (L2) guests with minimal performance penalty when compared to regular (L1) guests on ppc64 hardware. Bug fixes: - Xen: Handle soft reset shutdown event The pvops Linux kernel uses soft reset to handle the crash machine operation. The libxl driver now supports the soft reset shutdown event, allowing proper crash handling of pvops-based HVM domains. Thanks everybody for your contribution toward this release, be it with ideas, bug reports, patches reviews, docs, localization... Remember, next release should be around mid-January, 5.0.0, in the meantime enjoy the release and end of years vacations you may have ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH 0/7] Restructure firewall rules for virtual networks into private chains
by Daniel P. Berrangé 03 Dec '18

03 Dec '18

The virtual networks in NAT mode are supposed to only allow outbound network access for guests. Unfortunately due to ordering of the firewall rules libvirt creates, when you have multiple virtual networks, guests on the more recently created virtual networks can connect to guests on old virtual networks. This was reported way back in 2008 but we always thought the fix would be very complicated to deal with, so we've been putting it off forever. In parallel with this there's also been a long standing desire since 2009 to move our firewall rules out of the builtin chains, to libvirt private chains. This is to make it easier for admins to use hook scripts to setup rules in the builtin chains that take priority over rules libvirt creates. In implementing the changes to use private chains, I suddenly realized that fixing the network to network traffic blocking problem was trivial if I grouped the forwarding rules into three distinct sets. So this series finally fixes an annoying 10 year old bug, and implements a 9 year old RFE. It may take us a while, but we'll get to your bugs eventually ;-) Daniel P. Berrangé (7): util: refactor iptables APIs to share more code util: add iptables API for creating base chains util: prepare iptables for putting rules into private chains network: setup default iptables chains util: switch over to creating rules in private chains tests: remove duplicated test case in networkxml2firewalltest tests: fix dry run handling in network firewall test src/libvirt_private.syms | 1 + src/network/bridge_driver_linux.c | 3 + src/util/viriptables.c | 317 ++++++++++++++---- src/util/viriptables.h | 2 + .../nat-default-linux.args | 150 ++++++++- .../nat-ipv6-linux.args | 166 +++++++-- .../nat-many-ips-linux.args | 178 ++++++++-- .../nat-no-dhcp-linux.args | 164 +++++++-- .../nat-tftp-linux.args | 152 ++++++++- .../route-default-linux.args | 140 +++++++- tests/networkxml2firewalltest.c | 17 +- 11 files changed, 1107 insertions(+), 183 deletions(-) -- 2.19.1

2 15

[libvirt] [PATCH v3 00/11] Autoselect a DRM node for egl-headless add it to cmdline
by Erik Skultety 03 Dec '18

03 Dec '18

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1628892. The problem is that we didn't put the DRI device into the namespace for QEMU to access, but that was only a part of the issue. The other part of the issue is that QEMU doesn't support specifying 'rendernode' for egl-headless yet (patches are already in upstream) Instead, QEMU's been autoselecting the DRI device on its own. There's no compelling reason for libvirt not doing that instead and thus prevent any permission-related issues. Since v1: - updated capabilities to 3.1.0-rc2 containing the necessary QEMU patches - provided more test cases as requested - added a new XML sub-element <gl> for egl-headless graphics type Since v2: - The cmdline code wouldn't play nicely with old QEMU where I'd pick a rendernode automatically and then fail if we didn't have the corresponding capability, so this was fixed for v3 - v2 converted some tests to CAPS_LATEST only which would also be wrong because QEMU can still pick a DRM node so that's a valid use case (not a practical one though) - the 3.1.0 capabilities patch was merged separately Erik Skultety (11): util: Introduce virHostGetDRMRenderNode helper conf: Introduce virDomainGraphics-related helpers qemu: process: spice: Pick the first available DRM render node qemu: command: Introduce qemuBuildGraphicsEGLHeadlessCommandLine helper qemu: caps: Introduce QEMU_EGL_HEADLESS_RENDERNODE capability conf: gfx: Add egl-headless as a member to virDomainGraphicsDef struct conf: gfx: egl-headless: Introduce a new <gl> subelement qemu: domain: egl-headless: Add the DRI device into the namespace qemu: cgroup: gfx: egl-headless: Add the DRI device into the cgroup list security: dac: gfx: egl-headless: Relabel the DRI device qemu: command: gfx: egl-headless: Add 'rendernode' option to the cmdline docs/formatdomain.html.in | 11 ++- docs/schemas/domaincommon.rng | 17 +++- src/conf/domain_conf.c | 84 +++++++++++++++++++ src/conf/domain_conf.h | 12 +++ src/libvirt_private.syms | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 10 +-- src/qemu/qemu_command.c | 42 +++++++++- src/qemu/qemu_domain.c | 9 +- src/qemu/qemu_process.c | 32 ++++++- src/security/security_dac.c | 15 ++-- src/util/virutil.c | 53 ++++++++++++ src/util/virutil.h | 2 + .../caps_3.1.0.x86_64.xml | 1 + ...egl-headless-rendernode.x86_64-latest.args | 31 +++++++ .../graphics-egl-headless-rendernode.xml | 33 ++++++++ .../graphics-egl-headless.x86_64-latest.args | 31 +++++++ .../graphics-spice-gl-no-rendernode.args | 25 ++++++ .../graphics-spice-gl-no-rendernode.xml | 24 ++++++ ...play-spice-egl-headless.x86_64-latest.args | 2 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 2 +- tests/qemuxml2argvmock.c | 9 ++ tests/qemuxml2argvtest.c | 2 + .../graphics-egl-headless-rendernode.xml | 41 +++++++++ tests/qemuxml2xmltest.c | 2 + 26 files changed, 464 insertions(+), 33 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless-rendernode.xml create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-gl-no-rendernode.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-gl-no-rendernode.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml -- 2.19.1

3 26

[libvirt] [PATCH 0/2] qemu: arm guest on x86
by infos＠nafets.de 03 Dec '18

03 Dec '18

From: Stefan Schallenberg <nafets227(a)users.noreply.github.com> *** BLURB HERE *** Stefan Schallenberg (2): Add armv6l Support as guest qemu: Add Default PCI Device for arm guests docs/news.xml | 9 +++++ docs/schemas/basictypes.rng | 1 + src/qemu/qemu_capabilities.c | 5 ++- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_domain.c | 20 ++++++++-- src/qemu/qemu_domain_address.c | 6 ++- tests/capabilityschemadata/caps-qemu-kvm.xml | 10 +++++ tests/testutilsqemu.c | 40 +++++++++++++++++++- 8 files changed, 84 insertions(+), 11 deletions(-) -- 2.19.2

2 10

[libvirt] [PATCH v2] qemu: handle multicast overflow on macvtap NIC_RX_FILTER_CHANGED
by Jason Baron 03 Dec '18

03 Dec '18

Guest network devices can set 'overflow' when there are a number of multicast ips configured. For virtio_net, the limit is only 64. In this case, the list of mac addresses is empty and the 'overflow' condition is set. Thus, the guest will currently receive no multicast traffic in this state. When 'overflow' is set in the guest, let's turn this into ALLMULTI on the host. Signed-off-by: Jason Baron <jbaron(a)akamai.com> --- v1->v2: 1. check for < 0 in virNetDevSetRcvAllMulti() (Michal Privoznik) 2. restrict overflow check to VIR_NETDEV_RX_FILTER_MODE_NORMAL mode as to avoid unnecessarily calling rx filter updates for other modes 3. update virNetDevSetRcvAllMulti() call to use guestFilter->multicast.overflow directly (Michal Privoznik) src/qemu/qemu_driver.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7fb9102..f4bbfea 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4443,11 +4443,12 @@ static void syncNicRxFilterMultiMode(char *ifname, virNetDevRxFilterPtr guestFilter, virNetDevRxFilterPtr hostFilter) { - if (hostFilter->multicast.mode != guestFilter->multicast.mode) { + if (hostFilter->multicast.mode != guestFilter->multicast.mode || + (guestFilter->multicast.overflow && + guestFilter->multicast.mode == VIR_NETDEV_RX_FILTER_MODE_NORMAL)) { switch (guestFilter->multicast.mode) { case VIR_NETDEV_RX_FILTER_MODE_ALL: if (virNetDevSetRcvAllMulti(ifname, true)) { - VIR_WARN("Couldn't set allmulticast flag to 'on' for " "device %s while responding to " "NIC_RX_FILTER_CHANGED", ifname); @@ -4455,17 +4456,24 @@ syncNicRxFilterMultiMode(char *ifname, virNetDevRxFilterPtr guestFilter, break; case VIR_NETDEV_RX_FILTER_MODE_NORMAL: - if (virNetDevSetRcvMulti(ifname, true)) { + if (guestFilter->multicast.overflow && + (hostFilter->multicast.mode == VIR_NETDEV_RX_FILTER_MODE_ALL)) { + break; + } + if (virNetDevSetRcvMulti(ifname, true)) { VIR_WARN("Couldn't set multicast flag to 'on' for " "device %s while responding to " "NIC_RX_FILTER_CHANGED", ifname); } - if (virNetDevSetRcvAllMulti(ifname, false)) { - VIR_WARN("Couldn't set allmulticast flag to 'off' for " - "device %s while responding to " - "NIC_RX_FILTER_CHANGED", ifname); + if (virNetDevSetRcvAllMulti(ifname, + guestFilter->multicast.overflow) < 0) { + VIR_WARN("Couldn't set allmulticast flag to '%s' for " + "device %s while responding to " + "NIC_RX_FILTER_CHANGED", + virTristateSwitchTypeToString(virTristateSwitchFromBool(guestFilter->multicast.overflow)), + ifname); } break; -- 2.7.4

3 4

[libvirt] [PATCH] news: Fix version number
by Andrea Bolognani 03 Dec '18

03 Dec '18

The schema expects it to match the pattern v[0-9]+\.[0-9]+\.[0-9]+ which "5.0.0" clearly doesn't, causing the build to fail. Reported-by: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- The Fabulous Princess Crown of Shame has been deployed. docs/news.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index 4472936b31..3c63d46012 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -33,7 +33,7 @@ --> <libvirt> - <release version="5.0.0" date="unreleased"> + <release version="v5.0.0" date="unreleased"> <section title="New features"> </section> <section title="Improvements"> -- 2.19.2

1 0

[libvirt] [PATCH] maint: Post-release version bump to 5.0.0
by Andrea Bolognani 03 Dec '18

03 Dec '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. configure.ac | 2 +- docs/news.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d793431cc5..8c89ff365b 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [4.10.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] +AC_INIT([libvirt], [5.0.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/news.xml b/docs/news.xml index acc9cfc9c8..4472936b31 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -33,6 +33,14 @@ --> <libvirt> + <release version="5.0.0" date="unreleased"> + <section title="New features"> + </section> + <section title="Improvements"> + </section> + <section title="Bug fixes"> + </section> + </release> <release version="v4.10.0" date="2018-12-03"> <section title="New features"> <change> -- 2.19.2

1 0

[libvirt] [PATCH v3 RESEND] openvswitch: Add new port VLAN mode "dot1q-tunnel"
by luzhipeng＠uniudc.com 03 Dec '18

03 Dec '18

From: ZhiPeng Lu <luzhipeng(a)uniudc.com> Signed-off-by: ZhiPeng Lu <luzhipeng(a)uniudc.com> --- v1->v2: 1. Fix "make syntax-check" failure v2->v3: 1. remove other_config when updating vlan docs/formatnetwork.html.in | 17 +++++++++-------- docs/schemas/networkcommon.rng | 1 + src/conf/netdev_vlan_conf.c | 2 +- src/util/virnetdevopenvswitch.c | 7 +++++++ src/util/virnetdevvlan.h | 1 + 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 363a72b..3c1ae62 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -688,16 +688,17 @@ </p> <p> For network connections using Open vSwitch it is also possible - to configure 'native-tagged' and 'native-untagged' VLAN modes + to configure 'native-tagged' and 'native-untagged' and 'dot1q-tunnel' + VLAN modes. <span class="since">Since 1.1.0.</span> This is done with the - optional <code>nativeMode</code> attribute on - the <code><tag></code> subelement: <code>nativeMode</code> - may be set to 'tagged' or 'untagged'. The <code>id</code> - attribute of the <code><tag></code> subelement - containing <code>nativeMode</code> sets which VLAN is considered - to be the "native" VLAN for this interface, and + optional <code>nativeMode</code> attribute on the + <code><tag></code> subelement: <code>nativeMode</code> + may be set to 'tagged' or 'untagged' or 'dot1q-tunnel'. + The <code>id</code> attribute of the <code><tag></code> + subelement containing <code>nativeMode</code> sets which VLAN is + considered to be the "native" VLAN for this interface, and the <code>nativeMode</code> attribute determines whether or not - traffic for that VLAN will be tagged. + traffic for that VLAN will be tagged or QinQ. </p> <p> <code><vlan></code> elements can also be specified in diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index 2699555..11c48ff 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -223,6 +223,7 @@ <choice> <value>tagged</value> <value>untagged</value> + <value>dot1q-tunnel</value> </choice> </attribute> </optional> diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index dff49c6..79710d9 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -29,7 +29,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE VIR_ENUM_IMPL(virNativeVlanMode, VIR_NATIVE_VLAN_MODE_LAST, - "default", "tagged", "untagged") + "default", "tagged", "untagged", "dot1q-tunnel") int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 8fe06fd..2cc576f 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -91,6 +91,11 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, virNetDevVlanPtr virtVlan) virCommandAddArg(cmd, "vlan_mode=native-untagged"); virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); break; + case VIR_NATIVE_VLAN_MODE_DOT1Q_TUNNEL: + virCommandAddArg(cmd, "vlan_mode=dot1q-tunnel"); + virCommandAddArg(cmd, "other_config:qinq-ethtype=802.1q"); + virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); + break; case VIR_NATIVE_VLAN_MODE_DEFAULT: default: break; @@ -504,6 +509,8 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname, "--", "--if-exists", "clear", "Port", ifname, "tag", "--", "--if-exists", "clear", "Port", ifname, "trunk", "--", "--if-exists", "clear", "Port", ifname, "vlan_mode", + "--", "--if-exists", "remove", "Port", ifname, "other_config", + "qinq-ethtype", "--", "--if-exists", "set", "Port", ifname, NULL); if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0) diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index be85f59..0667f9d 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -29,6 +29,7 @@ typedef enum { VIR_NATIVE_VLAN_MODE_DEFAULT = 0, VIR_NATIVE_VLAN_MODE_TAGGED, VIR_NATIVE_VLAN_MODE_UNTAGGED, + VIR_NATIVE_VLAN_MODE_DOT1Q_TUNNEL, VIR_NATIVE_VLAN_MODE_LAST } virNativeVlanMode; -- 1.8.3.1

1 0