- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: fix crash in migrate when migrateuri do not have a scheme
by Luyao Huang 11 Feb '15

11 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1191355 When we migrate a vm with migrateuri option with a uri do not have scheme like this: # virsh migrate test4 --live qemu+ssh://lhuang/system --migrateuri 127.0.0.1 target libvirtd will crashed because uri->scheme is NULL in qemuMigrationPrepareDirect this line: if (STRNEQ(uri->scheme, "tcp") && add a value check before this line. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_migration.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 879b1bf..5c3b73e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3281,6 +3281,13 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, if (!(uri = qemuMigrationParseURI(uri_in, &well_formed_uri))) goto cleanup; + if (uri->scheme == NULL) { + virReportError(VIR_ERR_INVALID_ARG, + _("missing scheme in migration URI: %s"), + uri_in); + goto cleanup; + } + if (STRNEQ(uri->scheme, "tcp") && STRNEQ(uri->scheme, "rdma")) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, -- 1.8.3.1

4 4

[libvirt] [PATCH] storage: rbd: Improve the error when start a pool based on non-exist rados object
by Shanzhi Yu 11 Feb '15

11 Feb '15

When start/create a pool based on non-exist rados object, the error will be like $virsh pool-start p-c error: Failed to start pool p-c error: failed to create the RBD IoCTX. Does the pool 'libvirt-pool-clone' exist?: No such file or directory update it to error: Failed to start pool p-c error: internal error: failed to create the RBD IoCTX. the rados pool 'libvirt-pool-clone' is not available Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/storage/storage_backend_rbd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 57182de..98e7fe7 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -236,8 +236,10 @@ static int virStorageBackendRBDOpenIoCTX(virStorageBackendRBDStatePtr ptr, virSt { int r = rados_ioctx_create(ptr->cluster, pool->def->source.name, &ptr->ioctx); if (r < 0) { - virReportSystemError(-r, _("failed to create the RBD IoCTX. Does the pool '%s' exist?"), - pool->def->source.name); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to create the RBD IoCTX. " + "the rados pool '%s' is not available"), + pool->def->source.name); } return r; } -- 2.1.0

2 3

[libvirt] [PATCH] virsh: fix show the wrong IP address for network type listen address graphic
by Luyao Huang 11 Feb '15

11 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1191016 We try to get the IP address in /domain/devices/graphics/@listen, howerver for the network type listen address donnot have this parameter, it will show the address in the /domain/devices/graphics/listen/@address, running XML like this: <graphics type='spice' port='5901' autoport='yes' keymap='en-us'> <listen type='network' address='192.168.122.1' network='default'/> </graphics> This patch will try to get the IP address in this path /domain/devices/graphics/listen/@address Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-domain.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 358d61c..4a9b574 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10024,7 +10024,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) int tmp; int flags = 0; bool params = false; - const char *xpath_fmt = "string(/domain/devices/graphics[@type='%s']/@%s)"; + const char *xpath_fmt = "string(/domain/devices/graphics[@type='%s']/%s)"; virSocketAddr addr; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) @@ -10054,7 +10054,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) continue; /* Create our XPATH lookup for the current display's port */ - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "port") < 0) + if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "@port") < 0) goto cleanup; /* Attempt to get the port number for the current graphics scheme */ @@ -10068,7 +10068,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) /* Create our XPATH lookup for TLS Port (automatically skipped * for unsupported schemes */ - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "tlsPort") < 0) + if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "@tlsPort") < 0) goto cleanup; /* Attempt to get the TLS port number */ @@ -10081,7 +10081,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) continue; /* Create our XPATH lookup for the current display's address */ - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen") < 0) + if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@address") < 0) goto cleanup; /* Attempt to get the listening addr if set for the current @@ -10095,7 +10095,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) * care of when getting the XML */ /* Create our XPATH lookup for the password */ - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "passwd") < 0) + if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "@passwd") < 0) goto cleanup; /* Attempt to get the password */ -- 1.8.3.1

3 3

[libvirt] [PATCH v2] qemu: fix setting of VM CPU affinity with TCG
by Daniel P. Berrange 10 Feb '15

10 Feb '15

If a previous commit I fixed the incorrect handling of vcpu pids for TCG mode QEMU: commit b07f3d821dfb11a118ee75ea275fd6ab737d9500 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Thu Dec 18 16:34:39 2014 +0000 Don't setup fake CPU pids for old QEMU The code assumes that def->vcpus == nvcpupids, so when we setup fake CPU pids for old QEMU with nvcpupids == 1, we cause the later code to read off the end of the array. This has fun results like sche_setaffinity(0, ...) which changes libvirtd's own CPU affinity, or even better sched_setaffinity($RANDOM, ...) which changes the affinity of a random OS process. The intent was that this would merely disable the ability to set per-vCPU affinity. It should still have been possible to set VM level host CPU affinity. Unfortunately, when you set <vcpu cpuset='0-1'>4</vcpu>, the XML parser will internally take this & initialize an entry in the def->cputune.vcpupin array for every VCPU. IOW this is implicitly being treated as <cputune> <vcpupin cpuset='0-1' vcpu='0'/> <vcpupin cpuset='0-1' vcpu='1'/> <vcpupin cpuset='0-1' vcpu='2'/> <vcpupin cpuset='0-1' vcpu='3'/> </cputune> Even more fun, the faked cputune elements are hidden from view when querying the live XML, because their cpuset mask is the same as the VM default cpumask. The upshot was that it was impossible to set VM level CPU affinity. To fix this we must update qemuProcessSetVcpuAffinities so that it only reports a fatal error if the per-VCPU cpu mask is different from the VM level cpu mask. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) In v2: - Check for def->cpumask being NULL diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d5df60d..4c35f39 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2497,9 +2497,19 @@ qemuProcessSetVcpuAffinities(virDomainObjPtr vm) return 0; if (priv->vcpupids == NULL) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cpu affinity is not supported")); - return -1; + /* If any CPU has custom affinity that differs from the + * VM default affinity, we must reject it + */ + for (n = 0; n < def->vcpus; n++) { + if (!def->cpumask || + !virBitmapEqual(def->cpumask, + def->cputune.vcpupin[n]->cpumask)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cpu affinity is not supported")); + return -1; + } + } + return 0; } for (n = 0; n < def->vcpus; n++) { -- 2.1.0

1 0

[libvirt] virsh vcpuinfo with tcg
by Serge Hallyn 10 Feb '15

10 Feb '15

Hi, 'virsh vcpuinfo' in 1.2.12 returns an empty line for VMs using tcg. I assume this is due to commit b07f3d821dfb11 which explicitly sets nvcpupids to 0 now. Is 'virsh vcpuinfo' returning nothing just an unfortunate but expected side-effect, or is it a bug and it should return info anyway? My impression is that qemu_driver.c should be using vm->def->vcpus rather than priv->nvcpupids to determine the # of cpus to show? thanks, -serge

2 2

[libvirt] [PATCH] Fix qemu job handling in SetSchedulerParameters
by Ján Tomko 10 Feb '15

10 Feb '15

Commit c5ee5cf added a job to SetSchedulerParameters, but forgot to change one label in the SCHED_RANGE_CHECK macro. --- Not yet released. src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1614340..e3ca437 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9740,7 +9740,7 @@ qemuSetEmulatorBandwidthLive(virDomainObjPtr vm, virCgroupPtr cgroup, _("value of '%s' is out of range [%lld, %lld]"), \ NAME, MIN, MAX); \ rc = -1; \ - goto cleanup; \ + goto endjob; \ } static int -- 2.0.5

2 1

[libvirt] [PATCH 00/12] Implement random number generator hot/cold (un)plug
by Peter Krempa 10 Feb '15

10 Feb '15

Extension of Luyao's series with changes that were possible due to the prepare series for memory hotplug. Luyao Huang (7): qemu: Add helper to assign RNG device aliases qemu: refactor qemuBuildRNGDeviceArgs to allow reuse in RNG hotplug qemu: command: Make RNG backend device IDs unique audit: export virDomainAuditRNG conf: Add helpers to insert/remove/find RNG devices in domain def qemu: Implement random number generator hotplug qemu: Implement random number generator hotunplug Peter Krempa (5): conf: Introduce helper to find duplicate device address qemu: command: Shuffle around formatting of alias for RNG device backend qemu: command: Break some very long lines in qemuBuildRNGDevStr() qemu: command: Refactor creation of RNG device commandline qemu: Implement random number generator cold (un)plug src/conf/domain_audit.c | 2 +- src/conf/domain_audit.h | 7 + src/conf/domain_conf.c | 164 +++++++++++++++++ src/conf/domain_conf.h | 8 + src/libvirt_private.syms | 6 + src/qemu/qemu_command.c | 153 +++++++++++---- src/qemu/qemu_command.h | 9 + src/qemu/qemu_driver.c | 41 ++++- src/qemu/qemu_hotplug.c | 205 ++++++++++++++++++++- src/qemu/qemu_hotplug.h | 7 +- .../qemuxml2argv-aarch64-virt-virtio.args | 4 +- .../qemuxml2argv-arm-vexpressa9-virtio.args | 4 +- .../qemuxml2argv-arm-virt-virtio.args | 4 +- .../qemuxml2argv-s390-piix-controllers.args | 3 +- .../qemuxml2argv-s390-usb-none.args | 3 +- .../qemuxml2argv-virtio-rng-ccw.args | 4 +- .../qemuxml2argv-virtio-rng-default.args | 4 +- .../qemuxml2argv-virtio-rng-egd.args | 4 +- .../qemuxml2argv-virtio-rng-multiple.args | 8 +- .../qemuxml2argv-virtio-rng-random.args | 4 +- 20 files changed, 578 insertions(+), 66 deletions(-) -- 2.2.2

3 21

[libvirt] [PATCH] conf: disallow invalid values for video attributes
by Martin Kletzander 10 Feb '15

10 Feb '15

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1190956 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_conf.c | 8 ++++---- ...v-seclabel-dynamic-none.xml => qemuxml2argv-video-invalid.xml} | 4 +++- tests/qemuxml2argvtest.c | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) copy tests/qemuxml2argvdata/{qemuxml2argv-seclabel-dynamic-none.xml => qemuxml2argv-video-invalid.xml} (90%) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d5b15db..77319dc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10580,7 +10580,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, _("ram attribute only supported for type of qxl")); goto error; } - if (virStrToLong_ui(ram, NULL, 10, &def->ram) < 0) { + if (virStrToLong_uip(ram, NULL, 10, &def->ram) < 0) { virReportError(VIR_ERR_XML_ERROR, _("cannot parse video ram '%s'"), ram); goto error; @@ -10590,7 +10590,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, } if (vram) { - if (virStrToLong_ui(vram, NULL, 10, &def->vram) < 0) { + if (virStrToLong_uip(vram, NULL, 10, &def->vram) < 0) { virReportError(VIR_ERR_XML_ERROR, _("cannot parse video vram '%s'"), vram); goto error; @@ -10605,7 +10605,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, _("vgamem attribute only supported for type of qxl")); goto error; } - if (virStrToLong_ui(vgamem, NULL, 10, &def->vgamem) < 0) { + if (virStrToLong_uip(vgamem, NULL, 10, &def->vgamem) < 0) { virReportError(VIR_ERR_XML_ERROR, _("cannot parse video vgamem '%s'"), vgamem); goto error; @@ -10613,7 +10613,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, } if (heads) { - if (virStrToLong_ui(heads, NULL, 10, &def->heads) < 0) { + if (virStrToLong_uip(heads, NULL, 10, &def->heads) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse video heads '%s'"), heads); goto error; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-invalid.xml similarity index 90% copy from tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-none.xml copy to tests/qemuxml2argvdata/qemuxml2argv-video-invalid.xml index cec59f8..e3848e1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-none.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-invalid.xml @@ -22,7 +22,9 @@ <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> + <video> + <model type='qxl' ram='-1' vram='-1' vgamem='-1' heads='-1'/> + </video> <memballoon model='virtio'/> </devices> - <seclabel type='none' model='none'/> </domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 77ee630..f864c2a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1362,6 +1362,7 @@ mymain(void) QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_QXL_VGA_VGAMEM, QEMU_CAPS_QXL_VGAMEM); + DO_TEST_PARSE_ERROR("video-invalid", NONE); DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); -- 2.3.0

2 1

[libvirt] [PATCH 0/3] attach-interface: Learn net type='direct'
by Michal Privoznik 09 Feb '15

09 Feb '15

I've just wanted to hotplug a macvtap device into a running guest. I was too lazy to write an XML, and I've found out that virsh attach-interface doesn't know how to plug macvtaps. Michal Privoznik (3): virsh attach-interface: Use enum instead of arbitrary integers virsh: Use VIR_ENUM* macros for vshCmdAttachInterface virsh attach-interface: Allow macvtap hotplug tools/virsh-domain.c | 38 ++++++++++++++++++++++++++++---------- tools/virsh.pod | 14 ++++++++------ 2 files changed, 36 insertions(+), 16 deletions(-) -- 2.0.5

5 11

[libvirt] [PATCH 0/4] parallels: Better bridged network interfaces support and some fixes
by Maxim Nestratov 09 Feb '15

09 Feb '15

Maxim Nestratov (3): parallels: Fix connecting to parallels driver parallels: better bridge network interface support parallels: don't forget to unlock domain if unregister fails Mikhail Feoktistov (1): parallels: set cpu mode when applying xml configuration

2 9

[libvirt] [RFC PATCH 00/12] Add support for memory hotplug
by Peter Krempa 09 Feb '15

09 Feb '15

!! this series applies on top of the cleanup series posted earlier !! Hi, this is my try to implement memory hotplug in libvirt (for the qemu) driver. This series is almost code-complete but is lacking tests and docs as I wanted to agree on design first before attempting to write the documentation. Additionally this series is also lacking code that would fix memballoon handling but I'm waiting on a clousure how it's supposed to work from qemu's side as it appears to be broken there too. The basic XML used to add a memory device: <memory model='acpi-dimm'> <target> <size unit='KiB'>524287</size> <node>0</node> </target> </memory> The <target> subelement is mandatory, whereas the <source> subelement (that contains source numa nodes, source page size ) is optional and is inferred from the NUMA tuning for given target numa node. Please note that at least one guest numa node has to be configured for the guest for this to work (limitation of qemu). What's missing in this series: - tests - docs - commit message touch-up - code to audit the memory size changes - code to make memory balloning working with correct size Peter Krempa (12): qemu: caps: Add capability bit for the "pc-dimm" device conf: Add support for parsing and formatting max memory and slot count qemu: Implement setup of memory hotplug parameters conf: Add device address type for dimm devices conf: Add interface to parse and format memory device information qemu: memdev: Add infrastructure to load memory device information qemu: migration: Forbid migration with memory modules lacking info qemu: add support for memory devices conf: Introduce helper to find duplicate device address qemu: conf: Add support for memory device cold(un)plug qemu: Implement memory device hotplug qemu: Implement memory device hotunplug docs/formatdomain.html.in | 19 + docs/schemas/domaincommon.rng | 76 +++ src/bhyve/bhyve_domain.c | 9 +- src/conf/domain_conf.c | 655 ++++++++++++++++++++- src/conf/domain_conf.h | 63 ++ src/libvirt_private.syms | 7 + src/libxl/libxl_domain.c | 8 + src/lxc/lxc_domain.c | 8 + src/openvz/openvz_driver.c | 14 +- src/parallels/parallels_driver.c | 6 +- src/phyp/phyp_driver.c | 6 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 157 ++++- src/qemu/qemu_command.h | 15 + src/qemu/qemu_domain.c | 58 ++ src/qemu/qemu_domain.h | 6 + src/qemu/qemu_driver.c | 29 + src/qemu/qemu_hotplug.c | 178 ++++++ src/qemu/qemu_hotplug.h | 6 + src/qemu/qemu_migration.c | 14 + src/qemu/qemu_monitor.c | 45 ++ src/qemu/qemu_monitor.h | 14 + src/qemu/qemu_monitor_json.c | 116 ++++ src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 4 + src/uml/uml_driver.c | 9 +- src/vbox/vbox_common.c | 6 +- src/vmware/vmware_driver.c | 6 +- src/vmx/vmx.c | 6 +- src/xen/xen_driver.c | 7 + src/xenapi/xenapi_driver.c | 9 +- tests/domainschemadata/maxMemory.xml | 19 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + .../qemuxml2argv-memory-hotplug-dimm.xml | 47 ++ .../qemuxml2argv-memory-hotplug-nonuma.xml | 22 + .../qemuxml2argv-memory-hotplug.args | 6 + .../qemuxml2argv-memory-hotplug.xml | 34 ++ tests/qemuxml2argvtest.c | 4 + tests/qemuxml2xmltest.c | 4 + 40 files changed, 1682 insertions(+), 19 deletions(-) create mode 100644 tests/domainschemadata/maxMemory.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nonuma.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.xml -- 2.2.2

5 33

[libvirt] [PATCH 0/2] S390: ccw support for virsh attach-disk address parameter
by Stefan Zimmermann 09 Feb '15

09 Feb '15

This patch add the ccw support for the optional address parameter of virsh attach-disk. Stefan Zimmermann (2): S390: ccw support for virsh attach-disk address parameter S390: Documentation for ccw address type docs/formatdomain.html.in | 5 ++--- tools/virsh-domain.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- tools/virsh.pod | 3 ++- 3 files changed, 49 insertions(+), 5 deletions(-) -- 2.1.4

2 4

[libvirt] [PATCH 0/6] security: Add check for invalid security models and duplicates
by Erik Skultety 09 Feb '15

09 Feb '15

Add a check for invalid security models in per-device configuration as well as a check for seclabel duplicates in per-device configuration Erik Skultety (6): security: Add check for valid security model conf: fix a minor typo conf: forbid seclabel duplicates for domain devices schema: allow multiple seclabel for devices in domaincommon.rng test: add test to check for device seclabel duplicates po: add security_stack.c into POTFILES.in docs/schemas/domaincommon.rng | 16 ++++---- po/POTFILES.in | 1 + src/conf/domain_conf.c | 11 ++++- src/security/security_manager.c | 5 +++ src/security/security_manager.h | 1 + src/security/security_stack.c | 48 +++++++++++++++++++++- .../qemuxml2argv-seclabel-device-multiple.xml | 35 ++++++++++++++++ 7 files changed, 106 insertions(+), 11 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-device-multiple.xml -- 1.9.3

3 12

[libvirt] [PATCH] Follow up fix of commit a58e1cb4
by Cédric Bosdonnat 09 Feb '15

09 Feb '15

commit a58e1cb4 didn't fix the bug if the security_default_confined is not set to 1. We now clean up even if there is no seclabel defined or the default one. --- src/lxc/lxc_process.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index b385423..19ea7f3 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1022,6 +1022,7 @@ int virLXCProcessStart(virConnectPtr conn, virCgroupPtr selfcgroup; int status; char *pidfile = NULL; + bool clearSeclabel = false; if (virCgroupNewSelf(&selfcgroup) < 0) return -1; @@ -1126,6 +1127,10 @@ int virLXCProcessStart(virConnectPtr conn, /* If you are using a SecurityDriver with dynamic labelling, then generate a security label for isolation */ VIR_DEBUG("Generating domain security label (if required)"); + + clearSeclabel = vm->def->nseclabels == 0 || + vm->def->seclabels[0]->type == VIR_DOMAIN_SECLABEL_DEFAULT; + if (vm->def->nseclabels && vm->def->seclabels[0]->type == VIR_DOMAIN_SECLABEL_DEFAULT) vm->def->seclabels[0]->type = VIR_DOMAIN_SECLABEL_NONE; @@ -1387,7 +1392,8 @@ int virLXCProcessStart(virConnectPtr conn, virSecurityManagerReleaseLabel(driver->securityManager, vm->def); /* Clear out dynamically assigned labels */ if (vm->def->nseclabels && - vm->def->seclabels[0]->type == VIR_DOMAIN_SECLABEL_DYNAMIC) { + (vm->def->seclabels[0]->type == VIR_DOMAIN_SECLABEL_DYNAMIC || + clearSeclabel)) { VIR_FREE(vm->def->seclabels[0]->model); VIR_FREE(vm->def->seclabels[0]->label); VIR_FREE(vm->def->seclabels[0]->imagelabel); -- 2.1.4

3 2

[libvirt] ANNOUNCE: libvirt 1.2.9.2 maintenance release
by Cole Robinson 08 Feb '15

08 Feb '15

libvirt 1.2.9.2 is now available. This is a maintenance release of libvirt 1.2.9 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.2.9.2.tar.gz Changes in this version: * util: storage: Fix parsing of nbd:// URI without path * qemu: fix domain startup failing with 'strict' mode in numatune * storage: Need to clear pool prior to refreshPool during Autostart * xend: Don't crash in virDomainXMLDevID * CVE-2015-0236: qemu: Check ACLs when dumping security info from snapshots * CVE-2015-0236: qemu: Check ACLs when dumping security info from save image * conf: goto error when value of max_sectors is too large * Fix hotplugging of block device-backed usb disks * conf: fix crash when hotplug a channel chr device with no target * qemu: migration: Unlock vm on failed ACL check in protocol v2 APIs * storage: fix crash caused by no check return before set close * qemu: bulk stats: Fix logic in monitor handling * CVE-2014-8131: Fix possible deadlock and segfault in qemuConnectGetAllDomainStats() * qemu: Drop OVMF whitelist * qemu: Support OVMF on armv7l aarch64 guests For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 1.1.3.9 maintenance release
by Cole Robinson 08 Feb '15

08 Feb '15

libvirt 1.1.3.9 is now available. This is a maintenance release of libvirt 1.1.3 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.1.3.9.tar.gz Changes in this version: * CVE-2015-0236: qemu: Check ACLs when dumping security info from snapshots * CVE-2015-0236: qemu: Check ACLs when dumping security info from save image * qemu: migration: Unlock vm on failed ACL check in protocol v2 APIs For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] virt-manager issue, FreeBSD
by Jason Helfman 07 Feb '15

07 Feb '15

Hi, I am working on resolving an issue with virt-manager on FreeBSD. A contributor recently worked on getting spice-gtk ported to FreeBSD, however I am working on this error when launching console.py. [helfman@its-helfman03 ~/workspace/ports/deskutils/virt-manager]$ python /usr/local/share/virt-manager/virtManager/console.py Traceback (most recent call last): File "/usr/local/share/virt-manager/virtManager/console.py", line 42, in <module> from virtManager.autodrawer import AutoDrawer ImportError: No module named virtManager.autodrawer Thanks for your help! Jason -- Jason Helfman | FreeBSD Committer jgh(a)FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve

1 0

[libvirt] [PATCH v3] qemu: Pass file descriptor when using TPM passthrough
by Stefan Berger 07 Feb '15

07 Feb '15

Pass the TPM file descriptor to QEMU via command line. Instead of passing /dev/tpm0 we now pass /dev/fdset/10 and the additional parameters -add-fd set=10,fd=20. This addresses the use case when QEMU is started with non-root privileges and QEMU cannot open /dev/tpm0 for example. One problem is that for the passing of the file descriptor set to work, virCommandReorderFDs must not be called on the virCommand. This is prevented by setting a flag in the virCommandPassFDGetFDIndex that is checked to be clear when virCommandReorderFDs is run. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> v2->v3: Fixed some memory leaks --- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 136 ++++++++++++++++++++++++++++++++++++++++++++--- src/util/vircommand.c | 33 ++++++++++++ src/util/vircommand.h | 3 ++ 4 files changed, 166 insertions(+), 7 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index aeec440..3194e8b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1164,6 +1164,7 @@ virCommandNewArgList; virCommandNewArgs; virCommandNonblockingFDs; virCommandPassFD; +virCommandPassFDGetFDIndex; virCommandPassListenFDs; virCommandRawStatus; virCommandRequireHandshake; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8ed7934..17debba 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -159,6 +159,58 @@ VIR_ENUM_IMPL(qemuNumaPolicy, VIR_DOMAIN_NUMATUNE_MEM_LAST, "interleave"); /** + * qemuVirCommandGetFDSet: + * @cmd: the command to modify + * @fd: fd to reassign to the child + * + * Get the parameters for the QEMU -add-fd command line option + * for the given file descriptor. The file descriptor must previously + * have been 'transferred' in a virCommandPassFD() call. + * This function for example returns "set=10,fd=20". + */ +static char * +qemuVirCommandGetFDSet(virCommandPtr cmd, int fd) +{ + char *result = NULL; + int idx = virCommandPassFDGetFDIndex(cmd, fd); + + if (idx >= 0) { + ignore_value(virAsprintf(&result, "set=%d,fd=%d", idx, fd) < 0); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("file descriptor %d has not been transferred"), fd); + } + + return result; +} + +/** + * qemuVirCommandGetDevSet: + * @cmd: the command to modify + * @fd: fd to reassign to the child + * + * Get the parameters for the QEMU path= parameter where a file + * descriptor is accessed via a file descriptor set, for example + * /dev/fdset/10. The file descriptor must previously have been + * 'transferred' in a virCommandPassFD() call. + */ +static char * +qemuVirCommandGetDevSet(virCommandPtr cmd, int fd) +{ + char *result = NULL; + int idx = virCommandPassFDGetFDIndex(cmd, fd); + + if (idx >= 0) { + ignore_value(virAsprintf(&result, "/dev/fdset/%d", idx) < 0); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("file descriptor %d has not been transferred"), fd); + } + return result; +} + + +/** * qemuPhysIfaceConnect: * @def: the definition of the VM (needed by 802.1Qbh and audit) * @driver: pointer to the driver instance @@ -5926,14 +5978,20 @@ qemuBuildRNGDeviceArgs(virCommandPtr cmd, static char *qemuBuildTPMBackendStr(const virDomainDef *def, + virCommandPtr cmd, virQEMUCapsPtr qemuCaps, - const char *emulator) + const char *emulator, + int *tpmfd, int *cancelfd) { const virDomainTPMDef *tpm = def->tpm; virBuffer buf = VIR_BUFFER_INITIALIZER; const char *type = virDomainTPMBackendTypeToString(tpm->type); - char *cancel_path; + char *cancel_path = NULL; const char *tpmdev; + char *devset = NULL, *cancel_devset = NULL; + + *tpmfd = -1; + *cancelfd = -1; virBufferAsprintf(&buf, "%s,id=tpm-%s", type, tpm->info.alias); @@ -5946,11 +6004,49 @@ static char *qemuBuildTPMBackendStr(const virDomainDef *def, if (!(cancel_path = virTPMCreateCancelPath(tpmdev))) goto error; - virBufferAddLit(&buf, ",path="); - virBufferEscape(&buf, ',', ",", "%s", tpmdev); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) { + *tpmfd = open(tpmdev, O_RDWR); + if (*tpmfd < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not open TPM device %s"), tpmdev); + goto error; + } + + virCommandPassFD(cmd, *tpmfd, + VIR_COMMAND_PASS_FD_CLOSE_PARENT); + devset = qemuVirCommandGetDevSet(cmd, *tpmfd); + if (devset == NULL) + goto error; + + *cancelfd = open(cancel_path, O_WRONLY); + if (*cancelfd < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not open TPM device's cancel path " + "%s"), cancel_path); + goto error; + } + + virCommandPassFD(cmd, *cancelfd, + VIR_COMMAND_PASS_FD_CLOSE_PARENT); + cancel_devset = qemuVirCommandGetDevSet(cmd, *cancelfd); + if (cancel_devset == NULL) + goto error; + + virBufferAddLit(&buf, ",path="); + virBufferEscape(&buf, ',', ",", "%s", devset); + VIR_FREE(devset); - virBufferAddLit(&buf, ",cancel-path="); - virBufferEscape(&buf, ',', ",", "%s", cancel_path); + virBufferAddLit(&buf, ",cancel-path="); + virBufferEscape(&buf, ',', ",", "%s", cancel_devset); + VIR_FREE(cancel_devset); + } else { + /* all test cases will use this path */ + virBufferAddLit(&buf, ",path="); + virBufferEscape(&buf, ',', ",", "%s", tpmdev); + + virBufferAddLit(&buf, ",cancel-path="); + virBufferEscape(&buf, ',', ",", "%s", cancel_path); + } VIR_FREE(cancel_path); break; @@ -5970,6 +6066,10 @@ static char *qemuBuildTPMBackendStr(const virDomainDef *def, emulator, type); error: + VIR_FREE(devset); + VIR_FREE(cancel_devset); + VIR_FREE(cancel_path); + virBufferFreeAndReset(&buf); return NULL; } @@ -9223,13 +9323,35 @@ qemuBuildCommandLine(virConnectPtr conn, if (def->tpm) { char *optstr; + int tpmfd = -1; + int cancelfd = -1; + char *fdset; - if (!(optstr = qemuBuildTPMBackendStr(def, qemuCaps, emulator))) + if (!(optstr = qemuBuildTPMBackendStr(def, cmd, qemuCaps, emulator, + &tpmfd, &cancelfd))) goto error; virCommandAddArgList(cmd, "-tpmdev", optstr, NULL); VIR_FREE(optstr); + if (tpmfd >= 0) { + fdset = qemuVirCommandGetFDSet(cmd, tpmfd); + if (!fdset) + goto error; + + virCommandAddArgList(cmd, "-add-fd", fdset, NULL); + VIR_FREE(fdset); + } + + if (cancelfd >= 0) { + fdset = qemuVirCommandGetFDSet(cmd, cancelfd); + if (!fdset) + goto error; + + virCommandAddArgList(cmd, "-add-fd", fdset, NULL); + VIR_FREE(fdset); + } + if (!(optstr = qemuBuildTPMDevStr(def, qemuCaps, emulator))) goto error; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 6527d85..2616446 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -67,6 +67,7 @@ enum { VIR_EXEC_RUN_SYNC = (1 << 3), VIR_EXEC_ASYNC_IO = (1 << 4), VIR_EXEC_LISTEN_FDS = (1 << 5), + VIR_EXEC_FIXED_FDS = (1 << 6), }; typedef struct _virCommandFD virCommandFD; @@ -214,6 +215,12 @@ virCommandReorderFDs(virCommandPtr cmd) if (!cmd || cmd->has_error || !cmd->npassfd) return; + if ((cmd->flags & VIR_EXEC_FIXED_FDS)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("The fds are fixed and cannot be reordered")); + goto error; + } + for (i = 0; i < cmd->npassfd; i++) maxfd = MAX(cmd->passfd[i].fd, maxfd); @@ -1019,6 +1026,32 @@ virCommandPassListenFDs(virCommandPtr cmd) cmd->flags |= VIR_EXEC_LISTEN_FDS; } +/* + * virCommandPassFDGetFDIndex: + * @cmd: pointer to virCommand + * @fd: FD to get index of + * + * Determine the index of the FD in the transfer set. + * + * Returns index >= 0 if @set contains @fd, + * -1 otherwise. + */ +int +virCommandPassFDGetFDIndex(virCommandPtr cmd, int fd) +{ + size_t i = 0; + + while (i < cmd->npassfd) { + if (cmd->passfd[i].fd == fd) { + cmd->flags |= VIR_EXEC_FIXED_FDS; + return i; + } + i++; + } + + return -1; +} + /** * virCommandSetPidFile: * @cmd: the command to modify diff --git a/src/util/vircommand.h b/src/util/vircommand.h index bf65de4..198da2f 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -62,6 +62,9 @@ void virCommandPassFD(virCommandPtr cmd, void virCommandPassListenFDs(virCommandPtr cmd); +int virCommandPassFDGetFDIndex(virCommandPtr cmd, + int fd); + void virCommandSetPidFile(virCommandPtr cmd, const char *pidfile) ATTRIBUTE_NONNULL(2); -- 1.9.3

3 12

[libvirt] [PATCH v2] maint: improve usage of autogen's --no-git
by Stefan Zimmermann 06 Feb '15

06 Feb '15

If you will build libvirt with the no-git-option than you is the gnulib-srcdir mandatory. You will lose this information till now. With this patch you will save this information. Signed-off-by: Stefan Zimmermann <stzi(a)linux.vnet.ibm.com> --- autogen.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/autogen.sh b/autogen.sh index 1965f64..d1c319d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -20,6 +20,10 @@ no_git= if test "x$1" = "x--no-git"; then no_git=" $1" shift + case "$1 $2" in + --gnulib-srcdir=*) no_git="$no_git $1"; shift ;; + --gnulib-srcdir\ *) no_git="$no_git $1=$2"; shift; shift;; + esac fi if test -z "$NOCONFIGURE" ; then if test "x$1" = "x--system"; then -- 2.1.4

2 1

[libvirt] [PATCH] network: don't allow multiple portgroups with the same name in a network
by Laine Stump 06 Feb '15

06 Feb '15

When defining and creating networks, we have been checking to make sure there is only a single "default" portgroup, but haven't verified that no two portgroups have the same name. We *do* check for multiple definitions when updating the portgroups in an existing network though. This patch adds a check to networkValidate(), which is called when a network is defined or created, to disallow duplicate names. It would actually make sense to do this in the network XML parser (since it's not really "something that might make sense but isn't supported by this driver", but is instead "something that should never be allowed"), but doing that carries the danger of causing errors when rereading the config of existing networks when libvirtd is restarted after an upgrade, and that would result in networks disappearing from libvirt's list. (I'm thinking I should change the error to "XML_ERROR" instead of "UNSUPPORTED", even though that's not the type of error that networkValidate is intended for) This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1115858 --- src/network/bridge_driver.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c56e8f2..d549ca5 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1,7 +1,7 @@ /* * bridge_driver.c: core driver methods for managing network * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -2728,7 +2728,7 @@ static int networkValidate(virNetworkDefPtr def, bool check_active) { - size_t i; + size_t i, j; bool vlanUsed, vlanAllowed, badVlanUse = false; virPortGroupDefPtr defaultPortGroup = NULL; virNetworkIpDefPtr ipdef; @@ -2874,7 +2874,15 @@ networkValidate(virNetworkDefPtr def, } defaultPortGroup = &def->portGroups[i]; } - + for (j = i+1; j < def->nPortGroups; j++) { + if (STREQ(def->portGroups[i].name, def->portGroups[j].name)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("multiple <portgroup> elements with the " + "same name (%s) in network '%s'"), + def->portGroups[i].name, def->name); + return -1; + } + } if (def->portGroups[i].bandwidth && !bandwidthAllowed) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported <bandwidth> element in network '%s' " -- 2.1.0

2 1

[libvirt] [PATCHv3] Trivially support DomainHasManagedSaveImage
by Ján Tomko 05 Feb '15

05 Feb '15

Return 0 instead of ERR_NO_SUPPORT in each driver where we don't support managed save or -1 if the domain does not exist. This avoids spamming daemon logs when 'virsh dominfo' is run. https://bugzilla.redhat.com/show_bug.cgi?id=1095637 --- src/bhyve/bhyve_driver.c | 25 +++++++++++++- src/esx/esx_driver.c | 39 ++++++++++++++++++++- src/lxc/lxc_driver.c | 26 +++++++++++++- src/openvz/openvz_driver.c | 28 ++++++++++++++- src/parallels/parallels_driver.c | 20 ++++++++++- src/phyp/phyp_driver.c | 29 +++++++++++++++- src/uml/uml_driver.c | 33 +++++++++++++++++- src/vbox/vbox_common.c | 73 +++++++++++++++++++++++++++++++++++++++- src/vmware/vmware_driver.c | 27 ++++++++++++++- src/xenapi/xenapi_driver.c | 27 ++++++++++++++- 10 files changed, 317 insertions(+), 10 deletions(-) v2: implement the function in all drivers, not just LXC v3: also check if the domain exists diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 56cc8ab..ae39917 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -2,7 +2,7 @@ * bhyve_driver.c: core driver methods for managing bhyve guests * * Copyright (C) 2014 Roman Bogorodskiy - * Copyright (C) 2014 Red Hat, Inc. + * Copyright (C) 2014-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1430,6 +1430,28 @@ bhyveConnectDomainEventDeregisterAny(virConnectPtr conn, return 0; } +static int +bhyveDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = bhyveDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainHasManagedSaveImageEnsureACL(domain->conn, vm->def) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + static virHypervisorDriver bhyveHypervisorDriver = { .name = "bhyve", .connectOpen = bhyveConnectOpen, /* 1.2.2 */ @@ -1476,6 +1498,7 @@ static virHypervisorDriver bhyveHypervisorDriver = { .connectCompareCPU = bhyveConnectCompareCPU, /* 1.2.4 */ .connectDomainEventRegisterAny = bhyveConnectDomainEventRegisterAny, /* 1.2.5 */ .connectDomainEventDeregisterAny = bhyveConnectDomainEventDeregisterAny, /* 1.2.5 */ + .domainHasManagedSaveImage = bhyveDomainHasManagedSaveImage, /* 1.2.13 */ }; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 6b9965f..179f44c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1,7 +1,7 @@ /* * esx_driver.c: core driver functions for managing VMware ESX hosts * - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright (C) 2009-2014 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org> * @@ -5147,6 +5147,42 @@ esxConnectListAllDomains(virConnectPtr conn, } #undef MATCH +static int +esxDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) +{ + int result = -1; + esxPrivate *priv = domain->conn->privateData; + esxVI_ManagedObjectReference *managedObjectReference = NULL; + char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; + + virCheckFlags(0, -1); + + if (esxVI_EnsureSession(priv->primary) < 0) + return -1; + + virUUIDFormat(domain->uuid, uuid_string); + + if (esxVI_FindByUuid(priv->primary, priv->primary->datacenter->_reference, + uuid_string, esxVI_Boolean_True, + esxVI_Boolean_Undefined, + &managedObjectReference) < 0) { + return -1; + } + + if (!managedObjectReference) { + virReportError(VIR_ERR_NO_DOMAIN, + _("Could not find domain with UUID '%s'"), + uuid_string); + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_ManagedObjectReference_Free(&managedObjectReference); + return result; +} + static virHypervisorDriver esxHypervisorDriver = { .name = "ESX", @@ -5226,6 +5262,7 @@ static virHypervisorDriver esxHypervisorDriver = { .domainSnapshotHasMetadata = esxDomainSnapshotHasMetadata, /* 0.9.13 */ .domainSnapshotDelete = esxDomainSnapshotDelete, /* 0.8.0 */ .connectIsAlive = esxConnectIsAlive, /* 0.9.8 */ + .domainHasManagedSaveImage = esxDomainHasManagedSaveImage, /* 1.2.13 */ }; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 487e2a2..3adb21d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright IBM Corp. 2008 * * lxc_driver.c: linux container driver functions @@ -5726,6 +5726,29 @@ lxcNodeAllocPages(virConnectPtr conn, } +static int +lxcDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = lxcDomObjFromDomain(dom))) + return ret; + + if (virDomainHasManagedSaveImageEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + + /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { .name = LXC_DRIVER_NAME, @@ -5818,6 +5841,7 @@ static virHypervisorDriver lxcHypervisorDriver = { .domainLxcOpenNamespace = lxcDomainLxcOpenNamespace, /* 1.0.2 */ .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ + .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver lxcConnectDriver = { diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 556f626..5a5cd8d 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1,7 +1,7 @@ /* * openvz_driver.c: core driver methods for managing OpenVZ VEs * - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright (C) 2006, 2007 Binary Karma * Copyright (C) 2006 Shuveb Hussain * Copyright (C) 2007 Anoop Joe Cyriac @@ -2567,6 +2567,31 @@ openvzDomainMigrateConfirm3Params(virDomainPtr domain, return ret; } +static int +openvzDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + struct openvz_driver *driver = dom->conn->privateData; + virDomainObjPtr obj; + int ret = -1; + + virCheckFlags(0, -1); + + openvzDriverLock(driver); + obj = virDomainObjListFindByUUID(driver->domains, dom->uuid); + openvzDriverUnlock(driver); + if (!obj) { + virReportError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + ret = 0; + + cleanup: + if (obj) + virObjectUnlock(obj); + return ret; +} + + static virHypervisorDriver openvzHypervisorDriver = { .name = "OPENVZ", @@ -2632,6 +2657,7 @@ static virHypervisorDriver openvzHypervisorDriver = { .domainMigratePerform3Params = openvzDomainMigratePerform3Params, /* 1.2.8 */ .domainMigrateFinish3Params = openvzDomainMigrateFinish3Params, /* 1.2.8 */ .domainMigrateConfirm3Params = openvzDomainMigrateConfirm3Params, /* 1.2.8 */ + .domainHasManagedSaveImage = openvzDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver openvzConnectDriver = { diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index b569160..c9338b5 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -2,7 +2,7 @@ * parallels_driver.c: core driver functions for managing * Parallels Cloud Server hosts * - * Copyright (C) 2014 Red Hat, Inc. + * Copyright (C) 2014-2015 Red Hat, Inc. * Copyright (C) 2012 Parallels, Inc. * * This library is free software; you can redistribute it and/or @@ -956,6 +956,23 @@ parallelsDomainUndefine(virDomainPtr domain) return parallelsDomainUndefineFlags(domain, 0); } +static int +parallelsDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) +{ + parallelsConnPtr privconn = domain->conn->privateData; + virDomainObjPtr dom = NULL; + + virCheckFlags(0, -1); + + dom = virDomainObjListFindByUUID(privconn->domains, domain->uuid); + if (dom == NULL) { + parallelsDomNotFoundError(domain); + return -1; + } + + return 0; +} + static virHypervisorDriver parallelsDriver = { .name = "Parallels", .connectOpen = parallelsConnectOpen, /* 0.10.0 */ @@ -997,6 +1014,7 @@ static virHypervisorDriver parallelsDriver = { .connectIsEncrypted = parallelsConnectIsEncrypted, /* 1.2.5 */ .connectIsSecure = parallelsConnectIsSecure, /* 1.2.5 */ .connectIsAlive = parallelsConnectIsAlive, /* 1.2.5 */ + .domainHasManagedSaveImage = parallelsDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver parallelsConnectDriver = { diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 6c5a91e..d05f897 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright IBM Corp. 2009 * * phyp_driver.c: ssh layer to access Power Hypervisors @@ -3669,6 +3669,32 @@ phypDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) return phypDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE); } +static int +phypDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + + phyp_driverPtr phyp_driver = dom->conn->privateData; + LIBSSH2_SESSION *session = phyp_driver->session; + char *managed_system = phyp_driver->managed_system; + char *lpar_name = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + lpar_name = phypGetLparNAME(session, managed_system, dom->id, dom->conn); + + if (lpar_name == NULL) { + VIR_ERROR(_("Unable to determine domain's name.")); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(lpar_name); + return ret; +} + static virHypervisorDriver phypHypervisorDriver = { .name = "PHYP", .connectOpen = phypConnectOpen, /* 0.7.0 */ @@ -3698,6 +3724,7 @@ static virHypervisorDriver phypHypervisorDriver = { .connectIsSecure = phypConnectIsSecure, /* 0.7.3 */ .domainIsUpdated = phypDomainIsUpdated, /* 0.8.6 */ .connectIsAlive = phypConnectIsAlive, /* 0.9.8 */ + .domainHasManagedSaveImage = phypDomainHasManagedSaveImage, /* 1.2.13 */ }; static virStorageDriver phypStorageDriver = { diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 6ca038a..68efd18 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1,7 +1,7 @@ /* * uml_driver.c: core driver methods for managing UML guests * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -2943,6 +2943,36 @@ umlNodeAllocPages(virConnectPtr conn, } +static int +umlDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + struct uml_driver *driver = dom->conn->privateData; + int ret = -1; + virDomainObjPtr vm; + + virCheckFlags(0, -1); + + umlDriverLock(driver); + vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); + umlDriverUnlock(driver); + + if (!vm) { + virReportError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + + if (virDomainHasManagedSaveImageEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + + static virHypervisorDriver umlHypervisorDriver = { .name = "UML", .connectOpen = umlConnectOpen, /* 0.5.0 */ @@ -3006,6 +3036,7 @@ static virHypervisorDriver umlHypervisorDriver = { .nodeSetMemoryParameters = umlNodeSetMemoryParameters, /* 0.10.2 */ .nodeGetFreePages = umlNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = umlNodeAllocPages, /* 1.2.9 */ + .domainHasManagedSaveImage = umlDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver umlConnectDriver = { diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index bd3f50c..deca490 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2014, Taowei Luo (uaedante(a)gmail.com) - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright (C) 2008-2009 Sun Microsystems, Inc. * * This library is free software; you can redistribute it and/or @@ -7588,6 +7588,76 @@ vboxNodeAllocPages(virConnectPtr conn ATTRIBUTE_UNUSED, startCell, cellCount, add); } +static int +vboxDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + vboxGlobalData *data = dom->conn->privateData; + vboxArray machines = VBOX_ARRAY_INITIALIZER; + vboxIIDUnion iid; + char *machineNameUtf8 = NULL; + PRUnichar *machineNameUtf16 = NULL; + unsigned char uuid[VIR_UUID_BUFLEN]; + size_t i; + bool matched = false; + nsresult rc; + int ret = -1; + + virCheckFlags(0, -1); + + if (!data->vboxObj) + return ret; + + VBOX_IID_INITIALIZE(&iid); + rc = gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GET_MACHINES); + if (NS_FAILED(rc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not get list of machines, rc=%08x"), (unsigned)rc); + return ret; + } + + for (i = 0; i < machines.count; ++i) { + IMachine *machine = machines.items[i]; + PRBool isAccessible = PR_FALSE; + + if (!machine) + continue; + + gVBoxAPI.UIMachine.GetAccessible(machine, &isAccessible); + if (!isAccessible) + continue; + + gVBoxAPI.UIMachine.GetId(machine, &iid); + if (NS_FAILED(rc)) + continue; + vboxIIDToUUID(&iid, uuid); + vboxIIDUnalloc(&iid); + + if (memcmp(dom->uuid, uuid, VIR_UUID_BUFLEN) == 0) { + + PRUint32 state; + + matched = true; + + gVBoxAPI.UIMachine.GetName(machine, &machineNameUtf16); + VBOX_UTF16_TO_UTF8(machineNameUtf16, &machineNameUtf8); + + gVBoxAPI.UIMachine.GetState(machine, &state); + + ret = 0; + } + + if (matched) + break; + } + + /* Do the cleanup and take care you dont leak any memory */ + VBOX_UTF8_FREE(machineNameUtf8); + VBOX_COM_UNALLOC_MEM(machineNameUtf16); + gVBoxAPI.UArray.vboxArrayRelease(&machines); + + return ret; +} + /** * Function Tables @@ -7661,6 +7731,7 @@ virHypervisorDriver vboxCommonDriver = { .connectIsAlive = vboxConnectIsAlive, /* 0.9.8 */ .nodeGetFreePages = vboxNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = vboxNodeAllocPages, /* 1.2.9 */ + .domainHasManagedSaveImage = vboxDomainHasManagedSaveImage, /* 1.2.13 */ }; static void updateDriver(void) diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 2d7ba04..fb7fa5b 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -1,6 +1,6 @@ /*---------------------------------------------------------------------------*/ /* - * Copyright (C) 2011-2012 Red Hat, Inc. + * Copyright (C) 2011-2015 Red Hat, Inc. * Copyright 2010, diateam (www.diateam.net) * Copyright (C) 2013. Doug Goldstein <cardoe(a)cardoe.com> * @@ -1195,6 +1195,30 @@ vmwareConnectListAllDomains(virConnectPtr conn, return ret; } +static int +vmwareDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + struct vmware_driver *driver = dom->conn->privateData; + virDomainObjPtr obj; + int ret = -1; + + virCheckFlags(0, -1); + + vmwareDriverLock(driver); + obj = virDomainObjListFindByUUID(driver->domains, dom->uuid); + vmwareDriverUnlock(driver); + if (!obj) { + virReportError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + ret = 0; + + cleanup: + if (obj) + virObjectUnlock(obj); + return ret; +} + static virHypervisorDriver vmwareHypervisorDriver = { @@ -1233,6 +1257,7 @@ static virHypervisorDriver vmwareHypervisorDriver = { .domainIsActive = vmwareDomainIsActive, /* 0.8.7 */ .domainIsPersistent = vmwareDomainIsPersistent, /* 0.8.7 */ .connectIsAlive = vmwareConnectIsAlive, /* 0.9.8 */ + .domainHasManagedSaveImage = vmwareDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver vmwareConnectDriver = { diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 0902f9a..afb6d6c 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1,6 +1,6 @@ /* * xenapi_driver.c: Xen API driver. - * Copyright (C) 2011-2014 Red Hat, Inc. + * Copyright (C) 2011-2015 Red Hat, Inc. * Copyright (C) 2009, 2010 Citrix Ltd. * * This library is free software; you can redistribute it and/or @@ -1977,6 +1977,30 @@ xenapiConnectIsAlive(virConnectPtr conn) return 0; } +static int +xenapiDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + struct xen_vm_set *vms; + xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + + virCheckFlags(0, -1); + + if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) { + if (vms->size != 1) { + xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, + _("Domain name is not unique")); + xen_vm_set_free(vms); + return -1; + } + xen_vm_set_free(vms); + return 0; + } + if (vms) + xen_vm_set_free(vms); + xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); + return -1; +} + /* The interface which we export upwards to libvirt.c. */ static virHypervisorDriver xenapiHypervisorDriver = { .name = "XenAPI", @@ -2029,6 +2053,7 @@ static virHypervisorDriver xenapiHypervisorDriver = { .nodeGetFreeMemory = xenapiNodeGetFreeMemory, /* 0.8.0 */ .domainIsUpdated = xenapiDomainIsUpdated, /* 0.8.6 */ .connectIsAlive = xenapiConnectIsAlive, /* 0.9.8 */ + .domainHasManagedSaveImage = xenapiDomainHasManagedSaveImage, /* 1.2.13 */ }; -- 2.0.5

2 1

[libvirt] [PATCH 0/2] Interface backend attribute improvements
by Ján Tomko 05 Feb '15

05 Feb '15

Both for https://bugzilla.redhat.com/show_bug.cgi?id=1147195 Ján Tomko (2): Only parse custom vhost path for virtio interfaces Error out when custom tap device path makes no sense src/conf/domain_conf.c | 6 +++- src/qemu/qemu_command.c | 17 +++++++++- .../qemuxml2argv-tap-vhost-incorrect.xml | 39 ++++++++++++++++++++++ .../qemuxml2xmlout-tap-vhost-incorrect.xml | 38 +++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 5 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml -- 2.0.5

2 4

[libvirt] 答复： Re: [PATCH 0/3] Prevent removing a in-used static bridge and destroying a in-used virtual network
by Lin Ma 05 Feb '15

05 Feb '15

>>>> "Daniel P. Berrange" <berrange(a)redhat.com> 2015-2-4 下午 23:10 >>> >On Wed, Feb 04, 2015 at 02:21:18AM -0500, Laine Stump wrote: >> On 02/03/2015 11:47 AM, Michal Privoznik wrote: >> > On 02.02.2015 15:08, Lin Ma wrote: >> >> * Get the live state info of a virtual network through netcf in networkGetXMLDesc. >> >> * Add --system flag for net-dumpxml to show the live state info. >> >> * Check the live state info in net-destroy. >> >> * Add --force flag for net-destroy to forcibly destroy the virtual network. >> >> * Check the transient interfaces info in iface-unbridge. >> >> >> >> --- >> >> Lin Ma (3): >> >> bridge_driver: Return the live state info of a given virtual network >> >> virsh: prevent destroying a in-used network for net-destroy >> >> virsh: prevent removing a in-used bridge for iface-unbridge >> >> >> >> include/libvirt/libvirt-network.h | 1 + >> >> src/Makefile.am | 3 + >> >> src/network/bridge_driver.c | 141 ++++++++++++++++++++++++++++++++++- >> >> src/network/bridge_driver_platform.h | 7 ++ >> >> tests/Makefile.am | 4 + >> >> tools/virsh-interface.c | 25 ++++++- >> >> tools/virsh-network.c | 62 ++++++++++++++- >> >> tools/virsh.pod | 8 +- >> >> 8 files changed, 241 insertions(+), 10 deletions(-) >> >> >> > So I've spent some time thinking about this. I don't really like the >> > idea of producing completely different XML (it doesn't even have >> > as its root element!). But I see what you're trying to >> > achieve. How about putting the bridged interfaces into the network >> > definition (on request signalized by a flag, of course). >> >> I think that if we're going to add the list of connected guest devices >> to a network's status, that it should just always be there - adding a >> new flag for every little bit of different status sets a bad precedent >> and sets us up to have an infinitely increasing number of flags. >> >> Like I mentioned in my response to one of the patches, I think this >> information is better gathered and maintained by the bridge driver as >> guests connect to / disconnect from a network; this avoids the necessity >> of dragging netcf into the picture and allows much better information - >> the name of the domain using each interface can be included. > >You know if this checking for guests were done in the virNetworkDestroy >API implementation in src/network/bridge_driver.c, instead of in >virsh, then we would not need any of this code for extending the XML >nor parsing it in virsh. We could simply check the number of connections >which is something we have directly available internally. So 95% of this >patch series would go away :-C I'm sad...... :-), Anyway, Because we keep the original behaviour of net-destroy, So we keep iface-unbridge no changes as well, Then droping this patch series makes sense.

1 0

[libvirt] [PATCH] check "fc_host" and "vport_ops" capabilitis in SCSI host nodedevs
by Shivaprasad G Bhat 05 Feb '15

05 Feb '15

virNodeListDevices called by listDevices indirectly uses the virNodeDeviceHasCap() which is buggy. Earlier, virNodeListDevices was used in "virsh nodedev-list" as well. Though, the code was rewritten to use vshNodeDeviceListCollect instead. The patch fixes listDevices output for the below python script. ------------- import libvirt conn = libvirt.openReadOnly('qemu:///system') fc = conn.listDevices('fc_host', 0) print(fc) ------------ --- Shivaprasad G Bhat (1): check "fc_host" and "vport_ops" capabilities in SCSI host nodedevs src/conf/node_device_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- Signature

3 8

[libvirt] [libvirt-test-API][PATCH 0/2] Add API openGraphicsFD test case
by Jincheng Miao 05 Feb '15

05 Feb '15

Add API openGraphicsFD test case to linux_domain.conf Jincheng Miao (2): domain: add open_graphicsfd Add open_graphicsFD to linux_domain.conf cases/linux_domain.conf | 14 ++++++ repos/domain/open_graphicsfd.py | 89 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) create mode 100644 repos/domain/open_graphicsfd.py

2 3

[libvirt] [PATCH] qemu: Properly report error when cookin uuid not match the ctxt uuid
by Luyao Huang 05 Feb '15

05 Feb '15

Add the missing jump to the error label when cookin uuid does not match the ctxt uuid. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_migration.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8a8fa63..879b1bf 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1147,6 +1147,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, virReportError(VIR_ERR_INTERNAL_ERROR, _("Incoming cookie data had unexpected UUID %s vs %s"), tmp, uuidstr); + goto error; } VIR_FREE(tmp); -- 1.8.3.1

3 2

[libvirt] [libvirt-test-API][PATCH 0/2] Fix some regression issues
by jiahu 05 Feb '15

05 Feb '15

Some issues were introduced by 137211d15 and efac4a3ec commits, fix them. jiahu (2): Give a default value on br variable in mac_to_ip Fix regression issues repos/domain/destroy.py | 4 ++-- repos/domain/install_linux_cdrom.py | 4 ++-- utils/utils.py | 7 ++----- 3 files changed, 6 insertions(+), 9 deletions(-) -- 1.8.3.1

2 3

[libvirt] [PATCH] Bugfix for building with no-git-option
by Stefan Zimmermann 04 Feb '15

04 Feb '15

If you will build libvirt with the no-git-option than you is the gnulib-srcdir mandatory. You will lose this information till now. With this patch you will save this inforamtion. Signed-off-by: Stefan Zimmermann <stzi(a)linux.vnet.ibm.com> --- autogen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 1965f64..0168d24 100755 --- a/autogen.sh +++ b/autogen.sh @@ -18,8 +18,8 @@ test -f src/libvirt.c || { EXTRA_ARGS= no_git= if test "x$1" = "x--no-git"; then - no_git=" $1" - shift + no_git=" $1 $2" + shift 2 fi if test -z "$NOCONFIGURE" ; then if test "x$1" = "x--system"; then -- 2.1.4

2 1

[libvirt] [PATCHv2] Trivially support DomainHasManagedSaveImage
by Ján Tomko 04 Feb '15

04 Feb '15

Return 0 instead of ERR_NO_SUPPORT in each driver where we don't support managed save. This avoids spamming daemon logs when 'virsh dominfo' is run. https://bugzilla.redhat.com/show_bug.cgi?id=1095637 --- src/bhyve/bhyve_driver.c | 25 ++++++++++++++++++++++++- src/esx/esx_driver.c | 11 ++++++++++- src/lxc/lxc_driver.c | 26 +++++++++++++++++++++++++- src/openvz/openvz_driver.c | 12 +++++++++++- src/parallels/parallels_driver.c | 11 ++++++++++- src/phyp/phyp_driver.c | 11 ++++++++++- src/uml/uml_driver.c | 33 ++++++++++++++++++++++++++++++++- src/vbox/vbox_common.c | 11 ++++++++++- src/vmware/vmware_driver.c | 11 ++++++++++- src/xenapi/xenapi_driver.c | 11 ++++++++++- 10 files changed, 152 insertions(+), 10 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 56cc8ab..ae39917 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -2,7 +2,7 @@ * bhyve_driver.c: core driver methods for managing bhyve guests * * Copyright (C) 2014 Roman Bogorodskiy - * Copyright (C) 2014 Red Hat, Inc. + * Copyright (C) 2014-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1430,6 +1430,28 @@ bhyveConnectDomainEventDeregisterAny(virConnectPtr conn, return 0; } +static int +bhyveDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = bhyveDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainHasManagedSaveImageEnsureACL(domain->conn, vm->def) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + static virHypervisorDriver bhyveHypervisorDriver = { .name = "bhyve", .connectOpen = bhyveConnectOpen, /* 1.2.2 */ @@ -1476,6 +1498,7 @@ static virHypervisorDriver bhyveHypervisorDriver = { .connectCompareCPU = bhyveConnectCompareCPU, /* 1.2.4 */ .connectDomainEventRegisterAny = bhyveConnectDomainEventRegisterAny, /* 1.2.5 */ .connectDomainEventDeregisterAny = bhyveConnectDomainEventDeregisterAny, /* 1.2.5 */ + .domainHasManagedSaveImage = bhyveDomainHasManagedSaveImage, /* 1.2.13 */ }; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 6b9965f..53d31e3 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1,7 +1,7 @@ /* * esx_driver.c: core driver functions for managing VMware ESX hosts * - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright (C) 2009-2014 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org> * @@ -5147,6 +5147,14 @@ esxConnectListAllDomains(virConnectPtr conn, } #undef MATCH +static int +esxDomainHasManagedSaveImage(virDomainPtr dom ATTRIBUTE_UNUSED, unsigned int flags) +{ + virCheckFlags(0, -1); + + return 0; +} + static virHypervisorDriver esxHypervisorDriver = { .name = "ESX", @@ -5226,6 +5234,7 @@ static virHypervisorDriver esxHypervisorDriver = { .domainSnapshotHasMetadata = esxDomainSnapshotHasMetadata, /* 0.9.13 */ .domainSnapshotDelete = esxDomainSnapshotDelete, /* 0.8.0 */ .connectIsAlive = esxConnectIsAlive, /* 0.9.8 */ + .domainHasManagedSaveImage = esxDomainHasManagedSaveImage, /* 1.2.13 */ }; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 487e2a2..3adb21d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright IBM Corp. 2008 * * lxc_driver.c: linux container driver functions @@ -5726,6 +5726,29 @@ lxcNodeAllocPages(virConnectPtr conn, } +static int +lxcDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = lxcDomObjFromDomain(dom))) + return ret; + + if (virDomainHasManagedSaveImageEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + + /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { .name = LXC_DRIVER_NAME, @@ -5818,6 +5841,7 @@ static virHypervisorDriver lxcHypervisorDriver = { .domainLxcOpenNamespace = lxcDomainLxcOpenNamespace, /* 1.0.2 */ .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ + .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver lxcConnectDriver = { diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 556f626..4ce5a41 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1,7 +1,7 @@ /* * openvz_driver.c: core driver methods for managing OpenVZ VEs * - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright (C) 2006, 2007 Binary Karma * Copyright (C) 2006 Shuveb Hussain * Copyright (C) 2007 Anoop Joe Cyriac @@ -2567,6 +2567,15 @@ openvzDomainMigrateConfirm3Params(virDomainPtr domain, return ret; } +static int +openvzDomainHasManagedSaveImage(virDomainPtr dom ATTRIBUTE_UNUSED, unsigned int flags) +{ + virCheckFlags(0, -1); + + return 0; +} + + static virHypervisorDriver openvzHypervisorDriver = { .name = "OPENVZ", @@ -2632,6 +2641,7 @@ static virHypervisorDriver openvzHypervisorDriver = { .domainMigratePerform3Params = openvzDomainMigratePerform3Params, /* 1.2.8 */ .domainMigrateFinish3Params = openvzDomainMigrateFinish3Params, /* 1.2.8 */ .domainMigrateConfirm3Params = openvzDomainMigrateConfirm3Params, /* 1.2.8 */ + .domainHasManagedSaveImage = openvzDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver openvzConnectDriver = { diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index b569160..819f662 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -2,7 +2,7 @@ * parallels_driver.c: core driver functions for managing * Parallels Cloud Server hosts * - * Copyright (C) 2014 Red Hat, Inc. + * Copyright (C) 2014-2015 Red Hat, Inc. * Copyright (C) 2012 Parallels, Inc. * * This library is free software; you can redistribute it and/or @@ -956,6 +956,14 @@ parallelsDomainUndefine(virDomainPtr domain) return parallelsDomainUndefineFlags(domain, 0); } +static int +parallelsDomainHasManagedSaveImage(virDomainPtr dom ATTRIBUTE_UNUSED, unsigned int flags) +{ + virCheckFlags(0, -1); + + return 0; +} + static virHypervisorDriver parallelsDriver = { .name = "Parallels", .connectOpen = parallelsConnectOpen, /* 0.10.0 */ @@ -997,6 +1005,7 @@ static virHypervisorDriver parallelsDriver = { .connectIsEncrypted = parallelsConnectIsEncrypted, /* 1.2.5 */ .connectIsSecure = parallelsConnectIsSecure, /* 1.2.5 */ .connectIsAlive = parallelsConnectIsAlive, /* 1.2.5 */ + .domainHasManagedSaveImage = parallelsDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver parallelsConnectDriver = { diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 6c5a91e..d392709 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright IBM Corp. 2009 * * phyp_driver.c: ssh layer to access Power Hypervisors @@ -3669,6 +3669,14 @@ phypDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) return phypDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE); } +static int +phypDomainHasManagedSaveImage(virDomainPtr dom ATTRIBUTE_UNUSED, unsigned int flags) +{ + virCheckFlags(0, -1); + + return 0; +} + static virHypervisorDriver phypHypervisorDriver = { .name = "PHYP", .connectOpen = phypConnectOpen, /* 0.7.0 */ @@ -3698,6 +3706,7 @@ static virHypervisorDriver phypHypervisorDriver = { .connectIsSecure = phypConnectIsSecure, /* 0.7.3 */ .domainIsUpdated = phypDomainIsUpdated, /* 0.8.6 */ .connectIsAlive = phypConnectIsAlive, /* 0.9.8 */ + .domainHasManagedSaveImage = phypDomainHasManagedSaveImage, /* 1.2.13 */ }; static virStorageDriver phypStorageDriver = { diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 6ca038a..68efd18 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1,7 +1,7 @@ /* * uml_driver.c: core driver methods for managing UML guests * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -2943,6 +2943,36 @@ umlNodeAllocPages(virConnectPtr conn, } +static int +umlDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + struct uml_driver *driver = dom->conn->privateData; + int ret = -1; + virDomainObjPtr vm; + + virCheckFlags(0, -1); + + umlDriverLock(driver); + vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); + umlDriverUnlock(driver); + + if (!vm) { + virReportError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + + if (virDomainHasManagedSaveImageEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + + static virHypervisorDriver umlHypervisorDriver = { .name = "UML", .connectOpen = umlConnectOpen, /* 0.5.0 */ @@ -3006,6 +3036,7 @@ static virHypervisorDriver umlHypervisorDriver = { .nodeSetMemoryParameters = umlNodeSetMemoryParameters, /* 0.10.2 */ .nodeGetFreePages = umlNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = umlNodeAllocPages, /* 1.2.9 */ + .domainHasManagedSaveImage = umlDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver umlConnectDriver = { diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index bd3f50c..76fcc72 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2014, Taowei Luo (uaedante(a)gmail.com) - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright (C) 2008-2009 Sun Microsystems, Inc. * * This library is free software; you can redistribute it and/or @@ -7588,6 +7588,14 @@ vboxNodeAllocPages(virConnectPtr conn ATTRIBUTE_UNUSED, startCell, cellCount, add); } +static int +vboxDomainHasManagedSaveImage(virDomainPtr dom ATTRIBUTE_UNUSED, unsigned int flags) +{ + virCheckFlags(0, -1); + + return 0; +} + /** * Function Tables @@ -7661,6 +7669,7 @@ virHypervisorDriver vboxCommonDriver = { .connectIsAlive = vboxConnectIsAlive, /* 0.9.8 */ .nodeGetFreePages = vboxNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = vboxNodeAllocPages, /* 1.2.9 */ + .domainHasManagedSaveImage = vboxDomainHasManagedSaveImage, /* 1.2.13 */ }; static void updateDriver(void) diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 2d7ba04..22d0c91 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -1,6 +1,6 @@ /*---------------------------------------------------------------------------*/ /* - * Copyright (C) 2011-2012 Red Hat, Inc. + * Copyright (C) 2011-2015 Red Hat, Inc. * Copyright 2010, diateam (www.diateam.net) * Copyright (C) 2013. Doug Goldstein <cardoe(a)cardoe.com> * @@ -1195,6 +1195,14 @@ vmwareConnectListAllDomains(virConnectPtr conn, return ret; } +static int +vmwareDomainHasManagedSaveImage(virDomainPtr dom ATTRIBUTE_UNUSED, unsigned int flags) +{ + virCheckFlags(0, -1); + + return 0; +} + static virHypervisorDriver vmwareHypervisorDriver = { @@ -1233,6 +1241,7 @@ static virHypervisorDriver vmwareHypervisorDriver = { .domainIsActive = vmwareDomainIsActive, /* 0.8.7 */ .domainIsPersistent = vmwareDomainIsPersistent, /* 0.8.7 */ .connectIsAlive = vmwareConnectIsAlive, /* 0.9.8 */ + .domainHasManagedSaveImage = vmwareDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver vmwareConnectDriver = { diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 0902f9a..c7b9798 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1,6 +1,6 @@ /* * xenapi_driver.c: Xen API driver. - * Copyright (C) 2011-2014 Red Hat, Inc. + * Copyright (C) 2011-2015 Red Hat, Inc. * Copyright (C) 2009, 2010 Citrix Ltd. * * This library is free software; you can redistribute it and/or @@ -1977,6 +1977,14 @@ xenapiConnectIsAlive(virConnectPtr conn) return 0; } +static int +xenapiDomainHasManagedSaveImage(virDomainPtr dom ATTRIBUTE_UNUSED, unsigned int flags) +{ + virCheckFlags(0, -1); + + return 0; +} + /* The interface which we export upwards to libvirt.c. */ static virHypervisorDriver xenapiHypervisorDriver = { .name = "XenAPI", @@ -2029,6 +2037,7 @@ static virHypervisorDriver xenapiHypervisorDriver = { .nodeGetFreeMemory = xenapiNodeGetFreeMemory, /* 0.8.0 */ .domainIsUpdated = xenapiDomainIsUpdated, /* 0.8.6 */ .connectIsAlive = xenapiConnectIsAlive, /* 0.9.8 */ + .domainHasManagedSaveImage = xenapiDomainHasManagedSaveImage, /* 1.2.13 */ }; -- 2.0.5

2 1

[libvirt] [PATCH] lxc: fix double close handshakefds[1]
by Luyao Huang 04 Feb '15

04 Feb '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/lxc/lxc_process.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 01da344..b385423 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1270,11 +1270,6 @@ int virLXCProcessStart(virConnectPtr conn, goto error; } - if (VIR_CLOSE(handshakefds[1]) < 0) { - virReportSystemError(errno, "%s", _("could not close handshake fd")); - goto error; - } - if (virCommandHandshakeWait(cmd) < 0) goto error; -- 1.8.3.1

2 1

[libvirt] [PATCH v2] cpu: add Freescale ppc64 CPU models
by Olivia Yin 04 Feb '15

04 Feb '15

From: Olivia Yin <hong-hua.yin(a)freescale.com> With this patch, Freescale ppc64 CPU modesl could be recognized. virsh # cpu-models ppc64 POWERPC_e6500 POWERPC_e5500 power8 power8e power7+ power7 power6 POWER8_v1.0 POWER7+_v2.1 POWER7_v2.3 POWER7_v2.1 POWER7 virsh # capabilities <capabilities> <host> <uuid>5a54efa6-20dc-4da7-b271-0b7fb7062cb8</uuid> <cpu> <arch>ppc64</arch> <model>POWERPC_e6500</model> <vendor>Freescale</vendor> --- src/cpu/cpu_map.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index bd9b056..413148f 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -600,6 +600,7 @@ <arch name='ppc64'>  <vendor name='IBM'/> + <vendor name='Freescale'/>  <model name='POWER7'> @@ -657,5 +658,16 @@ <pvr value='0x004d0000'/> </model> + + <model name='POWERPC_e5500'> + <vendor name='Freescale'/> + <pvr value='0x80240000'/> + </model> + + <model name='POWERPC_e6500'> + <vendor name='Freescale'/> + <pvr value='0x80400000'/> + </model> + </arch> </cpus> -- 2.1.0.27.g96db324

2 1

[libvirt] [PATCH] conf: fix forget goto error when report a unsupport error
by Luyao Huang 04 Feb '15

04 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1188914 This will cause a issue that add a unsupport input device to a hypervisor which unsupport it, also will cause a wrong error message when the input device is not a mouse or keyboard. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 706e5d2..09b8e9b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8968,6 +8968,7 @@ virDomainInputDefParseXML(const virDomainDef *dom, virReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported input bus %s"), bus); + goto error; } if (def->type != VIR_DOMAIN_INPUT_TYPE_MOUSE && def->type != VIR_DOMAIN_INPUT_TYPE_KBD) { -- 1.8.3.1

3 2

[libvirt] [PATCH] conf: forget goto error when the node->name is not valid
by Luyao Huang 04 Feb '15

04 Feb '15

Although it won't cause a issue now, the code won't touch this place. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 706e5d2..3a0b13e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8609,6 +8609,7 @@ virDomainChrDefParseXML(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown character device type: %s"), nodeName); + goto error; } cur = node->children; -- 1.8.3.1

2 1

[libvirt] [PATCHv2] lxc: fix show the wrong xml when guest start failed
by Luyao Huang 04 Feb '15

04 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1176503 When guest start failed, libvirt will keep the current vm->def, this will make a issue that we cannot get a right xml after guest start failed. And don't call the stop/release hook to do some other clean work. Call virLXCProcessCleanup to help us clean the source and call the hooks if start a vm failed. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v2: use virLXCProcessCleanup to free the source and call the hook. src/lxc/lxc_process.c | 69 ++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 40 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index d7eb8bc..7ba0da8 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1006,6 +1006,7 @@ int virLXCProcessStart(virConnectPtr conn, virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); virCgroupPtr selfcgroup; int status; + bool need_stop = false; if (virCgroupNewSelf(&selfcgroup) < 0) return -1; @@ -1265,18 +1266,20 @@ int virLXCProcessStart(virConnectPtr conn, goto cleanup; } + need_stop = true; + if (virCgroupNewDetectMachine(vm->def->name, "lxc", vm->pid, vm->def->resource ? vm->def->resource->partition : NULL, -1, &priv->cgroup) < 0) - goto error; + goto cleanup; if (!priv->cgroup) { virReportError(VIR_ERR_INTERNAL_ERROR, _("No valid cgroup for machine %s"), vm->def->name); - goto error; + goto cleanup; } priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_FAILED; @@ -1296,17 +1299,17 @@ int virLXCProcessStart(virConnectPtr conn, _("guest failed to start: %s"), out); } - goto error; + goto cleanup; } if (autoDestroy && virCloseCallbacksSet(driver->closeCallbacks, vm, conn, lxcProcessAutoDestroy) < 0) - goto error; + goto cleanup; if (virDomainObjSetDefTransient(caps, driver->xmlopt, vm, false) < 0) - goto error; + goto cleanup; /* We don't need the temporary NIC names anymore, clear them */ virLXCProcessCleanInterfaces(vm->def); @@ -1318,7 +1321,7 @@ int virLXCProcessStart(virConnectPtr conn, * it with the live status XML instead. This is a (currently * harmless) inconsistency we should fix one day */ if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) - goto error; + goto cleanup; /* finally we can call the 'started' hook script if any */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { @@ -1334,47 +1337,38 @@ int virLXCProcessStart(virConnectPtr conn, * If the script raised an error abort the launch */ if (hookret < 0) - goto error; + goto cleanup; } rc = 0; cleanup: - if (rc != 0 && !err) - err = virSaveLastError(); - virCommandFree(cmd); if (VIR_CLOSE(logfd) < 0) { virReportSystemError(errno, "%s", _("could not close logfile")); rc = -1; } - for (i = 0; i < nveths; i++) { - if (rc != 0 && veths[i]) - ignore_value(virNetDevVethDelete(veths[i])); - VIR_FREE(veths[i]); - } if (rc != 0) { - if (vm->newDef) { - virDomainDefFree(vm->newDef); - vm->newDef = NULL; - } - if (priv->monitor) { - virObjectUnref(priv->monitor); - priv->monitor = NULL; - } - virDomainConfVMNWFilterTeardown(vm); - - virSecurityManagerRestoreAllLabel(driver->securityManager, - vm->def, false); - virSecurityManagerReleaseLabel(driver->securityManager, vm->def); - /* Clear out dynamically assigned labels */ - if (vm->def->nseclabels && - vm->def->seclabels[0]->type == VIR_DOMAIN_SECLABEL_DYNAMIC) { - VIR_FREE(vm->def->seclabels[0]->model); - VIR_FREE(vm->def->seclabels[0]->label); - VIR_FREE(vm->def->seclabels[0]->imagelabel); - VIR_DELETE_ELEMENT(vm->def->seclabels, 0, vm->def->nseclabels); + err = virSaveLastError(); + if (need_stop) { + virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); + } else { + virSecurityManagerRestoreAllLabel(driver->securityManager, + vm->def, false); + virSecurityManagerReleaseLabel(driver->securityManager, vm->def); + /* Clear out dynamically assigned labels */ + if (vm->def->nseclabels && + vm->def->seclabels[0]->type == VIR_DOMAIN_SECLABEL_DYNAMIC) { + VIR_FREE(vm->def->seclabels[0]->model); + VIR_FREE(vm->def->seclabels[0]->label); + VIR_FREE(vm->def->seclabels[0]->imagelabel); + VIR_DELETE_ELEMENT(vm->def->seclabels, 0, vm->def->nseclabels); + } + virLXCProcessCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); } } + virCommandFree(cmd); + for (i = 0; i < nveths; i++) + VIR_FREE(veths[i]); for (i = 0; i < nttyFDs; i++) VIR_FORCE_CLOSE(ttyFDs[i]); VIR_FREE(ttyFDs); @@ -1390,11 +1384,6 @@ int virLXCProcessStart(virConnectPtr conn, } return rc; - - error: - err = virSaveLastError(); - virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); - goto cleanup; } struct virLXCProcessAutostartData { -- 1.8.3.1

3 2

[libvirt] [libvirt-test-API][PATCH V2 00/11] Add network_dhcp_leases test case
by jiahu 04 Feb '15

04 Feb '15

For checking IPv6 address, libvirt need a IPv6 testing environment, so modified some cases and configuration files, also there are some small changes for other requirements. There are 9 new commits after comparing with the V1: Add global IPv6 default values to network part Add IPv6 section into network template xml Add IPv6 section into related network case Add xml file for <host> of IPv6 family Remove extra space from xml Change bridge name as a variable in functions Obtain a IPv6 addr on interface Change bridge name as a variable in XML Support brige name argument in cases According to those new commits in V2, updated its conf. Add network_dhcp_leases test case to conf jiahu (11): Add network_dhcp_leases test case Add global IPv6 default values to network part Add IPv6 section into network template xml Add IPv6 section into related network case Add xml file for <host> of IPv6 family Remove extra space from xml Change bridge name as a variable in functions Obtain a IPv6 addr on interface Change bridge name as a variable in XML Support brige name argument in cases Add network_dhcp_leases test case to conf cases/basic_network.conf | 100 ++++++++ global.cfg | 9 + kickstart.cfg | 2 +- repos/domain/destroy.py | 5 +- repos/domain/install_linux_cdrom.py | 5 +- .../domain/xmls/kvm_linux_guest_install_cdrom.xml | 2 +- repos/network/define.py | 7 +- repos/network/network_dhcp_leases.py | 277 +++++++++++++++++++++ repos/network/xmls/ip-dhcp-host.xml | 2 +- repos/network/xmls/ipv6-dhcp-host.xml | 1 + repos/network/xmls/network.xml | 5 + utils/ipget.sh | 7 +- utils/utils.py | 7 +- 13 files changed, 419 insertions(+), 10 deletions(-) create mode 100644 repos/network/network_dhcp_leases.py create mode 100644 repos/network/xmls/ipv6-dhcp-host.xml -- 1.8.3.1

3 13

[libvirt] [PATCH v2 0/2] add support for --reflink to virsh
by Chen Hanxiao 04 Feb '15

04 Feb '15

v2: add man page patch Chen Hanxiao (2): virsh-volume: add support for --reflink man: add --reflink man page of virsh tools/virsh-volume.c | 16 ++++++++++++++++ tools/virsh.pod | 9 ++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) -- 2.1.0

3 4

[libvirt] [PATCH] qemu: include libvirt & QEMU versions in QEMU log files
by Daniel P. Berrange 03 Feb '15

03 Feb '15

It is often helpful to know which version of libvirt and QEMU was present when a guest was first launched. Ensure this info is written into the QEMU log file for each guest. --- src/qemu/qemu_capabilities.c | 22 +++++++++++++++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_process.c | 54 ++++++++++++++++++++++++++++++++------------ src/util/virlog.c | 17 ++------------ src/util/virlog.h | 13 +++++++++++ 6 files changed, 77 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 13f3cd3..a04095e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -299,6 +299,7 @@ struct _virQEMUCaps { unsigned int version; unsigned int kvmVersion; + char *package; virArch arch; @@ -1941,6 +1942,10 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) ret->usedQMP = qemuCaps->usedQMP; ret->version = qemuCaps->version; ret->kvmVersion = qemuCaps->kvmVersion; + + if (VIR_STRDUP(ret->package, qemuCaps->package) < 0) + goto error; + ret->arch = qemuCaps->arch; if (VIR_ALLOC_N(ret->cpuDefinitions, qemuCaps->ncpuDefinitions) < 0) @@ -1992,6 +1997,7 @@ void virQEMUCapsDispose(void *obj) virBitmapFree(qemuCaps->flags); + VIR_FREE(qemuCaps->package); VIR_FREE(qemuCaps->binary); } @@ -2116,6 +2122,12 @@ unsigned int virQEMUCapsGetKVMVersion(virQEMUCapsPtr qemuCaps) } +const char *virQEMUCapsGetPackage(virQEMUCapsPtr qemuCaps) +{ + return qemuCaps->package; +} + + int virQEMUCapsAddCPUDefinition(virQEMUCapsPtr qemuCaps, const char *name) { @@ -2672,6 +2684,9 @@ virQEMUCapsLoadCache(virQEMUCapsPtr qemuCaps, const char *filename, goto cleanup; } + /* Don't check for NULL, since it is optional and thus may be missing */ + qemuCaps->package = virXPathString("string(./package)", ctxt); + if (!(str = virXPathString("string(./arch)", ctxt))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing arch in QEMU capabilities cache")); @@ -2783,6 +2798,10 @@ virQEMUCapsSaveCache(virQEMUCapsPtr qemuCaps, const char *filename) virBufferAsprintf(&buf, "<kvmVersion>%d</kvmVersion>\n", qemuCaps->kvmVersion); + if (qemuCaps->package) + virBufferAsprintf(&buf, "<package>%s</package>\n", + qemuCaps->package); + virBufferAsprintf(&buf, "<arch>%s</arch>\n", virArchToString(qemuCaps->arch)); @@ -2872,6 +2891,7 @@ virQEMUCapsReset(virQEMUCapsPtr qemuCaps) virBitmapClearAll(qemuCaps->flags); qemuCaps->version = qemuCaps->kvmVersion = 0; + VIR_FREE(qemuCaps->package); qemuCaps->arch = VIR_ARCH_NONE; qemuCaps->usedQMP = false; @@ -3204,6 +3224,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, } qemuCaps->version = major * 1000000 + minor * 1000 + micro; + qemuCaps->package = package; qemuCaps->usedQMP = true; virQEMUCapsInitQMPBasic(qemuCaps); @@ -3249,7 +3270,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, ret = 0; cleanup: - VIR_FREE(package); return ret; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 12e1688..1c1227a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -266,6 +266,7 @@ char *virQEMUCapsFlagsString(virQEMUCapsPtr qemuCaps); const char *virQEMUCapsGetBinary(virQEMUCapsPtr qemuCaps); virArch virQEMUCapsGetArch(virQEMUCapsPtr qemuCaps); unsigned int virQEMUCapsGetVersion(virQEMUCapsPtr qemuCaps); +const char *virQEMUCapsGetPackage(virQEMUCapsPtr qemuCaps); unsigned int virQEMUCapsGetKVMVersion(virQEMUCapsPtr qemuCaps); int virQEMUCapsAddCPUDefinition(virQEMUCapsPtr qemuCaps, const char *name); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 100deed..6cc7a24 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7988,7 +7988,7 @@ qemuBuildCommandLine(virConnectPtr conn, if (def->mem.nhugepages && (!def->cpu || !def->cpu->ncells)) { const long system_page_size = sysconf(_SC_PAGESIZE) / 1024; char *mem_path = NULL; - + fprintf(stderr, "SYSCONF %ld\n", system_page_size); if (def->mem.hugepages[0].size == system_page_size) { /* There is one special case: if user specified "huge" * pages of regular system pages size. */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b0f7b1c..3d5d58e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -76,7 +76,6 @@ VIR_LOG_INIT("qemu.qemu_process"); -#define START_POSTFIX ": starting up\n" #define ATTACH_POSTFIX ": attaching\n" #define SHUTDOWN_POSTFIX ": shutting down\n" @@ -4249,6 +4248,44 @@ qemuPrepareNVRAM(virQEMUDriverConfigPtr cfg, } +static void qemuLogOperation(virDomainObjPtr vm, + const char *msg, + int logfd, + virCommandPtr cmd) +{ + char *timestamp; + char *logline; + qemuDomainObjPrivatePtr priv = vm->privateData; + int qemuVersion = virQEMUCapsGetVersion(priv->qemuCaps); + const char *package = virQEMUCapsGetPackage(priv->qemuCaps); + char ebuf[1024]; + + if ((timestamp = virTimeStringNow()) == NULL) + goto error; + + if (virAsprintf(&logline, "%s: %s %s, qemu version: %d.%d.%d%s\n", + timestamp, msg, VIR_LOG_VERSION_STRING, + (qemuVersion / 1000000) % 1000, (qemuVersion / 1000) % 1000, qemuVersion % 1000, + package ? package : "") < 0) + goto error; + + if (safewrite(logfd, logline, strlen(logline)) < 0) + goto error; + + if (cmd) + virCommandWriteArgLog(cmd, logfd); + + cleanup: + VIR_FREE(timestamp); + VIR_FREE(logline); + return; + + error: + VIR_WARN("Unable to write banner to logfile: %s", + virStrerror(errno, ebuf, sizeof(ebuf))); + goto cleanup; +} + int qemuProcessStart(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -4264,7 +4301,6 @@ int qemuProcessStart(virConnectPtr conn, off_t pos = -1; char ebuf[1024]; int logfile = -1; - char *timestamp; qemuDomainObjPrivatePtr priv = vm->privateData; virCommandPtr cmd = NULL; struct qemuProcessHookData hookData; @@ -4620,19 +4656,7 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; } - if ((timestamp = virTimeStringNow()) == NULL) { - goto cleanup; - } else { - if (safewrite(logfile, timestamp, strlen(timestamp)) < 0 || - safewrite(logfile, START_POSTFIX, strlen(START_POSTFIX)) < 0) { - VIR_WARN("Unable to write timestamp to logfile: %s", - virStrerror(errno, ebuf, sizeof(ebuf))); - } - - VIR_FREE(timestamp); - } - - virCommandWriteArgLog(cmd, logfile); + qemuLogOperation(vm, "starting up", logfile, cmd); qemuDomainObjCheckTaint(driver, vm, logfile); diff --git a/src/util/virlog.c b/src/util/virlog.c index 14eb129..b45ee91 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -448,21 +448,8 @@ static int virLogVersionString(const char **rawmsg, char **msg) { -#ifdef PACKAGER_VERSION -# ifdef PACKAGER -# define LOG_VERSION_STRING \ - "libvirt version: " VERSION ", package: " PACKAGER_VERSION " (" PACKAGER ")" -# else -# define LOG_VERSION_STRING \ - "libvirt version: " VERSION ", package: " PACKAGER_VERSION -# endif -#else -# define LOG_VERSION_STRING \ - "libvirt version: " VERSION -#endif - - *rawmsg = LOG_VERSION_STRING; - return virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, LOG_VERSION_STRING); + *rawmsg = VIR_LOG_VERSION_STRING; + return virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, VIR_LOG_VERSION_STRING); } diff --git a/src/util/virlog.h b/src/util/virlog.h index 5b38891..443b3cd 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -25,6 +25,19 @@ # include "internal.h" # include "virbuffer.h" +# ifdef PACKAGER_VERSION +# ifdef PACKAGER +# define VIR_LOG_VERSION_STRING \ + "libvirt version: " VERSION ", package: " PACKAGER_VERSION " (" PACKAGER ")" +# else +# define VIR_LOG_VERSION_STRING \ + "libvirt version: " VERSION ", package: " PACKAGER_VERSION +# endif +# else +# define VIR_LOG_VERSION_STRING \ + "libvirt version: " VERSION +# endif + /* * To be made public */ -- 2.1.0

2 1

[libvirt] [PATCH 0/2] storage: Fix crash with NBD backing store without path
by Peter Krempa 03 Feb '15

03 Feb '15

Storage volume with "nbd://localhost" would crash libvirt if being parsed. Peter Krempa (2): tests: virstoragetest: Switch backing chain test to use automatic numbering util: storage: Fix parsing of nbd: string without path src/util/virstoragefile.c | 3 ++- tests/virstoragetest.c | 69 ++++++++++++++++++++++++++++------------------- 2 files changed, 44 insertions(+), 28 deletions(-) -- 2.2.2

2 3

[libvirt] [PATCH 0/2] fix build issues found by MinGW and Coverity
by Pavel Hrdina 03 Feb '15

03 Feb '15

Pavel Hrdina (2): virnetdev: fix some issues found by coverity and mingw builds virutil: fix MinGW build src/util/virnetdev.c | 36 ++++++++++++++++++++++++------------ src/util/virnetdev.h | 6 +++--- src/util/virutil.c | 8 ++++++++ 3 files changed, 35 insertions(+), 15 deletions(-) -- 2.0.5

4 8

[libvirt] [PATCH] virsh: report 0-length active block-commit job status
by Eric Blake 03 Feb '15

03 Feb '15

At least with live block commit, it is possible to have a block job that reports 0 status: namely, when the active image contains no sectors that differ from the backing image it is being committed into [1]. I'm not sure if that represents a qemu bug, but it leads to weird virsh output where 'virsh blockjob $dom vda' has no output during a no-op commit job. It appears that the special case for a zero total was first introduced for migration, where it does sort of make sense (when we do storage migration, the job is broken up into two pieces where the first half of migrating storage has no clue what the total length of the second phase will be, and where qemu migration always reports a non-zero total length but only once we complete the first phase to start actual migration), but it doesn't seem to make sense for any of the block jobs. [1] https://www.redhat.com/archives/libvir-list/2015-January/msg00348.html * tools/virsh-domain.c (vshPrintJobProgress): Move special-case of 0 total... (vshWatchJob): ...into lone caller where it matters. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/virsh-domain.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6733cfa..ec62aae 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1,7 +1,7 @@ /* * virsh-domain.c: Commands to manage domain * - * Copyright (C) 2005, 2007-2014 Red Hat, Inc. + * Copyright (C) 2005, 2007-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1678,10 +1678,6 @@ vshPrintJobProgress(const char *label, unsigned long long remaining, { int progress; - if (total == 0) - /* migration has not been started */ - return; - if (remaining == 0) { /* migration has completed */ progress = 100; @@ -4189,7 +4185,7 @@ vshWatchJob(vshControl *ctl, ret = virDomainGetJobInfo(dom, &jobinfo); pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); if (ret == 0) { - if (verbose) + if (verbose && jobinfo.dataTotal) vshPrintJobProgress(label, jobinfo.dataRemaining, jobinfo.dataTotal); -- 2.1.0

2 3

[libvirt] Looking for Outreachy sponsors for QEMU, libvirt, and KVM internships (was Outreach Program for Women)
by Stefan Hajnoczi 03 Feb '15

03 Feb '15

Outreach Program for Women is renaming to Outreachy. The new website is: http://outreachy.org/ What is Outreachy? Outreachy helps people from underrepresented groups join the open source community through a 12-week full-time paid internship. The format is similar to Google Summer of Code. Instead of funding university students the focus is on funding women (cis and trans), trans men, and genderqueer people. Last year QEMU participated with one intern, Maria, who developed a qcow2 image format fuzzer to find input validation bugs in QEMU's qcow2 block driver. GNOME, the Linux kernel community, and other projects have also been participating successfully for years. What is the level of sponsorship? Sponsorship is $6,500 per intern. Sponsors can choose their mentor if desired, otherwise we have experienced mentors who can participate. If your company wants to be active in growing the open source community, this is a great way to engage without administrating your own internship program! Dates: * Funding commitment: Monday, February 16 * Participating orgs announced: February 17 * Application deadline for interns: March 24 * Internship dates: May 25 to August 25 Sponsors are listed for recognition on the Outreachy website and can promote job openings. How do QEMU, libvirt, and KVM participate? We try to participate in both Outreachy and Google Summer of Code each year. QEMU acts as an umbrella organization for libvirt and KVM. We have experienced mentors and are able to add new mentors who are active contributors to QEMU, libvirt, or KVM. Full info for organizations: https://wiki.gnome.org/Outreachy/Admin/InfoForOrgs Please let me know if you have any questions. Stefan

1 0

[libvirt] [PATCH 0/8] qemu: support setting device's boot order when VM is running
by Wang Rui 03 Feb '15

03 Feb '15

QEMU supported to set device's boot index online recently(since QEMU 2.2.0). http://lists.gnu.org/archive/html/qemu-devel/2014-10/msg00879.html The QMP "qom-set" is available for setting boot index. qom-set's example is as follows: { .name = "qom-set", .args_type = "path:s,property:s,value:q", .mhandler.cmd_new = qmp_qom_set, } (qemu) qom-set nic1 bootindex 3 (qemu) qom-set nic1 bootindex -1 (qemu) qom-set scsi0-0-0-0 bootindex 2 Setting boot index to -1 means cancel it. We can attach/update a device and set it's boot order when VM is running. The boot order will take effect immediately(after guest rebooting). For example, we can use 'virsh update-device' to change an interface's boot order. The xml is specified as below. <interface type='bridge'> <mac address='fa:16:3e:2e:d4:3d'/> <source bridge='br0'/> <target dev='tap4f2bce78-5b'/> <model type='virtio'/> <driver queues='4'/> <boot order='2'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> If the 'boot order' is not specified in the xml, that means canceling its boot order. Wang Rui (8): qemu: add a new qemuMonitorSetBootIndex() method to set device's bootorder qemu: support attachment of net device with boot index conf: check boot order which is used by itself qemu: a code movement qemu: support attachment of disk device with boot index conf: add compatiblity check for boot index when updating device qemu: support updating interface with boot index qemu: support updating disk with boot index src/conf/device_conf.c | 13 ++ src/conf/device_conf.h | 12 ++ src/conf/domain_conf.c | 74 ++++++---- src/conf/domain_conf.h | 9 -- src/qemu/qemu_driver.c | 64 +++++++-- src/qemu/qemu_hotplug.c | 329 +++++++++++++++++++++++++++++++------------ src/qemu/qemu_hotplug.h | 4 + src/qemu/qemu_monitor.c | 25 ++++ src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 19 +++ src/qemu/qemu_monitor_json.h | 5 + 11 files changed, 424 insertions(+), 134 deletions(-) -- 1.7.12.4

3 18

[libvirt] [PATCH] virsh-volume: add support for --reflink
by Chen Hanxiao 03 Feb '15

03 Feb '15

add support for --reflink to specify VIR_STORAGE_VOL_CREATE_REFLINK flag. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- tools/virsh-volume.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index d585ee2..db94154 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -204,6 +204,7 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "prealloc-metadata")) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; + if (!(pool = vshCommandOptPool(ctl, cmd, "pool", NULL))) return false; @@ -378,6 +379,7 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "prealloc-metadata")) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; + if (!(pool = vshCommandOptPool(ctl, cmd, "pool", NULL))) return false; @@ -441,6 +443,10 @@ static const vshCmdOptDef opts_vol_create_from[] = { .type = VSH_OT_BOOL, .help = N_("preallocate metadata (for qcow2 instead of full allocation)") }, + {.name = "reflink", + .type = VSH_OT_BOOL, + .help = N_("use btrfs COW lightweight copy") + }, {.name = NULL} }; @@ -460,6 +466,9 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "prealloc-metadata")) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; + if (vshCommandOptBool(cmd, "reflink")) + flags |= VIR_STORAGE_VOL_CREATE_REFLINK; + if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) goto cleanup; @@ -554,6 +563,10 @@ static const vshCmdOptDef opts_vol_clone[] = { .type = VSH_OT_BOOL, .help = N_("preallocate metadata (for qcow2 instead of full allocation)") }, + {.name = "reflink", + .type = VSH_OT_BOOL, + .help = N_("use btrfs COW lightweight copy") + }, {.name = NULL} }; @@ -574,6 +587,9 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "prealloc-metadata")) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; + if (vshCommandOptBool(cmd, "reflink")) + flags |= VIR_STORAGE_VOL_CREATE_REFLINK; + origpool = virStoragePoolLookupByVolume(origvol); if (!origpool) { vshError(ctl, "%s", _("failed to get parent pool")); -- 2.1.0

3 2

[libvirt] [PATCH v2] Make tests independant of system page size
by Daniel P. Berrange 02 Feb '15

02 Feb '15

Some code paths have special logic depending on the page size reported by sysconf, which in turn affects the test results. We must mock this so tests always have a consistent page size. --- cfg.mk | 8 ++++++++ src/libvirt_private.syms | 2 ++ src/openvz/openvz_util.c | 5 +---- src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_driver.c | 6 +----- src/util/virfile.c | 2 +- src/util/virnuma.c | 6 +++--- src/util/virutil.c | 13 +++++++++++++ src/util/virutil.h | 3 +++ src/xen/xen_hypervisor.c | 4 ++-- tests/qemuxml2argvmock.c | 8 ++++++++ tests/qemuxml2argvtest.c | 1 + 12 files changed, 46 insertions(+), 18 deletions(-) diff --git a/cfg.mk b/cfg.mk index 70612f8..d72b039 100644 --- a/cfg.mk +++ b/cfg.mk @@ -997,6 +997,11 @@ sc_prohibit_virXXXFree: halt='avoid using 'virXXXFree', use 'virObjectUnref' instead' \ $(_sc_search_regexp) +sc_prohibit_sysconf_pagesize: + @prohibit='sysconf\(_SC_PAGESIZE' \ + halt='use virGetSystemPageSize[KB] instead of sysconf(_SC_PAGESIZE)' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null @@ -1187,3 +1192,6 @@ exclude_file_name_regexp--sc_prohibit_devname = \ exclude_file_name_regexp--sc_prohibit_virXXXFree = \ ^(docs/|tests/|examples/|tools/|cfg.mk|src/test/test_driver.c|src/libvirt_public.syms|include/libvirt/libvirt-(domain|network|nodedev|storage|stream|secret|nwfilter|interface|domain-snapshot).h|src/libvirt-(domain|qemu|network|nodedev|storage|stream|secret|nwfilter|interface|domain-snapshot).c$$) + +exclude_file_name_regexp--sc_prohibit_sysconf_pagesize = \ + ^(cfg\.mk|src/util/virutil\.c)$$ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f7f8ea2..376c69b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2228,6 +2228,8 @@ virGetListenFDs; virGetSCSIHostNameByParentaddr; virGetSCSIHostNumber; virGetSelfLastChanged; +virGetSystemPageSize; +virGetSystemPageSizeKB; virGetUnprivSGIOSysfsPath; virGetUserCacheDirectory; virGetUserConfigDirectory; diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c index 8032f6a..3cdc1c2 100644 --- a/src/openvz/openvz_util.c +++ b/src/openvz/openvz_util.c @@ -42,10 +42,7 @@ openvzKBPerPages(void) static long kb_per_pages; if (kb_per_pages == 0) { - kb_per_pages = sysconf(_SC_PAGESIZE); - if (kb_per_pages > 0) { - kb_per_pages /= 1024; - } else { + if ((kb_per_pages = virGetSystemPageSizeKB()) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Can't determine page size")); kb_per_pages = 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ec4f35b..3b6eddc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4540,7 +4540,7 @@ qemuBuildMemoryBackendStr(unsigned long long size, virDomainHugePagePtr master_hugepage = NULL; virDomainHugePagePtr hugepage = NULL; virDomainNumatuneMemMode mode; - const long system_page_size = sysconf(_SC_PAGESIZE) / 1024; + const long system_page_size = virGetSystemPageSizeKB(); virMemAccess memAccess = def->cpu->cells[guestNode].memAccess; size_t i; char *mem_path = NULL; @@ -7051,7 +7051,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, bool needBackend = false; int rc; int ret = -1; - const long system_page_size = sysconf(_SC_PAGESIZE) / 1024; + const long system_page_size = virGetSystemPageSizeKB(); if (virDomainNumatuneHasPerNodeBinding(def->numatune) && !(virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) || @@ -8239,7 +8239,7 @@ qemuBuildCommandLine(virConnectPtr conn, def->mem.max_balloon = VIR_DIV_UP(def->mem.max_balloon, 1024) * 1024; virCommandAddArgFormat(cmd, "%llu", def->mem.max_balloon / 1024); if (def->mem.nhugepages && (!def->cpu || !def->cpu->ncells)) { - const long system_page_size = sysconf(_SC_PAGESIZE) / 1024; + const long system_page_size = virGetSystemPageSizeKB(); char *mem_path = NULL; if (def->mem.hugepages[0].size == system_page_size) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 59a9593..cf351e6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1352,12 +1352,8 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, if (lastCpu) *lastCpu = cpu; - /* We got pages - * We want kiloBytes - * _SC_PAGESIZE is page size in Bytes - * So calculate, but first lower the pagesize so we don't get overflow */ if (vm_rss) - *vm_rss = rss * (sysconf(_SC_PAGESIZE) >> 10); + *vm_rss = rss * virGetSystemPageSizeKB(); VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d rss=%ld", diff --git a/src/util/virfile.c b/src/util/virfile.c index 4024f3d..68ef6eb 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1086,7 +1086,7 @@ safezero_mmap(int fd, off_t offset, off_t len) /* align offset and length, rounding offset down and length up */ if (pagemask == 0) - pagemask = ~(sysconf(_SC_PAGESIZE) - 1); + pagemask = ~(virGetSystemPageSize() - 1); map_skip = offset - (offset & pagemask); /* memset wants the mmap'ed file to be present on disk so create a diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 86564d4..e986c71 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -639,7 +639,7 @@ virNumaGetPageInfo(int node, unsigned int *page_free) { int ret = -1; - long system_page_size = sysconf(_SC_PAGESIZE); + long system_page_size = virGetSystemPageSize(); /* sysconf() returns page size in bytes, * the @page_size is however in kibibytes */ @@ -717,7 +717,7 @@ virNumaGetPages(int node, /* sysconf() returns page size in bytes, * but we are storing the page size in kibibytes. */ - system_page_size = sysconf(_SC_PAGESIZE) / 1024; + system_page_size = virGetSystemPageSizeKB(); /* Query huge pages at first. * On Linux systems, the huge pages pool cuts off the available memory and @@ -841,7 +841,7 @@ virNumaSetPagePoolSize(int node, char *end; unsigned long long nr_count; - if (page_size == sysconf(_SC_PAGESIZE) / 1024) { + if (page_size == virGetSystemPageSizeKB()) { /* Special case as kernel handles system pages * differently to huge pages. */ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", diff --git a/src/util/virutil.c b/src/util/virutil.c index 3037293..c905209 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2577,3 +2577,16 @@ virGetListenFDs(void) } #endif /* WIN32 */ + +long virGetSystemPageSize(void) +{ + return sysconf(_SC_PAGESIZE); +} + +long virGetSystemPageSizeKB(void) +{ + long val = virGetSystemPageSize(); + if (val < 0) + return val; + return val / 1024; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index f31bf88..d1173c1 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -244,4 +244,7 @@ VIR_ENUM_DECL(virTristateSwitch) unsigned int virGetListenFDs(void); +long virGetSystemPageSize(void); +long virGetSystemPageSizeKB(void); + #endif /* __VIR_UTIL_H__ */ diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 2473532..31a2a1b 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2736,7 +2736,7 @@ xenHypervisorGetMaxMemory(virConnectPtr conn, int ret; if (kb_per_pages == 0) { - kb_per_pages = sysconf(_SC_PAGESIZE) / 1024; + kb_per_pages = virGetSystemPageSizeKB(); if (kb_per_pages <= 0) kb_per_pages = 4; } @@ -2771,7 +2771,7 @@ xenHypervisorGetDomInfo(virConnectPtr conn, int id, virDomainInfoPtr info) uint32_t domain_flags, domain_state, domain_shutdown_cause; if (kb_per_pages == 0) { - kb_per_pages = sysconf(_SC_PAGESIZE) / 1024; + kb_per_pages = virGetSystemPageSizeKB(); if (kb_per_pages <= 0) kb_per_pages = 4; } diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index eccf4b0..d24725e 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -22,7 +22,15 @@ #include "internal.h" #include "virnuma.h" +#include "virmock.h" +#include "virutil.h" #include <time.h> +#include <unistd.h> + +long virGetSystemPageSize(void) +{ + return 4096; +} time_t time(time_t *t) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 89afa81..77ee630 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -22,6 +22,7 @@ # include "cpu/cpu_map.h" # include "virstring.h" # include "storage/storage_driver.h" +# include "virmock.h" # include "testutilsqemu.h" -- 2.1.0

2 1

[libvirt] [PATCH] virnetdev: fix some issues found by coverity and mingw builds
by Pavel Hrdina 02 Feb '15

02 Feb '15

Commit e562a61a introduced new function to get/set interface state but there was misuse of ATTRIBUTE_NONNULL on non-pointer attributes and also we need to wrap that functions by #ifdef to not break mingw build. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/virnetdev.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++-- src/util/virnetdev.h | 12 +++---- 2 files changed, 96 insertions(+), 10 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 7a0a43d..d8a4867 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -671,12 +671,23 @@ int virNetDevSetIFFlag(const char *ifname, * * Returns 0 in case of success or -1 on error. */ +#if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) int virNetDevSetOnline(const char *ifname, bool online) { return virNetDevSetIFFlag(ifname, IFF_UP, online); } +#else +int virNetDevSetOnline(const char *ifname, + bool online ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, + _("Cannot set interface flags on '%s'"), + ifname); + return -1; +} +#endif /** * virNetDevSetPromiscuous: @@ -689,11 +700,22 @@ int virNetDevSetOnline(const char *ifname, * * Returns 0 in case of success or -1 on error. */ +#if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) int virNetDevSetPromiscuous(const char *ifname, bool promiscuous) { return virNetDevSetIFFlag(ifname, IFF_PROMISC, promiscuous); } +#else +int virNetDevSetPromiscuous(const char *ifname, + bool promiscuous ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, + _("Cannot set interface flags on '%s'"), + ifname); + return -1; +} +#endif /** * virNetDevSetRcvMulti: @@ -707,11 +729,22 @@ int virNetDevSetPromiscuous(const char *ifname, * * Returns 0 in case of success or -1 on error. */ +#if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) int virNetDevSetRcvMulti(const char *ifname, bool receive) { return virNetDevSetIFFlag(ifname, IFF_MULTICAST, receive); } +#else +int virNetDevSetRcvMulti(const char *ifname, + bool receive ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, + _("Cannot set interface flags on '%s'"), + ifname); + return -1; +} +#endif /** * virNetDevSetRcvAllMulti: @@ -723,11 +756,22 @@ int virNetDevSetRcvMulti(const char *ifname, * * Returns 0 in case of success or -1 on error. */ +#if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) int virNetDevSetRcvAllMulti(const char *ifname, bool receive) { return virNetDevSetIFFlag(ifname, IFF_ALLMULTI, receive); } +#else +int virNetDevSetRcvAllMulti(const char *ifname, + bool receive ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, + _("Cannot set interface flags on '%s'"), + ifname); + return -1; +} +#endif #if defined(SIOCGIFFLAGS) && defined(HAVE_STRUCT_IFREQ) @@ -776,11 +820,22 @@ int virNetDevGetIFFlag(const char *ifname, * * Returns 0 in case of success or an errno code in case of failure. */ +#if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) int virNetDevGetOnline(const char *ifname, bool *online) { return virNetDevGetIFFlag(ifname, IFF_UP, online); } +#else +int virNetDevGetOnline(const char *ifname, + bool *online ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, + _("Cannot get interface flags on '%s'"), + ifname); + return -1; +} +#endif /** * virNetDevIsPromiscuous: @@ -792,11 +847,22 @@ int virNetDevGetOnline(const char *ifname, * * Returns 0 in case of success or an errno code in case of failure. */ +#if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) int virNetDevGetPromiscuous(const char *ifname, - bool *promiscuous) + bool *promiscuous) { return virNetDevGetIFFlag(ifname, IFF_PROMISC, promiscuous); } +#else +int virNetDevGetPromiscuous(const char *ifname, + bool *promiscuous ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, + _("Cannot get interface flags on '%s'"), + ifname); + return -1; +} +#endif /** * virNetDevIsRcvMulti: @@ -808,11 +874,22 @@ int virNetDevGetPromiscuous(const char *ifname, * * Returns 0 in case of success or -1 on error. */ +#if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) int virNetDevGetRcvMulti(const char *ifname, - bool *receive) + bool *receive) { return virNetDevGetIFFlag(ifname, IFF_MULTICAST, receive); } +#else +int virNetDevGetRcvMulti(const char *ifname, + bool *receive ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, + _("Cannot get interface flags on '%s'"), + ifname); + return -1; +} +#endif /** * virNetDevIsRcvAllMulti: @@ -824,11 +901,22 @@ int virNetDevGetRcvMulti(const char *ifname, * * Returns 0 in case of success or -1 on error. */ +#if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) int virNetDevGetRcvAllMulti(const char *ifname, - bool *receive) + bool *receive) { return virNetDevGetIFFlag(ifname, IFF_ALLMULTI, receive); } +#else +int virNetDevGetRcvAllMulti(const char *ifname, + bool *receive ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, + _("Cannot get interface flags on '%s'"), + ifname); + return -1; +} +#endif /** diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 8d03459..1001e43 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -201,25 +201,23 @@ int virNetDevDelMulti(const char *ifname, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevSetIFFlag(const char *ifname, int flag, bool val) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevGetIFFlag(const char *ifname, int flag, bool *val) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; int virNetDevSetPromiscuous(const char *ifname, bool promiscuous) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevGetPromiscuous(const char *ifname, bool *promiscuous) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevSetRcvMulti(const char *ifname, bool receive) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevGetRcvMulti(const char *ifname, bool *receive) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevSetRcvAllMulti(const char *ifname, bool receive) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevGetRcvAllMulti(const char *ifname, bool *receive) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; #endif /* __VIR_NETDEV_H__ */ -- 2.0.5

2 1

[libvirt] Missing libxl_device_nic settings
by Kim Larry 02 Feb '15

02 Feb '15

Hi, I was trying to pass ip address to scripts/vif-bridge by putting <ip address=""/> in guest config xml file, however, I found that libxlMakeNic(which located in libxl/libxl_conf.c:956) doesn't set x_nic->ip. So I patched myself but I'm not so sure about VIR_DOMAIN_NET_TYPE_ETHERNET. It seems like vif-route, correct? Here is my patch: diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 0555b91..0effc59 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1047,10 +1047,18 @@ libxlMakeNic(virDomainDefPtr def, if (VIR_STRDUP(x_nic->bridge, virDomainNetGetActualBridgeName(l_nic)) < 0) return -1; - /* fallthrough */ + if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) + return -1; + if (VIR_STRDUP(x_nic->ip, l_nic->data.bridge.ipaddr) < 0) + return -1; + break; case VIR_DOMAIN_NET_TYPE_ETHERNET: if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) return -1; + if (VIR_STRDUP(x_nic->ip, l_nic->data.ethernet.ipaddr) < 0) + return -1; + if (VIR_STRDUP(x_nic->gatewaydev, l_nic->data.ethernet.dev) < 0) + return -1; break; case VIR_DOMAIN_NET_TYPE_NETWORK: { Regards, Jihoon

3 4

[libvirt] [PATCH] Make tests independant of system page size
by Daniel P. Berrange 02 Feb '15

02 Feb '15

Some code paths have special logic depending on the page size reported by sysconf, which in turn affects the test results. We must mock this so tests always have a consistent page size. --- src/libvirt_private.syms | 2 ++ src/openvz/openvz_util.c | 5 +---- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_driver.c | 6 +----- src/util/virfile.c | 2 +- src/util/virnuma.c | 6 +++--- src/util/virutil.c | 13 +++++++++++++ src/util/virutil.h | 3 +++ src/xen/xen_hypervisor.c | 4 ++-- tests/qemuxml2argvmock.c | 13 +++++++++++++ tests/qemuxml2argvtest.c | 1 + 11 files changed, 42 insertions(+), 17 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bd7870f..aa68797 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2215,6 +2215,8 @@ virGetListenFDs; virGetSCSIHostNameByParentaddr; virGetSCSIHostNumber; virGetSelfLastChanged; +virGetSystemPageSize; +virGetSystemPageSizeKB; virGetUnprivSGIOSysfsPath; virGetUserCacheDirectory; virGetUserConfigDirectory; diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c index 8032f6a..3cdc1c2 100644 --- a/src/openvz/openvz_util.c +++ b/src/openvz/openvz_util.c @@ -42,10 +42,7 @@ openvzKBPerPages(void) static long kb_per_pages; if (kb_per_pages == 0) { - kb_per_pages = sysconf(_SC_PAGESIZE); - if (kb_per_pages > 0) { - kb_per_pages /= 1024; - } else { + if ((kb_per_pages = virGetSystemPageSizeKB()) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Can't determine page size")); kb_per_pages = 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 100deed..30f202f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6694,7 +6694,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, char *nodemask = NULL; char *mem_path = NULL; int ret = -1; - const long system_page_size = sysconf(_SC_PAGESIZE) / 1024; + const long system_page_size = virGetSystemPageSizeKB(); if (virDomainNumatuneHasPerNodeBinding(def->numatune) && !(virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) || @@ -7986,7 +7986,7 @@ qemuBuildCommandLine(virConnectPtr conn, def->mem.max_balloon = VIR_DIV_UP(def->mem.max_balloon, 1024) * 1024; virCommandAddArgFormat(cmd, "%llu", def->mem.max_balloon / 1024); if (def->mem.nhugepages && (!def->cpu || !def->cpu->ncells)) { - const long system_page_size = sysconf(_SC_PAGESIZE) / 1024; + const long system_page_size = virGetSystemPageSizeKB(); char *mem_path = NULL; if (def->mem.hugepages[0].size == system_page_size) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1d3bee6..0a1c88e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1352,12 +1352,8 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, if (lastCpu) *lastCpu = cpu; - /* We got pages - * We want kiloBytes - * _SC_PAGESIZE is page size in Bytes - * So calculate, but first lower the pagesize so we don't get overflow */ if (vm_rss) - *vm_rss = rss * (sysconf(_SC_PAGESIZE) >> 10); + *vm_rss = rss * virGetSystemPageSizeKB(); VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d rss=%ld", diff --git a/src/util/virfile.c b/src/util/virfile.c index 5f56005..f2b9738 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1086,7 +1086,7 @@ safezero_mmap(int fd, off_t offset, off_t len) /* align offset and length, rounding offset down and length up */ if (pagemask == 0) - pagemask = ~(sysconf(_SC_PAGESIZE) - 1); + pagemask = ~(virGetSystemPageSize() - 1); map_skip = offset - (offset & pagemask); /* memset wants the mmap'ed file to be present on disk so create a diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 86564d4..e986c71 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -639,7 +639,7 @@ virNumaGetPageInfo(int node, unsigned int *page_free) { int ret = -1; - long system_page_size = sysconf(_SC_PAGESIZE); + long system_page_size = virGetSystemPageSize(); /* sysconf() returns page size in bytes, * the @page_size is however in kibibytes */ @@ -717,7 +717,7 @@ virNumaGetPages(int node, /* sysconf() returns page size in bytes, * but we are storing the page size in kibibytes. */ - system_page_size = sysconf(_SC_PAGESIZE) / 1024; + system_page_size = virGetSystemPageSizeKB(); /* Query huge pages at first. * On Linux systems, the huge pages pool cuts off the available memory and @@ -841,7 +841,7 @@ virNumaSetPagePoolSize(int node, char *end; unsigned long long nr_count; - if (page_size == sysconf(_SC_PAGESIZE) / 1024) { + if (page_size == virGetSystemPageSizeKB()) { /* Special case as kernel handles system pages * differently to huge pages. */ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", diff --git a/src/util/virutil.c b/src/util/virutil.c index 3037293..f3e8920 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2577,3 +2577,16 @@ virGetListenFDs(void) } #endif /* WIN32 */ + +long virGetSystemPageSize(void) +{ + return sysconf(_SC_PAGESIZE); +} + +long virGetSystemPageSizeKB(void) +{ + long val = sysconf(_SC_PAGESIZE); + if (val < 0) + return val; + return val / 1024; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index f31bf88..d1173c1 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -244,4 +244,7 @@ VIR_ENUM_DECL(virTristateSwitch) unsigned int virGetListenFDs(void); +long virGetSystemPageSize(void); +long virGetSystemPageSizeKB(void); + #endif /* __VIR_UTIL_H__ */ diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 2473532..31a2a1b 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2736,7 +2736,7 @@ xenHypervisorGetMaxMemory(virConnectPtr conn, int ret; if (kb_per_pages == 0) { - kb_per_pages = sysconf(_SC_PAGESIZE) / 1024; + kb_per_pages = virGetSystemPageSizeKB(); if (kb_per_pages <= 0) kb_per_pages = 4; } @@ -2771,7 +2771,7 @@ xenHypervisorGetDomInfo(virConnectPtr conn, int id, virDomainInfoPtr info) uint32_t domain_flags, domain_state, domain_shutdown_cause; if (kb_per_pages == 0) { - kb_per_pages = sysconf(_SC_PAGESIZE) / 1024; + kb_per_pages = virGetSystemPageSizeKB(); if (kb_per_pages <= 0) kb_per_pages = 4; } diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index eccf4b0..7adf781 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -22,7 +22,20 @@ #include "internal.h" #include "virnuma.h" +#include "virmock.h" +#include "virutil.h" #include <time.h> +#include <unistd.h> + +long virGetSystemPageSize(void) +{ + return 4096; +} + +long virGetSystemPageSizeKB(void) +{ + return 4; +} time_t time(time_t *t) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 89afa81..77ee630 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -22,6 +22,7 @@ # include "cpu/cpu_map.h" # include "virstring.h" # include "storage/storage_driver.h" +# include "virmock.h" # include "testutilsqemu.h" -- 2.1.0

4 3

[libvirt] [PATCH] storage: Need to clear pool prior to refreshPool during Autostart
by John Ferlan 02 Feb '15

02 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1176510 When storageDriverAutostart is called path virStateReload via a 'service libvirtd reload', then because the volume list in the pool wasn't cleared prior to the call, each volume would be listed multiple times (as many times as we reload). I believe the issue would be introduced by commit id '9e093f0b' at least for the libvirtd reload path, although I suppose the introduction of virStateReload (commit id '70da0494') could be a different cause. Thus like other places prior to calling refreshPool, we need to call virStoragePoolObjClearVols Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index e1dd448..ad92c9b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -125,6 +125,7 @@ storageDriverAutostart(void) } if (started) { + virStoragePoolObjClearVols(pool); if (backend->refreshPool(conn, pool) < 0) { virErrorPtr err = virGetLastError(); if (backend->stopPool) -- 2.1.0

2 2

[libvirt] [PATCH] util: recheck the validating backend when the firewalld start/stop
by Luyao Huang 02 Feb '15

02 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1188088 When the firewalld is running and then start the libvirtd, libvirt will set the current backend as VIR_FIREWALL_BACKEND_FIREWALLD. But when firewalld is stop, we still try to use firewalld even it is stopped, this will make the vm which has nwfilter cannot start because systemd cannot find a running firewalld service. We already have a Dbus callback functions before, add a recheck for the validating backend in firewalld_dbus_filter_bridge and nwfilterFirewalldDBusFilter callback functions to help us dynamic change the validating backend. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 6 ++++++ src/nwfilter/nwfilter_driver.c | 6 ++++++ src/util/virfirewall.c | 8 ++++++++ src/util/virfirewall.h | 2 ++ 5 files changed, 23 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f7f8ea2..dd953b2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1386,6 +1386,7 @@ virFirewallAddRuleFull; virFirewallApply; virFirewallFree; virFirewallNew; +virFirewallRecheckBackend; virFirewallRemoveRule; virFirewallRuleAddArg; virFirewallRuleAddArgFormat; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c56e8f2..c0e77e6 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -60,6 +60,7 @@ #include "viruuid.h" #include "viriptables.h" #include "virlog.h" +#include "virfirewall.h" #include "virdnsmasq.h" #include "configmake.h" #include "virnetdev.h" @@ -448,6 +449,11 @@ firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, + "NameOwnerChanged")) { + virFirewallRecheckBackend(); + } + + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 8e3db43..5f8c48d 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -29,6 +29,7 @@ #include "virdbus.h" #include "virlog.h" +#include "virfirewall.h" #include "internal.h" @@ -87,6 +88,11 @@ nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, void *user_data ATTRIBUTE_UNUSED) { if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, + "NameOwnerChanged")) { + virFirewallRecheckBackend(); + } + + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) { diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index cd7afa5..ae00816 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -980,3 +980,11 @@ virFirewallApply(virFirewallPtr firewall) virMutexUnlock(&ruleLock); return ret; } + +int +virFirewallRecheckBackend(void) +{ + currentBackend = VIR_FIREWALL_BACKEND_AUTOMATIC; + + return virFirewallValidateBackend(currentBackend); +} diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index dbf3975..fa4bd8b 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -108,4 +108,6 @@ int virFirewallApply(virFirewallPtr firewall); void virFirewallSetLockOverride(bool avoid); +int virFirewallRecheckBackend(void); + #endif /* __VIR_FIREWALL_H__ */ -- 1.8.3.1

2 2

[libvirt] [RFC] [Patch] Make hugepage testcase arch-agnostic
by Prerna Saxena 02 Feb '15

02 Feb '15

Hi, I have attached this patch as a response to a recent failure observed on PowerPC architecture by commit 311b4a67. This patch introduces a check for dynamically obtaining system page size for test hugepages-pages6 under 'qemuxml2argv' suite. ( See patch for more verbose problem description) This patch is not the most perfect implementation -- it fails syntax check; and has a Makefile-driven cleanup pending. I will be happy to deck it up and send it if the community concurs with this approach. We could also implement this via a shell script ( just like 'virt-test-aa-helper') but I couldnt find an easy way to determine host page size. Awaiting community responses, Prerna >From 8a64d4d22e2e65158d3caa45b615ca9a263f841f Mon Sep 17 00:00:00 2001 From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Mon, 2 Feb 2015 10:48:48 +0530 Subject: [PATCH] Commit 311b4a67 introduces a test for normal-page backed guest XML. However, it hardcodes the page size to 4 KB which is only valid for Intel Make check consequently fails on PowerPC where page size is 64KB This makes the hugepages-pages6 test more modular, and enables the page size to be picked up at runtime. --- .../qemuxml2argv-hugepages-pages6.template | 32 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 24 +++++++++++++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.template diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.template b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.template new file mode 100644 index 0000000..8b9b995 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.template @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>SomeDummyHugepagesGuest</name> + <uuid>ef1bdff4-27f3-4e85-a807-5fb4d58463cc</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <memoryBacking> + <hugepages> + <page size='%llu' unit='KiB'/> + </hugepages> + </memoryBacking> + <vcpu placement='static'>2</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</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 89afa81..a16d937 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -479,6 +479,11 @@ mymain(void) { int ret = 0; bool skipLegacyCPUs = false; + const long system_page_size = sysconf(_SC_PAGESIZE) / 1024; + int fd_in; + FILE *f_out; + char *template, *xml = NULL; + char buf[1000]; abs_top_srcdir = getenv("abs_top_srcdir"); if (!abs_top_srcdir) @@ -702,7 +707,24 @@ mymain(void) DO_TEST_FAILURE("hugepages-pages4", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-pages5", QEMU_CAPS_MEM_PATH); - DO_TEST("hugepages-pages6", NONE); + + if (virAsprintf(&template, "%s/qemuxml2argvdata/qemuxml2argv-%s.template", + abs_srcdir, "hugepages-pages6") < 0 || + virAsprintf(&xml, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml", + abs_srcdir, "hugepages-pages6") < 0) + return EXIT_FAILURE; + fd_in = open(template, O_RDONLY); + f_out = fopen(xml, "w"); + + if ( fd_in != -1 && f_out != NULL ) { + if(read(fd_in, &buf, sizeof(buf))) { + fprintf(f_out, buf,system_page_size); + fclose(f_out); + close(fd_in); + DO_TEST("hugepages-pages6", NONE); + } + } + DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, -- 1.9.3 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

3 2

[libvirt] [PATCHv2 00/13] memory hotplug: Preliminary fixes and cleanups
by Peter Krempa 31 Jan '15

31 Jan '15

This series was split out from my memory hotplug series that is not quite ready yet. The aim of this series is to refactor the code that creates commandline for the memory-backend-* qemu object so that it can be later reused for hotplug via monitor. Additionally this series also fixes a bug in NUMA memory initialisation where qemu doesn't support a combination of old and new approach. Version 2 fixes bugs found by first round of review. Patch 4/13 is new in this series. Please see individual patches for changes. (If the change line isn't present the patch was not reviewed) Peter Krempa (13): conf: numatune: Extract code for requesting memory nodeset from formatting test: utils: Add helpers for automatic numbering of test cases util: json: make value object creator universal by supporting adding util: bitmap: Add option to allocate bitmap without reporting error util: json: Add functions to convert JSON arrays from/to virBitmaps util: json: add helper to iterate JSON object key=value pairs qemu: command: Add helper to format -object strings from JSON representation qemu: Extract code to setup memory backing objects qemu: command: Shuffle around formating of alias for memory backend objs qemu: command: Unify values for boolean values when formating memory backends qemu: command: Switch to bytes when formatting size for memory backends qemu: command: Refactor NUMA backend object formatting to use JSON objs qemu: command: Don't combine old and modern NUMA node creation src/conf/numatune_conf.c | 33 +- src/conf/numatune_conf.h | 5 + src/libvirt_private.syms | 7 + src/qemu/qemu_command.c | 547 +++++++++++++++------ src/qemu/qemu_command.h | 4 + src/util/virbitmap.c | 42 +- src/util/virbitmap.h | 1 + src/util/virjson.c | 222 ++++++++- src/util/virjson.h | 17 + tests/Makefile.am | 13 +- tests/qemucommandutiltest.c | 118 +++++ .../qemuxml2argv-hugepages-pages.args | 20 +- .../qemuxml2argv-hugepages-pages2.args | 8 +- .../qemuxml2argv-hugepages-pages3.args | 7 +- .../qemuxml2argv-hugepages-shared.args | 20 +- .../qemuxml2argv-numatune-memnode-no-memory.args | 6 +- .../qemuxml2argv-numatune-memnode.args | 8 +- tests/testutils.c | 52 ++ tests/testutils.h | 3 + 19 files changed, 912 insertions(+), 221 deletions(-) create mode 100644 tests/qemucommandutiltest.c -- 2.2.2

2 16

[libvirt] [PATCH] util: make virNetDev(Get|Set)IFFlags() static
by Laine Stump 30 Jan '15

30 Jan '15

e562a61a0739 added these two new helper functions and only used them within virnetdev.c, but declared them in the .h file. If some currently unsupported interface flags need to be accessed in the future, it will make more sense to write the appropriate higher level function rather than require us to artificially define IFF_* on some mythical platform that doesn't have SIOC[SG]IFFLAGS (and therefore doesn't have IFF_*) just so we can call virNetDevSetIFFFlags() to return an error. To help someone in not going down the wrong road, this patch makes the two helper functions static, hopefully making it less likely that someone will want to use them outside of virnetdev.c. --- src/util/virnetdev.c | 22 +++++++++++++--------- src/util/virnetdev.h | 10 +--------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 7a0a43d..4be6265 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 Red Hat, Inc. + * Copyright (C) 2007-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -610,7 +610,8 @@ int virNetDevSetName(const char* ifname, const char *newifname) #if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) -int virNetDevSetIFFlag(const char *ifname, int flag, bool val) +static int +virNetDevSetIFFlag(const char *ifname, int flag, bool val) { int fd = -1; int ret = -1; @@ -649,9 +650,10 @@ int virNetDevSetIFFlag(const char *ifname, int flag, bool val) return ret; } #else -int virNetDevSetIFFlag(const char *ifname, - int flag ATTRIBUTE_UNUSED, - bool val ATTRIBUTE_UNUSED) +static int +virNetDevSetIFFlag(const char *ifname, + int flag ATTRIBUTE_UNUSED, + bool val ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, _("Cannot set interface flags on '%s'"), @@ -731,7 +733,8 @@ int virNetDevSetRcvAllMulti(const char *ifname, #if defined(SIOCGIFFLAGS) && defined(HAVE_STRUCT_IFREQ) -int virNetDevGetIFFlag(const char *ifname, int flag, bool *val) +static int +virNetDevGetIFFlag(const char *ifname, int flag, bool *val) { int fd = -1; int ret = -1; @@ -755,9 +758,10 @@ int virNetDevGetIFFlag(const char *ifname, int flag, bool *val) return ret; } #else -int virNetDevGetIFFlag(const char *ifname, - int flag ATTRIBUTE_UNUSED, - bool *val ATTRIBUTE_UNUSED) +static int +virNetDevGetIFFlag(const char *ifname, + int flag ATTRIBUTE_UNUSED, + bool *val ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, _("Cannot get interface flags on '%s'"), diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 8d03459..6e8372f 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 Red Hat, Inc. + * Copyright (C) 2007-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -200,14 +200,6 @@ int virNetDevDelMulti(const char *ifname, virMacAddrPtr macaddr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; -int virNetDevSetIFFlag(const char *ifname, int flag, bool val) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; - -int virNetDevGetIFFlag(const char *ifname, int flag, bool *val) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; - int virNetDevSetPromiscuous(const char *ifname, bool promiscuous) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevGetPromiscuous(const char *ifname, bool *promiscuous) -- 1.9.3

2 1

[libvirt] [PATCH 0/2] schemas: Remove useless definition
by Martin Kletzander 30 Jan '15

30 Jan '15

Let's save 21 lines just because I've found out a way how to convince xmllint to do something we thought it can't. The first patch is the brains of this operation, the second one is just a cleaner guy; best served with '-w'. Martin Kletzander (2): schema: Remove unnecessary interface-options schema: Indent interface properly docs/schemas/domaincommon.rng | 787 ++++++++++++++++++++---------------------- 1 file changed, 383 insertions(+), 404 deletions(-) -- 2.2.2

2 4

[libvirt] [PATCH] xend: Don't crash in virDomainXMLDevID
by Michal Privoznik 30 Jan '15

30 Jan '15

The function is called from all {Attach,Update,Detach}Device APIs to create config strings that are later passed to the xend to perform the desired action. The function is intended to handle all supported devices. However, as of 5b05358abacb1029fa0d61f72decacf0d4fd8ffb we are trying to get disk driver of the device without checking if the device really is a disk. This leads to an segmentation fault: #0 0x00007ffff7571815 in virDomainDiskGetDriver () from /usr/lib/libvirt.so.0 #1 0x00007fffeb9ad471 in ?? () from /usr/lib/libvirt/connection-driver/libvirt_driver_xen.so #2 0x00007fffeb9b1062 in xenDaemonAttachDeviceFlags () from /usr/lib/libvirt/connection-driver/libvirt_driver_xen.so #3 0x00007fffeb9a8a86 in ?? () from /usr/lib/libvirt/connection-driver/libvirt_driver_xen.so #4 0x00007ffff7609266 in virDomainAttachDevice () from /usr/lib/libvirt.so.0 #5 0x0000555555593c9d in ?? () #6 0x00007ffff76743c9 in virNetServerProgramDispatch () from /usr/lib/libvirt.so.0 #7 0x00005555555a678d in ?? () #8 0x00007ffff755460e in ?? () from /usr/lib/libvirt.so.0 #9 0x00007ffff7553b06 in ?? () from /usr/lib/libvirt.so.0 #10 0x00007ffff4998b50 in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0 #11 0x00007ffff46e30ed in clone () from /lib/x86_64-linux-gnu/libc.so.6 #12 0x0000000000000000 in ?? () Reported-by: Xiaolin Su <linxxnil(a)126.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/xen/xend_internal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index a51cb20..c2b9098 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -3329,9 +3329,10 @@ virDomainXMLDevID(virConnectPtr conn, xenUnifiedPrivatePtr priv = conn->privateData; char *xref; char *tmp; - const char *driver = virDomainDiskGetDriver(dev->data.disk); if (dev->type == VIR_DOMAIN_DEVICE_DISK) { + const char *driver = virDomainDiskGetDriver(dev->data.disk); + if (STREQ_NULLABLE(driver, "tap") || STREQ_NULLABLE(driver, "tap2")) strcpy(class, driver); else -- 2.0.5

2 2

[libvirt] [PATCH v3 1/2] util: Functions for getting/setting device options
by akrowiak＠linux.vnet.ibm.com 30 Jan '15

30 Jan '15

From: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> This patch provides the utility functions needed to synchronize the rxfilter changes made to a guest domain with the corresponding macvtap devices on the host: * Get/set PROMISC flag * Get/set ALLMULTI, MULTICAST Signed-off-by: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> --- Changes for v3: * Fixed a syntax-check error in virNetDevGetRxFilter function src/libvirt_private.syms | 8 ++- src/util/virnetdev.c | 186 +++++++++++++++++++++++++++++++++++++++------- src/util/virnetdev.h | 24 ++++++- 3 files changed, 190 insertions(+), 28 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a2eec83..8d76f9b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1639,13 +1639,16 @@ virNetDevGetIPv4Address; virNetDevGetLinkInfo; virNetDevGetMAC; virNetDevGetMTU; +virNetDevGetOnline; virNetDevGetPhysicalFunction; +virNetDevGetPromiscuous; +virNetDevGetRcvAllMulti; +virNetDevGetRcvMulti; virNetDevGetRxFilter; virNetDevGetVirtualFunctionIndex; virNetDevGetVirtualFunctionInfo; virNetDevGetVirtualFunctions; virNetDevGetVLanID; -virNetDevIsOnline; virNetDevIsVirtualFunction; virNetDevLinkDump; virNetDevReplaceMacAddress; @@ -1663,6 +1666,9 @@ virNetDevSetMTUFromDevice; virNetDevSetName; virNetDevSetNamespace; virNetDevSetOnline; +virNetDevSetPromiscuous; +virNetDevSetRcvAllMulti; +virNetDevSetRcvMulti; virNetDevSetupControl; virNetDevValidateConfig; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index ef96b2b..5d330ce 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -610,17 +610,7 @@ int virNetDevSetName(const char* ifname, const char *newifname) #if defined(SIOCSIFFLAGS) && defined(HAVE_STRUCT_IFREQ) -/** - * virNetDevSetOnline: - * @ifname: the interface name - * @online: true for up, false for down - * - * Function to control if an interface is activated (up, true) or not (down, false) - * - * Returns 0 in case of success or -1 on error. - */ -int virNetDevSetOnline(const char *ifname, - bool online) +int virNetDevSetIFFlag(const char *ifname, int flag, bool val) { int fd = -1; int ret = -1; @@ -637,10 +627,10 @@ int virNetDevSetOnline(const char *ifname, goto cleanup; } - if (online) - ifflags = ifr.ifr_flags | IFF_UP; + if (val) + ifflags = ifr.ifr_flags | flag; else - ifflags = ifr.ifr_flags & ~IFF_UP; + ifflags = ifr.ifr_flags & ~flag; if (ifr.ifr_flags != ifflags) { ifr.ifr_flags = ifflags; @@ -659,8 +649,9 @@ int virNetDevSetOnline(const char *ifname, return ret; } #else -int virNetDevSetOnline(const char *ifname, - bool online ATTRIBUTE_UNUSED) +int virNetDevSetIFFlag(const char *ifname, + int flag ATTRIBUTE_UNUSED, + bool val ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, _("Cannot set interface flags on '%s'"), @@ -670,18 +661,77 @@ int virNetDevSetOnline(const char *ifname, #endif -#if defined(SIOCGIFFLAGS) && defined(HAVE_STRUCT_IFREQ) + /** - * virNetDevIsOnline: + * virNetDevSetOnline: * @ifname: the interface name - * @online: where to store the status + * @online: true for up, false for down * - * Function to query if an interface is activated (true) or not (false) + * Function to control if an interface is activated (up, true) or not (down, false) * - * Returns 0 in case of success or an errno code in case of failure. + * Returns 0 in case of success or -1 on error. */ -int virNetDevIsOnline(const char *ifname, - bool *online) +int virNetDevSetOnline(const char *ifname, + bool online) +{ + + return virNetDevSetIFFlag(ifname, IFF_UP, online); +} + +/** + * virNetDevSetPromiscuous: + * @ifname: the interface name + * @promiscuous: true for receive all packets, false for do not receive + * all packets + * + * Function to control if an interface is to receive all + * packets (receive all, true) or not (do not receive all, false) + * + * Returns 0 in case of success or -1 on error. + */ +int virNetDevSetPromiscuous(const char *ifname, + bool promiscuous) +{ + return virNetDevSetIFFlag(ifname, IFF_PROMISC, promiscuous); +} + +/** + * virNetDevSetRcvMulti: + * @ifname: the interface name + * @:receive true for receive multicast packets, false for do not receive + * multicast packets + * + * Function to control if an interface is to receive multicast + * packets in which it is interested (receive, true) + * or not (do not receive, false) + * + * Returns 0 in case of success or -1 on error. + */ +int virNetDevSetRcvMulti(const char *ifname, + bool receive) +{ + return virNetDevSetIFFlag(ifname, IFF_MULTICAST, receive); +} + +/** + * virNetDevSetRcvAllMulti: + * @ifname: the interface name + * @:receive true for receive all packets, false for do not receive all packets + * + * Function to control if an interface is to receive all multicast + * packets (receive, true) or not (do not receive, false) + * + * Returns 0 in case of success or -1 on error. + */ +int virNetDevSetRcvAllMulti(const char *ifname, + bool receive) +{ + return virNetDevSetIFFlag(ifname, IFF_ALLMULTI, receive); +} + + +#if defined(SIOCGIFFLAGS) && defined(HAVE_STRUCT_IFREQ) +int virNetDevGetIFFlag(const char *ifname, int flag, bool *val) { int fd = -1; int ret = -1; @@ -697,7 +747,7 @@ int virNetDevIsOnline(const char *ifname, goto cleanup; } - *online = (ifr.ifr_flags & IFF_UP) ? true : false; + *val = (ifr.ifr_flags & flag) ? true : false; ret = 0; cleanup: @@ -705,8 +755,9 @@ int virNetDevIsOnline(const char *ifname, return ret; } #else -int virNetDevIsOnline(const char *ifname, - bool *online ATTRIBUTE_UNUSED) +int virNetDevGetIFFlag(const char *ifname, + int flag ATTRIBUTE_UNUSED, + bool *val ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, _("Cannot get interface flags on '%s'"), @@ -717,6 +768,70 @@ int virNetDevIsOnline(const char *ifname, /** + * virNetDevGetOnline: + * @ifname: the interface name + * @online: where to store the status + * + * Function to query if an interface is activated (true) or not (false) + * + * Returns 0 in case of success or an errno code in case of failure. + */ +int virNetDevGetOnline(const char *ifname, + bool *online) +{ + return virNetDevGetIFFlag(ifname, IFF_UP, online); +} + +/** + * virNetDevIsPromiscuous: + * @ifname: the interface name + * @promiscuous: where to store the status + * + * Function to query if an interface is receiving all packets (true) or + * not (false) + * + * Returns 0 in case of success or an errno code in case of failure. + */ +int virNetDevGetPromiscuous(const char *ifname, + bool *promiscuous) +{ + return virNetDevGetIFFlag(ifname, IFF_PROMISC, promiscuous); +} + +/** + * virNetDevIsRcvMulti: + * @ifname: the interface name + * @receive where to store the status + * + * Function to query whether an interface is receiving multicast packets (true) + * in which it is interested, or not (false) + * + * Returns 0 in case of success or -1 on error. + */ +int virNetDevGetRcvMulti(const char *ifname, + bool *receive) +{ + return virNetDevGetIFFlag(ifname, IFF_MULTICAST, receive); +} + +/** + * virNetDevIsRcvAllMulti: + * @ifname: the interface name + * @:receive where to store the status + * + * Function to query whether an interface is receiving all multicast + * packets (receiving, true) or not (is not receiving, false) + * + * Returns 0 in case of success or -1 on error. + */ +int virNetDevGetRcvAllMulti(const char *ifname, + bool *receive) +{ + return virNetDevGetIFFlag(ifname, IFF_ALLMULTI, receive); +} + + +/** * virNetDevGetIndex: * @ifname : Name of the interface whose index is to be found * @ifindex: Pointer to int where the index will be written into @@ -2549,6 +2664,7 @@ int virNetDevGetRxFilter(const char *ifname, virNetDevRxFilterPtr *filter) { int ret = -1; + bool receive; virNetDevRxFilterPtr fil = virNetDevRxFilterNew(); if (!fil) @@ -2560,6 +2676,24 @@ int virNetDevGetRxFilter(const char *ifname, if (virNetDevGetMulticastTable(ifname, fil)) goto cleanup; + if (virNetDevGetPromiscuous(ifname, &fil->promiscuous)) + goto cleanup; + + if (virNetDevGetRcvAllMulti(ifname, &receive)) + goto cleanup; + + if (receive) { + fil->multicast.mode = VIR_NETDEV_RX_FILTER_MODE_ALL; + } else { + if (virNetDevGetRcvMulti(ifname, &receive)) + goto cleanup; + + if (receive) + fil->multicast.mode = VIR_NETDEV_RX_FILTER_MODE_NORMAL; + else + fil->multicast.mode = VIR_NETDEV_RX_FILTER_MODE_NONE; + } + ret = 0; cleanup: if (ret < 0) { diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index fb7988f..8d03459 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -83,7 +83,7 @@ int virNetDevExists(const char *brname) int virNetDevSetOnline(const char *ifname, bool online) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; -int virNetDevIsOnline(const char *ifname, +int virNetDevGetOnline(const char *ifname, bool *online) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; @@ -200,4 +200,26 @@ int virNetDevDelMulti(const char *ifname, virMacAddrPtr macaddr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevSetIFFlag(const char *ifname, int flag, bool val) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_RETURN_CHECK; + +int virNetDevGetIFFlag(const char *ifname, int flag, bool *val) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_RETURN_CHECK; + +int virNetDevSetPromiscuous(const char *ifname, bool promiscuous) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevGetPromiscuous(const char *ifname, bool *promiscuous) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + +int virNetDevSetRcvMulti(const char *ifname, bool receive) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevGetRcvMulti(const char *ifname, bool *receive) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + +int virNetDevSetRcvAllMulti(const char *ifname, bool receive) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevGetRcvAllMulti(const char *ifname, bool *receive) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; #endif /* __VIR_NETDEV_H__ */ -- 1.7.1

2 5

[libvirt] [PATCH v3] conf: Don't mangle vcpu placement randomly
by Michal Privoznik 30 Jan '15

30 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1170492 In one of our previous commits (dc8b7ce7) we've done a functional change even though it was intended as pure refactor. The problem is, that the following XML: <vcpu placement='static' current='2'>6</vcpu> <cputune> <emulatorpin cpuset='1-3'/> </cputune> <numatune> <memory mode='strict' placement='auto'/> </numatune> gets translated into this one: <vcpu placement='auto' current='2'>6</vcpu> <cputune> <emulatorpin cpuset='1-3'/> </cputune> <numatune> <memory mode='strict' placement='auto'/> </numatune> We should not change the vcpu placement mode. Moreover, we're doing something similar in case of emulatorpin and iothreadpin. If they were set, but vcpu placement was auto, we've mistakenly removed them from the domain XML even though we are able to set them independently on vcpus. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v2: -Martin's review worked in src/conf/domain_conf.c | 84 +++++++++------------- .../qemuxml2argv-cputune-numatune.xml | 35 +++++++++ tests/qemuxml2xmltest.c | 1 + 3 files changed, 70 insertions(+), 50 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d562e1a..706e5d2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13084,28 +13084,20 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } - /* Ignore emulatorpin if <vcpu> placement is "auto", they - * conflicts with each other, and <vcpu> placement can't be - * simply ignored, as <numatune>'s placement defaults to it. - */ if (n) { - if (def->placement_mode != VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { - if (n > 1) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("only one emulatorpin is supported")); - VIR_FREE(nodes); - goto error; - } - - def->cputune.emulatorpin = virDomainVcpuPinDefParseXML(nodes[0], - ctxt, 0, - true, false); - - if (!def->cputune.emulatorpin) - goto error; - } else { - VIR_WARN("Ignore emulatorpin for <vcpu> placement is 'auto'"); + if (n > 1) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("only one emulatorpin is supported")); + VIR_FREE(nodes); + goto error; } + + def->cputune.emulatorpin = virDomainVcpuPinDefParseXML(nodes[0], + ctxt, 0, + true, false); + + if (!def->cputune.emulatorpin) + goto error; } VIR_FREE(nodes); @@ -13116,38 +13108,28 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } - /* Ignore iothreadpin if <vcpu> placement is "auto", they - * conflict with each other, and <vcpu> placement can't be - * simply ignored, as <numatune>'s placement defaults to it. - */ - if (n) { - if (def->placement_mode != VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { - if (VIR_ALLOC_N(def->cputune.iothreadspin, n) < 0) - goto error; + if (n && VIR_ALLOC_N(def->cputune.iothreadspin, n) < 0) + goto error; - for (i = 0; i < n; i++) { - virDomainVcpuPinDefPtr iothreadpin = NULL; - iothreadpin = virDomainVcpuPinDefParseXML(nodes[i], ctxt, - def->iothreads, - false, true); - if (!iothreadpin) - goto error; + for (i = 0; i < n; i++) { + virDomainVcpuPinDefPtr iothreadpin = NULL; + iothreadpin = virDomainVcpuPinDefParseXML(nodes[i], ctxt, + def->iothreads, + false, true); + if (!iothreadpin) + goto error; - if (virDomainVcpuPinIsDuplicate(def->cputune.iothreadspin, - def->cputune.niothreadspin, - iothreadpin->vcpuid)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("duplicate iothreadpin for same iothread")); - virDomainVcpuPinDefFree(iothreadpin); - goto error; - } - - def->cputune.iothreadspin[def->cputune.niothreadspin++] = - iothreadpin; - } - } else { - VIR_WARN("Ignore iothreadpin for <vcpu> placement is 'auto'"); + if (virDomainVcpuPinIsDuplicate(def->cputune.iothreadspin, + def->cputune.niothreadspin, + iothreadpin->vcpuid)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("duplicate iothreadpin for same iothread")); + virDomainVcpuPinDefFree(iothreadpin); + goto error; } + + def->cputune.iothreadspin[def->cputune.niothreadspin++] = + iothreadpin; } VIR_FREE(nodes); @@ -13185,7 +13167,9 @@ virDomainDefParseXML(xmlDocPtr xml, ctxt) < 0) goto error; - if (virDomainNumatuneHasPlacementAuto(def->numatune) && !def->cpumask) + if (virDomainNumatuneHasPlacementAuto(def->numatune) && + !def->cpumask && !def->cputune.vcpupin && + !def->cputune.emulatorpin && !def->cputune.iothreadspin) def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO; if ((n = virXPathNodeSet("./resource", ctxt, &nodes)) < 0) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml new file mode 100644 index 0000000..9759b48 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml @@ -0,0 +1,35 @@ +<domain type='kvm'> + <name>dummy2</name> + <uuid>4d92ec27-9ebf-400b-ae91-20c71c647c19</uuid> + <memory unit='KiB'>131072</memory> + <currentMemory unit='KiB'>65536</currentMemory> + <vcpu placement='auto' current='2'>6</vcpu> + <cputune> + <emulatorpin cpuset='1-3'/> + </cputune> + <numatune> + <memory mode='strict' placement='auto'/> + </numatune> + <os> + <type arch='x86_64' machine='pc-q35-2.3'>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-x86_64</emulator> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> + </controller> + <controller type='pci' index='2' model='pci-bridge'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 4abb303..285538a 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -310,6 +310,7 @@ mymain(void) DO_TEST("blkiotune-device"); DO_TEST("cputune"); DO_TEST("cputune-zero-shares"); + DO_TEST("cputune-numatune"); DO_TEST("smp"); DO_TEST("iothreads"); -- 2.0.5

2 1

[libvirt] Bug fixing of libvirt -- attach-interface using xen driver
by linxxnil 30 Jan '15

30 Jan '15

Dear: I think there was a bug, when attach-interface using xen driver. when I use xen driver to attach interface for domain, the libvirtd will crash. the info with GDB: #0 0x00007ffff7571815 in virDomainDiskGetDriver () from /usr/lib/libvirt.so.0 #1 0x00007fffeb9ad471 in ?? () from /usr/lib/libvirt/connection-driver/libvirt_driver_xen.so #2 0x00007fffeb9b1062 in xenDaemonAttachDeviceFlags () from /usr/lib/libvirt/connection-driver/libvirt_driver_xen.so #3 0x00007fffeb9a8a86 in ?? () from /usr/lib/libvirt/connection-driver/libvirt_driver_xen.so #4 0x00007ffff7609266 in virDomainAttachDevice () from /usr/lib/libvirt.so.0 #5 0x0000555555593c9d in ?? () #6 0x00007ffff76743c9 in virNetServerProgramDispatch () from /usr/lib/libvirt.so.0 #7 0x00005555555a678d in ?? () #8 0x00007ffff755460e in ?? () from /usr/lib/libvirt.so.0 #9 0x00007ffff7553b06 in ?? () from /usr/lib/libvirt.so.0 #10 0x00007ffff4998b50 in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0 #11 0x00007ffff46e30ed in clone () from /lib/x86_64-linux-gnu/libc.so.6 #12 0x0000000000000000 in ?? () And I think the bug is at the function virDomainXMLDevID(), file path: src/xen/xend_internal.c -------------------------------------------------- static int virDomainXMLDevID(virConnectPtr conn, virDomainDefPtr def, virDomainDeviceDefPtr dev, char *class, char *ref, int ref_len) { xenUnifiedPrivatePtr priv = conn->privateData; char *xref; char *tmp; const char *driver = virDomainDiskGetDriver(dev->data.disk); if (dev->type == VIR_DOMAIN_DEVICE_DISK) { if (STREQ_NULLABLE(driver, "tap") || STREQ_NULLABLE(driver, "tap2")) strcpy(class, driver); else strcpy(class, "vbd"); ----------------------------------------------------------------- the follow line: const char *driver = virDomainDiskGetDriver(dev->data.disk); if the dev->data.disk not initialize before, the libvirt will crash. And I changed it like this : -------------------------------------------------------------- static int virDomainXMLDevID(virConnectPtr conn, virDomainDefPtr def, virDomainDeviceDefPtr dev, char *class, char *ref, int ref_len) { xenUnifiedPrivatePtr priv = conn->privateData; char *xref; char *tmp; if (dev->type == VIR_DOMAIN_DEVICE_DISK) { const char *driver = virDomainDiskGetDriver(dev->data.disk); if (STREQ_NULLABLE(driver, "tap") || STREQ_NULLABLE(driver, "tap2")) strcpy(class, driver); else strcpy(class, "vbd"); ------------------------------------------------------------- It works fine Would some confirm and fix it? Xiaolin.Su

2 1

[libvirt] [PATCH] Add ability to set rlimits at container boot
by Ryan Cleere 30 Jan '15

30 Jan '15

--- docs/formatdomain.html.in | 49 +++++++++++++++++++++++ docs/schemas/domaincommon.rng | 89 +++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.c | 92 +++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 33 ++++++++++++++++ src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 32 +++++++++++++++ src/util/virprocess.c | 4 +- src/util/virprocess.h | 2 + 8 files changed, 300 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f8d5f89..5aec51c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -348,6 +348,55 @@ </pre> + <p> + If you want to set an rlimit of the containter init process instead of + inheriting from the host init, set the <code>rlimits</code> element. You + are able to set any of the rlimits that setrlimits is able to set using + any of the following sub-elements: + </p> + + <dl> + <dt><code>as</code></dt> + <dd>Used to set RLIMIT_AS.</dd> + <dt><code>core</code></dt> + <dd>Used to set RLIMIT_CORE.</dd> + <dt><code>cpu</code></dt> + <dd>Used to set RLIMIT_CPU.</dd> + <dt><code>data</code></dt> + <dd>Used to set RLIMIT_DATA.</dd> + <dt><code>fsize</code></dt> + <dd>Used to set RLIMIT_FSIZE.</dd> + <dt><code>locks</code></dt> + <dd>Used to set RLIMIT_LOCKS.</dd> + <dt><code>memlock</code></dt> + <dd>Used to set RLIMIT_MEMLOCK.</dd> + <dt><code>msgqueue</code></dt> + <dd>Used to set RLIMIT_MSGQUEUE.</dd> + <dt><code>nice</code></dt> + <dd>Used to set RLIMIT_NICE.</dd> + <dt><code>nofile</code></dt> + <dd>Used to set RLIMIT_NOFILE.</dd> + <dt><code>nproc</code></dt> + <dd>Used to set RLIMIT_NPROC.</dd> + <dt><code>rss</code></dt> + <dd>Used to set RLIMIT_RSS.</dd> + <dt><code>rtprio</code></dt> + <dd>Used to set RLIMIT_RTPRIO.</dd> + <dt><code>rttime</code></dt> + <dd>Used to set RLIMIT_RTTIME.</dd> + <dt><code>sigpending</code></dt> + <dd>Used to set RLIMIT_SIGPENDING.</dd> + <dt><code>stack</code></dt> + <dd>Used to set RLIMIT_STACK.</dd> + </dl> + + <pre> + <rlimits> + <nofile>10240</nofile> + </rlimits> + </pre> + + <h3><a name="elementsSysinfo">SMBIOS System Information</a></h3> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d467dce..b98f8d5 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -59,6 +59,9 @@ <ref name="idmap"/> </optional> <optional> + <ref name="rlimits"/> + </optional> + <optional> <ref name="devices"/> </optional> <zeroOrMore> @@ -570,6 +573,92 @@ </interleave> </element> </define> + <define name="rlimits"> + <element name="rlimits"> + <interleave> + <optional> + <element name="cpu"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="fsize"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="data"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="stack"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="core"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="rss"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="nproc"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="nofile"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="memlock"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="as"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="locks"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="sigpending"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="msgqueue"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="nice"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="rtprio"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="rttime"> + <ref name='scaledInteger'/> + </element> + </optional> + </interleave> + </element> + </define> <!-- Resources usage defines the amount of memory (maximum and possibly current usage) and number of virtual CPUs used by that domain. diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d562e1a..399976e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -772,6 +772,24 @@ VIR_ENUM_IMPL(virDomainLoader, "rom", "pflash") +VIR_ENUM_IMPL(virDomainRLimit, VIR_DOMAIN_RLIMIT_LAST, + "cpu", + "fsize", + "data", + "stack", + "core", + "rss", + "nproc", + "nofile", + "memlock", + "as", + "locks", + "sigpending", + "msgqueue", + "nice", + "rtprio", + "rttime") + /* Internal mapping: subset of block job types that can be present in * <mirror> XML (remaining types are not two-phase). */ VIR_ENUM_DECL(virDomainBlockJob) @@ -979,7 +997,40 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, return -1; } +static virDomainRLimitsPtr +virDomainRLimitParseXML(xmlNodePtr node) +{ + char *c = NULL; + long long val; + virDomainRLimitsPtr def; + + if (VIR_ALLOC(def) < 0) + return NULL; + if (node->type == XML_ELEMENT_NODE) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ll(c, NULL, 10, &val) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse rlimit value of %s"), + c); + goto error; + } + VIR_FREE(c); + + def->limit = val; + if ((def->resource = virDomainRLimitTypeFromString((const char *)node->name)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not determine resource type of '%s'"), + node->name); + goto error; + } + } + return def; + error: + VIR_FREE(c); + VIR_FREE(def); + return NULL; +} static void virDomainObjListDataFree(void *payload, const void *name ATTRIBUTE_UNUSED) @@ -14423,6 +14474,34 @@ virDomainDefParseXML(xmlDocPtr xml, virHashFree(bootHash); + if ((node = virXPathNode("./rlimits[1]", ctxt)) != NULL && (n = virXMLChildElementCount(node)) > 0) { + xmlNodePtr cur = node->children; + if (n && VIR_ALLOC_N(def->rlimits, n) < 0) + goto error; + + for (i = 0; i < n; i++) { + if (!(def->rlimits[i] = virDomainRLimitParseXML(cur))) { + for (j = 0; j < i; j++) + VIR_FREE(def->rlimits[j]); + VIR_FREE(def->rlimits); + goto error; + } + def->nrlimits++; + for (j = 0; j < i; j++) { + if (def->rlimits[j]->resource == def->rlimits[i]->resource) { + virReportError(VIR_ERR_XML_ERROR, + _("duplicate rlimit resources '%s'"), + virDomainRLimitTypeToString(def->rlimits[j]->resource)); + for (int k = 0; k < i; k++) + VIR_FREE(def->rlimits[k]); + VIR_FREE(def->rlimits); + goto error; + } + } + cur = cur->next; + } + } + return def; error: @@ -20048,6 +20127,19 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto error; } + if (def->nrlimits > 0) { + virBufferAddLit(buf, "<rlimits>\n"); + virBufferAdjustIndent(buf, 2); + for (n = 0; n < def->nrlimits; n++) { + virBufferAsprintf(buf, "<%s>%lld</%s>\n", + virDomainRLimitTypeToString(def->rlimits[n]->resource), + def->rlimits[n]->limit, + virDomainRLimitTypeToString(def->rlimits[n]->resource)); + } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</rlimits>\n"); + } + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</domain>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 93f2314..b032202 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1851,6 +1851,27 @@ typedef enum { VIR_DOMAIN_CLOCK_BASIS_LAST } virDomainClockBasis; +typedef enum { + VIR_DOMAIN_RLIMIT_CPU, + VIR_DOMAIN_RLIMIT_FSIZE, + VIR_DOMAIN_RLIMIT_DATA, + VIR_DOMAIN_RLIMIT_STACK, + VIR_DOMAIN_RLIMIT_CORE, + VIR_DOMAIN_RLIMIT_RSS, + VIR_DOMAIN_RLIMIT_NPROC, + VIR_DOMAIN_RLIMIT_NOFILE, + VIR_DOMAIN_RLIMIT_MEMLOCK, + VIR_DOMAIN_RLIMIT_AS, + VIR_DOMAIN_RLIMIT_LOCKS, + VIR_DOMAIN_RLIMIT_SIGPENDING, + VIR_DOMAIN_RLIMIT_MSGQUEUE, + VIR_DOMAIN_RLIMIT_NICE, + VIR_DOMAIN_RLIMIT_RTPRIO, + VIR_DOMAIN_RLIMIT_RTTIME, + + VIR_DOMAIN_RLIMIT_LAST +} virDomainRLimit; + typedef struct _virDomainClockDef virDomainClockDef; typedef virDomainClockDef *virDomainClockDefPtr; struct _virDomainClockDef { @@ -2039,6 +2060,14 @@ struct _virDomainPowerManagement { int s4; }; +typedef struct _virDomainRLimits virDomainRLimits; +typedef virDomainRLimits *virDomainRLimitsPtr; + +struct _virDomainRLimits { + int resource; + long long limit; +}; + /* * Guest VM main configuration * @@ -2156,6 +2185,9 @@ struct _virDomainDef { size_t nshmems; virDomainShmemDefPtr *shmems; + size_t nrlimits; + virDomainRLimitsPtr *rlimits; + /* Only 1 */ virDomainWatchdogDefPtr watchdog; virDomainMemballoonDefPtr memballoon; @@ -2844,6 +2876,7 @@ VIR_ENUM_DECL(virDomainRNGModel) VIR_ENUM_DECL(virDomainRNGBackend) VIR_ENUM_DECL(virDomainTPMModel) VIR_ENUM_DECL(virDomainTPMBackend) +VIR_ENUM_DECL(virDomainRLimit) /* from libvirt.h */ VIR_ENUM_DECL(virDomainState) VIR_ENUM_DECL(virDomainNostateReason) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bd7870f..7b71ff1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1896,6 +1896,7 @@ virProcessGetNamespaces; virProcessGetStartTime; virProcessKill; virProcessKillPainfully; +virProcessPrLimit; virProcessRunInMountNamespace; virProcessSetAffinity; virProcessSetMaxFiles; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 8a7c7e8..5c63a1b 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -798,6 +798,35 @@ static int virLXCControllerSetupCgroupLimits(virLXCControllerPtr ctrl) return ret; } +static int virLXCControllerSetupRLimits(virLXCControllerPtr ctrl) +{ + int i, ret = -1; + struct rlimit rlim; + + VIR_DEBUG("Setting up rlimits"); + + VIR_DEBUG("nrlimits = %d", (int)ctrl->def->nrlimits); + VIR_DEBUG("setting limits on process %d", ctrl->initpid); + if (ctrl->def->nrlimits > 0) { + for (i = 0; i < ctrl->def->nrlimits; i++) { + rlim.rlim_max = rlim.rlim_cur = ctrl->def->rlimits[i]->limit; + VIR_DEBUG("Setting rlimit %s(%d) on pid %d to %lld", + virDomainRLimitTypeToString(ctrl->def->rlimits[i]->resource), + ctrl->def->rlimits[i]->resource, + ctrl->initpid, + ctrl->def->rlimits[i]->limit); + if (virProcessPrLimit(ctrl->initpid, ctrl->def->rlimits[i]->resource, &rlim) < 0) { + virReportSystemError(errno, "%s", + _("Unable to set rlimit")); + goto cleanup; + } + } + } + ret = 0; + cleanup: + return ret; +} + static void virLXCControllerClientCloseHook(virNetServerClientPtr client) { @@ -2318,6 +2347,9 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerSetupCgroupLimits(ctrl) < 0) goto cleanup; + if (virLXCControllerSetupRLimits(ctrl) < 0) + goto cleanup; + if (virLXCControllerSetupUserns(ctrl) < 0) goto cleanup; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index d0a1500..d83ae28 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -676,13 +676,13 @@ int virProcessSetNamespaces(size_t nfdlist, } #if HAVE_PRLIMIT -static int +int virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim) { return prlimit(pid, resource, rlim, NULL); } #elif HAVE_SETRLIMIT -static int +int virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED, int resource ATTRIBUTE_UNUSED, struct rlimit *rlim ATTRIBUTE_UNUSED) diff --git a/src/util/virprocess.h b/src/util/virprocess.h index bcaede5..c40b41a 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -22,6 +22,7 @@ #ifndef __VIR_PROCESS_H__ # define __VIR_PROCESS_H__ +# include <sys/resource.h> # include <sys/types.h> # include "internal.h" @@ -73,4 +74,5 @@ typedef int (*virProcessNamespaceCallback)(pid_t pid, void *opaque); int virProcessRunInMountNamespace(pid_t pid, virProcessNamespaceCallback cb, void *opaque); +int virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim); #endif /* __VIR_PROCESS_H__ */

2 1

[libvirt] [PATCH 00/12] memory hotplug: Preliminary fixes and cleanups
by Peter Krempa 30 Jan '15

30 Jan '15

This series was split out from my memory hotplug series that is not quite ready yet. The aim of this series is to refactor the code that creates commandline for the memory-backend-* qemu object so that it can be later reused for hotplug via monitor. Additionally this series also fixes a bug in NUMA memory initialisation where qemu doesn't support a combination of old and new approach. Peter Krempa (12): conf: numatune: Extract code for requesting memory nodeset from formatting test: utils: Add helpers for automatic numbering of test cases util: json: make value object creator universal by supporting adding util: json: Add functions to convert JSON arrays from/to virBitmaps util: json: add helper to iterate JSON object key=value pairs qemu: command: Add helper to format -object strings from JSON representation qemu: Extract code to setup memory backing objects qemu: command: Shuffle around formating of alias for memory backend objs qemu: command: Unify values for boolean values when formating memory backends qemu: command: Switch to bytes when formatting size for memory backends qemu: command: Refactor NUMA backend object formatting to use JSON objs qemu: command: Don't combine old and modern NUMA node creation src/conf/numatune_conf.c | 33 +- src/conf/numatune_conf.h | 5 + src/libvirt_private.syms | 6 + src/qemu/qemu_command.c | 547 +++++++++++++++------ src/qemu/qemu_command.h | 4 + src/util/virjson.c | 220 ++++++++- src/util/virjson.h | 17 + tests/Makefile.am | 13 +- tests/qemucommandutiltest.c | 118 +++++ .../qemuxml2argv-hugepages-pages.args | 20 +- .../qemuxml2argv-hugepages-pages2.args | 8 +- .../qemuxml2argv-hugepages-pages3.args | 7 +- .../qemuxml2argv-hugepages-shared.args | 20 +- .../qemuxml2argv-numatune-memnode-no-memory.args | 6 +- .../qemuxml2argv-numatune-memnode.args | 8 +- tests/testutils.c | 46 ++ tests/testutils.h | 3 + 17 files changed, 871 insertions(+), 210 deletions(-) create mode 100644 tests/qemucommandutiltest.c -- 2.2.2

4 21

[libvirt] [PATCH] cpu: add Freescale ppc64 CPU models
by Olivia Yin 30 Jan '15

30 Jan '15

Signed-off-by: Olivia Yin <hong-hua.yin(a)freescale.com> --- src/cpu/cpu_map.xml | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index bd9b056..c34874e 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -1,4 +1,4 @@ -<cpus> +n<cpus> <arch name='x86'>  <vendor name='Intel' string='GenuineIntel'/> @@ -600,6 +600,7 @@ <arch name='ppc64'>  <vendor name='IBM'/> + <vendor name='Freescale'/>  <model name='POWER7'> @@ -657,5 +658,40 @@ <pvr value='0x004d0000'/> </model> + + <model name='POWERPC_e5500_v10'> + <vendor name='Freescale'/> + <pvr value='0x80240010'/> + </model> + + <model name='POWERPC_e5500_v11'> + <vendor name='Freescale'/> + <pvr value='0x80240011'/> + </model> + + <model name='POWERPC_e5500_v12'> + <vendor name='Freescale'/> + <pvr value='0x80240012'/> + </model> + + <model name='POWERPC_e5500_v1020'> + <vendor name='Freescale'/> + <pvr value='0x80241020'/> + </model> + + <model name='POWERPC_e6500_v10'> + <vendor name='Freescale'/> + <pvr value='0x80400010'/> + </model> + + <model name='POWERPC_e6500_v20'> + <vendor name='Freescale'/> + <pvr value='0x80400020'/> + </model> + + <model name='POWERPC_e6500_v120'> + <vendor name='Freescale'/> + <pvr value='0x80400120'/> + </model> </arch> </cpus> -- 2.1.0.27.g96db324

3 2

[libvirt] [PATCH] schemas: Allow all generic elements and attributes for all interfaces
by Michal Privoznik 30 Jan '15

30 Jan '15

There are some interface types (notably 'server' and 'client') which instead of allowing the default set of elements and attributes (like the rest do), try to enumerate only the elements they know of. This way it's, however, easy to miss something. For instance, the <address/> element was not mentioned at all. This resulted in a strange behavior: when such interface was added into XML, the address was automatically generated by parsing code. Later, the formatted XML hasn't passed the RNG schema. This became more visible once we've turned on the XML validation on domain XML changes: appending an empty line at the end of formatted XML (to trick virsh think the XML had changed) made libvirt to refuse the very same XML it formatted. Instead of trying to find each element and attribute we are missing in the schema, lets just allow all the elements and attributes like we're doing that for the rest of types. It's no harm if the schema is wider than our parser allows. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/schemas/domaincommon.rng | 28 +--- .../qemuxml2argv-interface-server.xml | 157 +++++++++++++++++++++ 2 files changed, 159 insertions(+), 26 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 9d6c1ee..d467dce 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2173,14 +2173,7 @@ </attribute> <empty/> </element> - <optional> - <element name="mac"> - <attribute name="address"> - <ref name="uniMacAddr"/> - </attribute> - <empty/> - </element> - </optional> + <ref name="interface-options"/> </interleave> </group> <group> @@ -2199,24 +2192,7 @@ </attribute> <empty/> </element> - <optional> - <element name="mac"> - <attribute name="address"> - <ref name="uniMacAddr"/> - </attribute> - <empty/> - </element> - </optional> - <optional> - <element name="model"> - <attribute name="type"> - <data type="string"> - <param name='pattern'>[a-zA-Z0-9\-_]+</param> - </data> - </attribute> - <empty/> - </element> - </optional> + <ref name="interface-options"/> </interleave> </group> <group> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml b/tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml new file mode 100644 index 0000000..9edf773 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml @@ -0,0 +1,157 @@ +<domain type='kvm'> + <name>gentoo</name> + <uuid>a75aca4b-a02f-2bcb-4a91-c93cd848c34b</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <memoryBacking> + <hugepages> + <page size='1048576' unit='KiB' nodeset='0-3'/> + </hugepages> + </memoryBacking> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-1.4'>hvm</type> + <boot dev='hd'/> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <cpu mode='custom' match='exact'> + <model fallback='allow'>Haswell</model> + <vendor>Intel</vendor> + <feature policy='require' name='tm2'/> + <feature policy='require' name='est'/> + <feature policy='require' name='vmx'/> + <feature policy='require' name='osxsave'/> + <feature policy='require' name='smx'/> + <feature policy='require' name='ss'/> + <feature policy='require' name='ds'/> + <feature policy='require' name='vme'/> + <feature policy='require' name='dtes64'/> + <feature policy='require' name='abm'/> + <feature policy='require' name='ht'/> + <feature policy='require' name='acpi'/> + <feature policy='require' name='pbe'/> + <feature policy='require' name='tm'/> + <feature policy='require' name='pdcm'/> + <feature policy='require' name='pdpe1gb'/> + <feature policy='require' name='ds_cpl'/> + <feature policy='require' name='rdrand'/> + <feature policy='require' name='f16c'/> + <feature policy='require' name='xtpr'/> + <feature policy='require' name='monitor'/> + <numa> + <cell id='0' cpus='0' memory='1048576' unit='KiB'/> + <cell id='1' cpus='1' memory='1048576' unit='KiB'/> + <cell id='2' cpus='2' memory='1048576' unit='KiB'/> + <cell id='3' cpus='3' memory='1048576' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <pm> + <suspend-to-mem enabled='yes'/> + <suspend-to-disk enabled='yes'/> + </pm> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='file' device='floppy'> + <driver name='qemu' type='raw' cache='none'/> + <source file='/var/lib/libvirt/images/fd.img'/> + <target dev='fda' bus='fdc'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/gentoo.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/OtherDemo.img'/> + <target dev='vdb' bus='virtio'/> + <encryption format='qcow'> + <secret type='passphrase' uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/> + </encryption> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw' cache='none'/> + <source file='/home/zippy/tmp/install-amd64-minimal-20140619.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <shareable/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </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'/> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='virtio-serial' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> + </controller> + <controller type='fdc' index='0'/> + <interface type='network'> + <mac address='52:54:00:d6:c0:0b'/> + <source network='default'/> + <bandwidth> + <inbound average='100'/> + <outbound average='100'/> + </bandwidth> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <interface type='server'> + <mac address='52:54:00:22:c9:42'/> + <source address='127.0.0.1' port='1234'/> + <bandwidth> + <inbound average='1234'/> + <outbound average='5678'/> + </bandwidth> + <model type='rtl8139'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> + </interface> + <interface type='client'> + <mac address='52:54:00:8c:b1:f8'/> + <source address='127.0.0.1' port='1234'/> + <model type='rtl8139'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> + </interface> + <serial type='pty'> + <target port='0'/> + </serial> + <serial type='pty'> + <target port='1'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <channel type='unix'> + <source mode='bind' path='/var/lib/libvirt/qemu/channel/target/gentoo.org.qemu.guest_agent.0'/> + <target type='virtio' name='org.qemu.guest_agent.0'/> + <address type='virtio-serial' controller='0' bus='0' port='1'/> + </channel> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes'/> + <sound model='ich6'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </sound> + <video> + <model type='cirrus' vram='16384' heads='1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </memballoon> + </devices> +</domain> -- 2.0.5

2 3

[libvirt] [PATCH] Add rlimits to lxc
by Ryan Cleere 30 Jan '15

30 Jan '15

--- src/conf/domain_conf.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 12 +++++ src/lxc/lxc_controller.c | 12 +++++ src/util/virprocess.c | 4 +- src/util/virprocess.h | 3 ++ 5 files changed, 144 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2d81c37..a673dc2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26,6 +26,7 @@ #include <dirent.h> #include <fcntl.h> #include <strings.h> +#include <sys/resource.h> #include <sys/stat.h> #include <unistd.h> @@ -1003,7 +1004,86 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, return -1; } +static virDomainRLimitsPtr +virDomainRLimitsNew(void) +{ + virDomainRLimitsPtr def = NULL; + + if (VIR_ALLOC(def) < 0) + return NULL; + + return def; +} + +static virDomainRLimitsPtr +virDomainRLimitParseXML(xmlNodePtr node) +{ + char *c = NULL; + long long val; + virDomainRLimitsPtr def; + if (!(def = virDomainRLimitsNew())) + return NULL; + + if (node->type == XML_ELEMENT_NODE) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ll(c, NULL, 10, &val) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse rlimit value of %s"), + c); + goto error; + } + VIR_FREE(c); + + def->limit = val; + if (VIR_STRDUP(def->name, (char *)node->name) < 0) + goto error; + + if (xmlStrEqual(node->name, BAD_CAST "as")) { + def->resource = RLIMIT_AS; + } else if (xmlStrEqual(node->name, BAD_CAST "core")) { + def->resource = RLIMIT_CORE; + } else if (xmlStrEqual(node->name, BAD_CAST "cpu")) { + def->resource = RLIMIT_CPU; + } else if (xmlStrEqual(node->name, BAD_CAST "data")) { + def->resource = RLIMIT_DATA; + } else if (xmlStrEqual(node->name, BAD_CAST "fsize")) { + def->resource = RLIMIT_FSIZE; + } else if (xmlStrEqual(node->name, BAD_CAST "locks")) { + def->resource = RLIMIT_LOCKS; + } else if (xmlStrEqual(node->name, BAD_CAST "memlock")) { + def->resource = RLIMIT_MEMLOCK; + } else if (xmlStrEqual(node->name, BAD_CAST "msgqueue")) { + def->resource = RLIMIT_MSGQUEUE; + } else if (xmlStrEqual(node->name, BAD_CAST "nice")) { + def->resource = RLIMIT_NICE; + } else if (xmlStrEqual(node->name, BAD_CAST "nofile")) { + def->resource = RLIMIT_NOFILE; + } else if (xmlStrEqual(node->name, BAD_CAST "nproc")) { + def->resource = RLIMIT_NPROC; + } else if (xmlStrEqual(node->name, BAD_CAST "rss")) { + def->resource = RLIMIT_RSS; + } else if (xmlStrEqual(node->name, BAD_CAST "rtprio")) { + def->resource = RLIMIT_RTPRIO; + } else if (xmlStrEqual(node->name, BAD_CAST "sigpending")) { + def->resource = RLIMIT_SIGPENDING; + } else if (xmlStrEqual(node->name, BAD_CAST "stack")) { + def->resource = RLIMIT_STACK; + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not determine resource type of '%s'"), + node->name); + goto error; + } + } + + return def; + + error: + VIR_FREE(c); + VIR_FREE(def); + return NULL; +} static void virDomainObjListDataFree(void *payload, const void *name ATTRIBUTE_UNUSED) @@ -14180,6 +14260,28 @@ virDomainDefParseXML(xmlDocPtr xml, virHashFree(bootHash); + if ((node = virXPathNode("./rlimits[1]", ctxt)) != NULL && (n = virXMLChildElementCount(node)) > 0) { + xmlNodePtr cur = node->children; + if (n && VIR_ALLOC_N(def->rlimits, n) < 0) + goto error; + + for (i = 0; i < n; i++) { + if (!(def->rlimits[i] = virDomainRLimitParseXML(cur))) + goto error; + def->nrlimits++; + for (j = 0; j < i; j++) { + if (def->rlimits[j]->resource == def->rlimits[i]->resource) { + virReportError(VIR_ERR_XML_ERROR, + _("duplicate rlimit resources '%s'"), + def->rlimits[j]->name); + goto error; + } + } + cur = cur->next; + } + } + VIR_FREE(node); + return def; error: @@ -19759,6 +19861,19 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto error; } + if (def->nrlimits > 0) { + virBufferAddLit(buf, "<rlimits>\n"); + virBufferAdjustIndent(buf, 2); + for (n = 0; n < def->nrlimits; n++) { + virBufferAsprintf(buf, "<%s>%lld</%s>\n", + def->rlimits[n]->name, + def->rlimits[n]->limit, + def->rlimits[n]->name); + } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</rlimits>\n"); + } + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</domain>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 439f3c0..abad30e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2021,6 +2021,15 @@ struct _virDomainPowerManagement { int s4; }; +typedef struct _virDomainRLimits virDomainRLimits; +typedef virDomainRLimits *virDomainRLimitsPtr; + +struct _virDomainRLimits { + char *name; + int resource; + long long limit; +}; + /* * Guest VM main configuration * @@ -2138,6 +2147,9 @@ struct _virDomainDef { size_t nshmems; virDomainShmemDefPtr *shmems; + size_t nrlimits; + virDomainRLimitsPtr *rlimits; + /* Only 1 */ virDomainWatchdogDefPtr watchdog; virDomainMemballoonDefPtr memballoon; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 53a2c8d..ef5551e 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2490,6 +2490,18 @@ int main(int argc, char *argv[]) } } + VIR_INFO("nrlimits = %d", (int)ctrl->def->nrlimits); + if (ctrl->def->nrlimits > 0) { + struct rlimit rlim; + int n; + for (i = 0; i < ctrl->def->nrlimits; i++) { + rlim.rlim_max = rlim.rlim_cur = ctrl->def->rlimits[i]->limit; + n = virProcessPrLimit(0, ctrl->def->rlimits[i]->resource, &rlim); + if (n < 0) + goto cleanup; + } + } + rc = virLXCControllerRun(ctrl); cleanup: diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 0c8a32f..9bb5370 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -675,13 +675,13 @@ int virProcessSetNamespaces(size_t nfdlist, } #if HAVE_PRLIMIT -static int +int virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim) { return prlimit(pid, resource, rlim, NULL); } #elif HAVE_SETRLIMIT -static int +int virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED, int resource ATTRIBUTE_UNUSED, struct rlimit *rlim ATTRIBUTE_UNUSED) diff --git a/src/util/virprocess.h b/src/util/virprocess.h index bcaede5..045f8d4 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -22,6 +22,7 @@ #ifndef __VIR_PROCESS_H__ # define __VIR_PROCESS_H__ +# include <sys/resource.h> # include <sys/types.h> # include "internal.h" @@ -73,4 +74,6 @@ typedef int (*virProcessNamespaceCallback)(pid_t pid, void *opaque); int virProcessRunInMountNamespace(pid_t pid, virProcessNamespaceCallback cb, void *opaque); + +int virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim); #endif /* __VIR_PROCESS_H__ */ -- 1.9.3 (Apple Git-50)

2 2

[libvirt] [PATCH 0/7] Resolve issues saving domain to NFS root squashed client
by John Ferlan 29 Jan '15

29 Jan '15

Lots of details here: https://bugzilla.redhat.com/show_bug.cgi?id=1158034 During my investigation I uncovered some other "issues" which are covered by the first 4 patches. The issues are error path related. The first two patches could be combined, but for now they're apart so that it's proveable that they resolve a single issue. Hopefully mkletzan can take a look at these to ensure they fit with the "spirit" of the changes they're fixing. With these fixes in place the error from virfile through qemu will be displayed... The third and fourth patches can be combined. Realistically only the third one is necessary as it resolves an issue introduced by the ref'd gnulib change (eblake has already read about it). The fourth takes eblake's suggestion to me in order to take the next step to avoid the throw-away waitpid loop in virFileOpenForked and replace it by more inline logic. Since this is code introduced by laine, I'm hoping he'll be able to take a look-see. It's not required for the series, but nice to have. The third patch allows us to be able to get the "correct" EACCES error back from the vfork'd child, while the forth tries to make it clearer. The fifth and sixth patches resolve the problem from the above ref'd bz. Essentially what's happening is that when there's a root squashed nfs client to which the 'virsh save $dom $file' is being saved, the attempt by the second virOpenFileAs to open or chmod the $file can fail because the file generated by the first call may not be able to be opened, written, or chown'd due to whatever was set by that first call. The fifth patch is there because I found that if a 'save' file existed initially and a 'virsh save $dom $file' failed - the $file was deleted (and of course the subsequent 'virsh save $dom $file' would succeed). Since we didn't create the file, we shouldn't delete it The seventh patch isn't required, but I was hoping it might generate some discussion as to whether it's the right thing to do. If we don't set the VIR_FILE_OPEN_FORCE_MODE flag on the virFileOpenAs call, then the subsequent virFileOpenForceOwnerMode will not change the protection bits. So why pass something different if the end result is not change? I looked at other virOpenFileAs paths that are creating and found only one where the bit was set in virStorageBackendCreateRaw. Perhaps this patch generates other patches to "really" save mode bits when CREAT is being used. An eight patch was considered, but I dropped it. I was going to add an S_IROTH to the bits being passed on that nfs root squash path. This was being considered because the above ref'd bz uses an nfs pool in order to save the file into. That pool used different protections on files when first created and once/if a pool-refresh or libvirtd restart/ reload is done - the pool will fail to start because of the save file's protections. Setting other+read "resolved" or "work-around" that, but I don't really think that's the right thing to do. Altough, it is NFS and well not necessarily secure. John Ferlan (7): qemu: Save/restore error in error path for qemuDomainSaveInternal qemu: Adjust EndAsyncJob for qemuDomainSaveInternal error path virfile: Need to check for ENOTCONN from recvfd failure virfile: Adjust error path for virFileOpenForked qemu: Don't unconditionally delete file in qemuOpenFileAs qemu: remove failed create prior to root squash share path qemu: qemuOpenFileAs - set flag VIR_FILE_OPEN_FORCE_MODE src/qemu/qemu_driver.c | 24 +++++++++++++++--- src/util/virfile.c | 66 +++++++++++++++++++++++++++++--------------------- 2 files changed, 60 insertions(+), 30 deletions(-) -- 2.1.0

3 18

[libvirt] Build failed in Jenkins: libvirt-syntax-check #3103
by Jenkins CI 29 Jan '15

29 Jan '15

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/3103/> ------------------------------------------ Started by upstream project "libvirt-build" build number 3538 Building on master in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson8816773861766117951.sh + make syntax-check GEN bracket-spacing-check GFDL_version 1.47 GFDL_version TAB_in_indentation 0.52 TAB_in_indentation Wundef_boolean 0.28 Wundef_boolean avoid_attribute_unused_in_header 0.33 avoid_attribute_unused_in_header avoid_ctype_macros 0.75 avoid_ctype_macros avoid_if_before_free 6.51 avoid_if_before_free avoid_strcase 0.66 avoid_strcase avoid_write 0.73 avoid_write bindtextdomain 0.43 bindtextdomain cast_of_argument_to_free 0.73 cast_of_argument_to_free cast_of_x_alloc_return_value 0.63 cast_of_x_alloc_return_value changelog 0.29 changelog const_long_option 0.69 const_long_option copyright_check 0.80 copyright_check copyright_format 1.84 copyright_format copyright_usage 1.86 copyright_usage correct_id_types 0.69 correct_id_types curly_braces_style 1.36 curly_braces_style error_message_period 0.61 error_message_period error_message_warn_fatal 0.58 error_message_warn_fatal flags_debug 1.29 flags_debug flags_usage src/util/virnetdevmacvlan.c:1069: unsigned int flags ATTRIBUTE_UNUSED) maint.mk: flags should be checked with virCheckFlags make: *** [sc_flags_usage] Error 1 Build step 'Execute shell' marked build as failure

1 1

[libvirt] [PATCH v5 0/2] Allow UEFI paths to be specified at compile time
by Michal Privoznik 29 Jan '15

29 Jan '15

diff to v4: - added check for list consistence to configure too - slightly reformatted C parsing code 2/2 has been ACKed meanwhile, so sending it just for completeness. Michal Privoznik (2): qemu: Allow UEFI paths to be specified at compile time qemu: Add AAVMF to the list of known UEFIs configure.ac | 17 ++++++ src/qemu/qemu.conf | 12 +++- src/qemu/qemu_conf.c | 67 +++++++++++++++++++--- src/qemu/test_libvirtd_qemu.aug.in | 1 + .../domaincaps-qemu_1.6.50-1.xml | 1 + tests/domaincapstest.c | 16 +++--- 6 files changed, 97 insertions(+), 17 deletions(-) -- 2.0.5

2 3

[libvirt] [PATCH] Fix syntax-check
by Ján Tomko 29 Jan '15

29 Jan '15

My commit 08d1ae1 broke syntax-check by adding ATTRIBUTE_UNUSED to the flags parameter. Rename the parameter to unused_flags to bypass the check. --- Pushed as a build fix. src/util/virnetdevmacvlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 6a8a923..72e1f65 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1066,7 +1066,7 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED, char **res_ifname ATTRIBUTE_UNUSED, virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED, char *stateDir ATTRIBUTE_UNUSED, - unsigned int flags ATTRIBUTE_UNUSED) + unsigned int unused_flags ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform")); -- 2.0.5

1 0

[libvirt] [PATCH v3 0/9] qemu: support hot-plug/unplug RNG device
by Luyao Huang 29 Jan '15

29 Jan '15

qemu already support hot-plug and hot-unplug RNG device. These patch will make libvirt support hot-plug/unplug RNG device for qemu driver. v3: -fix a wrong use of virJSONValueObjectCreate -merge some new functions use qemu monitor in one patch -merge tests fix in the patch which need fix tests v2: -remove a commit about add 4 new func in libvirt_private.syms and move them to the commit which use these functions -impove some commit subject -improve the logic in virDomainRNGRemove -remove qemuDomainRNGInsert -unexport qemuDomainRNGRemove -add a check if chardev and backend object ID have the same basic alias name -rename need_remove to remove_chardev in qemuDomainAttachRNGDevice -add qemu capability check for RNG device backend Luyao Huang (9): qemu: Add helper to assign RNG device aliases qemu: refactor qemuBuildRNGDeviceArgs to allow reuse in RNG hotplug conf: Introduce function to compare RNG devices. conf: add 3 functions for insert,remove and find a RNG device qemu: add id when build RNG device and rename object id qemu: add functions for attach/detach RNG device via qemu monitor audit: export virDomainAuditRNG qemu: Implement RNG device hotplug on live level qemu: Implement RNG device hotunplug on live level src/conf/domain_audit.c | 2 +- src/conf/domain_audit.h | 7 + src/conf/domain_conf.c | 76 +++++++ src/conf/domain_conf.h | 9 + src/libvirt_private.syms | 6 + src/qemu/qemu_command.c | 69 ++++--- src/qemu/qemu_command.h | 5 + src/qemu/qemu_driver.c | 12 +- src/qemu/qemu_hotplug.c | 218 ++++++++++++++++++++- src/qemu/qemu_hotplug.h | 7 +- src/qemu/qemu_monitor.c | 43 ++++ src/qemu/qemu_monitor.h | 7 + src/qemu/qemu_monitor_json.c | 43 ++++ src/qemu/qemu_monitor_json.h | 5 + .../qemuxml2argv-aarch64-virt-virtio.args | 4 +- .../qemuxml2argv-arm-vexpressa9-virtio.args | 4 +- .../qemuxml2argv-arm-virt-virtio.args | 4 +- .../qemuxml2argv-s390-piix-controllers.args | 2 +- .../qemuxml2argv-s390-usb-none.args | 2 +- .../qemuxml2argv-virtio-rng-ccw.args | 4 +- .../qemuxml2argv-virtio-rng-default.args | 4 +- .../qemuxml2argv-virtio-rng-egd.args | 4 +- .../qemuxml2argv-virtio-rng-multiple.args | 8 +- .../qemuxml2argv-virtio-rng-random.args | 4 +- 24 files changed, 501 insertions(+), 48 deletions(-) -- 1.8.3.1

2 11

[libvirt] [PATCH] cpu: add Freescale ppc64 CPU models
by Olivia Yin 29 Jan '15

29 Jan '15

When running Openstack on Freescale ppc64 board, got libvirtError as before: nova.openstack.common.threadgroup libvirtError: XML error: Missing CPU model name. This patch is to add Freescale ppc64 CPU models. Signed-off-by: Olivia Yin <hong-hua.yin(a)freescale.com> --- src/cpu/cpu_map.xml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index bd9b056..707cf88 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -600,6 +600,7 @@ <arch name='ppc64'>  <vendor name='IBM'/> + <vendor name='Freescale'/>  <model name='POWER7'> @@ -657,5 +658,40 @@ <pvr value='0x004d0000'/> </model> + + <model name='POWERPC_e5500_v10'> + <vendor name='Freescale'/> + <pvr value='0x80240010'/> + </model> + + <model name='POWERPC_e5500_v11'> + <vendor name='Freescale'/> + <pvr value='0x80240011'/> + </model> + + <model name='POWERPC_e5500_v12'> + <vendor name='Freescale'/> + <pvr value='0x80240012'/> + </model> + + <model name='POWERPC_e5500_v1020'> + <vendor name='Freescale'/> + <pvr value='0x80241020'/> + </model> + + <model name='POWERPC_e6500_v10'> + <vendor name='Freescale'/> + <pvr value='0x80400010'/> + </model> + + <model name='POWERPC_e6500_v20'> + <vendor name='Freescale'/> + <pvr value='0x80400020'/> + </model> + + <model name='POWERPC_e6500_v120'> + <vendor name='Freescale'/> + <pvr value='0x80400120'/> + </model> </arch> </cpus> -- 2.1.0.27.g96db324

3 2

[libvirt] [PATCH v2] conf: Disallow emulatorpin when numatune's in effect
by Michal Privoznik 29 Jan '15

29 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1170492 In one of our previous commits (dc8b7ce7) we've done a functional change even though it was intended as pure refactor. The problem is, that the following XML: <vcpu placement='static' current='2'>6</vcpu> <cputune> <emulatorpin cpuset='1-3'/> </cputune> gets translated into this one: <vcpu placement='auto' current='2'>6</vcpu> <cputune> <emulatorpin cpuset='1-3'/> </cputune> <numatune> <memory mode='strict' placement='auto'/> </numatune> We should not change the vcpu placement mode. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -Martin's review worked in src/conf/domain_conf.c | 3 +- .../qemuxml2argv-cputune-numatune.xml | 35 ++++++++++++++++++++++ .../qemuxml2xmlout-cputune-numatune.xml | 32 ++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9ff3819..fbc0e96 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13173,7 +13173,8 @@ virDomainDefParseXML(xmlDocPtr xml, ctxt) < 0) goto error; - if (virDomainNumatuneHasPlacementAuto(def->numatune) && !def->cpumask) + if (virDomainNumatuneHasPlacementAuto(def->numatune) && + !def->cpumask && !def->cputune.vcpupin && !def->cputune.emulatorpin) def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO; if ((n = virXPathNodeSet("./resource", ctxt, &nodes)) < 0) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml new file mode 100644 index 0000000..9759b48 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml @@ -0,0 +1,35 @@ +<domain type='kvm'> + <name>dummy2</name> + <uuid>4d92ec27-9ebf-400b-ae91-20c71c647c19</uuid> + <memory unit='KiB'>131072</memory> + <currentMemory unit='KiB'>65536</currentMemory> + <vcpu placement='auto' current='2'>6</vcpu> + <cputune> + <emulatorpin cpuset='1-3'/> + </cputune> + <numatune> + <memory mode='strict' placement='auto'/> + </numatune> + <os> + <type arch='x86_64' machine='pc-q35-2.3'>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-x86_64</emulator> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> + </controller> + <controller type='pci' index='2' model='pci-bridge'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml new file mode 100644 index 0000000..b33f57f --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml @@ -0,0 +1,32 @@ +<domain type='kvm'> + <name>dummy2</name> + <uuid>4d92ec27-9ebf-400b-ae91-20c71c647c19</uuid> + <memory unit='KiB'>131072</memory> + <currentMemory unit='KiB'>65536</currentMemory> + <vcpu placement='auto' current='2'>6</vcpu> + <numatune> + <memory mode='strict' placement='auto'/> + </numatune> + <os> + <type arch='x86_64' machine='pc-q35-2.3'>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-x86_64</emulator> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> + </controller> + <controller type='pci' index='2' model='pci-bridge'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 4abb303..9ceda58 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -310,6 +310,7 @@ mymain(void) DO_TEST("blkiotune-device"); DO_TEST("cputune"); DO_TEST("cputune-zero-shares"); + DO_TEST_DIFFERENT("cputune-numatune"); DO_TEST("smp"); DO_TEST("iothreads"); -- 2.0.5

3 3

[libvirt] [PATCH] Remove flag checking in MacVLanCreate helper stub
by Ján Tomko 29 Jan '15

29 Jan '15

When compiling without WITH_MACVTAP, we can get: 'unsupported flags (0x1) in function virNetDevMacVLanCreateWithVPortProfile' on an attempt to start a domain. Remove the flag check to reach the more helpful error: Cannot create macvlan devices on this platform https://bugzilla.redhat.com/show_bug.cgi?id=1186928 --- src/util/virnetdevmacvlan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index f2eae06..6a8a923 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1066,9 +1066,8 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED, char **res_ifname ATTRIBUTE_UNUSED, virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED, char *stateDir ATTRIBUTE_UNUSED, - unsigned int flags) + unsigned int flags ATTRIBUTE_UNUSED) { - virCheckFlags(0, -1); virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform")); return -1; -- 2.0.5

2 1

[libvirt] [PATCH] virsh: man: Document behavior of some blkdeviotune's flags when querying
by Peter Krempa 29 Jan '15

29 Jan '15

--live and --config can't be specified together when querying the configuration, but are valid when setting. The man page was hinting that they are valid always. --- tools/virsh.pod | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 1591341..804458e 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1100,9 +1100,10 @@ cannot be mixed with non-zero values for read or write. 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. -Both I<--live> and I<--config> flags may be given, but I<--current> is -exclusive. If no flag is specified, behavior is different depending -on hypervisor. +When setting the disk io parameters both I<--live> and I<--config> flags may be +given, but I<--current> is exclusive. For querying only one of I<--live>, +I<--config> or I<--current> can be specified. If no flag is specified, behavior +is different depending on hypervisor. =item B<blockjob> I<domain> I<path> { [I<--abort>] [I<--async>] [I<--pivot>] | [I<--info>] [I<--raw>] [I<--bytes>] | [I<bandwidth>] } -- 2.2.2

2 2

[libvirt] [PATCH] qemu: fix cannot set graphic passwd via qemuDomainSaveImageDefineXML
by Luyao Huang 29 Jan '15

29 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1183890 When we try to update a xml to a image file, we will clear the graphics passwd settings, because we do not pass VIR_DOMAIN_XML_SECURE to qemuDomainDefCopy, qemuDomainDefFormatBuf won't format the passwd. Add VIR_DOMAIN_XML_SECURE flag when we call qemuDomainDefCopy in qemuDomainSaveImageUpdateDef. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5994558..abe3b9f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5613,7 +5613,8 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, if (!(newdef_migr = qemuDomainDefCopy(driver, newdef, - VIR_DOMAIN_XML_MIGRATABLE))) + VIR_DOMAIN_XML_MIGRATABLE | + VIR_DOMAIN_XML_SECURE))) goto cleanup; if (!virDomainDefCheckABIStability(def, newdef_migr)) { -- 1.8.3.1

3 2

[libvirt] [PATCHv2] util: bitmap: Tolerate NULL bitmaps in virBitmapEqual
by Peter Krempa 28 Jan '15

28 Jan '15

After virBitmapEqual is able to compare NULL bitmaps few bits of code can be cleaned up. --- Version 2 cleans up code paths that would do a duplicate check now. src/conf/domain_conf.c | 40 ++++++++++------------------------------ src/conf/numatune_conf.c | 3 --- src/util/virbitmap.c | 6 ++++++ src/util/virbitmap.h | 3 +-- 4 files changed, 17 insertions(+), 35 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9ff3819..d364d3c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15625,18 +15625,10 @@ virDomainDefCheckABIStability(virDomainDefPtr src, goto error; } - if (src_huge->nodemask && dst_huge->nodemask) { - if (!virBitmapEqual(src_huge->nodemask, dst_huge->nodemask)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Target huge page nodemask does not match source")); - goto error; - } - } else { - if (src_huge->nodemask || dst_huge->nodemask) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Target huge page nodemask does not match source")); - goto error; - } + if (!virBitmapEqual(src_huge->nodemask, dst_huge->nodemask)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Target huge page nodemask does not match source")); + goto error; } } @@ -19126,20 +19118,12 @@ virDomainIsAllVcpupinInherited(virDomainDefPtr def) { size_t i; - if (!def->cpumask) { - if (def->cputune.nvcpupin) + for (i = 0; i < def->cputune.nvcpupin; i++) { + if (!virBitmapEqual(def->cputune.vcpupin[i]->cpumask, def->cpumask)) return false; - else - return true; - } else { - for (i = 0; i < def->cputune.nvcpupin; i++) { - if (!virBitmapEqual(def->cputune.vcpupin[i]->cpumask, - def->cpumask)) - return false; - } + } - return true; - } + return true; } @@ -19477,9 +19461,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, for (i = 0; i < def->cputune.nvcpupin; i++) { char *cpumask; /* Ignore the vcpupin which inherit from "cpuset of "<vcpu>." */ - if (def->cpumask && - virBitmapEqual(def->cpumask, - def->cputune.vcpupin[i]->cpumask)) + if (virBitmapEqual(def->cpumask, def->cputune.vcpupin[i]->cpumask)) continue; virBufferAsprintf(buf, "<vcpupin vcpu='%u' ", @@ -19506,9 +19488,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, for (i = 0; i < def->cputune.niothreadspin; i++) { char *cpumask; /* Ignore the iothreadpin which inherit from "cpuset of "<vcpu>." */ - if (def->cpumask && - virBitmapEqual(def->cpumask, - def->cputune.iothreadspin[i]->cpumask)) + if (virBitmapEqual(def->cpumask, def->cputune.iothreadspin[i]->cpumask)) continue; virBufferAsprintf(buf, "<iothreadpin iothread='%u' ", diff --git a/src/conf/numatune_conf.c b/src/conf/numatune_conf.c index ad928e0..323cd59 100644 --- a/src/conf/numatune_conf.c +++ b/src/conf/numatune_conf.c @@ -542,9 +542,6 @@ virDomainNumatuneNodesEqual(virDomainNumatunePtr n1, if (!nd1->nodeset && !nd2->nodeset) continue; - if (!nd1->nodeset || !nd2->nodeset) - return false; - if (nd1->mode != nd2->mode) return false; diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 05c50e4..d5b0035 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -504,6 +504,12 @@ bool virBitmapEqual(virBitmapPtr b1, virBitmapPtr b2) virBitmapPtr tmp; size_t i; + if (!b1 && !b2) + return true; + + if (!b1 || !b2) + return false; + if (b1->max_bit > b2->max_bit) { tmp = b1; b1 = b2; diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index 565264c..a347f0a 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -84,8 +84,7 @@ virBitmapPtr virBitmapNewData(void *data, int len) ATTRIBUTE_NONNULL(1); int virBitmapToData(virBitmapPtr bitmap, unsigned char **data, int *dataLen) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -bool virBitmapEqual(virBitmapPtr b1, virBitmapPtr b2) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +bool virBitmapEqual(virBitmapPtr b1, virBitmapPtr b2); size_t virBitmapSize(virBitmapPtr bitmap) ATTRIBUTE_NONNULL(1); -- 2.2.1

2 1

[libvirt] [PATCH] libvirt.spec: remove vbox storage and network .so files
by Pavel Hrdina 28 Jan '15

28 Jan '15

Commit 55ea7be7 removed separated modules for vbox_network and vbox_storage drivers but forget to update libvirt.spec.in file. This patch will fix rpm build. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. libvirt.spec.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b2db80e..7f8be38 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2117,8 +2117,6 @@ exit 0 %files daemon-driver-vbox %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so -%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox_network.so -%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox_storage.so %endif %endif # %{with_driver_modules} -- 2.0.5

1 0

[libvirt] [PATCHv2 0/6] Resolve issues in disk pool backend
by John Ferlan 28 Jan '15

28 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1138516 v1: http://www.redhat.com/archives/libvir-list/2015-January/msg00465.html In my previous attempt to resolve the issue, I created a stateDir and saved the volume XML for each pool in order to attempt to preserve the volume "name" and "target format type". However, it was pointed out during review that having a different "name" was not the original design intention. The intention was the name would be the partition name rather than something the user fabricates and expects to be saved/used. Since partition naming is handled by parted, the control over the name is not ours. Additionally, a pool refresh or libvirtd restart/reload would use the 'default' of the source device path and the partition number from the partition table. The "simple" fix to the issue is in patch 6; however, as I was going through fixing this I realized a few things and found a few other issues along the way, namely: Patches #1 & #2: After creating the partition if we fail something within the callback to virStorageBackendDiskMakeDataVol as a result of parsing the partition table from libvirt_parthelper, then the partition wasn't removed. So, patches 1 & 2 work at moving the DeleteVol code and then calling it if something in virStorageBackendDiskReadPartitions fails. Patch #3: When determining what type of partitions currently exist in the pool we compared against the target.format which is supposed to be the file system format type of the partition on the target rather than whether the partition is a primary, extended, or logical partition on the source. Since we set the partType on the source while reading the partitions, that's what we should use. Patch #4: During a refresh of the pool, we use virStorageBackendDiskReadPartitions in order to determine what types of partitions exist; however, if we have an extended partition and have created either a logical partition within or another primary partition after the extended one, then the open() will fail with ENXIO. So I special cased that. Patch #5: When we delete an extended partition, any logical partitions that existed in the pool would still be listed even though as part of the delete partition logic all the logical partitions were also deleted. Patch #6: So here is essentially the replacement for the previous patch series. Since the theory is one is supposed to know what they are doing and will provide the correct vol->name, make sure that they do so and cause a failure if they don't (indicating what the name should be). As an alternative we could just "overwrite" the name like we did anyway with pool refresh or libvirtd restart/reload by doing the following instead: /* Like the reload/restart/refresh path - use the name created by * parted rather than the API/user provided name */ if (STRNEQ(vol->name, partname)) { VIR_FREE(vol->name); if (VIR_STRDUP(vol->name, partname) < 0) return -1; } I also added details to the virsh.pod and formatstorage.html.in for the 'name' and the intersting "side effect" I found using 'virsh vol-create-as $pool $name $size --format extended'. I'd remove it, but I fear that someone else found this and has made use of it. The reality is that '--format' is supposed to be the file system format of the partition. However, the way it's used in the code will take what is supposed to be target format and allow creation of an extended partition. In virStorageBackendDiskPartFormat, if the pool source.format is DOS and the vol->target.format is VIR_STORAGE_VOL_DISK_EXTENDED, then we create an extended source partition as long as one doesn't already exist. John Ferlan (6): storage: Move virStorageBackendDiskDeleteVol storage: Attempt error recovery in virStorageBackendDiskCreateVol storage: Fix check for partition type for disk backing volumes storage: Adjust how to refresh extended partition disk data storage: When delete extended partition, need to refresh pool storage: Check the partition name against provided name docs/formatstorage.html.in | 12 +- src/storage/storage_backend.c | 4 + src/storage/storage_backend_disk.c | 235 +++++++++++++++++++++++-------------- tools/virsh.pod | 17 ++- 4 files changed, 174 insertions(+), 94 deletions(-) -- 2.1.0

2 7

[libvirt] [PATCH v2 0/9] qemu: Add quorum support to libvirt
by Matthias Gatto 28 Jan '15

28 Jan '15

The purpose of these patches is to introduce quorum for libvirt I've try to follow this proposal: http://www.redhat.com/archives/libvir-list/2014-May/msg00533.html This feature ask for 6 task: 1) Allow a _virStorageSource to contain more than one backing store. Therefore we have to treat the field virStorageSourcePtr backingStores as an array instead of a pointer. But doing that, most of the backingStore field would be an array contening only one element. So I've decide to allocate the array only if there is more than 1 backing store in a _virStorageSource. Because all the actual libvirt code use the backingStore field as a pointer and we needs want to change that, I've decide to encapsulate the backingStore field to simplifie the array manipulation. 2) Add the missing field a quorum need in _virStorageSource and the VIR_STORAGE_TYPE_QUORUM and VIR_STORAGE_FILE_QUORUM in their respectives enums. 3) Parse and format the xml Because a quorum allows to have more than one backing store at the same level we need to change virDomainDiskDefFormat and virDomainDiskDefParseXML to call virDomainDiskBackingStoreFormat and virDomainDiskBackingStoreParse in a loop. virDomainDiskBackingStoreFormat and virDomainDiskBackingStoreParse can call themself recursively in a loop because a quorum can contain another quorum 4) Add nodename We need to add nodename support in _virStorageSource because qemu use them for their child. 5) Build qemu string As for the xml, we have to call the function which create quorum recursively. But this task have the problem explained here: http://www.redhat.com/archives/libvir-list/2014-October/msg00529.html The _virStorageSource missing some informations that can be passed to a child, and therefore this version of quorum is incomplet. 6) Allow to hotplug/change a disk in a quorum This part is not present in these patches because for this task we have to use blockdev-add, and currently libvirt use device_add for hotpluging that doesn't allow to hotplug quorum childs. There is 3 way to handle this problem: 1) create a virDomainBlockDevAdd function in libvirt witch call blockdev-add. 2) use blockdev-add instead of device_add in qemuMonitorJSONAddDevice 3) write a hack which uses blockdev-add when only attaching quorum (but i'm pretty sure this solution is not the good one) V2: -Rebase on master -Add Documentation Matthias Gatto (9): virstoragefile: Add virStorageSourceGetBackingStore virstoragefile: Always use virStorageSourceGetBackingStore to get backing store virstoragefile: Add virStorageSourceSetBackingStore virstoragefile: Always use virStorageSourceSetBackingStore to set backing store virstoragefile: Treat backingStore as a pointer or an array virstoragefile: Add quorum in virstoragefile domain_conf: Read and Write quorum config qemu: Add quorum support in qemuBuildDriveDevStr virstoragefile: Add node-name docs/formatdomain.html.in | 27 ++++- docs/schemas/storagecommon.rng | 1 + docs/schemas/storagevol.rng | 1 + src/conf/domain_conf.c | 193 ++++++++++++++++++++++++++-------- src/conf/storage_conf.c | 25 +++-- src/libvirt_private.syms | 3 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 114 ++++++++++++++++++++ src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 20 ++-- src/qemu/qemu_migration.c | 1 + src/security/security_dac.c | 2 +- src/security/security_selinux.c | 4 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend.c | 30 +++--- src/storage/storage_backend_fs.c | 35 +++--- src/storage/storage_backend_gluster.c | 8 +- src/storage/storage_backend_logical.c | 8 +- src/storage/storage_driver.c | 2 +- src/util/virstoragefile.c | 138 +++++++++++++++++++++--- src/util/virstoragefile.h | 12 +++ tests/virstoragetest.c | 18 ++-- 22 files changed, 518 insertions(+), 132 deletions(-) -- 1.8.3.1

2 15

[libvirt] [PATCHv2 0/2] Really fix the crash on qemu crash on chardev hotplug
by Ján Tomko 28 Jan '15

28 Jan '15

An alternative solution that only adds the chardev to the definition after the command succeeded. Ján Tomko (2): Split qemuDomainChrInsert into two parts hotplug: only add a chardev to vmdef after monitor call src/conf/domain_conf.c | 18 ++++++++-- src/conf/domain_conf.h | 7 ++-- src/libvirt_private.syms | 3 +- src/qemu/qemu_hotplug.c | 88 +++++++++++++++++++++++++++++++----------------- 4 files changed, 79 insertions(+), 37 deletions(-) -- 2.0.5

2 4

[libvirt] [PATCHv2 0/2] add support for btrfs COW copy
by Chen Hanxiao 28 Jan '15

28 Jan '15

If VIR_STORAGE_VOL_CREATE_REFLINK is specified, try to use btrfs COW copy; v2: check BTRFS_IOC_CLONE in configure.ac error out if COW copy is not supported Chen Hanxiao (2): storage: introduce btrfsCloneFile() for COW copy storage: try to perform btrfs clone if possible configure.ac | 12 +++++++ include/libvirt/libvirt-storage.h | 1 + src/storage/storage_backend.c | 67 +++++++++++++++++++++++++++++++++++---- src/storage/storage_backend_fs.c | 8 +++-- src/storage/storage_driver.c | 4 ++- 5 files changed, 82 insertions(+), 10 deletions(-) -- 2.1.0

3 6

[libvirt] [PATCH 0/2] Really fix the crash on qemu crash in chardev hotplug
by Ján Tomko 27 Jan '15

27 Jan '15

Ján Tomko (2): Always free the device in AttachChrDevice Unify cleanup path in AttachChrDevice src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_hotplug.c | 40 +++++++++++++++++++++------------------- tests/qemuhotplugtest.c | 1 + 3 files changed, 23 insertions(+), 21 deletions(-) -- 2.0.5

2 4

[libvirt] [PATCH] Fix shadowed variable warning
by Ján Tomko 27 Jan '15

27 Jan '15

libvirtd.c: In function 'daemonSetupAccessManager': libvirtd.c:730:18: error: declaration of 'driver' shadows a global declaration [-Werror=shadow] const char **driver = (const char **)config->access_drivers; ^ In file included from libvirtd.c:95:0: ../src/node_device/node_device_driver.h:43:36: error: shadowed declaration is here [-Werror=shadow] extern virNodeDeviceDriverStatePtr driver; ^ --- daemon/libvirtd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Pushed as a build breaker fix. diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 5ccfcdd..86accaa 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -727,13 +727,13 @@ daemonSetupAccessManager(struct daemonConfig *config) { virAccessManagerPtr mgr; const char *none[] = { "none", NULL }; - const char **driver = (const char **)config->access_drivers; + const char **drv = (const char **)config->access_drivers; - if (!driver || - !driver[0]) - driver = none; + if (!drv || + !drv[0]) + drv = none; - if (!(mgr = virAccessManagerNewStack(driver))) + if (!(mgr = virAccessManagerNewStack(drv))) return -1; virAccessManagerSetDefault(mgr); -- 2.0.5

1 0

[libvirt] [PATCH tck 0/5] Misc. TCK cleanups
by Mike Latimer 27 Jan '15

27 Jan '15

While running TCK on qemu, lxc and xen, I've ran into a few issues worth fixing upstream. The patches in this series are mainly focused on fixing minor typos, or safeguarding against failures in non-qemu environments. Depending on how interested people are in running TCK with xen, I can provide a few additional patches. Mike Latimer (5): hooks_051-return0 nwfilter_050-handle-failures hooks_qemu-only_skip TCK-check_uri TCK-eval-snapshots-list lib/Sys/Virt/TCK.pm | 3 ++- lib/Sys/Virt/TCK/Capabilities.pm | 6 ++++-- scripts/hooks/051-daemon-hook.t | 6 +++++- scripts/hooks/052-domain-hook.t | 2 +- scripts/nwfilter/nwfilter2vmtest.sh | 4 +++- 5 files changed, 15 insertions(+), 6 deletions(-) -- 1.8.4.5

2 6

[libvirt] [PATCH 0/7] qemu: Job handling fixes
by Peter Krempa 27 Jan '15

27 Jan '15

While reviewing Martin's reference counting series I've noticed a few qemu API impls that don't properly handle jobs. Peter Krempa (7): qemu: Fix job handling in qemuDomainPinVcpuFlags qemu: Fix job handling in qemuDomainPinEmulator qemu: Fix job handling in qemuDomainSetAutostart qemu: Fix job handling in qemuDomainSetMemoryParameters qemu: Fix job handling in qemuDomainSetSchedulerParametersFlags qemu: Fix job type in qemuDomainGetBlockIoTune qemu: Fix job handling in qemuDomainSetMetadata src/qemu/qemu_driver.c | 135 +++++++++++++++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 48 deletions(-) -- 2.2.1

2 12

[libvirt] [PATCH] Post-release version bump for new dev cycle
by Peter Krempa 27 Jan '15

27 Jan '15

--- Pushed as trivial. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f370475..ddbdba5 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.2.12], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.13], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 2.2.1

1 0

[libvirt] Release of libvirt-1.2.12
by Daniel Veillard 27 Jan '15

27 Jan '15

As planned I pushed the libvirt-1.2.12 release as well as the corresponding python bindings to the server, they are also tagged in git(s): ftp://libvirt.org/libvirt [/python] This is a mixed release, not really a huge feature addition though there should be user noticeable improvement for networking and users of Parallels. 2 secutity fixes, a large set of bug fixes and lot of improvements: Security: - CVE-2015-0236: qemu: Check ACLs when dumping security info from snapshots (Peter Krempa) - CVE-2015-0236: qemu: Check ACLs when dumping security info from save image (Peter Krempa) Documentation: - Fix docs about python bindings package (Martin Kletzander) - Document some -boot option limitations on UEFI (Michal Privoznik) - virsh.pod: Update description (John Ferlan) - Fix typo s/interpetation/interpretation/ (Claudio Bley) - split typedef and struct definition for apibuild.py (Claudio Bley) Portability: - Fix build with older gcc (Ján Tomko) - Fix virCgroupNewMachine prototype on non-Linux (Ján Tomko) - Conditionalize use of -Wno-suggest-attribute=format pragma (Daniel P. Berrange) - virnetlink: fix build on non-Linux (Eric Blake) - util: Fix fallocate stubs for mingw build (Martin Kletzander) - avoid using deprecated udev logging functions (Daniel P. Berrange) Bug Fixes: - Fix a memory leak in virCgroupGetPercpuStats (Ján Tomko) - Use correct location for qcow1 encryption header (Ján Tomko) - systemd: fix build without dbus (Daniel P. Berrange) - Fix apparmor issues for tck (Mike Latimer) - Fix apparmor issues for Xen (Mike Latimer) - esx_vi: fix possible segfault (Pavel Hrdina) - xenapi_driver: fix copy-paste typo (Pavel Hrdina) - Fix virCgroupGetPercpuStats with non-continuous present CPUs (Ján Tomko) - qemu: output error when try to hotplug unsupported console type (Luyao Huang) - qemu: format server interface without a listen address (Ján Tomko) - tests: fix xlconfigtest build failure (Jim Fehlig) - qemu_conf: check for duplicate security drivers (Ján Tomko) - Always check return value of qemuDomainObjExitMonitor (Ján Tomko) - Fix vmdef usage after domain crash in monitor on device attach (Ján Tomko) - Fix vmdef usage after domain crash in monitor on device detach (Ján Tomko) - libxl: Set path to console on domain startup. (Anthony PERARD) - Coverity fix: properly check for 0 ipv6 address. (Cédric Bosdonnat) - network: Resolve Coverity FORWARD_NULL (John Ferlan) - qemu: Tweak auto adding PCI bridge controller when extending default PCI bus (Erik Skultety) - domain_conf: Check errors from virSocketAddrFormat (John Ferlan) - domain_conf: Resolve Coverity RESOURCE_LEAK (John Ferlan) - Fix ipv6 regex in RNG schemas to match '::' (Cédric Bosdonnat) - virNetworkDefUpdateIPDHCPHost: Don't crash when updating network (Michal Privoznik) - qemu: free priv->origname when qemuMigrationPrepareAny fails (Luyao Huang) - Fix vmdef usage while in monitor in qemu process (Ján Tomko) - Fix vmdef usage while in monitor in BlockStat* APIs (Ján Tomko) - Fix vmdef usage while in monitor in qemuDomainHotplugVcpus (Ján Tomko) - qemu_driver: fix setting vcpus for offline domain (Pavel Hrdina) - qemu: snapshot: inactive external snapshot can't work after libvirtd restart (Shanzhi Yu) - qemu: forbid second blockcommit during active commit (Eric Blake) - parallels: don't override error message when XML parsing fails (Daniel P. Berrange) - Don't use VIR_DOMAIN_XML_SECURE when parsing XML (Daniel P. Berrange) - conf: fix crash when hotplug a channel chr device with no target (Luyao Huang) - qemuxml2argvtest: Fix test after change of qxl vgamem_mb default (Michal Privoznik) - cpu: Bugfix for s390 CPU driver to return a host CPU model (Daniel Hansel) - virconf: Resolve a possible memory leak in virConfSetValue (John Ferlan) - openvz: Resolve Coverity RESOURCE_LEAK (John Ferlan) - lxc: Don't crash on NULL ifname_guest_actual (Guido Günther) - conf: Correctly format controller's driver (Luyao Huang) - vmx: Fix a VMX parsing problem (Geoff Hickey) - qemu: Fix system pages handling in <memoryBacking/> (Michal Privoznik) - qemu: Don't unref domain after exit from nested async job (Peter Krempa) - conf: Don't format actual network definition in migratable XML (Luyao Huang) - qemu: Restore old bandwidth rules when setting new fails (Luyao Huang) - Fix error when starting a container after an error (Cédric Bosdonnat) - qemu: Fix coverity issues after refcount refactoring (Martin Kletzander) - util: Fix possible NULL dereference (Martin Kletzander) - disable vCPU pinning with TCG mode (Daniel P. Berrange) - Don't setup fake CPU pids for old QEMU (Daniel P. Berrange) - Fix hotplugging of block device-backed usb disks (Ján Tomko) - Buffer size too small when reading sysinfo (Boris Fiuczynski) - qemu: fix memory leak in blockinfo (Eric Blake) - conf: fix cannot start a guest have a shareable network iscsi hostdev (Luyao Huang) - qemu: fix bugs in blockstats (Eric Blake) - qemu: Free saved error in qemuDomainSetVcpusFlags (Martin Kletzander) - qemu: Add missing goto error in qemuRestoreCgroupState (Martin Kletzander) - conf: Fix invalid condition when parsing storage owner (Martin Kletzander) - qemu: Fix hotplugging cpus with strict memory pinning (Martin Kletzander) - parallels: fix usage of disk->info.addr.drive structure (Dmitry Guryanov) - qemu: Auto generate a controller when attach hostdev and chr device (Luyao Huang) - xenconfig: fix boot device parsing (Wei Liu) - conf: fix virDomainLeaseIndex logic (Luyao Huang) - conf: Fix libvirtd crash matching hostdev XML (Luyao Huang) - fix typo in sanlock driver s/VIR_CONF_UONG/VIR_CONF_ULONG/ (Daniel P. Berrange) - qemu: avoid rare race when undefining domain (Martin Kletzander) Improvement: - tests: Check for virQEMUDriverConfigNew return value (Michal Privoznik) - systemd: avoid string comparisons on dbus error messages (Daniel P. Berrange) - aarch64: Support versioned machine types. (Richard W.M. Jones) - qemu: Add check for PCI bridge placement if there are too many PCI devices (Erik Skultety) - qemu: Fix auto-adding PCI bridge when all slots are reserved (Erik Skultety) - qemu: move PCI slot assignment for PIIX3, Q35 into a separate function (Erik Skultety) - qemu: reorder PCI slot assignment functions (Erik Skultety) - schemas: Move definition of 'hexuint' to basictypes (Peter Krempa) - util: json: Make argument of virJSONValueArraySize const (Peter Krempa) - qemu: command: Honor const-correctnes in qemuBuildNumaArgStr (Peter Krempa) - conf: Fix comment mentioning actual type of @multi member of virDevicePCIAddress (Peter Krempa) - Grant access to helpers (Mike Latimer) - conf: virDomainDefMaybeAddController tweak return code (Erik Skultety) - qemu: Remove dead code in qemuDomainAssignPCIAddresses revert patch (Erik Skultety) - network: Let domains be restricted to local DNS (Josh Stone) - Make ZFS storage pool XML tests optional (Gary R Hook) - Simplify condition for formatting CPU features (Ján Tomko) - Add an XML test for host-model CPU with features (Ján Tomko) - parallels: create container from existing image (Dmitry Guryanov) - parallels: allow to add filesystems to container (Dmitry Guryanov) - parallels: commit with PVCF_DETACH_HDD_BUNDLE flag (Dmitry Guryanov) - parallels: dump info about container filesystems (Dmitry Guryanov) - add ploop fs driver type (Dmitry Guryanov) - qemu: Add support for enabling/disabling PMU (Martin Kletzander) - docs, schema, conf: Add support for PMU feature (Martin Kletzander) - virsh: add support for domain XML validation (Daniel P. Berrange) - Add XML test for too many PCI devices on default PCI bus (Erik Skultety) - Remove dead code in qemuDomainAssignPCIAddresses (Erik Skultety) - virSocketAddrGetIpPrefix 0.0.0.0 and :: special cases (Cédric Bosdonnat) - Use the network route definitions for domains (Cédric Bosdonnat) - Move code related to network routes to networkcommon_conf.[ch] (Cédric Bosdonnat) - Move network route definition to networkcommon.rng (Cédric Bosdonnat) - Add support for schema validation when passing in XML (Daniel P. Berrange) - Add virXMLValidateAgainstSchema helper method (Daniel P. Berrange) - Change int to size_t in size var for tap/vhost FDs (Daniel P. Berrange) - Log dtrace/systemd probes at INFO level instead of DEBUG (Daniel P. Berrange) - Add systemd/dtrace probes for DBus APIs (Daniel P. Berrange) - Add support for systemd-machined CreateMachineWithNetwork (Daniel P. Berrange) - Mark the domain as active in qemuhotplugtest (Ján Tomko) - Check for domain liveness in qemuDomainObjExitMonitor (Ján Tomko) - check IOMMU group devices usage when preparing device for vfio passthrough (Shivaprasad G Bhat) - virpci: Implement virPCIDeviceGetAddress function (Shivaprasad G Bhat) - libxl: Add support for parsing/formating Xen XL config (Kiarie Kahurani) - tests: Tests for the xen-xl parser (Kiarie Kahurani) - Introduce support for parsing/formatting Xen xl config format (Jim Fehlig) - qemu_process: detect updated video ram size values from QEMU (Pavel Hrdina) - qemu_monitor: introduce new function to get QOM path (Pavel Hrdina) - qemu, lxc: Warn if setting QoS on unsupported vNIC types (Michal Privoznik) - conf: Increase virNetDevBandwidthParse intelligence (Michal Privoznik) - Give virDomainDef parser & formatter their own flags (Daniel P. Berrange) - Decouple CPU XML formatting from domain XML public API flags (Daniel P. Berrange) - formatdomaincaps: Correctly format API reference (Michal Privoznik) - Fix flags passed to virDomainDefParseString by XenAPI driver (Daniel P. Berrange) - Add stub virDomainDefineXMLFlags impls (Daniel P. Berrange) - Add new virDomainDefineXMLFlags public API (Daniel P. Berrange) - qemu: Allow enabling/disabling features with host-passthrough (Martin Kletzander) - lxc: Move setting ifname_guest_actual to virLXCSetupInterfaces (Guido Günther) - openvz: Check errors from virSocketAddrFormat (John Ferlan) - qxl: change the default value for vgamem_mb to 16 MiB (Pavel Hrdina) - virsh: Emit error for VSH_OT_DATA without VSH_OFLAG_REQ (Hao Liu) - safezero: fall back to writing zeroes even when resizing (Ján Tomko) - maint: in src/Makefile.am, $(top_srcdir)/src is verbose (Eric Blake) - nwfilter: Add support for icmpv6 filtering (Stefan Berger) - Parallels: Add VNC hostname setup (Alexander Burluka) - qemu: fix miss goto cleanup in qemuDomainAttachNetDevice (Luyao Huang) - networkGetDHCPLeases: Remove unnecessary error reporting (Nehal J Wani) - qemu: use a wrong name for guest panic status (Luyao Huang) - maint: update to latest gnulib (Eric Blake) - Report error if a driver can't handle multiple IP addresses (Cédric Bosdonnat) - Openvz --ipadd can be provided multiple times (Cédric Bosdonnat) - LXC: honour network devices link state (Cédric Bosdonnat) - LXC: use the new net devices routes definition (Cédric Bosdonnat) - lxc conf2xml: convert lxc.network.ipv[46].gateway (Cédric Bosdonnat) - Domain network devices can now have a <route> element (Cédric Bosdonnat) - lxc conf2xml: convert ip addresses for hostdev NICs (Cédric Bosdonnat) - Allow network capabilities hostdev to configure IP addresses (Cédric Bosdonnat) - lxc conf2xml: convert IP addresses (Cédric Bosdonnat) - LXC: set IP addresses to veth devices in the container (Cédric Bosdonnat) - Domain conf: allow more than one IP address for net devices (Cédric Bosdonnat) - Renamed virNetDevClearIPv4Address to virNetDevClearIPAddress (Cédric Bosdonnat) - virNetDevClearIPv4Address: netlink implementation (Cédric Bosdonnat) - virNetDevAddRoute: implementation using netlink (Cédric Bosdonnat) - Renamed virNetDevSetIPv4Address to virNetDevSetIPAddress (Cédric Bosdonnat) - virNetDevSetIPv4Address: libnl implementation (Cédric Bosdonnat) - Forgot to cleanup ifname_guest* in domain network def parsing (Cédric Bosdonnat) - maint: fix date in local gnulib patch (Daniel P. Berrange) - maint: update to latest gnulib (Daniel P. Berrange) - Teach AppArmor, that /usr/lib64 may exist. (Cedric Bosdonnat) - Add tests to xmconfigtest (Chunyan Liu) - xenconfig: set HVM pae/apic/acpi/ default to 1 (Chunyan Liu) - src/xenconfig: Export helper functions (Kiarie Kahurani) - capabilities: Format <domain/> properly (Michal Privoznik) - parallels: report, that cdrom image is raw (Dmitry Guryanov) - tests: Set up two more overrides for root builders (Martin Kletzander) - test: fix nwfilter tests following changes in virfirewall.c (Stefan Berger) - qemu: completely rework reference counting (Martin Kletzander) - maint: update .mailmap (Claudio Bley) - qemu: Create memory-backend-{ram,file} iff needed (Michal Privoznik) - Remove redundant cleanup in qemuDomainAttachVirtioDiskDevice (Ján Tomko) - Fix error message on redirdev caps detection (Ján Tomko) - logical: Add "--type snapshot" to lvcreate command (John Ferlan) - getstats: crawl backing chain for qemu (Eric Blake) - getstats: split block stats reporting for easier recursion (Eric Blake) - getstats: add new flag for block backing chain (Eric Blake) - getstats: prepare for dynamic block.count stat (Eric Blake) - getstats: report block sizes for offline domains (Eric Blake) - qemu: refactor blockinfo data gathering (Eric Blake) - getstats: rearrange blockinfo gathering (Eric Blake) - getstats: perform recursion in monitor collection (Eric Blake) - getstats: prepare monitor collection for recursion (Eric Blake) - qemu: let blockinfo reuse virStorageSource (Eric Blake) - qemu: refactor blockinfo job handling (Eric Blake) - build: fix typo in previous patch (Eric Blake) - virstoragefile: Have virStorageFileResize use safezero (John Ferlan) - virfile: Refactor safezero (John Ferlan) - conf: Rework virDomainObjListFindByUUID to allow more concurrent APIs (Martin Kletzander) - storage: unify permission formatting (Martin Kletzander) - qemu: Leave cpuset.mems in parent cgroup alone (Martin Kletzander) - qemu: Save numad advice into qemuDomainObjPrivate (Martin Kletzander) - qemu: Remove unnecessary qemuSetupCgroupPostInit function (Martin Kletzander) - util: Add virNumaGetHostNodeset (Martin Kletzander) - util: Add function virCgroupHasEmptyTasks (Martin Kletzander) - spec: Fix syntax (Jiri Denemark) - spec: Disable -Werror in Fedora RPM builds (Daniel P. Berrange) - parallels: set format for real disk devices (Dmitry Guryanov) - parallels: support NULL virDomainVideoAccelDefPtr (Dmitry Guryanov) - qemu: add/remove bridge fdb entries as guest CPUs are started/stopped (Laine Stump) - qemu: make persistent update of graphics device supported (Wang Rui) - qemu: fix alignment of qemuDomainFindGraphics (Wang Rui) - qemu: report properer error number when change graphics failed (Wang Rui) - qemu: Allow system pages to <memoryBacking/> (Michal Privoznik) - virconf: Introduce VIR_CONF_ULONG (Michal Privoznik) - virConfType: switch to VIR_ENUM_{DECL,IMPL} (Michal Privoznik) - virConfSetValue: Simplify condition (Michal Privoznik) - conf: move the check for secondary consoles of targetType serial (Erik Skultety) - qemu: add a qemuInterfaceStopDevices(), called when guest CPUs stop (Laine Stump) - qemu: always call qemuInterfaceStartDevices() when starting CPUs (Laine Stump) - conf: Ignore device address for model=none usb controller and memballon (Luyao Huang) Cleanup: - Indentation (Ján Tomko) Thanks everybody for helping with this release, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Submit your Google Summer of Code project ideas and volunteer to mentor
by Stefan Hajnoczi 27 Jan '15

27 Jan '15

Dear libvirt, KVM, and QEMU contributors, The Google Summer of Code season begins soon and it's time to collect our thoughts for mentoring students this summer working full-time on libvirt, KVM, and QEMU. What is GSoC? Google Summer of Code 2015 (GSoC) funds students to work on open source projects for 12 weeks over the summer. Open source organizations apply to participate and those accepted receive funding for one or more students. We now need to collect a list of project ideas on our wiki. We also need mentors to volunteer. http://qemu-project.org/Google_Summer_of_Code_2015 Project ideas Please post project ideas on the wiki page below. Project ideas should be suitable as a 12-week project that a student fluent in C/Python/etc can complete. No prior knowledge of QEMU/KVM/libvirt internals can be assumed. http://qemu-project.org/Google_Summer_of_Code_2015 Mentors Please add your name to project ideas you are willing to mentor. In order to mentor you must be an established contributor (regularly contribute patches). You must be willing to spend about 5 hours per week from May 25 to August 21. I have CCed the 8 most active committers since QEMU 2.1.0 as well as the previous libvirt and KVM mentors but everyone is invited. Official timeline: https://www.google-melange.com/gsoc/events/google/gsoc20145 Stefan

2 1

[libvirt] [PATCH] tests: Check for virQEMUDriverConfigNew return value
by Michal Privoznik 26 Jan '15

26 Jan '15

The function may return NULL if something went wrong. In some places in the tests we are not checking the return value rather than accessing the pointer directly resulting in SIGSEGV. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/domaincapstest.c | 3 +++ tests/qemuhotplugtest.c | 3 ++- tests/qemuxmlnstest.c | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 70d2ef3..fa931f6 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -212,46 +212,49 @@ static int mymain(void) { int ret = 0; #define DO_TEST(Filename, Emulatorbin, Machine, Arch, Type, ...) \ do { \ struct test_virDomainCapsFormatData data = {.filename = Filename, \ .emulatorbin = Emulatorbin, .machine = Machine, .arch = Arch, \ .type = Type, __VA_ARGS__}; \ if (virtTestRun(Filename, test_virDomainCapsFormat, &data) < 0) \ ret = -1; \ } while (0) DO_TEST("basic", "/bin/emulatorbin", "my-machine-type", VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_UML); DO_TEST("full", "/bin/emulatorbin", "my-machine-type", VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_KVM, .fillFunc = fillAll); #ifdef WITH_QEMU virQEMUDriverConfigPtr cfg = virQEMUDriverConfigNew(false); + if (!cfg) + return EXIT_FAILURE; + # define DO_TEST_QEMU(Filename, QemuCapsFile, Emulatorbin, Machine, Arch, Type, ...) \ do { \ const char *capsPath = abs_srcdir "/qemucapabilitiesdata/" QemuCapsFile ".caps"; \ virQEMUCapsPtr qemuCaps = qemuTestParseCapabilities(capsPath); \ struct fillQemuCapsData fillData = {.qemuCaps = qemuCaps, .cfg = cfg}; \ struct test_virDomainCapsFormatData data = {.filename = Filename, \ .emulatorbin = Emulatorbin, .machine = Machine, .arch = Arch, \ .type = Type, .fillFunc = fillQemuCaps, .opaque = &fillData}; \ if (!qemuCaps) { \ fprintf(stderr, "Unable to build qemu caps from %s\n", capsPath); \ ret = -1; \ } else if (virtTestRun(Filename, test_virDomainCapsFormat, &data) < 0) \ ret = -1; \ } while (0) DO_TEST_QEMU("qemu_1.6.50-1", "caps_1.6.50-1", "/usr/bin/qemu-system-x86_64", "pc-1.2", VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_KVM); virObjectUnref(cfg); #endif /* WITH_QEMU */ return ret; } diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 1c18dbb..12a7f71 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -333,165 +333,166 @@ static int mymain(void) { int ret = 0; struct qemuHotplugTestData data = {0}; virSecurityManagerPtr mgr; #if !WITH_YAJL fputs("libvirt not compiled with yajl, skipping this test\n", stderr); return EXIT_AM_SKIP; #endif if (virThreadInitialize() < 0 || !(driver.caps = testQemuCapsInit()) || !(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver))) return EXIT_FAILURE; virEventRegisterDefaultImpl(); - driver.config = virQEMUDriverConfigNew(false); + if (!(driver.config = virQEMUDriverConfigNew(false))) + return EXIT_FAILURE; VIR_FREE(driver.config->spiceListen); VIR_FREE(driver.config->vncListen); /* some dummy values from 'config file' */ if (VIR_STRDUP_QUIET(driver.config->spicePassword, "123456") < 0) return EXIT_FAILURE; if (!(driver.domainEventState = virObjectEventStateNew())) return EXIT_FAILURE; driver.lockManager = virLockManagerPluginNew("nop", "qemu", driver.config->configBaseDir, 0); if (!driver.lockManager) return EXIT_FAILURE; if (!(mgr = virSecurityManagerNew("none", "qemu", false, false, false))) return EXIT_FAILURE; if (!(driver.securityManager = virSecurityManagerNewStack(mgr))) return EXIT_FAILURE; /* wait only 100ms for DEVICE_DELETED event */ qemuDomainRemoveDeviceWaitTime = 100; #define DO_TEST(file, ACTION, dev, event, fial, kep, ...) \ do { \ const char *my_mon[] = { __VA_ARGS__, NULL}; \ const char *name = file " " #ACTION " " dev; \ data.action = ACTION; \ data.domain_filename = file; \ data.device_filename = dev; \ data.fail = fial; \ data.mon = my_mon; \ data.keep = kep; \ data.deviceDeletedEvent = event; \ if (virtTestRun(name, testQemuHotplug, &data) < 0) \ ret = -1; \ } while (0) #define DO_TEST_ATTACH(file, dev, fial, kep, ...) \ DO_TEST(file, ATTACH, dev, false, fial, kep, __VA_ARGS__) #define DO_TEST_DETACH(file, dev, fial, kep, ...) \ DO_TEST(file, DETACH, dev, false, fial, kep, __VA_ARGS__) #define DO_TEST_ATTACH_EVENT(file, dev, fial, kep, ...) \ DO_TEST(file, ATTACH, dev, true, fial, kep, __VA_ARGS__) #define DO_TEST_DETACH_EVENT(file, dev, fial, kep, ...) \ DO_TEST(file, DETACH, dev, true, fial, kep, __VA_ARGS__) #define DO_TEST_UPDATE(file, dev, fial, kep, ...) \ DO_TEST(file, UPDATE, dev, false, fial, kep, __VA_ARGS__) #define QMP_OK "{\"return\": {}}" #define HMP(msg) "{\"return\": \"" msg "\"}" #define QMP_DEVICE_DELETED(dev) \ "{" \ " \"timestamp\": {" \ " \"seconds\": 1374137171," \ " \"microseconds\": 2659" \ " }," \ " \"event\": \"DEVICE_DELETED\"," \ " \"data\": {" \ " \"device\": \"" dev "\"," \ " \"path\": \"/machine/peripheral/" dev "\"" \ " }" \ "}\r\n" DO_TEST_UPDATE("graphics-spice", "graphics-spice-nochange", false, false, NULL); DO_TEST_UPDATE("graphics-spice-timeout", "graphics-spice-timeout-nochange", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); DO_TEST_UPDATE("graphics-spice-timeout", "graphics-spice-timeout-password", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); DO_TEST_UPDATE("graphics-spice", "graphics-spice-listen", true, false, NULL); DO_TEST_UPDATE("graphics-spice-listen-network", "graphics-spice-listen-network", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); /* Strange huh? Currently, only graphics can be updated :-P */ DO_TEST_UPDATE("disk-cdrom", "disk-cdrom-nochange", true, false, NULL); DO_TEST_ATTACH("console-compat-2", "console-virtio", false, true, "chardev-add", "{\"return\": {\"pty\": \"/dev/pts/26\"}}", "device_add", QMP_OK); DO_TEST_DETACH("console-compat-2", "console-virtio", false, false, "device_del", QMP_OK, "chardev-remove", QMP_OK); DO_TEST_ATTACH("hotplug-base", "disk-virtio", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-virtio", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH_EVENT("hotplug-base", "disk-virtio", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-virtio", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_DETACH("hotplug-base", "disk-virtio", false, false, "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH("hotplug-base", "disk-usb", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-usb", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH_EVENT("hotplug-base", "disk-usb", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-usb", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_DETACH("hotplug-base", "disk-usb", false, false, "device_del", QMP_DEVICE_DELETED("usb-disk16") QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH("hotplug-base", "disk-scsi", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-scsi", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH_EVENT("hotplug-base", "disk-scsi", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("hotplug-base", "disk-scsi", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_DETACH("hotplug-base", "disk-scsi", false, false, "device_del", QMP_DEVICE_DELETED("scsi0-0-0-5") QMP_OK, "human-monitor-command", HMP("")); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); virObjectUnref(driver.config); return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 947aa9c..4d665da 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -205,62 +205,63 @@ static int mymain(void) { int ret = 0; bool json = false; abs_top_srcdir = getenv("abs_top_srcdir"); if (!abs_top_srcdir) abs_top_srcdir = abs_srcdir "/.."; - driver.config = virQEMUDriverConfigNew(false); + if (!(driver.config = virQEMUDriverConfigNew(false))) + return EXIT_FAILURE; if ((driver.caps = testQemuCapsInit()) == NULL) return EXIT_FAILURE; if (!(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver))) return EXIT_FAILURE; # define DO_TEST_FULL(name, migrateFrom, migrateFd, expectError, ...) \ do { \ struct testInfo info = { \ name, NULL, migrateFrom, migrateFd, json, expectError \ }; \ if (!(info.extraFlags = virQEMUCapsNew())) \ return EXIT_FAILURE; \ virQEMUCapsSetList(info.extraFlags, __VA_ARGS__, QEMU_CAPS_LAST);\ if (virtTestRun("QEMU XML-2-ARGV " name, \ testCompareXMLToArgvHelper, &info) < 0) \ ret = -1; \ virObjectUnref(info.extraFlags); \ } while (0) # define DO_TEST(name, expectError, ...) \ DO_TEST_FULL(name, NULL, -1, expectError, __VA_ARGS__) # define NONE QEMU_CAPS_LAST /* Unset or set all envvars here that are copied in qemudBuildCommandLine * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected * values for these envvars */ setenv("PATH", "/bin", 1); setenv("USER", "test", 1); setenv("LOGNAME", "test", 1); setenv("HOME", "/home/test", 1); unsetenv("TMPDIR"); unsetenv("LD_PRELOAD"); unsetenv("LD_LIBRARY_PATH"); unsetenv("QEMU_AUDIO_DRV"); unsetenv("SDL_AUDIODRIVER"); DO_TEST("qemu-ns-domain", false, NONE); DO_TEST("qemu-ns-domain-ns0", false, NONE); DO_TEST("qemu-ns-domain-commandline", false, NONE); DO_TEST("qemu-ns-domain-commandline-ns0", false, NONE); DO_TEST("qemu-ns-commandline", false, NONE); DO_TEST("qemu-ns-commandline-ns0", false, NONE); DO_TEST("qemu-ns-commandline-ns1", false, NONE); virObjectUnref(driver.config); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.0.5

2 2

[libvirt] [PATCH v4 0/2] Allow UEFI paths to be specified at compile time
by Michal Privoznik 26 Jan '15

26 Jan '15

diff to v3: - basically the patch is split into two patches - dropped shell script in to configure.ac Michal Privoznik (2): qemu: Allow UEFI paths to be specified at compile time qemu: Add AAVMF to the list of known UEFIs configure.ac | 12 ++++ src/qemu/qemu.conf | 12 +++- src/qemu/qemu_conf.c | 68 +++++++++++++++++++--- src/qemu/test_libvirtd_qemu.aug.in | 1 + .../domaincaps-qemu_1.6.50-1.xml | 1 + tests/domaincapstest.c | 16 ++--- 6 files changed, 93 insertions(+), 17 deletions(-) -- 2.0.5

2 5

[libvirt] [PATCH] Fix a memory leak in virCgroupGetPercpuStats
by Ján Tomko 26 Jan '15

26 Jan '15

Coverity reports that my commit af1c98e introduced two memory leaks: the cpumap if ncpus == 0 in virCgroupGetPercpuStats and the params array in the test of the function. --- src/util/vircgroup.c | 6 ++++-- tests/vircgrouptest.c | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e65617a..6957e81 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3061,8 +3061,10 @@ virCgroupGetPercpuStats(virCgroupPtr group, total_cpus = virBitmapSize(cpumap); - if (ncpus == 0) - return total_cpus; + if (ncpus == 0) { + rv = total_cpus; + goto cleanup; + } if (start_cpu >= total_cpus) { virReportError(VIR_ERR_INVALID_ARG, diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index a455a81..cc1825b 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -614,6 +614,7 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) cleanup: virCgroupFree(&cgroup); + VIR_FREE(params); return ret; } -- 2.0.5

2 1

[libvirt] [PATCH] [Build-breaker : 1.2.12] Suppress compilation without dbus headers
by Prerna Saxena 26 Jan '15

26 Jan '15

Hi, While testing 1.2.12 rc2 on Powerpc, Fedora 21, I hit a bunch of build failures in absence of dbus-devel : src/util/virsystemd.c:284:17: note: in expansion of macro 'STREQ_NULLABLE' if (STREQ_NULLABLE("org.freedesktop.DBus.Error.UnknownMethod", ^ .... src/util/virsystemd.c:288:17: error: implicit declaration of function 'dbus_error_free' [-Werror=implicit-function-declaration] dbus_error_free(&error); Found that this was because commit 318df5a05 needs Dbus libraries for compilation, and configure didnt mark "with_dbus" to be mandatory. In this case, the compilation itself failed in a much uglier fashion on my system where dbus-devel was absent. The following patch introduces a compile error when dbus-devel is absent, so that the build itself proceeds later without cryptic errors. This has also been reported on the list : https://www.redhat.com/archives/libvir-list/2015-January/msg00641.html >From 8c4f583b6bb47ca41866ff884af0cd55487f047d Mon Sep 17 00:00:00 2001 From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Sun, 25 Jan 2015 05:35:23 -0600 Subject: [PATCH] Build: Fix dbus m4 macro to correctly flag it as a required dependency. Commit 318df5a needs dbus headers to compile. However, this package is listed as optional, and so this breaks libvirt compilation on systems that lack the relevant devel files. This patch does not allow ./configure to proceed if dbus-devel is absent. It also tweaks the libvirt spec file to reflect this relationship. --- libvirt.spec.in | 3 --- m4/virt-dbus.m4 | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index ba1cf41..4dfda13 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -627,10 +627,7 @@ BuildRequires: util-linux BuildRequires: nfs-utils %endif -%if %{with_firewalld} -# Communication with the firewall daemon uses DBus BuildRequires: dbus-devel -%endif # Fedora build root suckage BuildRequires: gawk diff --git a/m4/virt-dbus.m4 b/m4/virt-dbus.m4 index 3f9b306..42359cf 100644 --- a/m4/virt-dbus.m4 +++ b/m4/virt-dbus.m4 @@ -19,6 +19,7 @@ dnl AC_DEFUN([LIBVIRT_CHECK_DBUS],[ LIBVIRT_CHECK_PKG([DBUS], [dbus-1], [1.0.0]) + m4_divert_text([DEFAULTS], [with_dbus=yes]) if test "$with_dbus" = "yes" ; then old_CFLAGS="$CFLAGS" -- 1.8.3.1 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 2

[libvirt] [libvirt-test-API][PATCH] Add IPv6 section into network case
by jiahu 26 Jan '15

26 Jan '15

Add IPv6 family related scenarios to virtual network case --- cases/basic_network.conf | 8 ++++++++ repos/network/define.py | 7 ++++++- repos/network/xmls/network.xml | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/cases/basic_network.conf b/cases/basic_network.conf index e9abd57..5d1438e 100644 --- a/cases/basic_network.conf +++ b/cases/basic_network.conf @@ -13,6 +13,14 @@ network:define $defaultnetend netmode nat + netip6addr + $netip6addr + netip6prefix + $netip6prefix + netip6start + $netip6start + netip6end + $netip6end network:network_list flags diff --git a/repos/network/define.py b/repos/network/define.py index dd054f7..6e50eb7 100644 --- a/repos/network/define.py +++ b/repos/network/define.py @@ -17,7 +17,12 @@ required_params = ('networkname', 'bridgenetmask', 'netstart', 'netend', - 'netmode',) + 'netmode', + 'netip6addr', + 'netip6prefix', + 'netip6start', + 'netip6end', + ) optional_params = {'xml' : 'xmls/network.xml', } diff --git a/repos/network/xmls/network.xml b/repos/network/xmls/network.xml index 220169b..97e3517 100644 --- a/repos/network/xmls/network.xml +++ b/repos/network/xmls/network.xml @@ -7,4 +7,9 @@ <range start="NETSTART" end="NETEND"/> </dhcp> </ip> + <ip family="ipv6" address="NETIP6ADDR" prefix="NETIP6PREFIX" > + <dhcp> + <range start="NETIP6START" end="NETIP6END" /> + </dhcp> + </ip> </network> -- 1.8.1.4

2 1

[libvirt] [PATCH] conf: Disallow emulatorpin when numatune's in effect
by Michal Privoznik 26 Jan '15

26 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1170492 In one of our previous commits (dc8b7ce7) we've obsoleted <cputune/> in favor of <numatune/> and others. If old element was passed it was basically ignored and interesting settings were copied from the new one. Well with one exception we'd forgotten about: emulatorpin. Imagine that domain is configured as follows: <vcpu placement='static' current='2'>6</vcpu> <cputune> <emulatorpin cpuset='1-3'/> </cputune> This is perfectly valid as only old style elements are used. However, adding new style elements messes up the XML: <vcpu placement='auto' current='2'>6</vcpu> <cputune> <emulatorpin cpuset='1-3'/> </cputune> <numatune> <memory mode='strict' placement='auto'/> </numatune> Since <numatune/> is auto, <vcpu/> becomes auto as well. However in that case we can't guarantee that emulator will be pinned onto selected nodes. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 12 +++++++- .../qemuxml2argv-cputune-numatune.xml | 35 ++++++++++++++++++++++ .../qemuxml2xmlout-cputune-numatune.xml | 32 ++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8792f5e..0b8af6d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13173,8 +13173,18 @@ virDomainDefParseXML(xmlDocPtr xml, ctxt) < 0) goto error; - if (virDomainNumatuneHasPlacementAuto(def->numatune) && !def->cpumask) + if (virDomainNumatuneHasPlacementAuto(def->numatune) && !def->cpumask) { + /* If numatune is used, it obsoletes some older settings + * like /domain/vcpu/@placement or + * /domain/cputune/emulatorpin. For more info see comment + * a few lines above where emulatorpin is parsed. */ def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO; + if (def->cputune.emulatorpin) { + VIR_WARN("Ignore emulatorpin for <numatune> placement is 'auto'"); + virDomainVcpuPinDefFree(def->cputune.emulatorpin); + def->cputune.emulatorpin = NULL; + } + } if ((n = virXPathNodeSet("./resource", ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml new file mode 100644 index 0000000..9759b48 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml @@ -0,0 +1,35 @@ +<domain type='kvm'> + <name>dummy2</name> + <uuid>4d92ec27-9ebf-400b-ae91-20c71c647c19</uuid> + <memory unit='KiB'>131072</memory> + <currentMemory unit='KiB'>65536</currentMemory> + <vcpu placement='auto' current='2'>6</vcpu> + <cputune> + <emulatorpin cpuset='1-3'/> + </cputune> + <numatune> + <memory mode='strict' placement='auto'/> + </numatune> + <os> + <type arch='x86_64' machine='pc-q35-2.3'>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-x86_64</emulator> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> + </controller> + <controller type='pci' index='2' model='pci-bridge'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml new file mode 100644 index 0000000..b33f57f --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml @@ -0,0 +1,32 @@ +<domain type='kvm'> + <name>dummy2</name> + <uuid>4d92ec27-9ebf-400b-ae91-20c71c647c19</uuid> + <memory unit='KiB'>131072</memory> + <currentMemory unit='KiB'>65536</currentMemory> + <vcpu placement='auto' current='2'>6</vcpu> + <numatune> + <memory mode='strict' placement='auto'/> + </numatune> + <os> + <type arch='x86_64' machine='pc-q35-2.3'>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-x86_64</emulator> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> + </controller> + <controller type='pci' index='2' model='pci-bridge'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 4abb303..9ceda58 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -310,6 +310,7 @@ mymain(void) DO_TEST("blkiotune-device"); DO_TEST("cputune"); DO_TEST("cputune-zero-shares"); + DO_TEST_DIFFERENT("cputune-numatune"); DO_TEST("smp"); DO_TEST("iothreads"); -- 2.0.5

2 1

[libvirt] [libvirt-test-API][PATCH] Add global IPv6 default values to network part
by jiahu 26 Jan '15

26 Jan '15

Added below variables into global.cfg. netip6addr/netip6prefix/netip6start/netip6end --- global.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/global.cfg b/global.cfg index db8f71e..56677a5 100644 --- a/global.cfg +++ b/global.cfg @@ -195,6 +195,15 @@ defaultnetstart = 192.168.111.2 # default the ending address ip defaultnetend = 192.168.111.254 +# default bridge ipv6 addr +netip6addr = 2001:db8:ca2:99::1 +# default bridge ipv6 prefix +netip6prefix = 64 +# default the starting ipv6 address +netip6start = 2001:db8:ca2:99::11 +# default the ending ipv6 address +netip6end = 2001:db8:ca2:99::ff + ################################################################ # # host interface -- 1.8.1.4

1 0

[libvirt] Missing libxl_device_nic settings
by Kim Larry 25 Jan '15

25 Jan '15

Hi, I was trying to pass ip address to scripts/vif-bridge by putting <ip address=""/> in guest config xml file, however, I found that libxlMakeNic(which located in libxl/libxl_conf.c:956) doesn't set x_nic->ip. So I patched myself but I'm not so sure about VIR_DOMAIN_NET_TYPE_ETHERNET. It seems like vif-route, correct? Here is my patch: diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 0555b91..0effc59 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1047,10 +1047,18 @@ libxlMakeNic(virDomainDefPtr def, if (VIR_STRDUP(x_nic->bridge, virDomainNetGetActualBridgeName(l_nic)) < 0) return -1; - /* fallthrough */ + if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) + return -1; + if (VIR_STRDUP(x_nic->ip, l_nic->data.bridge.ipaddr) < 0) + return -1; + break; case VIR_DOMAIN_NET_TYPE_ETHERNET: if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) return -1; + if (VIR_STRDUP(x_nic->ip, l_nic->data.ethernet.ipaddr) < 0) + return -1; + if (VIR_STRDUP(x_nic->gatewaydev, l_nic->data.ethernet.dev) < 0) + return -1; break; case VIR_DOMAIN_NET_TYPE_NETWORK: { Regards, Jihoon

1 0

[libvirt] Entering freeze for libvirt-1.2.12
by Daniel Veillard 24 Jan '15

24 Jan '15

As planned I tagged the release candidate 1 in git and pushed signed tarballs and rpms to the usual place: ftp://libvirt.org/libvirt/ Seems to work fine for me, but my testing is limited. Give it a try especially on other architectures or OSes. Plan is to release an rc2 by the dn of the week and the final next Tuesday assuming everythings goes smoothly ! thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] libvirt domXML -> libxl_domain_config conversion testing
by Jim Fehlig 24 Jan '15

24 Jan '15

Hi All, I've been attempting to revive the libvirt domXML -> libxl_domain_config tests originally started by Daniel all the way back in May! https://www.redhat.com/archives/libvir-list/2014-May/msg01102.html In a reply to patch5 of the series, Ian Campbell noted that the doc produced by libxl_domain_config_to_json() may change as new config is added, defaults changed, etc. Some suggestions for coping with this included 1. json template files per libxl version 2. a new API in libvirt's json toolbox to compare json docs (with ability to control the comparison, e.g. ignore certain content) 3. make use of new functionality in Xen 4.5 such as libxl_domain_config_from_json() and libxl_domain_config_compare() Option 1 is simple-minded. Option 2 is an improvement, but a growing list of content must be ignored as additions/changes are made to the libxl_domain_config object. (Example of ignored content in this discussion - https://www.redhat.com/archives/libvir-list/2014-September/msg00627.html) In some cases, we might actually want to test some of the new content instead of ignoring it. Option 3 is promising, but doesn't help with Xen versions 4.2-4.4. Also, 4.5 is missing libxl_domain_config_compare(). After a bit of hacking on a combination of 2 and 3, I'm reconsidering 1 :-). At least for Xen 4.2-4.5. It's a simple solution that doesn't prevent testing new content in the libxl_domain_config object. Going forward, I could work on libxl_domain_config_compare() for xen-unstable/4.6, and then use option 3 to stop the template bloom. Any thoughts on this approach? Smarter options? Regards, Jim

1 0

[libvirt] [PATCH] aarch64: Support versioned machine types.
by Richard W.M. Jones 23 Jan '15

23 Jan '15

From: "Richard W.M. Jones" <rjones(a)redhat.com> For distros that want to add versioned machine types, they will add (downstream) machine types like "virt-foo-1.2.3". Detect these as MMIO too. Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> --- src/qemu/qemu_command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 434ac7c..3c75de5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1158,7 +1158,8 @@ qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def, if (((def->os.arch == VIR_ARCH_ARMV7L) || (def->os.arch == VIR_ARCH_AARCH64)) && (STRPREFIX(def->os.machine, "vexpress-") || - STREQ(def->os.machine, "virt")) && + STREQ(def->os.machine, "virt") || + STRPREFIX(def->os.machine, "virt-")) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) { qemuDomainPrimeVirtioDeviceAddresses( def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO); -- 1.8.3.1

2 1

[libvirt] [PATCH] Use correct location for qcow1 encryption header
by Ján Tomko 23 Jan '15

23 Jan '15

After the 8-byte size header, there are two one-byte headers and two bytes of padding before the crypt_header field. Our QCOW1_HDR_CRYPT constant did not skip the padding. http://git.qemu.org/?p=qemu.git;a=blob;f=block/qcow.c;h=ece22697#l41 https://bugzilla.redhat.com/show_bug.cgi?id=1185165 --- src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 7a4f9a0..8568ebb 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -161,7 +161,7 @@ qedGetBackingStore(char **, int *, const char *, size_t); #define QCOWX_HDR_BACKING_FILE_SIZE (QCOWX_HDR_BACKING_FILE_OFFSET+8) #define QCOWX_HDR_IMAGE_SIZE (QCOWX_HDR_BACKING_FILE_SIZE+4+4) -#define QCOW1_HDR_CRYPT (QCOWX_HDR_IMAGE_SIZE+8+1+1) +#define QCOW1_HDR_CRYPT (QCOWX_HDR_IMAGE_SIZE+8+1+1+2) #define QCOW2_HDR_CRYPT (QCOWX_HDR_IMAGE_SIZE+8) #define QCOW1_HDR_TOTAL_SIZE (QCOW1_HDR_CRYPT+4+8) -- 2.0.4

2 1

[libvirt] [PATCH v2 0/4] qemu: fix PCI bridge auto-add to extend default bus
by Erik Skultety 23 Jan '15

23 Jan '15

Erik Skultety (4): qemu: reorder PCI slot assignment functions qemu: move PCI slot assignment for PIIX3, Q35 into a separate function qemu: Fix auto-adding PCI bridge when all slots are reserved qemu: Add check for PCI bridge placement if there are too many PCI devices src/qemu/qemu_command.c | 265 ++++++++++++++++++++++++++++-------------------- 1 file changed, 154 insertions(+), 111 deletions(-) -- 1.9.3

2 10

[libvirt] [PATCH 0/5] Const correctnes/random fixes
by Peter Krempa 23 Jan '15

23 Jan '15

Few fixes/tweaks that have accumulated in my memory hotplug branch. They should be trivial enough and semantically inert. Peter Krempa (5): conf: Fix comment mentioning actual type of @multi member of virDevicePCIAddress qemu: command: Honor const-correctnes in qemuBuildNumaArgStr util: json: Make argument of virJSONValueArraySize const schemas: Move definition of 'hexuint' to basictypes util: bitmap: Tolerate NULL bitmaps in virBitmapEqual docs/schemas/basictypes.rng | 6 ++++++ docs/schemas/nodedev.rng | 6 ------ src/conf/device_conf.h | 2 +- src/qemu/qemu_command.c | 2 +- src/util/virbitmap.c | 6 ++++++ src/util/virbitmap.h | 3 +-- src/util/virjson.c | 2 +- src/util/virjson.h | 2 +- 8 files changed, 17 insertions(+), 12 deletions(-) -- 2.2.1

2 8

[libvirt] [PATCH 0/5] Revert and fix PCI bridge auto-add to extend default bus
by Erik Skultety 23 Jan '15

23 Jan '15

Erik Skultety (5): qemu: Remove dead code in qemuDomainAssignPCIAddresses revert patch conf: virDomainDefMaybeAddController tweak return code qemu: Fix auto-adding PCI bridge when all slots are reserved qemu: move PCI slot assignment for PIIX3, Q35 into a separate function qemu: reorder PCI slot assignment functions src/conf/domain_conf.c | 2 +- src/qemu/qemu_command.c | 264 ++++++++++++++++++++++++++++-------------------- 2 files changed, 154 insertions(+), 112 deletions(-) -- 1.9.3

2 11