- Devel - libvirt List Archives

[libvirt] [PATCH] libvirtd: clarify the TLS conf default vaule setting
by Chen Hanxiao 12 Jan '18

12 Jan '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> As the description of daemon/libvirtd.conf, setting key_file, cert_file or key_file will override the default value. But if we set any one of them, we need to set all the rest of them. This patch clarify that description. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- daemon/libvirtd.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 8e0c0d96d..7040ff26b 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -183,6 +183,9 @@ # +# NB, if the default value of 'key_file', 'cert_file" or +# 'ca_file' would be changed, +# all of them should be changed together. # Override the default server key file path # #key_file = "/etc/pki/libvirt/private/serverkey.pem" -- 2.14.3

1 0

[libvirt] [PATCH] m4: Don't enable bash-completion by default
by Michal Privoznik 12 Jan '18

12 Jan '18

Due to the way that check logic was written we basically enabled bash completion whenever readline was enabled. This is not right because it made bash-completion pkg-config module required. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Even though this would qualify as a build breaker, I'd rather have another pair of eyes to look at it (sorry Cyclops). m4/virt-bash-completion.m4 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/m4/virt-bash-completion.m4 b/m4/virt-bash-completion.m4 index e1ef58740..c8342176f 100644 --- a/m4/virt-bash-completion.m4 +++ b/m4/virt-bash-completion.m4 @@ -30,14 +30,10 @@ AC_DEFUN([LIBVIRT_CHECK_BASH_COMPLETION], [ AC_REQUIRE([LIBVIRT_CHECK_READLINE]) if test "x$with_readline" != "xyes" ; then - if test "x$with_bash_completion" != "xyes" ; then - with_bash_completion=no - else + if test "x$with_bash_completion" = "xyes" ; then AC_MSG_ERROR([readline is required for bash completion support]) - fi - else - if test "x$with_bash_completion" = "xcheck" ; then - with_bash_completion=yes + else + with_bash_completion=no fi fi -- 2.13.6

2 1

[libvirt] [PATCH] qemu: Fix type of a completed job
by Jiri Denemark 12 Jan '18

12 Jan '18

Libvirt 3.7.0 and earlier libvirt reported a migration job as completed immediately after QEMU finished sending migration data at which point migration was not really complete yet. Commit v3.7.0-29-g3f2d6d829e fixed this, but caused a regression in reporting statistics for completed jobs which started reporting the job as still running. This happened because the completed job statistics including the job status are copied from the running job before we finally mark it as completed. Let's make sure QEMU_DOMAIN_JOB_STATUS_COMPLETED is always set in the completed job info even when the job has not finished yet. https://bugzilla.redhat.com/show_bug.cgi?id=1523036 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index c1ceb164d1..a56bc596ff 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1646,8 +1646,10 @@ qemuMigrationWaitForCompletion(virQEMUDriverPtr driver, qemuDomainJobInfoUpdateTime(jobInfo); qemuDomainJobInfoUpdateDowntime(jobInfo); VIR_FREE(priv->job.completed); - if (VIR_ALLOC(priv->job.completed) == 0) + if (VIR_ALLOC(priv->job.completed) == 0) { *priv->job.completed = *jobInfo; + priv->job.completed->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED; + } if (asyncJob != QEMU_ASYNC_JOB_MIGRATION_OUT && jobInfo->status == QEMU_DOMAIN_JOB_STATUS_QEMU_COMPLETED) @@ -5479,8 +5481,9 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } if (dom) { - priv->job.completed = jobInfo; - jobInfo = NULL; + VIR_STEAL_PTR(priv->job.completed, jobInfo); + priv->job.completed->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED; + if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, QEMU_MIGRATION_COOKIE_STATS) < 0) VIR_WARN("Unable to encode migration cookie"); -- 2.15.1

2 1

[libvirt] [PATCH] qemu: Ignore fallback CPU attribute on reconnect
by Jiri Denemark 12 Jan '18

12 Jan '18

When reconnecting to a running domain with host-model CPU started by old libvirt which did not store the actual CPU in the status XML, we need to ignore the fallback attribute to make sure we can translate the detected host CPU model to a model which is supported by the running QEMU. https://bugzilla.redhat.com/show_bug.cgi?id=1532980 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_process.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1a0923af36..25ec464d3e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3887,6 +3887,11 @@ qemuProcessUpdateCPU(virQEMUDriverPtr driver, virDomainCapsCPUModelsPtr models = NULL; int ret = -1; + /* The host CPU model comes from host caps rather than QEMU caps so + * fallback must be allowed no matter what the user specified in the XML. + */ + vm->def->cpu->fallback = VIR_CPU_FALLBACK_ALLOW; + if (qemuProcessFetchGuestCPU(driver, vm, asyncJob, &cpu, &disabled) < 0) goto cleanup; -- 2.15.1

2 1

[libvirt] [RFC PATCH] lxc: Up back the veth interfaces by default
by Benjamin Cama 12 Jan '18

12 Jan '18

Upping an interface without configuring it is not a “cardinal sin” but a sensible way to achieve auto-configuration, e.g. with IPv6 SLAAC (RFC 4862). If NetworkManager has troube with interfaces having only a link-local address, this is a bug in NetworkManager, not in libvirt; it should listen for router advertisements to decide if some interface has global connectivity or not. With network interfaces up by default, stateless containers can be easily auto-configured through the network with SLAAC, without any specific configuration from the host system. This reverts commit c3cf3c43a0bb2e0e4909c32821e20f607635ec85. Signed-off-by: Benjamin Cama <b.cama(a)kerlink.fr> --- Hi, The patch that I propose to revert basically broke my workflow for light stateless containers, where they could be auto-configured on IPv6-only network through SLAAC. Of course, fully-fledged containers can bring up the interface themselves, but this behavior had previously been the default for quite some time, and is even indicated as default in src/conf/domain_conf.h ("Default link state (up)"). I cannot find any real justification for the patch I am reverting, and the bugzilla looks private so I can not comment on the NetworkManager behavior, which looks very buggy to me. Please tell me if you think this is wrong. Also, please Cc me, I am not subscribed. Regards. .mailmap | 1 + src/lxc/lxc_container.c | 7 +------ src/lxc/lxc_native.c | 10 ++++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.mailmap b/.mailmap index 2f0fc901e..9dc3bff85 100644 --- a/.mailmap +++ b/.mailmap @@ -36,6 +36,7 @@ <gerd(a)egidy.de> <lists(a)egidy.de> <gerd(a)egidy.de> <gerd.von.egidy(a)intra2net.com> <benoar(a)dolka.fr> <benjamin.cama(a)telecom-bretagne.eu> +<benoar(a)dolka.fr> <b.cama(a)kerlink.fr> <zhlcindy(a)linux.vnet.ibm.com> <zhlcindy(a)gmail.com> <serge.hallyn(a)canonical.com> <serue(a)us.ibm.com> <pritesh.kothari(a)sun.com> <Pritesh.Kothari(a)Sun.COM> diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 96fceaf1b..e546f0aaf 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -517,12 +517,7 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, if (virNetDevSetName(veths[i], newname) < 0) goto cleanup; - /* Only enable this device if there is a reason to do so (either - * at least one IP was specified, or link state was set to up in - * the config) - */ - if (netDef->guestIP.nips || - netDef->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP) { + if (netDef->linkstate != VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN) { VIR_DEBUG("Enabling %s", newname); if (virNetDevSetOnline(newname, true) < 0) goto cleanup; diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index fdc03a57e..f77a2a910 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -349,10 +349,12 @@ lxcCreateNetDef(const char *type, if (VIR_ALLOC(net) < 0) goto error; - if (STREQ_NULLABLE(flag, "up")) - net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP; - else - net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN; + if (flag) { + if (STREQ(flag, "up")) + net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP; + else + net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN; + } if (VIR_STRDUP(net->ifname_guest, name) < 0) goto error; -- 2.11.0

1 1

[libvirt] [BUG] virsh list didn,t clean vm when qemu destroy failed
by wang.guang55＠zte.com.cn 11 Jan '18

11 Jan '18

U3RlcHMgdG8gcmVwcm9kdWNlIA0KDQoNCjEgdmlyc2ggY3JlYXRlICB0ZXN0dm0gICANCg0KDQoy IGdkYiBhdHRjaCBxZW11LGFuZCBub3QgY29udGludWUNCg0KDQozICB2aXJzaCBkZXN0cm95ICB0 ZXN0dm0gICDvvIx0aGVuIGRlc3RvcnkgZmFpbGVk44CCDQoNCg0KNCBnZGIgcWVtdSBjb250aW51 ZSBhbmQgZXhpdCx0aGVuIHFlbXUgZXhpdC4NCg0KDQoNCg0KDQoNCltyb290QGhvc3QtMTIwLTUx IGhvbWVdIyBwcyAtYXV4IHxncmVwIHFlbXUNCg0KDQpyb290ICAgICAgMjgxNCAgMC4wICAwLjAg MTEyNjQ0ICAgOTU2IHB0cy8zICAgIFMrICAgMTE6NDAgICAwOjAwIGdyZXAgLS1jb2xvcj1hdXRv IHFlbXUNCg0KW3Jvb3RAaG9zdC0xMjAtNTEgaG9tZV0jIHZpcnNoIGxpc3QNCg0KIElkICAgIE5h bWUgICAgICAgICAgICAgICAgICAgICAgICAgICBTdGF0ZQ0KDQotLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQoNCiAzICAgIHRlc3R2bSAgICAgICAg ICAgICAgICAgICAgICAgcnVubmluZw0KDQoNCg0KDQoNCg0KDQoNCg0KDQpjYW4gd2UgdHJpZ2dl ciBxZW11UHJvY2Vzc0hhbmRsZU1vbml0b3JFT0YgYWdhaW4gdG8gcmVtb3ZlIHZtPz8=

1 0

[libvirt] [PATCH v2] treat host models as case-insensitive strings
by Scott Garfinkle 11 Jan '18

11 Jan '18

Qemu now allows case-insensitive specification of CPU models. This fixes the resulting problems on (at least) POWER arch machines. Patch V2: Change only the internal interface. This solves the actual problem at hand of reporting unsupported models now that qemu allows case-insensitive strings (e.g. "Power8" instead of "POWER8"). Signed-off-by: Scott Garfinkle <scottgar(a)linux.vnet.ibm.com> --- src/conf/domain_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index e7323a8..f7d9be5 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -271,7 +271,7 @@ virDomainCapsCPUModelsGet(virDomainCapsCPUModelsPtr cpuModels, return NULL; for (i = 0; i < cpuModels->nmodels; i++) { - if (STREQ(cpuModels->models[i].name, name)) + if (STRCASEEQ(cpuModels->models[i].name, name)) return cpuModels->models + i; } -- 1.8.3.1

2 2

[libvirt] [PATCH] vsh: add a necessary assertion
by Marc Hartmayer 11 Jan '18

11 Jan '18

This fixes the compilation error (compiled with the compiler option '-03'). In file included from ../../tools/vsh.c:28:0: ../../tools/vsh.c: In function 'vshCommandOptStringQuiet': ../../tools/vsh.c:838:30: error: potential null pointer dereference [-Werror=null-dereference] assert(!needData || valid->type != VSH_OT_BOOL); Signed-off-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- tools/vsh.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index e878119b988f..677eb9db3e41 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -816,8 +816,8 @@ vshCommandFree(vshCmd *cmd) * to the option if found, 0 with *OPT set to NULL if the name is * valid and the option is not required, -1 with *OPT set to NULL if * the option is required but not present, and assert if NAME is not - * valid (which indicates a programming error). No error messages are - * issued if a value is returned. + * valid or the option was not found (which indicates a programming + * error). No error messages are issued if a value is returned. */ static int vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt, @@ -835,6 +835,8 @@ vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt, break; valid++; } + assert(valid); + assert(!needData || valid->type != VSH_OT_BOOL); if (valid->flags & VSH_OFLAG_REQ) ret = -1; -- 2.13.4

2 5

[libvirt] [PATCH] docs: Add missing encryption type
by John Ferlan 11 Jan '18

11 Jan '18

Update the text to include "luks" as a possible value. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial. docs/formatstorageencryption.html.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in index c4b209527..23efbf932 100644 --- a/docs/formatstorageencryption.html.in +++ b/docs/formatstorageencryption.html.in @@ -17,7 +17,8 @@ The top-level tag of volume encryption specification is <code>encryption</code>, with a mandatory attribute <code>format</code>. Currently defined values - of <code>format</code> are <code>default</code> and <code>qcow</code>. + of <code>format</code> are <code>default</code>, <code>qcow</code>, + and <code>luks</code>. Each value of <code>format</code> implies some expectations about the content of the <code>encryption</code> tag. Other format values may be defined in the future. -- 2.13.6

1 0

[libvirt] [PATCH] tests: Break symlink loop
by Andrea Bolognani 11 Jan '18

11 Jan '18

distcheck, and possibly more stuff, breaks because of it. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/node0 | 1 - tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/node0 | 1 - tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/node0 | 1 - tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/node0 | 1 - tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/node0 | 1 - tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/node0 | 1 - tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/node0 | 1 - tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/node0 | 1 - 8 files changed, 8 deletions(-) delete mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/node0 delete mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/node0 delete mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/node0 delete mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/node0 delete mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/node0 delete mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/node0 delete mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/node0 delete mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/node0 diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/node0 b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/node0 deleted file mode 120000 index 222b6af32..000000000 --- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/node0 +++ /dev/null @@ -1 +0,0 @@ -../../node/node0 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/node0 b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/node0 deleted file mode 120000 index 222b6af32..000000000 --- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/node0 +++ /dev/null @@ -1 +0,0 @@ -../../node/node0 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/node0 b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/node0 deleted file mode 120000 index 222b6af32..000000000 --- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/node0 +++ /dev/null @@ -1 +0,0 @@ -../../node/node0 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/node0 b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/node0 deleted file mode 120000 index 222b6af32..000000000 --- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/node0 +++ /dev/null @@ -1 +0,0 @@ -../../node/node0 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/node0 b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/node0 deleted file mode 120000 index 222b6af32..000000000 --- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/node0 +++ /dev/null @@ -1 +0,0 @@ -../../node/node0 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/node0 b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/node0 deleted file mode 120000 index 222b6af32..000000000 --- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/node0 +++ /dev/null @@ -1 +0,0 @@ -../../node/node0 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/node0 b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/node0 deleted file mode 120000 index 222b6af32..000000000 --- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/node0 +++ /dev/null @@ -1 +0,0 @@ -../../node/node0 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/node0 b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/node0 deleted file mode 120000 index 222b6af32..000000000 --- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/node0 +++ /dev/null @@ -1 +0,0 @@ -../../node/node0 \ No newline at end of file -- 2.14.3

2 1

[libvirt] [PATCH 0/5] Proof of concept for libvirt_qemu shim process
by Daniel P. Berrange 11 Jan '18

11 Jan '18

This patch series provides a proof of concept impl of the libvirt_qemu shim process I previously suggested here: https://www.redhat.com/archives/libvir-list/2017-November/msg00526.html The end goal is that we'll be able to fully isolate managemen to each QEMU process. ie all the virDomain* APIs would be executed inside the libvirt_qemu shim process. The QEMU driver in libvirtd would merely deal with aggregating the views / tracking central resource allocations. This series, however, does *not* do that. It is a very much smaller proof of concept, principally to: - Learn about pros/cons of different approaches for the long term goal - Provide a working PoC that can be used by the KubeVirt project such that they can spawn QEMU in a separate docker container than libvirtd is in, and inherit namespaces & cgroup placement, etc So, in this series, libvirtd functionality remains essentially unchanged. All I have done is provide a new binary 'libvirt_qemu' that accepts an XML file as input, launches the QEMU process directly, and then calls a new virDomainQemuReconnect() API to make libvirtd aware of its existance. At this point libvirtd can deal with it normally (some caveats listed in last patch). Usage is pretty simple - start libvirtd normally, then to launch a guest just use $ libvirt_qemu /path/to/xml/file It'll be associated with whatever libvirtd instance is running with the same user account. ie if you launch libvirt_qemu as root, it'll associate with qemu:///system. By default it will still place VMs in a dedicated cgroup. To inherit the cgroup of the caller, use <resource register="none"/> in the XML schema to turn off cgroup setup in libvirt_qemu. Having written this PoC, however, I'm less convinced that a bottom up, minimal impl which incrementally picks certain subsets of QEMU driver APIs to call is the right way to attack this problem. ie I was intending to have this minimal shim, then gradually move functionality into it from libvirtd. This feels like it is going to create alot of busy-work, delaying the end goal. I think instead a different approach might be better in the short term. Take the existing libvirtd code as a starting point, clone it to a libvirt_qemu and just start cutting out existing code to make a lighter weight binary that can only run a single guest, whose XML is passed in. We would still ultimately need to deal with much of the same issues, like getting VMs reported to the central libvirtd, but I think that might get to the end result, where all APIs run inside the shim, quicker. The key difference is that we could sooner focus on the harder problems of dealing with shared resource allocation tracking, instead of doing lots of code rewiring for API execution. Daniel P. Berrange (5): conf: allow different resource registration modes conf: expose APIs to let drivers load individual config / status files qemu: add a public API to trigger QEMU driver to connect to running guest qemu: implement the new virDomainQemuReconnect method qemu: implement the 'libvirt_qemu' shim for launching guests externally include/libvirt/libvirt-qemu.h | 4 + po/POTFILES.in | 1 + src/Makefile.am | 49 ++++ src/conf/domain_conf.c | 42 +++- src/conf/domain_conf.h | 12 + src/conf/virdomainobjlist.c | 98 +++++--- src/conf/virdomainobjlist.h | 17 ++ src/driver-hypervisor.h | 5 + src/libvirt-qemu.c | 48 ++++ src/libvirt_private.syms | 4 + src/libvirt_qemu.syms | 5 + src/lxc/lxc_cgroup.c | 34 +++ src/lxc/lxc_cgroup.h | 3 + src/lxc/lxc_process.c | 11 +- src/qemu/qemu_cgroup.c | 69 +++++- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_controller.c | 551 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 59 ++++- src/qemu/qemu_process.c | 31 ++- src/qemu/qemu_process.h | 1 + src/remote/qemu_protocol.x | 18 +- src/remote/remote_driver.c | 1 + src/util/vircgroup.c | 55 ++-- src/util/vircgroup.h | 10 +- 25 files changed, 1046 insertions(+), 86 deletions(-) create mode 100644 src/qemu/qemu_controller.c -- 2.14.3

3 15

[libvirt] Plan for next release
by Daniel Veillard 11 Jan '18

11 Jan '18

So first release for the year comes with a renumbering, so 4.0.0 should come soon, usually we target mid january, so I suggest to enter freeze tomorrow get an RC2 on Monday and hence have the first release Wed next week. I hope this works for everyone, thanks 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/3] processor frequency information on S390
by Bjoern Walk 11 Jan '18

11 Jan '18

Since kernel version 4.7, processor frequency information is available on S390. This patch series extends the parser for both node information and system information, respectively. Let's also add a testcase to the test suite for a S390 CPU configuration running kernel version 4.14 on LPAR. This goes on top of Andrea's changes in here: https://www.redhat.com/archives/libvir-list/2017-December/msg00519.html Bjoern Walk (3): util: virhostcpu: parse frequency information on S390 tests: virhostcputest: testcase for S390 system util: virsysinfo: parse frequency information on S390 src/util/virhostcpu.c | 2 + src/util/virsysinfo.c | 31 +++++++++++++ .../linux-s390x-with-frequency.cpuinfo | 52 ++++++++++++++++++++++ .../linux-s390x-with-frequency.expected | 1 + .../linux-with-frequency/cpu/cpu0/online | 1 + .../linux-with-frequency/cpu/cpu0/topology/book_id | 1 + .../cpu/cpu0/topology/book_siblings | 1 + .../cpu/cpu0/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/core_siblings | 1 + .../cpu/cpu0/topology/core_siblings_list | 1 + .../cpu/cpu0/topology/drawer_id | 1 + .../cpu/cpu0/topology/drawer_siblings | 1 + .../cpu/cpu0/topology/drawer_siblings_list | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings | 1 + .../cpu/cpu0/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu1/online | 1 + .../linux-with-frequency/cpu/cpu1/topology/book_id | 1 + .../cpu/cpu1/topology/book_siblings | 1 + .../cpu/cpu1/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/core_siblings | 1 + .../cpu/cpu1/topology/core_siblings_list | 1 + .../cpu/cpu1/topology/drawer_id | 1 + .../cpu/cpu1/topology/drawer_siblings | 1 + .../cpu/cpu1/topology/drawer_siblings_list | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings | 1 + .../cpu/cpu1/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu2/online | 1 + .../linux-with-frequency/cpu/cpu2/topology/book_id | 1 + .../cpu/cpu2/topology/book_siblings | 1 + .../cpu/cpu2/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/core_siblings | 1 + .../cpu/cpu2/topology/core_siblings_list | 1 + .../cpu/cpu2/topology/drawer_id | 1 + .../cpu/cpu2/topology/drawer_siblings | 1 + .../cpu/cpu2/topology/drawer_siblings_list | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings | 1 + .../cpu/cpu2/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu3/online | 1 + .../linux-with-frequency/cpu/cpu3/topology/book_id | 1 + .../cpu/cpu3/topology/book_siblings | 1 + .../cpu/cpu3/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/core_siblings | 1 + .../cpu/cpu3/topology/core_siblings_list | 1 + .../cpu/cpu3/topology/drawer_id | 1 + .../cpu/cpu3/topology/drawer_siblings | 1 + .../cpu/cpu3/topology/drawer_siblings_list | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings | 1 + .../cpu/cpu3/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu4/online | 1 + .../linux-with-frequency/cpu/cpu4/topology/book_id | 1 + .../cpu/cpu4/topology/book_siblings | 1 + .../cpu/cpu4/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu4/topology/core_id | 1 + .../cpu/cpu4/topology/core_siblings | 1 + .../cpu/cpu4/topology/core_siblings_list | 1 + .../cpu/cpu4/topology/drawer_id | 1 + .../cpu/cpu4/topology/drawer_siblings | 1 + .../cpu/cpu4/topology/drawer_siblings_list | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../cpu/cpu4/topology/thread_siblings | 1 + .../cpu/cpu4/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu5/online | 1 + .../linux-with-frequency/cpu/cpu5/topology/book_id | 1 + .../cpu/cpu5/topology/book_siblings | 1 + .../cpu/cpu5/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu5/topology/core_id | 1 + .../cpu/cpu5/topology/core_siblings | 1 + .../cpu/cpu5/topology/core_siblings_list | 1 + .../cpu/cpu5/topology/drawer_id | 1 + .../cpu/cpu5/topology/drawer_siblings | 1 + .../cpu/cpu5/topology/drawer_siblings_list | 1 + .../cpu/cpu5/topology/physical_package_id | 1 + .../cpu/cpu5/topology/thread_siblings | 1 + .../cpu/cpu5/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu6/online | 1 + .../linux-with-frequency/cpu/cpu6/topology/book_id | 1 + .../cpu/cpu6/topology/book_siblings | 1 + .../cpu/cpu6/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu6/topology/core_id | 1 + .../cpu/cpu6/topology/core_siblings | 1 + .../cpu/cpu6/topology/core_siblings_list | 1 + .../cpu/cpu6/topology/drawer_id | 1 + .../cpu/cpu6/topology/drawer_siblings | 1 + .../cpu/cpu6/topology/drawer_siblings_list | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../cpu/cpu6/topology/thread_siblings | 1 + .../cpu/cpu6/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu7/online | 1 + .../linux-with-frequency/cpu/cpu7/topology/book_id | 1 + .../cpu/cpu7/topology/book_siblings | 1 + .../cpu/cpu7/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu7/topology/core_id | 1 + .../cpu/cpu7/topology/core_siblings | 1 + .../cpu/cpu7/topology/core_siblings_list | 1 + .../cpu/cpu7/topology/drawer_id | 1 + .../cpu/cpu7/topology/drawer_siblings | 1 + .../cpu/cpu7/topology/drawer_siblings_list | 1 + .../cpu/cpu7/topology/physical_package_id | 1 + .../cpu/cpu7/topology/thread_siblings | 1 + .../cpu/cpu7/topology/thread_siblings_list | 1 + .../virhostcpudata/linux-with-frequency/cpu/online | 1 + .../linux-with-frequency/cpu/present | 1 + tests/virhostcputest.c | 1 + 111 files changed, 193 insertions(+) create mode 100644 tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo create mode 100644 tests/virhostcpudata/linux-s390x-with-frequency.expected create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/present -- 2.13.4

2 16

[libvirt] [PATCH] tests: Remove trailing whitespace
by John Ferlan 10 Jan '18

10 Jan '18

Commit/push resulted in following error: remote: tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo:5: trailing whitespace. remote: +features : esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx sie remote: error: hook declined to update refs/heads/master Just removed the trailing whitespace. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Missed this during 'git am' processing and the syntax-check didn't find it either, but the push hook did. Just update the file to remove the trailing whitespace (built and tested just fine). tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo b/tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo index 0edc371dd..b50aa18c3 100644 --- a/tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo +++ b/tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo @@ -2,7 +2,7 @@ vendor_id : IBM/S390 # processors : 8 bogomips per cpu: 20325.00 max thread id : 1 -features : esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx sie +features : esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx sie facilities : 0 1 2 3 4 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 30 31 32 33 34 35 36 37 40 41 42 43 44 45 46 47 48 49 50 51 52 53 55 57 64 65 66 67 68 69 70 71 72 73 75 76 77 78 80 128 129 131 132 142 143 cache0 : level=1 type=Data scope=Private size=128K line_size=256 associativity=8 cache1 : level=1 type=Instruction scope=Private size=96K line_size=256 associativity=6 -- 2.13.6

1 1

[libvirt] [PATCH] docs: formatdomain: Specify the default value of 'check' attribute
by Kashyap Chamarthy 10 Jan '18

10 Jan '18

The 'check' attribute is referring to this: <cpu mode='custom' match='exact' check='full'> Upstream documentation says, it is: used to request a specific way of checking whether the virtual CPU matches the specification. It is usually safe to omit this attribute when starting a domain and stick with the default value. But doesn't tell *what* the default value is. It is check='partial'. Mention it so. Thanks: Jiri Denemark --- docs/formatdomain.html.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d272cc1ba..8985da836 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1287,10 +1287,11 @@ attribute can be used to request a specific way of checking whether the virtual CPU matches the specification. It is usually safe to omit this attribute when starting a domain and stick with the default - value. Once the domain starts, libvirt will automatically change the - <code>check</code> attribute to the best supported value to ensure the - virtual CPU does not change when the domain is migrated to another - host. The following values can be used: + value (<code>partial>/code>). Once the domain starts, libvirt will + automatically change the <code>check</code> attribute to the best + supported value to ensure the virtual CPU does not change when the + domain is migrated to another host. The following values can be + used: <dl> <dt><code>none</code></dt> @@ -1303,7 +1304,7 @@ <dt><code>partial</code></dt> <dd>Libvirt will check the guest CPU specification before starting a domain, but the rest is left on the hypervisor. It can still - provide a different virtual CPU.</dd> + provide a different virtual CPU. (This is the default.)</dd> <dt><code>full</code></dt> <dd>The virtual CPU created by the hypervisor will be checked -- 2.13.6

3 9

[libvirt] [PATCH 0/4] Alter Disk Volume logic to use objects
by John Ferlan 10 Jan '18

10 Jan '18

This series converts the storage volume forward linked list into an object that contains hash tables of volume objects. The first two patches resolve issues seen during testing with the Disk backend which had some special cased code to handle the Create/Delete paths and interactions with the partition logic. The first patch was much more quickly seen with object free logic in place. The second two patches make the conversion to objects and hash tables in "smaller chunks", but they could easily be combined. John Ferlan (4): storage: When delete volume avoid disk backend removal storage: Modify virStorageBackendDiskMakeDataVol logic storage: Introduce _virStorageVolObj[List] storage: Complete implementation volume by hash object src/conf/virstorageobj.c | 540 ++++++++++++++++++++++++++++++------- src/storage/storage_backend_disk.c | 40 +-- src/storage/storage_driver.c | 14 +- 3 files changed, 471 insertions(+), 123 deletions(-) -- 2.13.6

2 8

[libvirt] [PATCH 0/5] Refresh QEMU caps when CPU microcode changes
by Jiri Denemark 10 Jan '18

10 Jan '18

Jiri Denemark (1): cpu_x86: Rename virCPUx86MapInitialize Paolo Bonzini (4): util: add virFileReadHeaderQuiet wrapper around virFileReadHeaderFD util: introduce virHostCPUGetMicrocodeVersion conf: include x86 microcode version in virsh capabilities qemu: capabilities: force update if the microcode version does not match src/conf/cpu_conf.c | 14 +++++++ src/conf/cpu_conf.h | 1 + src/cpu/cpu_x86.c | 17 +++++++-- src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 40 +++++++++++++++++++- src/qemu/qemu_capabilities.h | 6 ++- src/qemu/qemu_capspriv.h | 5 +++ src/qemu/qemu_driver.c | 9 ++++- src/util/virfile.c | 19 ++++++++++ src/util/virfile.h | 2 + src/util/virhostcpu.c | 43 ++++++++++++++++++++++ src/util/virhostcpu.h | 2 + tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemucapabilitiestest.c | 14 +++++-- tests/qemucapsprobe.c | 2 +- tests/testutilsqemu.c | 2 +- 40 files changed, 189 insertions(+), 14 deletions(-) -- 2.15.1

5 15

[libvirt] [PATCH 0/3] cpu_x86: Few small fixes
by Jiri Denemark 10 Jan '18

10 Jan '18

I found these issues when working on patches and tests for CVE-2017-5715 part of Spectre. Jiri Denemark (3): cputest: Fix cpu-cpuid.py diff command cpu_x86: Add debug messages to x86DecodeUseCandidate cpu_x86: Copy CPU signature from ancestor src/cpu/cpu_x86.c | 26 ++++++++--- tests/cputestdata/cpu-cpuid.py | 52 +++++++++++++++------- .../x86_64-cpuid-A10-5800K-disabled.xml | 1 - .../cputestdata/x86_64-cpuid-A10-5800K-enabled.xml | 2 - .../x86_64-cpuid-Core-i5-2500-enabled.xml | 1 - .../x86_64-cpuid-Core-i5-2540M-enabled.xml | 1 - .../x86_64-cpuid-Core-i5-4670T-enabled.xml | 1 - .../x86_64-cpuid-Core-i5-6600-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-2600-enabled.xml | 1 - ...x86_64-cpuid-Core-i7-2600-xsaveopt-disabled.xml | 1 - .../x86_64-cpuid-Core-i7-2600-xsaveopt-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-3740QM-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-3770-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-4510U-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-4600U-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-5600U-arat-disabled.xml | 1 + .../x86_64-cpuid-Core-i7-5600U-arat-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-5600U-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-7700-enabled.xml | 1 - .../x86_64-cpuid-Core2-E6850-enabled.xml | 1 - .../x86_64-cpuid-EPYC-7601-32-Core-disabled.xml | 1 - .../x86_64-cpuid-EPYC-7601-32-Core-enabled.xml | 2 - .../x86_64-cpuid-Opteron-2350-disabled.xml | 1 - .../x86_64-cpuid-Opteron-2350-enabled.xml | 2 - .../x86_64-cpuid-Opteron-6234-disabled.xml | 1 - .../x86_64-cpuid-Opteron-6234-enabled.xml | 2 - .../x86_64-cpuid-Phenom-B95-disabled.xml | 1 - .../x86_64-cpuid-Phenom-B95-enabled.xml | 2 - ..._64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml | 1 - ...6_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml | 2 - .../x86_64-cpuid-Xeon-E3-1245-v5-enabled.xml | 1 - .../x86_64-cpuid-Xeon-E5-2630-v3-enabled.xml | 1 - .../x86_64-cpuid-Xeon-E5-2650-v3-enabled.xml | 1 - .../x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml | 1 + .../x86_64-cpuid-Xeon-E5-2650-v4-enabled.xml | 1 - .../x86_64-cpuid-Xeon-E7-4820-enabled.xml | 1 - .../x86_64-cpuid-Xeon-E7-4830-enabled.xml | 1 - .../x86_64-cpuid-Xeon-E7-8890-v3-enabled.xml | 1 - .../x86_64-cpuid-Xeon-Gold-6148-disabled.xml | 1 + .../x86_64-cpuid-Xeon-Gold-6148-enabled.xml | 1 - .../x86_64-cpuid-Xeon-W3520-enabled.xml | 1 - 41 files changed, 60 insertions(+), 63 deletions(-) -- 2.15.1

2 4

[libvirt] [PATCH v2] nodedev: update mdev_types caps before dumpxml
by Wu Zongyong 09 Jan '18

09 Jan '18

In current implemention, mdev_types caps keep constant all the time. But, it is possible that a device capable of mdev_types sometime(for example:bind to proper driver) and incapable of mdev_types at other times(for example: unbind from its driver). We should keep the info of xml dumped out consistent with real status of the device. Signed-off-by: Wu Zongyong <cordius.wu(a)huawei.com> --- v2: - fix mistakes pointed out by Erik src/node_device/node_device_linux_sysfs.c | 21 +++++++++++++++++++++ src/node_device/node_device_udev.c | 29 +++++++++++++++++++++++++++++ src/node_device/node_device_udev.h | 18 +++++++++++++----- 3 files changed, 63 insertions(+), 5 deletions(-) diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 6f438e5..8b00aff 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -29,6 +29,7 @@ #include "dirname.h" #include "node_device_driver.h" #include "node_device_hal.h" +#include "node_device_udev.h" #include "node_device_linux_sysfs.h" #include "virerror.h" #include "viralloc.h" @@ -175,6 +176,24 @@ nodeDeviceSysfsGetPCIIOMMUGroupCaps(virNodeDevCapPCIDevPtr pci_dev) return ret; } +static int +nodeDeviceSysfsGetPCIMdevTypesCaps(const char *sysfsPath, + virNodeDevCapPCIDevPtr pci_dev) +{ + size_t i; + + /* this could be a refresh, so clear out the old data */ + for (i = 0; i < pci_dev->nmdev_types; i++) + virNodeDevCapMdevTypeFree(pci_dev->mdev_types[i]); + VIR_FREE(pci_dev->mdev_types); + pci_dev->nmdev_types = 0; + + if (udevPCISysfsGetMdevTypesCap(sysfsPath, pci_dev) < 0) + return -1; + + return 0; +} + /* nodeDeviceSysfsGetPCIRelatedCaps() get info that is stored in sysfs * about devices related to this device, i.e. things that can change @@ -190,6 +209,8 @@ nodeDeviceSysfsGetPCIRelatedDevCaps(const char *sysfsPath, return -1; if (nodeDeviceSysfsGetPCIIOMMUGroupCaps(pci_dev) < 0) return -1; + if (nodeDeviceSysfsGetPCIMdevTypesCaps(sysfsPath, pci_dev) < 0) + return -1; return 0; } diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index e0fca61..781facf 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -506,6 +506,35 @@ udevPCIGetMdevTypesCap(struct udev_device *device, } +int +udevPCISysfsGetMdevTypesCap(const char *sysfsPath, + virNodeDevCapPCIDevPtr pci_dev) +{ + int ret = -1; + udevEventDataPtr priv = NULL; + struct udev *udev = NULL; + struct udev_device *device = NULL; + + priv = driver->privateData; + udev = udev_monitor_get_udev(priv->udev_monitor); + device = udev_device_new_from_syspath(udev, sysfsPath); + if (!device) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to create udev device from path %s"), + sysfsPath); + goto cleanup; + } + + if (udevPCIGetMdevTypesCap(device, pci_dev) < 0) + goto cleanup; + + ret = 0; + cleanup: + udev_device_unref(device); + return ret; +} + + static int udevProcessPCI(struct udev_device *device, virNodeDeviceDefPtr def) diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h index f15e520..bbdc70f 100644 --- a/src/node_device/node_device_udev.h +++ b/src/node_device/node_device_udev.h @@ -19,10 +19,18 @@ * * Author: Dave Allan <dallan(a)redhat.com> */ +#ifndef __VIR_NODE_DEVICE_UDEV_H__ +# define __VIR_NODE_DEVICE_UDEV_H__ -#include <libudev.h> -#include <stdint.h> +# include <libudev.h> +# include <stdint.h> -#define SYSFS_DATA_SIZE 4096 -#define DMI_DEVPATH "/sys/devices/virtual/dmi/id" -#define DMI_DEVPATH_FALLBACK "/sys/class/dmi/id" +# define SYSFS_DATA_SIZE 4096 +# define DMI_DEVPATH "/sys/devices/virtual/dmi/id" +# define DMI_DEVPATH_FALLBACK "/sys/class/dmi/id" + +int +udevPCISysfsGetMdevTypesCap(const char *sysfsPath, virNodeDevCapPCIDevPtr pci_dev); + + +#endif /* __VIR_NODE_DEVICE_UDEV_H__ */ -- 1.8.3.1

2 1

[libvirt] [PATCH 0/4] apparmor: implement more domain callbacks
by Christian Ehrhardt 09 Jan '18

09 Jan '18

Based on a discussion in [1] I found that the AppArmor security module lacked some callbacks. Implementing those not only fixes the issue I had before but will also cover a few more cases I didn't even run into so far. [1]: https://www.redhat.com/archives/libvir-list/2017-December/msg00726.html Christian Ehrhardt (4): security, apparmor: implement domainSetPathLabel security: full path option for DomainSetPathLabel security, apparmor: add (Set|Restore)ChardevLabel apparmor, virt-aa-helper: drop static channel rule src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_process.c | 4 +- src/security/security_apparmor.c | 96 ++++++++++++++++++++++++++++++++++++++++ src/security/security_dac.c | 3 +- src/security/security_driver.h | 3 +- src/security/security_manager.c | 5 ++- src/security/security_manager.h | 3 +- src/security/security_selinux.c | 3 +- src/security/security_stack.c | 5 ++- src/security/virt-aa-helper.c | 2 - 10 files changed, 113 insertions(+), 13 deletions(-) -- 2.7.4

2 18

[libvirt] [cim][PATCH 0/2] memory leak fixes in CIM provider
by Adam Majer 09 Jan '18

09 Jan '18

In some instances, asprintf allocated memory is not freed resulting in a slow memory leak. Adam Majer (2): Fix memory leak in set_other_id_info Fix memory leak in set_input_props src/Virt_ComputerSystem.c | 2 ++ src/Virt_SettingsDefineCapabilities.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) -- 2.13.6

1 2

[libvirt] [cim][PATCH 1/2] Fix memory leak in set_other_id_info
by Adam Majer 09 Jan '18

09 Jan '18

model was allocated by asprintf but never freed after usage and assignement. Signed-off-by: Adam Majer <amajer(a)suse.de> --- src/Virt_ComputerSystem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Virt_ComputerSystem.c b/src/Virt_ComputerSystem.c index da07f93..b4930ac 100644 --- a/src/Virt_ComputerSystem.c +++ b/src/Virt_ComputerSystem.c @@ -417,6 +417,8 @@ static int set_other_id_info(const CMPIBroker *broker, CMPI_string); } + free(model); + CMSetProperty(instance, "OtherIdentifyingInfo", &id_info, CMPI_stringA); -- 2.13.6

2 4

[libvirt] [PATCH] tests: Only format the CPU frequency if it's known
by Andrea Bolognani 09 Jan '18

09 Jan '18

Instead of formatting 'MHz: 0', which can be confusing, skip the field altogether. This behavior is consistent with that of 'virsh nodeinfo'. Suggested-by: John Ferlan <jferlan(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .../linux-aarch64-f21-mustang.expected | 2 +- .../linux-aarch64-rhel74-moonshot.expected | 2 +- .../linux-aarch64-rhelsa-3.19.0-mustang.expected | 2 +- .../linux-armv6l-raspberrypi.expected | 2 +- tests/virhostcputest.c | 28 +++++++++++++++++----- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/tests/virhostcpudata/linux-aarch64-f21-mustang.expected b/tests/virhostcpudata/linux-aarch64-f21-mustang.expected index ac950dc15..1ee3cf737 100644 --- a/tests/virhostcpudata/linux-aarch64-f21-mustang.expected +++ b/tests/virhostcpudata/linux-aarch64-f21-mustang.expected @@ -1 +1 @@ -CPUs: 8/8, MHz: 0, Nodes: 1, Sockets: 4, Cores: 2, Threads: 1 +CPUs: 8/8, Nodes: 1, Sockets: 4, Cores: 2, Threads: 1 diff --git a/tests/virhostcpudata/linux-aarch64-rhel74-moonshot.expected b/tests/virhostcpudata/linux-aarch64-rhel74-moonshot.expected index 6776aa6c2..1926af836 100644 --- a/tests/virhostcpudata/linux-aarch64-rhel74-moonshot.expected +++ b/tests/virhostcpudata/linux-aarch64-rhel74-moonshot.expected @@ -1 +1 @@ -CPUs: 8/8, MHz: 0, Nodes: 1, Sockets: 1, Cores: 8, Threads: 1 +CPUs: 8/8, Nodes: 1, Sockets: 1, Cores: 8, Threads: 1 diff --git a/tests/virhostcpudata/linux-aarch64-rhelsa-3.19.0-mustang.expected b/tests/virhostcpudata/linux-aarch64-rhelsa-3.19.0-mustang.expected index 6776aa6c2..1926af836 100644 --- a/tests/virhostcpudata/linux-aarch64-rhelsa-3.19.0-mustang.expected +++ b/tests/virhostcpudata/linux-aarch64-rhelsa-3.19.0-mustang.expected @@ -1 +1 @@ -CPUs: 8/8, MHz: 0, Nodes: 1, Sockets: 1, Cores: 8, Threads: 1 +CPUs: 8/8, Nodes: 1, Sockets: 1, Cores: 8, Threads: 1 diff --git a/tests/virhostcpudata/linux-armv6l-raspberrypi.expected b/tests/virhostcpudata/linux-armv6l-raspberrypi.expected index 1c4c713d5..4961316fb 100644 --- a/tests/virhostcpudata/linux-armv6l-raspberrypi.expected +++ b/tests/virhostcpudata/linux-armv6l-raspberrypi.expected @@ -1 +1 @@ -CPUs: 1/1, MHz: 0, Nodes: 1, Sockets: 1, Cores: 1, Threads: 1 +CPUs: 1/1, Nodes: 1, Sockets: 1, Cores: 1, Threads: 1 diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index d3ee18461..9a1a48098 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -32,6 +32,7 @@ linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile) { int ret = -1; + virBuffer buf = VIR_BUFFER_INITIALIZER; char *actualData = NULL; virNodeInfo nodeinfo; FILE *cpuinfo; @@ -57,20 +58,35 @@ linuxTestCompareFiles(const char *cpuinfofile, } VIR_FORCE_FCLOSE(cpuinfo); - if (virAsprintf(&actualData, - "CPUs: %u/%u, MHz: %u, Nodes: %u, Sockets: %u, " - "Cores: %u, Threads: %u\n", - nodeinfo.cpus, VIR_NODEINFO_MAXCPUS(nodeinfo), - nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets, - nodeinfo.cores, nodeinfo.threads) < 0) + virBufferAsprintf(&buf, + "CPUs: %u/%u, ", + nodeinfo.cpus, VIR_NODEINFO_MAXCPUS(nodeinfo)); + + /* Only format the CPU frequency if it's known. This behavior is + * consistent with that of 'virsh nodeinfo' */ + if (nodeinfo.mhz) { + virBufferAsprintf(&buf, + "MHz: %u, ", + nodeinfo.mhz); + } + + virBufferAsprintf(&buf, + "Nodes: %u, Sockets: %u, Cores: %u, Threads: %u\n", + nodeinfo.nodes, nodeinfo.sockets, + nodeinfo.cores, nodeinfo.threads); + + if (virBufferError(&buf)) goto fail; + actualData = virBufferContentAndReset(&buf); + if (virTestCompareToFile(actualData, outputfile) < 0) goto fail; ret = 0; fail: + virBufferFreeAndReset(&buf); VIR_FREE(actualData); return ret; } -- 2.14.3

3 4

[libvirt] [PATCH] add support of iSER transport type in qemu with libiscsi
by lichstor＠gmail.com 09 Jan '18

09 Jan '18

From: zhangshengyu <zhangshengyu(a)fusionstack.cn> --- src/conf/domain_conf.c | 10 ++++++ src/qemu/qemu_block.c | 24 +++++++++++-- src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_parse_command.c | 10 +++++- src/storage/storage_backend_gluster.c | 1 + src/util/virstoragefile.c | 3 +- src/util/virstoragefile.h | 1 + .../qemuargv2xmldata/disk-drive-network-iser.args | 25 +++++++++++++ tests/qemuargv2xmldata/disk-drive-network-iser.xml | 41 ++++++++++++++++++++++ tests/qemuargv2xmltest.c | 1 + .../qemuxml2argvdata/disk-drive-network-iser.args | 29 +++++++++++++++ tests/qemuxml2argvdata/disk-drive-network-iser.xml | 37 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmloutdata/disk-drive-network-iser.xml | 41 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 15 files changed, 224 insertions(+), 4 deletions(-) create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser.args create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser.args create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser.xml create mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-iser.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9a62bc472..5767575d0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7080,6 +7080,7 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node, virStorageNetHostDefPtr *hosts, size_t *nhosts) { + char *transport = NULL; xmlNodePtr child; for (child = node->children; child; child = child->next) { @@ -7091,6 +7092,11 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node, } } + if ((*hosts) && (transport = virXMLPropString(node, "transport"))) { + //VIR_WARN("missing network source transport type"); + (*hosts)->transport = virStorageNetHostTransportTypeFromString(transport); + } + return 0; } @@ -8495,6 +8501,7 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, if (virDomainStorageNetworkParseHosts(node, &src->hosts, &src->nhosts) < 0) goto cleanup; + virStorageSourceNetworkAssignDefaultPorts(src); ret = 0; @@ -22364,6 +22371,9 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf, VIR_FREE(path); + if (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_ISER) + virBufferEscapeString(attrBuf, " transport='%s'", "iser"); + if (src->haveTLS != VIR_TRISTATE_BOOL_ABSENT && !(flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && src->tlsFromConfig)) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 585f0255e..49837205f 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -433,6 +433,12 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) if (VIR_STRDUP(uri->scheme, virStorageNetProtocolTypeToString(src->protocol)) < 0) goto cleanup; + } else if (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_ISER) { + uri->port = src->hosts->port; + + if (VIR_STRDUP(uri->scheme, + virStorageNetHostTransportTypeToString(src->hosts->transport)) < 0) + goto cleanup; } else { if (virAsprintf(&uri->scheme, "%s+%s", virStorageNetProtocolTypeToString(src->protocol), @@ -506,6 +512,19 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDefPtr host, goto cleanup; break; + case VIR_STORAGE_NET_HOST_TRANS_ISER: + transport = "iser"; + if (virAsprintf(&port, "%u", host->port) < 0) + goto cleanup; + + if (virJSONValueObjectCreate(&server, + "s:type", transport, + "s:host", host->name, + "s:port", port, + NULL) < 0) + goto cleanup; + break; + case VIR_STORAGE_NET_HOST_TRANS_UNIX: if (virJSONValueObjectCreate(&server, "s:type", "unix", @@ -590,7 +609,8 @@ qemuBlockStorageSourceBuildJSONInetSocketAddress(virStorageNetHostDefPtr host) virJSONValuePtr ret = NULL; char *port = NULL; - if (host->transport != VIR_STORAGE_NET_HOST_TRANS_TCP) { + if (host->transport != VIR_STORAGE_NET_HOST_TRANS_TCP && + host->transport != VIR_STORAGE_NET_HOST_TRANS_ISER) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("only TCP protocol can be converted to InetSocketAddress")); return NULL; @@ -831,7 +851,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr src) "s:portal", portal, "s:target", target, "u:lun", lun, - "s:transport", "tcp", + "s:transport", virStorageNetHostTransportTypeToString(src->hosts->transport), "S:user", username, "S:password-secret", objalias, NULL)); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4d0c141e5..eb482097f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -883,6 +883,8 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, if (!((src->hosts->name && strchr(src->hosts->name, ':')) || (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP && !src->hosts->name) || + (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_ISER && + !src->hosts->name) || (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_UNIX && src->hosts->socket && src->hosts->socket[0] != '/'))) { @@ -891,6 +893,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, switch (src->hosts->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: + case VIR_STORAGE_NET_HOST_TRANS_ISER: virBufferAsprintf(&buf, "%s:%u", src->hosts->name, src->hosts->port); break; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 5fe3f97d0..d376af208 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -70,7 +70,9 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, if (transp) *transp++ = 0; - if (STRNEQ(uri->scheme, scheme)) { + if (STREQ(uri->scheme, "iser")) { + transp = (char *)"iser"; + } else if (STRNEQ(uri->scheme, scheme)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid transport/scheme '%s'"), uri->scheme); goto error; @@ -709,6 +711,12 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, if (qemuParseISCSIString(def) < 0) goto error; + } else if (STRPREFIX(def->src->path, "iser:")) { + def->src->type = VIR_STORAGE_TYPE_NETWORK; + def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI; + + if (qemuParseISCSIString(def) < 0) + goto error; } else if (STRPREFIX(def->src->path, "sheepdog:")) { char *p = def->src->path; char *port, *vdi; diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 5eea84f16..1452fa0cd 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -608,6 +608,7 @@ virStorageFileBackendGlusterInitServer(virStorageFileBackendGlusterPrivPtr priv, hoststr = host->socket; break; + case VIR_STORAGE_NET_HOST_TRANS_ISER: case VIR_STORAGE_NET_HOST_TRANS_LAST: break; } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 5780180a9..63253a9c4 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -92,7 +92,8 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST, VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST, "tcp", "unix", - "rdma") + "rdma", + "iser") VIR_ENUM_IMPL(virStorageSourcePoolMode, VIR_STORAGE_SOURCE_POOL_MODE_LAST, diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index ecd806c93..5a6ec7776 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -147,6 +147,7 @@ typedef enum { VIR_STORAGE_NET_HOST_TRANS_TCP, VIR_STORAGE_NET_HOST_TRANS_UNIX, VIR_STORAGE_NET_HOST_TRANS_RDMA, + VIR_STORAGE_NET_HOST_TRANS_ISER, VIR_STORAGE_NET_HOST_TRANS_LAST } virStorageNetHostTransport; diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser.args b/tests/qemuargv2xmldata/disk-drive-network-iser.args new file mode 100644 index 000000000..c476e759e --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser.args @@ -0,0 +1,25 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example,format=raw,\ +if=virtio \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ +if=virtio \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser.xml b/tests/qemuargv2xmldata/disk-drive-network-iser.xml new file mode 100644 index 000000000..88f043f66 --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/0' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index cb010268c..3a82630e0 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -213,6 +213,7 @@ mymain(void) DO_TEST("disk-drive-network-nbd-unix"); DO_TEST("disk-drive-network-iscsi"); DO_TEST("disk-drive-network-iscsi-auth"); + DO_TEST("disk-drive-network-iser"); DO_TEST("disk-drive-network-gluster"); DO_TEST("disk-drive-network-rbd"); DO_TEST("disk-drive-network-rbd-auth"); diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser.args b/tests/qemuxml2argvdata/disk-drive-network-iser.args new file mode 100644 index 000000000..49ea467ff --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser.args @@ -0,0 +1,29 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example/0,format=raw,\ +if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ +if=none,id=drive-virtio-disk1 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ +id=virtio-disk1 diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser.xml b/tests/qemuxml2argvdata/disk-drive-network-iser.xml new file mode 100644 index 000000000..b1634555c --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example' transport='iser'> + <host name='example.org' port='6000'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdb' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ca24e0bbb..accfdaf4b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -936,6 +936,7 @@ mymain(void) DO_TEST("disk-drive-network-iscsi-lun", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BLOCK); + DO_TEST("disk-drive-network-iser", NONE); DO_TEST("disk-drive-network-gluster", QEMU_CAPS_GLUSTER_DEBUG_LEVEL); DO_TEST("disk-drive-network-rbd", NONE); diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-iser.xml b/tests/qemuxml2xmloutdata/disk-drive-network-iser.xml new file mode 100644 index 000000000..88f043f66 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-drive-network-iser.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/0' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2be8eb2c1..23f9292c4 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -515,6 +515,7 @@ mymain(void) DO_TEST("disk-drive-network-nbd-unix", NONE); DO_TEST("disk-drive-network-iscsi", NONE); DO_TEST("disk-drive-network-iscsi-auth", NONE); + DO_TEST("disk-drive-network-iser", NONE); DO_TEST("disk-drive-network-gluster", NONE); DO_TEST("disk-drive-network-rbd", NONE); DO_TEST("disk-drive-network-rbd-auth", NONE); -- 2.13.6 (Apple Git-96)

3 3

Re: [libvirt] [PATCH] usb: allow host devices to be specified by port
by Xen Mann 09 Jan '18

09 Jan '18

> [libvirt] [PATCH] usb: allow host devices to be specified by port > > ------------------------------------------------------------ > > From: Thomas Hebb <thomas hebb editshare com>To: libvir-list redhat comCc: Thomas Hebb <thomas hebb editshare com>Subject: [libvirt] [PATCH] usb: allow host devices to be specified by portDate: Tue, 5 Jul 2016 17:21:24 -0400 > ------------------------------------------------------------ > Previously, only VID/PID and bus/device matching were supported. Neither > of these provide a stable and persistent way of assigning a guest a > specific host device out of several with the same VID and PID, as device > numbers change on every enumeration. Hey there, is this patch already part of libvirt? As mentioned by DanielB. (https://stackoverflow.com/questions/46421962/from-qemu-to-libvirtvirsh-add-…) this feature is probably already implemented by now. If so, I really would like to use it, it would save me lot's of work. Is this feature already part of libvirt? If it is already implemented, how can I use it? If not, is this on schedule? Thx in advance! Xensemann

1 0

[libvirt] [PATCH v4.1 0/2] qemu: Add support for hot unplugging redirdev
by Chen Hanxiao 08 Jan '18

08 Jan '18

v4.1: call qemuDomainRemoveRedirdevDevice in qemuDomainRemoveDevice v4: update commit messages and news v3: use helper qemuDomainDelChardevTLSObjects and address some comments v2: rebased on master Chen Hanxiao (2): qemu: Add support for hot unplugging redirdev device which can use the detach-device --live news: add change of hot unplug redirdev docs/news.xml | 5 +++ src/qemu/qemu_driver.c | 4 ++- src/qemu/qemu_hotplug.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.h | 4 +++ 4 files changed, 107 insertions(+), 2 deletions(-) -- 2.14.3

2 3

[libvirt] [PATCH] nodedev: Fix failing to parse PCI address for non-PCI network devices
by Fei Li 08 Jan '18

08 Jan '18

Commit 8708ca01c added virNetDevSwitchdevFeature to check whether the NIC had Switchdev capabilities; however this causes errors for network devices whose address is not in PCI format, like qeth device whose address is 0.0.0800, when calling virPCIDeviceAddressParse. Change virReportError to VIR_DEBUG to avoid these two error messages occuring when starting the libvirtd service, just leave their callers to handle the return values respectively. Signed-off-by: Fei Li <fli(a)suse.com> --- src/util/virpci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index fe57bef32..880d7baba 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2561,7 +2561,7 @@ logStrToLong_ui(char const *s, ret = virStrToLong_ui(s, end_ptr, base, result); if (ret != 0) - VIR_ERROR(_("Failed to convert '%s' to unsigned int"), s); + VIR_DEBUG("Failed to convert '%s' to unsigned int", s); return ret; } @@ -2638,9 +2638,7 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link) goto out; if (virPCIDeviceAddressParse(config_address, bdf) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse PCI config address '%s'"), - config_address); + VIR_DEBUG("Failed to parse PCI config address '%s'", config_address); VIR_FREE(bdf); goto out; } -- 2.13.5

4 4

[libvirt] [PATCH] qemu: Prepare BIOS/UEFI when starting a domain
by Michal Privoznik 08 Jan '18

08 Jan '18

https://bugzilla.redhat.com/show_bug.cgi?id=1527740 Users might use a block device as UEFI VAR store. Or even have OVMF stored there. Therefore, when starting a domain and separate mount namespace is used, we have to create all the /dev entries that are configured for the domain. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 43bd0fff4..04af68809 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9470,6 +9470,44 @@ qemuDomainSetupAllRNGs(virQEMUDriverConfigPtr cfg, } +static int +qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, + virDomainObjPtr vm, + const struct qemuDomainCreateDeviceData *data) +{ + virDomainLoaderDefPtr loader = vm->def->os.loader; + int ret = -1; + + VIR_DEBUG("Setting up loader"); + + if (loader) { + switch ((virDomainLoader) loader->type) { + case VIR_DOMAIN_LOADER_TYPE_ROM: + if (qemuDomainCreateDevice(loader->path, data, false) < 0) + goto cleanup; + break; + + case VIR_DOMAIN_LOADER_TYPE_PFLASH: + if (qemuDomainCreateDevice(loader->path, data, false) < 0) + goto cleanup; + + if (loader->nvram && + qemuDomainCreateDevice(loader->nvram, data, false) < 0) + goto cleanup; + break; + + case VIR_DOMAIN_LOADER_TYPE_LAST: + break; + } + } + + VIR_DEBUG("Setup loader"); + ret = 0; + cleanup: + return ret; +} + + int qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg, virSecurityManagerPtr mgr, @@ -9538,6 +9576,9 @@ qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg, if (qemuDomainSetupAllRNGs(cfg, vm, &data) < 0) goto cleanup; + if (qemuDomainSetupLoader(cfg, vm, &data) < 0) + goto cleanup; + /* Save some mount points because we want to share them with the host */ for (i = 0; i < ndevMountsPath; i++) { struct stat sb; -- 2.13.6

2 1

[libvirt] [PATCH v3 0/5] Improvements to CPU frequency reporting
by Andrea Bolognani 08 Jan '18

08 Jan '18

Changes from [v2]: * improve the parser; * print the architecture name instead of "your architecture". Changes from [v1]: * adopt Bjoern's approach to refactoring. [v2] https://www.redhat.com/archives/libvir-list/2017-December/msg00467.html [v1] https://www.redhat.com/archives/libvir-list/2017-December/msg00356.html Andrea Bolognani (4): tests: Add host CPU data for Moonshot (RHEL 7.4) util: Print architecture name in /proc/cpuinfo parser util: Improve CPU frequency parsing util: Don't report CPU frequency for ARM hosts Bjoern Walk (1): util: virhostcpu: factor out frequency parsing src/Makefile.am | 1 + src/util/virhostcpu.c | 188 ++++++++++++--------- .../linux-aarch64-rhel74-moonshot.cpuinfo | 72 ++++++++ .../linux-aarch64-rhel74-moonshot.expected | 1 + .../linux-armv6l-raspberrypi.expected | 2 +- .../linux-rhel74-moonshot/cpu/cpu0/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu0/online | 1 + .../cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/core_siblings | 1 + .../cpu/cpu0/topology/core_siblings_list | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings | 1 + .../cpu/cpu0/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu1/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu1/online | 1 + .../cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/core_siblings | 1 + .../cpu/cpu1/topology/core_siblings_list | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings | 1 + .../cpu/cpu1/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu2/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu2/online | 1 + .../cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/core_siblings | 1 + .../cpu/cpu2/topology/core_siblings_list | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings | 1 + .../cpu/cpu2/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu3/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu3/online | 1 + .../cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/core_siblings | 1 + .../cpu/cpu3/topology/core_siblings_list | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings | 1 + .../cpu/cpu3/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu4/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu4/online | 1 + .../cpu/cpu4/topology/core_id | 1 + .../cpu/cpu4/topology/core_siblings | 1 + .../cpu/cpu4/topology/core_siblings_list | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../cpu/cpu4/topology/thread_siblings | 1 + .../cpu/cpu4/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu5/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu5/online | 1 + .../cpu/cpu5/topology/core_id | 1 + .../cpu/cpu5/topology/core_siblings | 1 + .../cpu/cpu5/topology/core_siblings_list | 1 + .../cpu/cpu5/topology/physical_package_id | 1 + .../cpu/cpu5/topology/thread_siblings | 1 + .../cpu/cpu5/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu6/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu6/online | 1 + .../cpu/cpu6/topology/core_id | 1 + .../cpu/cpu6/topology/core_siblings | 1 + .../cpu/cpu6/topology/core_siblings_list | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../cpu/cpu6/topology/thread_siblings | 1 + .../cpu/cpu6/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu7/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu7/online | 1 + .../cpu/cpu7/topology/core_id | 1 + .../cpu/cpu7/topology/core_siblings | 1 + .../cpu/cpu7/topology/core_siblings_list | 1 + .../cpu/cpu7/topology/physical_package_id | 1 + .../cpu/cpu7/topology/thread_siblings | 1 + .../cpu/cpu7/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/kernel_max | 1 + .../linux-rhel74-moonshot/cpu/offline | 1 + .../linux-rhel74-moonshot/cpu/online | 1 + .../linux-rhel74-moonshot/cpu/possible | 1 + .../linux-rhel74-moonshot/cpu/present | 1 + .../linux-rhel74-moonshot/node/has_cpu | 1 + .../linux-rhel74-moonshot/node/has_memory | 1 + .../linux-rhel74-moonshot/node/has_normal_memory | 1 + .../linux-rhel74-moonshot/node/node0/cpu0 | 1 + .../linux-rhel74-moonshot/node/node0/cpu1 | 1 + .../linux-rhel74-moonshot/node/node0/cpu2 | 1 + .../linux-rhel74-moonshot/node/node0/cpu3 | 1 + .../linux-rhel74-moonshot/node/node0/cpu4 | 1 + .../linux-rhel74-moonshot/node/node0/cpu5 | 1 + .../linux-rhel74-moonshot/node/node0/cpu6 | 1 + .../linux-rhel74-moonshot/node/node0/cpu7 | 1 + .../linux-rhel74-moonshot/node/node0/cpulist | 1 + .../linux-rhel74-moonshot/node/node0/cpumap | 1 + .../linux-rhel74-moonshot/node/online | 1 + .../linux-rhel74-moonshot/node/possible | 1 + tests/virhostcpudata/linux-x86_64-test1.cpuinfo | 4 + tests/virhostcputest.c | 1 + 91 files changed, 273 insertions(+), 80 deletions(-) create mode 100644 tests/virhostcpudata/linux-aarch64-rhel74-moonshot.cpuinfo create mode 100644 tests/virhostcpudata/linux-aarch64-rhel74-moonshot.expected create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/kernel_max create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/offline create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/possible create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/present create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/has_cpu create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/has_memory create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/has_normal_memory create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu0 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu1 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu2 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu3 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu4 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu5 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu6 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu7 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpulist create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpumap create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/possible -- 2.14.3

3 15

[libvirt] [PATCH] virsh: Checking the volume capacity before uploading a new file.
by Julio Faracco 08 Jan '18

08 Jan '18

The current command 'vol-upload' is not checking if the volume accepts a file bigger than its capacity. It can cause an interrupt of the upload stream. This commit adds a check that fails before starting to send new file to volume if the file is bigger. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1529059 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tools/virsh-volume.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 8265a39..1359dba 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -672,6 +672,7 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) { const char *file = NULL; virStorageVolPtr vol = NULL; + virStorageVolInfo volumeInfo; bool ret = false; int fd = -1; virStreamPtr st = NULL; @@ -701,6 +702,9 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) cbData.ctl = ctl; cbData.fd = fd; + if (virStorageVolGetInfo(vol, &volumeInfo) < 0) + goto cleanup; + if (vshCommandOptBool(cmd, "sparse")) flags |= VIR_STORAGE_VOL_UPLOAD_SPARSE_STREAM; @@ -709,6 +713,11 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) goto cleanup; } + if (volumeInfo.capacity <= virFileLength(file, fd)) { + vshError(ctl, _("file is bigger than volume %s capacity"), name); + goto cleanup; + } + if (virStorageVolUpload(vol, st, offset, length, flags) < 0) { vshError(ctl, _("cannot upload to volume %s"), name); goto cleanup; -- 2.7.4

2 2

[libvirt] [PATCH v2 0/2] Introducing testDomainRename().
by Julio Faracco 08 Jan '18

08 Jan '18

This commit introduces the testDomainRename() for test driver. It includes: - testDomainRename() implementation. - Test case for virshtest to test 'domrename' command. Julio Faracco (2): test: Implementing testDomainRename(). tests: Adding test case for 'domrename' command inside virshtest. src/test/test_driver.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/virshtest.c | 13 +++++++++ 2 files changed, 85 insertions(+) -- 2.7.4

2 4

[libvirt] [PATCH] domain_conf: skip boot order check of CD-ROM or floppy device
by Chen Hanxiao 06 Jan '18

06 Jan '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> If we insert or eject a CD-ROM/floppy device with a boot order, we may get: unsupported configuration: boot order 2 is already used by another device This check should be skipped in this case. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/conf/domain_conf.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9a62bc472..885ab88d2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26880,11 +26880,19 @@ virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def ATTRIBUTE_UNUSED, { virDomainDeviceInfoPtr newinfo = opaque; + int disk_device = device->data.disk->device; if (info->bootIndex == newinfo->bootIndex) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("boot order %u is already used by another device"), - newinfo->bootIndex); - return -1; + /* Skip check for insert or eject CD-ROM device */ + if (disk_device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || + disk_device == VIR_DOMAIN_DISK_DEVICE_CDROM) { + VIR_DEBUG("Skip boot index check for floppy or CDROM"); + return 0; + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("boot order %u is already used by another device"), + newinfo->bootIndex); + return -1; + } } return 0; } -- 2.14.3

3 3

[libvirt] [PATCH v3 0/2] qemu: Add support for hot unplugging
by Chen Hanxiao 06 Jan '18

06 Jan '18

v3: use helper qemuDomainDelChardevTLSObjects and address some comments v2: rebased on master Chen Hanxiao (2): qemu: Add support for hot unplugging redirdev device which can use the detach-device --live news: add change of hot unplug redirdev docs/news.xml | 11 ++++++ src/qemu/qemu_driver.c | 4 ++- src/qemu/qemu_hotplug.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.h | 4 +++ 4 files changed, 109 insertions(+), 1 deletion(-) -- 2.14.3

3 7

[libvirt] [PATCH v4 00/13] Move qemu command line controller checks to qemuDomainDeviceDefValidateController* checks
by John Ferlan 05 Jan '18

05 Jan '18

v3: https://www.redhat.com/archives/libvir-list/2017-December/msg00209.html Differences since v3: * Pushed first 4 ACK'd patches of v3 * Rework/Separate out a few patches for the SCSI handling * Alter the PCI handling as requested by code review (although I still had a question to a review comment regarding whether or not the model should be handled in PostParse). * Alter the SATA code as indicated by code review * Add Andrea's patch into the series Andrea Bolognani (1): qemu: Add missing checks for pcie-root-port options John Ferlan (12): qemu: Introduce qemuDomainDeviceDefValidateControllerAttributes qemu: Move model set for qemuBuildControllerDevStr qemu: Adjust SCSI controller switch in qemuBuildControllerDevStr qemu: Add check for iothread attribute in validate controller qemu: Introduce qemuDomainDeviceDefValidateControllerSCSI qemu: Introduce qemuDomainDeviceDefValidateControllerPCI qemu: Use virDomainPCIControllerOpts in qemuBuildControllerDevStr qemu: Move PCI command modelName check to controller def validate qemu: Move PCI command modelName TypeToString to controller def validate qemu: Move PCI more command checks to controller def validate qemu: Complete PCI command checks to controller def validate qemu: Introduce qemuDomainDeviceDefValidateControllerSATA src/qemu/qemu_command.c | 403 ++++------------------------------------------ src/qemu/qemu_domain.c | 420 +++++++++++++++++++++++++++++++++++++++++++++++- tests/qemumemlocktest.c | 14 ++ tests/qemuxml2xmltest.c | 5 +- 4 files changed, 466 insertions(+), 376 deletions(-) -- 2.13.6

2 20

[libvirt] [PATCH] [PATCH] vcpupin: add clear feature
by Yi Wang 05 Jan '18

05 Jan '18

We can't clear vcpupin settings of XML once we did vcpupin command, this is not convenient under some condition such as migration. This patch introduces clear feature, which can clear vcpuin setting of XML. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Signed-off-by: Xi Xu <xu.xi8(a)zte.com.cn> --- include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 24 +++++++++++++++++++----- tools/virsh-domain.c | 5 ++++- tools/virsh.pod | 1 + 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 4048acf..7b171df 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1837,6 +1837,7 @@ typedef enum { VIR_DOMAIN_VCPU_MAXIMUM = (1 << 2), /* Max rather than current count */ VIR_DOMAIN_VCPU_GUEST = (1 << 3), /* Modify state of the cpu in the guest */ VIR_DOMAIN_VCPU_HOTPLUGGABLE = (1 << 4), /* Make vcpus added hot(un)pluggable */ + VIR_DOMAIN_VCPU_CLEAR = (1 << 5), /* Clear vcpus pin info */ } virDomainVcpuFlags; int virDomainSetVcpus (virDomainPtr domain, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 97b194b..9e8759f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5001,7 +5001,7 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, int vcpu, virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg, - virBitmapPtr cpumap) + virBitmapPtr cpumap, bool clear) { virBitmapPtr tmpmap = NULL; virDomainVcpuDefPtr vcpuinfo; @@ -5049,7 +5049,12 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, } virBitmapFree(vcpuinfo->cpumask); - vcpuinfo->cpumask = tmpmap; + if (clear) { + virBitmapFree(tmpmap); + vcpuinfo->cpumask = NULL; + } else { + vcpuinfo->cpumask = tmpmap; + } tmpmap = NULL; if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) @@ -5093,9 +5098,11 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, virBitmapPtr pcpumap = NULL; virDomainVcpuDefPtr vcpuinfo = NULL; virQEMUDriverConfigPtr cfg = NULL; + bool clear = false; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, -1); + VIR_DOMAIN_AFFECT_CONFIG | + VIR_DOMAIN_VCPU_CLEAR, -1); cfg = virQEMUDriverGetConfig(driver); @@ -5111,6 +5118,8 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) goto endjob; + clear = !!(flags & VIR_DOMAIN_VCPU_CLEAR); + if ((def && def->virtType == VIR_DOMAIN_VIRT_QEMU) || (persistentDef && persistentDef->virtType == VIR_DOMAIN_VIRT_QEMU)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -5136,12 +5145,17 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, } if (def && - qemuDomainPinVcpuLive(vm, def, vcpu, driver, cfg, pcpumap) < 0) + qemuDomainPinVcpuLive(vm, def, vcpu, driver, cfg, pcpumap, clear) < 0) goto endjob; if (persistentDef) { virBitmapFree(vcpuinfo->cpumask); - vcpuinfo->cpumask = pcpumap; + if (clear) { + virBitmapFree(pcpumap); + vcpuinfo->cpumask = NULL; + } else { + vcpuinfo->cpumask = pcpumap; + } pcpumap = NULL; ret = virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 93cb020..4bad9e7 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6860,7 +6860,7 @@ virshParseCPUList(vshControl *ctl, int *cpumaplen, unsigned char *cpumap = NULL; virBitmapPtr map = NULL; - if (cpulist[0] == 'r') { + if (cpulist[0] == 'r' || STREQ("clear", cpulist)) { if (!(map = virBitmapNew(maxcpu))) return NULL; virBitmapSetAll(map); @@ -6938,6 +6938,9 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) goto cleanup; } + if (STREQ(cpulist, "clear")) + flags |= VIR_DOMAIN_VCPU_CLEAR; + /* Pin mode: pinning specified vcpu to specified physical cpus*/ if (!(cpumap = virshParseCPUList(ctl, &cpumaplen, cpulist, maxcpu))) goto cleanup; diff --git a/tools/virsh.pod b/tools/virsh.pod index 69cc423..caaa230 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2857,6 +2857,7 @@ I<cpulist> is a list of physical CPU numbers. Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed. The '-' denotes the range and the '^' denotes exclusive. For pinning the I<vcpu> to all physical cpus specify 'r' as a I<cpulist>. +For clearing pinning info, specify 'clear' as a I<cpulist>. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -- 1.8.3.1

3 2

[libvirt] [PATCH v2 0/2] Enable pseries machine's max-cpu-compat parameter
by Shivaprasad G Bhat 05 Jan '18

05 Jan '18

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1519146 --- Shivaprasad G Bhat (2): qemu: Add capability for pseries machine's max-cpu-compat= parameter qemu: Add support for pseries machine's max-cpu-compat= parameter src/qemu/qemu_capabilities.c | 7 +++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 ++++++++++ tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + .../pseries-machine-max-cpu-compat.args | 21 ++++++++++++++++++++ .../pseries-machine-max-cpu-compat.xml | 17 ++++++++++++++++ tests/qemuxml2argvtest.c | 5 +++++ 7 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args create mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml -- Signature

2 3

[libvirt] [PATCH] nodedev: update mdev_types caps before dumpxml
by Wu Zongyong 05 Jan '18

05 Jan '18

Wu Zongyong (1): nodedev: update mdev_types caps before dumpxml src/node_device/node_device_linux_sysfs.c | 42 +++++++++++++++++++++++++++++++ src/node_device/node_device_udev.c | 11 ++++++-- src/node_device/node_device_udev.h | 8 ++++++ 3 files changed, 59 insertions(+), 2 deletions(-) -- 1.9.1

2 2

[libvirt] [PATCH] qemuDomainDiskChangeSupported: Forbid alias change
by Michal Privoznik 05 Jan '18

05 Jan '18

Since we have user aliases it may happen that users want to change it using 'update-device'. Instead of ignoring it silently, error out loudly. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 347fc0742..00d6c41c9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6762,6 +6762,14 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk, return false; } + if (disk->info.alias && + STRNEQ_NULLABLE(disk->info.alias, orig_disk->info.alias)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("cannot modify field '%s' of the disk"), + "alias"); + return false; + } + CHECK_EQ(info.bootIndex, "boot order", true); CHECK_EQ(rawio, "rawio", true); CHECK_EQ(sgio, "sgio", true); -- 2.13.6

3 7

[libvirt] [PATCH] qemuDomainAttachDeviceMknodHelper: Remove symlink before creating it
by Michal Privoznik 05 Jan '18

05 Jan '18

https://bugzilla.redhat.com/show_bug.cgi?id=1528502 So imagine you have /dev/blah symlink which points to /dev/sda. You attach /dev/blah as disk to your domain. Libvirt correctly creates the /dev/blah -> /dev/sda symlink in the qemu namespace. However, then you detach the disk, change the symlink so that it points to /dev/sdb and tries to attach the disk again. This time, however, the attach fails (well, qemu attaches wrong disk) because the code assumes that symlinks don't change. Well they do. This is inspired by test fix written by Eduardo Habkost. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 70fb40650..5f29d1ad5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9737,13 +9737,23 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, if (isLink) { VIR_DEBUG("Creating symlink %s -> %s", data->file, data->target); + + /* First, unlink the symlink target. Symlinks change and + * therefore we have no guarantees that pre-existing + * symlink is still valid. */ + if (unlink(data->file) < 0 && + errno != ENOENT) { + virReportSystemError(errno, + _("Unable to remove symlink %s"), + data->file); + goto cleanup; + } + if (symlink(data->target, data->file) < 0) { - if (errno != EEXIST) { - virReportSystemError(errno, - _("Unable to create symlink %s"), - data->target); - goto cleanup; - } + virReportSystemError(errno, + _("Unable to create symlink %s"), + data->target); + goto cleanup; } else { delDevice = true; } -- 2.13.6

2 4

[libvirt] About CVE-2017-5715
by Wang King 05 Jan '18

05 Jan '18

As CVE-2017-5715 described on https://access.redhat.com/security/cve/cve-2017-5715, libvirt under the influence yet, So what's coming next for this? Signed-off-by: Wang King <king.wang(a)huawei.com> -- 2.8.3

3 3

[libvirt] [PATCH 0/2] Enable pseries machine's max-cpu-compat parameter
by Shivaprasad G Bhat 05 Jan '18

05 Jan '18

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1519146 --- Shivaprasad G Bhat (2): qemu: Add capability for pseries machine's max-cpu-compat= parameter qemu: Add support for pseries machine's max-cpu-compat= parameter src/qemu/qemu_capabilities.c | 7 ++++++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 14 ++++++++++-- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + .../pseries-machine-max-cpu-compat.args | 23 ++++++++++++++++++++ .../pseries-machine-max-cpu-compat.xml | 21 ++++++++++++++++++ tests/qemuxml2argvtest.c | 5 ++++ 7 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args create mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml -- Signature

2 4

[libvirt] [PATCH] Fixed documentation for destroy storage pool
by frankie＠telecos.upc.edu 05 Jan '18

05 Jan '18

From: Francesc Guasch <frankie(a)telecos.upc.edu> --- lib/Sys/Virt/StoragePool.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/Sys/Virt/StoragePool.pm b/lib/Sys/Virt/StoragePool.pm index 0bc1d50..2ba5101 100644 --- a/lib/Sys/Virt/StoragePool.pm +++ b/lib/Sys/Virt/StoragePool.pm @@ -115,14 +115,11 @@ C<define_storage_pool> method in L<Sys::Virt>. Remove the configuration associated with a storage pool previously defined with the C<define_storage pool> method in L<Sys::Virt>. If the storage pool is -running, you probably want to use the C<shutdown> or C<destroy> -methods instead. +running, you probably want to use the C<destroy> method instead. =item $pool->destroy() -Immediately terminate the machine, and remove it from the virtual -machine monitor. The C<$pool> handle is invalid after this call -completes and should not be used again. +Immediately stop the storage pool. =item $flag = $pool->get_autostart(); -- 2.14.1

3 3

[libvirt] [REBASE PATCH v2 0/8] Implement query-dump command
by John Ferlan 05 Jan '18

05 Jan '18

Previous rebase: https://www.redhat.com/archives/libvir-list/2017-December/msg00124.html Rebase after pushing first 2 ACK'd patches and for recent capabilities adjustments. Plus it's been a month... Original v2: https://www.redhat.com/archives/libvir-list/2017-November/msg00779.html Rebase due to additional capabilitiies v2 Cover: v1: https://www.redhat.com/archives/libvir-list/2017-November/msg00731.html Differences from v1 (besides more patches) Rather than use a timing loop in order to fetch the dump stats and the presence of the 'query-dump' command, let's use the DUMP_COMPLETED event and wire that up in order to determine when the dump has been completed. In the mean time, the previous timing loop is converted into a qemuDomainGetJobInfoDumpStats to be called if the "right conditions" exist. Also found/fixed a couple of minor issues from v1 regarding usage "dumpformat" instead of just "format" from my patch 2 adjustment and a type for qemuMonitorDumpStatus (was qemuMontiorDumpStatus in v1). NB: (from v1 cover): Details in the patches. Essentially though QEMU 2.6 added the ability to perform the 'dump-guest-memory' via a thread by adding a 'detach' boolean to the command. In order to watch the progress of the thread the 'query-dump' command was added. The query-dump will return just the current status, the total size to be dumped, and the current progress. So using the migrate stats data in the DomainJobInfo we can then save our current progress allowing tools such as virsh to watch that progress. As an added benefit, the dump-guest-memory is now truly asynchronous. John Ferlan (8): qemu: Add support for DUMP_COMPLETED event qemu: Introduce qemuProcessHandleDumpCompleted qemu: Introduce qemuMonitor[JSON]QueryDump qemu: Add new parameter to qemuMonitorDumpToFd qemu: Introduce qemuDomainGetJobInfoMigrationStats qemu: Introduce qemuDomainGetJobInfoDumpStats qemu: Add dump completed event to the capabilities qemu: Allow showing the dump progress for memory only dump src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 146 ++++++++++++++++++--- src/qemu/qemu_monitor.c | 39 +++++- src/qemu/qemu_monitor.h | 33 ++++- src/qemu/qemu_monitor_json.c | 104 ++++++++++++++- src/qemu/qemu_monitor_json.h | 7 +- src/qemu/qemu_process.c | 23 ++++ .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemumonitorjsontest.c | 3 +- 27 files changed, 352 insertions(+), 26 deletions(-) -- 2.13.6

2 9

[libvirt] [PATCH v4 0/2] qemu: Add support for hot unplugging redirdev
by Chen Hanxiao 05 Jan '18

05 Jan '18

v4: update commit messages and news v3: use helper qemuDomainDelChardevTLSObjects and address some comments v2: rebased on master Chen Hanxiao (2): qemu: Add support for hot unplugging redirdev device which can use the detach-device --live news: add change of hot unplug redirdev docs/news.xml | 5 +++ src/qemu/qemu_driver.c | 4 ++- src/qemu/qemu_hotplug.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.h | 4 +++ 4 files changed, 102 insertions(+), 1 deletion(-) -- 2.14.3

1 2

[libvirt] [PATCH v3 0/6] Add setting CPU features (CPUID) with libxenlight driver.
by Marek Marczykowski-Górecki 05 Jan '18

05 Jan '18

Add support for CPUID setting based on <cpu> element. Since libxl format support only adjusting specific bits over host CPU, only mode='host-passthrough' is supported - other values are rejected (including default 'custom'). This will break some configurations working before (bare <cpu> element with for example NUMA configuration), but libxl driver never supported full 'custom' mode - it was silently ignored, which might lead to some unexpected effects. Since mode='host-passthrough' is now necessary to specify CPU options, do not enable nested HVM feature by mere presence of this element, require explicit enabling "vmx" or "svm" bits. Nested HVM is still in "preview" state, so better be explicit here. v2 of this patch series: https://www.redhat.com/archives/libvir-list/2017-July/msg00050.html Marek Marczykowski-Górecki (6): libxl: error out on not supported CPU mode, instead of silently ignoring libxl: do not enable nested HVM by mere presence of <cpu> element libxl: add support for CPUID features policy tests: check CPU features handling in libxl driver xenconfig: add CPUID handling to domXML <-> xl.cfg conversion tests: add test case for CPUID in xenconfig driver src/libxl/libxl_conf.c | 53 +- src/xenconfig/xen_xl.c | 260 ++++++++- src/xenconfig/xen_xl.h | 2 +- tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 64 ++- tests/libxlxml2domconfigdata/fullvirt-cpuid.xml | 37 +- tests/libxlxml2domconfigdata/vnuma-hvm.json | 1 +- tests/libxlxml2domconfigtest.c | 1 +- tests/xlconfigdata/test-fullvirt-cpuid.cfg | 25 +- tests/xlconfigdata/test-fullvirt-cpuid.xml | 36 +- tests/xlconfigdata/test-fullvirt-nestedhvm.xml | 4 +- tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.xml | 2 +- tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml | 2 +- tests/xlconfigdata/test-fullvirt-vnuma-partialdist.xml | 2 +- tests/xlconfigdata/test-fullvirt-vnuma.xml | 2 +- tests/xlconfigtest.c | 1 +- 15 files changed, 453 insertions(+), 39 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.json create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.xml create mode 100644 tests/xlconfigdata/test-fullvirt-cpuid.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-cpuid.xml base-commit: 984c534a3f2219444f4cb4df61d77b8c6e5054d7 -- git-series 0.9.1

4 22

[libvirt] [PATCH V3] blockjob: Fix error checking of blockjob status
by Jie Wang 05 Jan '18

05 Jan '18

offset and len can also be equal to 0 on failed if blockjob return status:"BLOCK_JOB_COMPLETED" with error:"File descriptor in bad state", so it's better to make our decision based on whether 'error' is non-NULL. --- src/qemu/qemu_monitor_json.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e45868b..18b2ad6 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -885,8 +885,7 @@ qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon, switch ((virConnectDomainEventBlockJobStatus) event) { case VIR_DOMAIN_BLOCK_JOB_COMPLETED: error = virJSONValueObjectGetString(data, "error"); - /* Make sure the whole device has been processed */ - if (offset != len) + if (offset != len || error) event = VIR_DOMAIN_BLOCK_JOB_FAILED; break; case VIR_DOMAIN_BLOCK_JOB_CANCELED: -- 1.8.3.1

1 0

[libvirt] [PATCH] qemu_hotplug: use VIR_ERR_NO_DEVICE when target detaching device is not found
by Chen Hanxiao 04 Jan '18

04 Jan '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We used VIR_ERR_OPERATION_FAILED when target detaching device is not found. That error code VIR_ERR_OPERATION_FAILED is widely used, so the tools powered by libvirt, such as nova, can't catch the exact errors from libvirt. This patch uses VIR_ERR_NO_DEVICE instead. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/libvirt_private.syms | 2 ++ src/qemu/qemu_hotplug.c | 51 +++++++++++++++++++++++++++++++----------------- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d5c3b9abb..31e83f152 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -203,6 +203,7 @@ virDomainChrConsoleTargetTypeToString; virDomainChrDefForeach; virDomainChrDefFree; virDomainChrDefNew; +virDomainChrDeviceTypeToString; virDomainChrEquals; virDomainChrFind; virDomainChrGetDomainPtrs; @@ -427,6 +428,7 @@ virDomainMemoryDefFree; virDomainMemoryFindByDef; virDomainMemoryFindInactiveByDef; virDomainMemoryInsert; +virDomainMemoryModelTypeToString; virDomainMemoryRemove; virDomainMemorySourceTypeFromString; virDomainMemorySourceTypeToString; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7de04c85a..0fa3c54c0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3454,7 +3454,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, int ret = -1; if (!olddev) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_NO_DEVICE, "%s", _("cannot find existing graphics device to modify")); goto cleanup; } @@ -4743,7 +4743,7 @@ int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver, if ((idx = virDomainControllerFind(vm->def, dev->data.controller->type, dev->data.controller->idx)) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, + virReportError(VIR_ERR_NO_DEVICE, _("controller %s:%d not found"), virDomainControllerTypeToString(dev->data.controller->type), dev->data.controller->idx); @@ -4972,18 +4972,18 @@ int qemuDomainDetachHostDevice(virQEMUDriverPtr driver, if (idx < 0) { switch (subsys->type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: - virReportError(VIR_ERR_OPERATION_FAILED, + virReportError(VIR_ERR_NO_DEVICE, _("host pci device %.4x:%.2x:%.2x.%.1x not found"), pcisrc->addr.domain, pcisrc->addr.bus, pcisrc->addr.slot, pcisrc->addr.function); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: if (usbsrc->bus && usbsrc->device) { - virReportError(VIR_ERR_OPERATION_FAILED, + virReportError(VIR_ERR_NO_DEVICE, _("host usb device %03d.%03d not found"), usbsrc->bus, usbsrc->device); } else { - virReportError(VIR_ERR_OPERATION_FAILED, + virReportError(VIR_ERR_NO_DEVICE, _("host usb device vendor=0x%.4x product=0x%.4x not found"), usbsrc->vendor, usbsrc->product); } @@ -4992,13 +4992,13 @@ int qemuDomainDetachHostDevice(virQEMUDriverPtr driver, if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi; - virReportError(VIR_ERR_OPERATION_FAILED, + virReportError(VIR_ERR_NO_DEVICE, _("host scsi iSCSI path %s not found"), iscsisrc->src->path); } else { virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; - virReportError(VIR_ERR_OPERATION_FAILED, + virReportError(VIR_ERR_NO_DEVICE, _("host scsi device %s:%u:%u.%llu not found"), scsihostsrc->adapter, scsihostsrc->bus, scsihostsrc->target, scsihostsrc->unit); @@ -5036,8 +5036,10 @@ qemuDomainDetachShmemDevice(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; if ((idx = virDomainShmemDefFind(vm->def, dev)) < 0) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("device not present in domain configuration")); + virReportError(VIR_ERR_NO_DEVICE, + _("Shmem device of model '%s' not found " + "in domain configuration"), + virDomainShmemModelTypeToString(dev->model)); return -1; } @@ -5093,8 +5095,10 @@ qemuDomainDetachWatchdog(virQEMUDriverPtr driver, watchdog->model == dev->model && watchdog->action == dev->action && virDomainDeviceInfoAddressIsEqual(&dev->info, &watchdog->info))) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("watchdog device not present in domain configuration")); + virReportError(VIR_ERR_NO_DEVICE, + _("watchdog device of model '%s' is not " + "found in domain configuration"), + virDomainWatchdogModelTypeToString(watchdog->model)); return -1; } @@ -5134,8 +5138,13 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, virDomainNetDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; - if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0) { + char mac[VIR_MAC_STRING_BUFLEN]; + virReportError(VIR_ERR_NO_DEVICE, + _("netdev '%s' not found in domain configuration"), + virMacAddrFormat(&dev->data.net->mac, mac)); goto cleanup; + } detach = vm->def->nets[detachidx]; @@ -5321,8 +5330,10 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver, char *devstr = NULL; if (!(tmpChr = virDomainChrFind(vmdef, chr))) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("device not present in domain configuration")); + virReportError(VIR_ERR_NO_DEVICE, + _("Chr device of type '%s' not found " + "in domain configuration"), + virDomainChrDeviceTypeToString(chr->deviceType)); goto cleanup; } @@ -5368,8 +5379,10 @@ qemuDomainDetachRNGDevice(virQEMUDriverPtr driver, int ret = -1; if ((idx = virDomainRNGFind(vm->def, rng)) < 0) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("device not present in domain configuration")); + virReportError(VIR_ERR_NO_DEVICE, + _("RNG device of model '%s' not found " + "in domain configuration"), + virDomainRNGBackendTypeToString(rng->model)); return -1; } @@ -5411,8 +5424,10 @@ qemuDomainDetachMemoryDevice(virQEMUDriverPtr driver, qemuDomainMemoryDeviceAlignSize(vm->def, memdef); if ((idx = virDomainMemoryFindByDef(vm->def, memdef)) < 0) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("device not present in domain configuration")); + virReportError(VIR_ERR_NO_DEVICE, + _("memory device of model '%s' not found " + "in domain configuration"), + virDomainMemoryModelTypeToString(memdef->model)); return -1; } -- 2.14.3

2 1

[libvirt] [PATCH V2] blockjob: Fix error checking of blockjob status
by Jie Wang 04 Jan '18

04 Jan '18

offset and len can also be equal to 0 on failed if blockjob return status:"BLOCK_JOB_COMPLETED" with error:"File descriptor in bad state", so it's better to make our decision based on whether 'error' is non-NULL. --- src/qemu/qemu_monitor_json.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e45868b..ae64a5a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -885,8 +885,7 @@ qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon, switch ((virConnectDomainEventBlockJobStatus) event) { case VIR_DOMAIN_BLOCK_JOB_COMPLETED: error = virJSONValueObjectGetString(data, "error"); - /* Make sure the whole device has been processed */ - if (offset != len) + if (error != NULL) event = VIR_DOMAIN_BLOCK_JOB_FAILED; break; case VIR_DOMAIN_BLOCK_JOB_CANCELED: -- 1.8.3.1

2 1

[libvirt] [PATCH v2 0/3] Storage pool common object fixes
by John Ferlan 04 Jan '18

04 Jan '18

v1: https://www.redhat.com/archives/libvir-list/2017-December/msg00543.html Changes since v1... * Added a patch to handle a NULL return with pool obj lock * Alter the IsDuplicate API to use a bool parameter * Use the IsDuplicate API from the test driver. This would have generated the correct error message about a duplicate UUID instead of the Duplicate key that was generated. Ran virt-manager tests prior to Cole's fixes and of course after. John Ferlan (3): conf: Need to unlock pools on object allocation failure conf: Use bool for @check_active parameter test: Use virStoragePoolObjIsDuplicate for storage define/create src/conf/virstorageobj.c | 4 ++-- src/conf/virstorageobj.h | 2 +- src/storage/storage_driver.c | 4 ++-- src/test/test_driver.c | 11 ++++------- 4 files changed, 9 insertions(+), 12 deletions(-) -- 2.13.6

2 6

[libvirt] [PATCH] rpc: remove redundant logic
by Pavel Hrdina 04 Jan '18

04 Jan '18

Introduced by commit <0eaa59dce1>. That comparison already returns true or false. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. src/rpc/virnetserverclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index cae5375359..1f335d3b1e 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1090,7 +1090,7 @@ virNetServerClientClose(virNetServerClientPtr client) bool virNetServerClientIsClosedLocked(virNetServerClientPtr client) { - return client->sock == NULL ? true : false; + return client->sock == NULL; } -- 2.14.3

1 0