- Devel - libvirt List Archives

[libvirt] [PATCH] Fix memory leak in virSCSIDeviceListDel()
by Nehal J Wani 26 Feb '14

26 Feb '14

While running virscsitest, it was found that valgrind pointed out the following memory leak: ==320== 5 bytes in 1 blocks are definitely lost in loss record 4 of 37 ==320== at 0x4A069EE: malloc (vg_replace_malloc.c:270) ==320== by 0x3E6CE81171: strdup (strdup.c:43) ==320== by 0x4CB28DF: virStrdup (virstring.c:554) ==320== by 0x4CAC987: virSCSIDeviceSetUsedBy (virscsi.c:289) ==320== by 0x402321: test2 (virscsitest.c:100) ==320== by 0x403231: virtTestRun (testutils.c:199) ==320== by 0x402121: mymain (virscsitest.c:180) ==320== by 0x4039AD: virtTestMain (testutils.c:782) ==320== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==320== --- src/util/virscsi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/virscsi.c b/src/util/virscsi.c index acc3815..2f469f2 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -435,6 +435,7 @@ virSCSIDeviceListDel(virSCSIDeviceListPtr list, for (i = 0; i < dev->n_used_by; i++) { if (STREQ_NULLABLE(dev->used_by[i], name)) { if (dev->n_used_by > 1) { + VIR_FREE(dev->used_by[i]); VIR_DELETE_ELEMENT(dev->used_by, i, dev->n_used_by); } else { tmp = virSCSIDeviceListSteal(list, dev); -- 1.7.1

2 1

[libvirt] [question] doubt about cpu model 'qemu64'
by Wangyufei (James) 26 Feb '14

26 Feb '14

Hello, Recently I noticed that if I gave no model to qemu, then I would get 'qemu64' as default cpu model. Model 'qemu64' defined in qemu and defined in libvirt both support feature 'svm'. And if I start a VM with 'qemu64' as the qemu default model, I can get no 'svm' feature in the GuestOS: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni cx16 popcnt hypervisor syscall nx lm lahf_lm My host cpu is intel E5620, and it doesn't support 'svm' feature: 'fpu', 'vme', 'de', 'pse', 'tsc', 'msr', 'pae', 'mce', 'cx8', 'apic', 'sep', 'mtrr', 'pge', 'mca', 'cmov', 'pat', 'pse36', 'clflush', 'ds', 'acpi', 'mmx', 'fxsr', 'sse', 'sse2', 'ss', 'ht', 'tm', 'pbe', 'pni', 'pclmulqdq', 'dtes64', 'monitor', 'ds_cpl', 'vmx', 'smx', 'est', 'tm2', 'ssse3', 'cx16', 'xtpr', 'pdcm', 'pcid', 'dca', 'sse4.1', 'sse4.2', 'popcnt', 'aes', 'syscall', 'nx', 'pdpe1gb', 'rdtscp', 'lm', 'lahf_lm', 'dts', 'arat', 'constant_tsc' I can get the same result with libvirt API compareCPU on the host: model:qemu64; ret:0 model:Conroe; ret:2 model:Penryn; ret:2 model:Nehalem; ret:2 model:Westmere; ret:2 model:SandyBridge; ret:0 model:Haswell; ret:0 Isn't it strange that the host cpu doesn't support 'qemu64' model, but we can still start a VM with 'qemu64' as the default model on it? Best Regards, -WangYufei

1 0

[libvirt] Entering freeze for libvirt-1.2.2
by Daniel Veillard 26 Feb '14

26 Feb '14

As planned I tagged a release candidate 1 version in git and made tarballs and rpms available at the usual place: ftp://libvirt.org/libvirt/ it seems to work well in my limited testing, but let's spend some time this week making more tests and checking it compiles on other systems and architectures. if all goes well I will probably push the release next week-end, with an rc2 on Wednesday based on feedback, 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/

3 4

[libvirt] [PATCH 0/2] fix mingw build
by Eric Blake 26 Feb '14

26 Feb '14

I hit some issues while running ./autobuild.sh on a machine set up for a mingw cross build; pushing this series under the build-breaker rule. Eric Blake (2): build: fix cgroups on non-Linux build: avoid ld_preload tests on mingw src/util/vircgroup.c | 27 +++++++++++++++++++++++++- tests/Makefile.am | 7 ++++--- tests/virportallocatortest.c | 45 +++++++++++++++++++++++++++----------------- 3 files changed, 58 insertions(+), 21 deletions(-) -- 1.8.5.3

1 2

[libvirt] [PATCH] virNetDevVethCreate: Serialize callers
by Michal Privoznik 25 Feb '14

25 Feb '14

Consider dozen of LXC domains, each of them having this type of interface: <interface type='network'> <mac address='52:54:00:a7:05:4b'/> <source network='default'/> </interface> When starting these domain in parallel, all workers may meet in virNetDevVethCreate() where a race starts. Race over allocating veth pairs because allocation requires two steps: 1) find first nonexistent '/sys/class/net/vnet%d/' 2) run 'ip link add ...' command Now consider two threads. Both of them find N as the first unused veth index but only one of them succeeds allocating it. The other one fails. For such cases, we are running the allocation in a loop with 10 rounds. However this is very flaky synchronization. It should be rather used when libvirt is competing with other process than when libvirt threads fight each other. Therefore, internally we should use mutex to serialize callers, and do the allocation in loop (just in case we are competing with a different process). By the way we have something similar already since 1cf97c87. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetdevveth.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 25eb282..e698ce2 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -39,6 +39,19 @@ /* Functions */ +virMutex virNetDevVethCreateMutex; + +static int virNetDevVethCreateMutexOnceInit(void) +{ + if (virMutexInit(&virNetDevVethCreateMutex) < 0) { + virReportSystemError(errno, "%s", _("unable to init mutex")); + return -1; + } + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virNetDevVethCreateMutex); + static int virNetDevVethExists(int devNum) { int ret; @@ -117,6 +130,10 @@ int virNetDevVethCreate(char** veth1, char** veth2) * We might race with other containers, but this is reasonably * unlikely, so don't do too many retries for device creation */ + if (virNetDevVethCreateMutexInitialize() < 0) + return -1; + + virMutexLock(&virNetDevVethCreateMutex); #define MAX_VETH_RETRIES 10 for (i = 0; i < MAX_VETH_RETRIES; i++) { @@ -179,6 +196,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) MAX_VETH_RETRIES); cleanup: + virMutexUnlock(&virNetDevVethCreateMutex); virCommandFree(cmd); VIR_FREE(veth1auto); VIR_FREE(veth2auto); -- 1.9.0

2 1

[libvirt] Question about building libvirt.so
by vikhyath reddy 25 Feb '14

25 Feb '14

Hi, Thanks for libvirt. It is a life saver. I am in the process of writing some custom wrappers for libvirt so that it can be easily accessed from nodejs using the nodejs-ffi interfacing (basically describes a way to convert nodejs to c calls). I did write the wrapper on the lines of the examples provided. But I am unable to see my new functions in the libvirt.so file (which nodejs interfacing needs). Which means that my wrappers under <libvirt>/wrappers/ are not getting into libvirt.so like the ones at <libvirt>/examples Can you please guide me as to where I am going wrong? I was able to do a successful configure + make and I thought this will regenerate the new libvirt.so (which it does, but I cant see my new wrapper methods in it). Much appreciated, Thanks, vik.

5 7

[libvirt] libvirt iSCSI target discovery
by Sijo Jose 25 Feb '14

25 Feb '14

Hi, Is it possible to discover iSCSI targets using libvirt API..? OR is it possible to get the similar results of below commands using libvirtAPI..? iscsiadm --mode discovery --type sendtargets --portal server1.example.com sudo iscsiadm -m discovery -t st -p 192.168.0.10 Regards Sijo

2 1

[libvirt] [PATCH V2] libxl: queue domain event earlier in shutdown handler
by Jim Fehlig 25 Feb '14

25 Feb '14

The shutdown handler may restart a domain when handling a reboot event or when <on_*> is set to 'restart'. Restarting consists of calling libxlVmCleanup followed by libxlVmStart. libxlVmStart will emit a VIR_DOMAIN_EVENT_STARTED event, but the SHUTDOWN event is not emitted until exiting the shutdown handler, after the STARTED event. This patch changes the logic a bit to queue the event at the start of the shutdown action, ensuring it is queued before any subsequent events that may be generated while executing the shutdown action. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V2: Enqueue any pending events at the beginning of the shutdown action labels, as suggested by Michal Privoznik https://www.redhat.com/archives/libvir-list/2014-February/msg01446.html src/libxl/libxl_driver.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index f7379b5..a79efcb 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -473,6 +473,10 @@ libxlDomainShutdownThread(void *opaque) } destroy: + if (dom_event) { + libxlDomainEventQueue(driver, dom_event); + dom_event = NULL; + } libxl_domain_destroy(ctx, vm->def->id, NULL); if (libxlVmCleanupJob(driver, vm, reason)) { if (!vm->persistent) { @@ -483,6 +487,10 @@ destroy: goto cleanup; restart: + if (dom_event) { + libxlDomainEventQueue(driver, dom_event); + dom_event = NULL; + } libxl_domain_destroy(ctx, vm->def->id, NULL); libxlVmCleanupJob(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN); libxlVmStart(driver, vm, 0, -1); -- 1.8.1.4

2 2

[libvirt] [PATCH libvirt-java] spec: Depend on java-headless for Fedora 21+
by Cole Robinson 25 Feb '14

25 Feb '14

Details: https://bugzilla.redhat.com/show_bug.cgi?id=1068369 --- libvirt-java.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libvirt-java.spec.in b/libvirt-java.spec.in index 137af83..d07b998 100644 --- a/libvirt-java.spec.in +++ b/libvirt-java.spec.in @@ -12,7 +12,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: jna Requires: libvirt-client >= @libvirt.required@ +%if 0%{?fedora} >= 21 +Requires: java-headless >= @java.required@ +%else Requires: java >= @java.required@ +%endif Requires: jpackage-utils BuildRequires: ant BuildRequires: jna -- 1.8.5.3

2 2

[libvirt] Compiling libvirt RPC client library for QNX
by Panday Ritesh Sharma (rpanday) 25 Feb '14

25 Feb '14

HI Team, I have downloaded the libvirt source code from libvirt_0.9.8.orig.tar.gz<https://launchpad.net/ubuntu/+archive/primary/+files/libvirt_0.9.8.orig.tar…> . I just wanted libvirt RPC client library to be compiled for QNX. My remote box which is running QNX would like to establish libvirt connection with linux box to launch virtual domains/VMs and would also like to get lifecycle events. Could you please let me know what all directory/files I need to compile which I have got from libvirt_0.9.8.orig.tar.gz<https://launchpad.net/ubuntu/+archive/primary/+files/libvirt_0.9.8.orig.tar…> ? While browsing through net I found the files available under src/util, src/conf, src/rpc, src/remote, are sufficient for client RPC library? Is this correct or I need to include any other files ? Is there any instruction or help available which I can use to compile this library for QNX ? Regards Ritesh Sharma

4 14

[libvirt] [PATCH 0/3] Couple of libvirt-guests fixes
by Michal Privoznik 25 Feb '14

25 Feb '14

*** BLURB HERE *** Michal Privoznik (3): virSystemdCreateMachine: Set dependencies for slices libvirt-guests: Wait for libirtd to initialize virNetServerRun: Notify systemd that we're accepting clients configure.ac | 2 ++ daemon/libvirtd.service.in | 1 + m4/virt-systemd-daemon.m4 | 34 ++++++++++++++++++++++++++++++++++ src/Makefile.am | 4 ++-- src/libvirt_private.syms | 1 + src/rpc/virnetserver.c | 7 +++++++ src/util/virsystemd.c | 18 ++++++++++++++++-- src/util/virsystemd.h | 2 ++ tools/libvirt-guests.sh.in | 19 +++++++++++++------ 9 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 m4/virt-systemd-daemon.m4 -- 1.9.0

5 15

[libvirt] [PATCH 0/7] network: include plugged interface XML in "plugged" network hook
by Laine Stump 25 Feb '14

25 Feb '14

Although the immediate reason for all these patches is $subject, it really is something that should have been done a long time ago (I just hadn't convinced myself it was the right thing to do). These patches will allow a management application to easily learn exactly what physical hardware is being used by a domain's interface, which wasn't previously possible (e.g., it will be simple to learn which SRIOV VF is being used by a domain interface that is configured as <interface type='network'> where the network is a pool of VFs). Laine Stump (7): conf: clarify what is returned for actual bandwidth and vlan conf: handle null pointer in virNetDevVlanFormat conf: make virDomainNetDefFormat a public function conf: re-situate <bandwidth> element in <interface> conf: new function virDomainActualNetDefContentsFormat conf: output actual netdev status in <interface> XML network: include plugged interface XML in "plugged" network hook src/conf/domain_conf.c | 303 +++++++++++++-------- src/conf/domain_conf.h | 4 + src/conf/netdev_vlan_conf.c | 4 +- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 48 ++-- ...qemuhotplug-console-compat-2+console-virtio.xml | 4 +- .../qemuxml2argv-console-compat-2.xml | 4 +- .../qemuxml2argv-net-bandwidth.xml | 2 +- 8 files changed, 233 insertions(+), 137 deletions(-) -- 1.8.5.3

4 20

[libvirt] [PATCH 0/3] Multiple fixes related to lookup of gluster volumes
by Peter Krempa 25 Feb '14

25 Feb '14

Peter Krempa (3): storage: Don't lie about path used to look up in error message util: file: Don't sanitize URI protocol separator in virFileSanitizePath gluster: Fix "key" attribute for gluster volumes src/storage/storage_backend_gluster.c | 10 ++++++++-- src/storage/storage_driver.c | 12 +++++++++--- src/util/virfile.c | 12 ++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) -- 1.8.5.5

3 11

[libvirt] [PATCH 0/3] Various RBD storage pool changes
by Wido den Hollander 25 Feb '14

25 Feb '14

This series of patches changes a couple of things in the RBD storage pool driver. The first change is that it includes the return status of librados and librbd in log and debug messages making it easier for users to track down the real cause of the problem. The second patch simplifies some code. The third patch leverages the new timeout options from librados. Should the backing Ceph cluster not respond for any reason librados will timeout. This prevents libvirt from handing on a rados_* or rbd_* call and locking up libvirt. If the librados version on the system does not support these timeout options nothing happens. libvirt compiles and runs just fine, but the timeout simply won't work. Wido den Hollander (3): rbd: Include return statusses from librados/librbd in logging rbd: Simplify opening RADOS IoCTX rbd: Set timeout options for librados src/storage/storage_backend_rbd.c | 137 ++++++++++++++++++++++--------------- 1 file changed, 80 insertions(+), 57 deletions(-) -- 1.7.9.5

2 8

[libvirt] [PATCH] virsh: initialize str to NULL for solving a build issue
by Chen Hanxiao 25 Feb '14

25 Feb '14

Fix a -Werror=maybe-uninitialized issue. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- tools/virsh-domain-monitor.c | 2 +- tools/virsh-domain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index c67b833..1192565 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -218,7 +218,7 @@ VIR_ENUM_IMPL(vshDomainPMSuspendedReason, static const char * vshDomainStateReasonToString(int state, int reason) { - const char *str; + const char *str = NULL; switch ((virDomainState) state) { case VIR_DOMAIN_NOSTATE: str = vshDomainNostateReasonTypeToString(reason); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 8e42300..3e73340 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10399,7 +10399,7 @@ VIR_ENUM_IMPL(vshDomainEventCrashed, static const char * vshDomainEventDetailToString(int event, int detail) { - const char *str; + const char *str = NULL; switch ((virDomainEventType) event) { case VIR_DOMAIN_EVENT_DEFINED: str = vshDomainEventDefinedTypeToString(detail); -- 1.8.5.3

2 1

[libvirt] [PATCH] virsh: mark CPU usage field names as translatable
by Ján Tomko 25 Feb '14

25 Feb '14

My commit ac75801 removed the translation markers when moving the field names into an array. --- tools/virsh-host.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 502203b..6a04f9d 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -352,12 +352,12 @@ VIR_ENUM_IMPL(vshCPUStats, VSH_CPU_LAST, VIR_NODE_CPU_STATS_UTILIZATION); const char *vshCPUOutput[] = { - "user:", - "system:", - "idle:", - "iowait:", - "intr:", - "usage:" + N_("user:"), + N_("system:"), + N_("idle:"), + N_("iowait:"), + N_("intr:"), + N_("usage:") }; static bool -- 1.8.3.2

2 2

[libvirt] [PATCH v1 0/2] support dumping guest memory in compressed format
by Qiao Nuohan 25 Feb '14

25 Feb '14

dumping guest's memroy is introduced without compression supported, and this is a freature regression of 'virsh dump --memory-only'. This patchset is used to add support in libvirt side to make qemu dump guest's memory in kdump-compressed format and please refer the following address to see implementation of the qemu side, the lastest version of qemu side is v9(ready for being queued). http://lists.nongnu.org/archive/html/qemu-devel/2014-02/msg03016.html qiaonuohan (2): make qemu dump memory in kdump-compressed format add dump_memory_format in qemu.conf include/libvirt/libvirt.h.in | 19 ++++++++++---- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 13 +++++++++- src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_driver.c | 51 +++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor.c | 6 ++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 4 ++- src/qemu/qemu_monitor_json.h | 3 ++- src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemumonitorjsontest.c | 2 +- tools/virsh-domain.c | 42 +++++++++++++++++++++++++++++++ 13 files changed, 133 insertions(+), 17 deletions(-)

2 5

[libvirt] QEMU accepted for Google Summer of Code 2014
by Stefan Hajnoczi 24 Feb '14

24 Feb '14

Great news: the organizations for Google Summer of Code 2014 have been announced and QEMU is participating again this year! If you are a student who is interested in a 12-week full-time project working on QEMU, KVM, or libvirt this summer, head over to our project ideas page: http://qemu-project.org/Google_Summer_of_Code_2014 Student applications are open from March 10th to March 21st. See the Google Summer of Code timeline for details: https://www.google-melange.com/gsoc/events/google/gsoc2014 Also be sure to read the FAQs on the Summer of Code website to find out about eligibility, time requirements, and how the process works: https://www.google-melange.com/gsoc/document/show/gsoc_program/google/gsoc2… Thanks to our mentors for posting their project ideas on time, thus helping us produce a good organization application. I will send a private email to mentors to kickstart the process for GSoC 2014. Stefan

1 0

[libvirt] [PATCH 0/2] virsh cleanups
by Eric Blake 24 Feb '14

24 Feb '14

Followups written based on review to my 'virsh event' addition. Eric Blake (2): virsh: use more compact VIR_ENUM_IMPL virsh: kill over-engineered asprintf failure recovery tools/virsh-domain-monitor.c | 280 +++++++++++++++------------------- tools/virsh-domain.c | 347 ++++++++++++++++++------------------------- tools/virsh-network.c | 36 ++--- tools/virsh-pool.c | 139 ++++++----------- tools/virsh-volume.c | 104 ++++--------- 5 files changed, 358 insertions(+), 548 deletions(-) -- 1.8.5.3

2 7

[libvirt] [PATCH 0/4] libxl: improve domain lifecycle event support
by Jim Fehlig 24 Feb '14

24 Feb '14

This series is the result of a report from Kim Larry [1] about missing shutdown events in the libxl driver. Kim's report revealed that the libxl driver was ignoring the <on_*> domain lifecycle event configuration! Patch1 adds support for the four standard actions (destroy, restart, preserve, and rename-restart) of <on_*>. Patch2 queues the shutdown event earlier in the shutdown handler, to avoid it being delivered after the a start event in the case of a restart. Patches 3 and 4 add support for the extra <on_crash> actions coredump-destroy and coredump-restart. [1] https://www.redhat.com/archives/libvir-list/2014-February/msg01121.html Jim Fehlig (4): libxl: honor domain lifecycle event configuration libxl: queue domain event earlier in shutdown handler libxl: add dump dir to libxlDriverConfig object libxl: handle on_crash coredump actions src/libxl/libxl_conf.c | 3 + src/libxl/libxl_conf.h | 2 + src/libxl/libxl_driver.c | 148 ++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 125 insertions(+), 28 deletions(-) -- 1.8.1.4

3 14

[libvirt] [PATCH] Document the keyboard as a valid input type
by Ján Tomko 24 Feb '14

24 Feb '14

Commit bc18373 added a new input type, but didn't change the documentation. --- docs/formatdomain.html.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ea1a97b..400de07 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3847,15 +3847,16 @@ qemu-kvm -net nic,model=? /dev/null ... <devices> <input type='mouse' bus='usb'/> + <input type='keyboard' bus='usb'/> </devices> ...</pre> <dl> <dt><code>input</code></dt> <dd>The <code>input</code> element has one mandatory attribute, - the <code>type</code> whose value can be either 'mouse' or - 'tablet'. The latter provides absolute - cursor movement, while the former uses relative movement. The optional + the <code>type</code> whose value can be 'mouse', 'tablet' or + 'keyboard'. The tablet provides absolute cursor movement, + while the mouse uses relative movement. The optional <code>bus</code> attribute can be used to refine the exact device type. It takes values "xen" (paravirtualized), "ps2" and "usb".</dd> </dl> -- 1.8.3.2

2 2

[libvirt] [PATCH] virsh: Don't leak buffer if GetFDs fails in cmdCreate
by Ján Tomko 24 Feb '14

24 Feb '14

Change the logic of the function to return false by default and move the freeing of the buffer to the cleanup section. https://bugzilla.redhat.com/show_bug.cgi?id=1067338 --- tools/virsh-domain.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 00ace11..59e843f 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6518,7 +6518,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; const char *from = NULL; - bool ret = true; + bool ret = false; char *buffer; #ifndef WIN32 bool console = vshCommandOptBool(cmd, "console"); @@ -6534,7 +6534,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) return false; if (cmdStartGetFDs(ctl, cmd, &nfds, &fds) < 0) - return false; + goto cleanup; if (vshCommandOptBool(cmd, "paused")) flags |= VIR_DOMAIN_START_PAUSED; @@ -6545,20 +6545,23 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) dom = virDomainCreateXMLWithFiles(ctl->conn, buffer, nfds, fds, flags); else dom = virDomainCreateXML(ctl->conn, buffer, flags); - VIR_FREE(buffer); - if (dom != NULL) { - vshPrint(ctl, _("Domain %s created from %s\n"), - virDomainGetName(dom), from); -#ifndef WIN32 - if (console) - cmdRunConsole(ctl, dom, NULL, 0); -#endif - virDomainFree(dom); - } else { + if (!dom) { vshError(ctl, _("Failed to create domain from %s"), from); - ret = false; + goto cleanup; } + + vshPrint(ctl, _("Domain %s created from %s\n"), + virDomainGetName(dom), from); +#ifndef WIN32 + if (console) + cmdRunConsole(ctl, dom, NULL, 0); +#endif + virDomainFree(dom); + ret = true; + +cleanup: + VIR_FREE(buffer); VIR_FREE(fds); return ret; } -- 1.8.3.2

2 2

[libvirt] [PATCH] Fix memory leak when lookup pool list with invalid type option
by shyu 24 Feb '14

24 Feb '14

There will be memory leak when lookup pool list with invalid type option https://bugzilla.redhat.com/show_bug.cgi?id=1069068 ==23060== Memcheck, a memory error detector ==23060== Copyright (C) 2002-2012, and GNU GPL'd, by Julian Seward et al. ==23060== Using Valgrind-3.8.1 and LibVEX; rerun with -h for copyright info ==23060== Command: virsh pool-list --type invalid ==23060== error: Invalid pool type ==23060== ==23060== HEAP SUMMARY: ==23060== in use at exit: 138,383 bytes in 1,559 blocks ==23060== total heap usage: 4,199 allocs, 2,640 frees, 21,372,544 bytes allocated ==23060== ==23060== LEAK SUMMARY: ==23060== definitely lost: 8 bytes in 1 blocks ==23060== indirectly lost: 0 bytes in 0 blocks ==23060== possibly lost: 0 bytes in 0 blocks ==23060== still reachable: 138,375 bytes in 1,558 blocks ==23060== suppressed: 0 bytes in 0 blocks ==23060== Rerun with --leak-check=full to see details of leaked memory ==23060== ==23060== For counts of detected and suppressed errors, rerun with: -v ==23060== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 8 from 6) Signed-off-by: shyu <shyu(a)redhat.com> --- tools/virsh-pool.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 642b078..db4d3ae 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -859,6 +859,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) for (i = 0; i < npoolTypes; i++) { if ((poolType = virStoragePoolTypeFromString(poolTypes[i])) < 0) { vshError(ctl, "%s", _("Invalid pool type")); + VIR_FREE(*poolTypes); VIR_FREE(poolTypes); return false; } -- 1.7.1

3 3

[libvirt] block pull/commit for non-local storage
by Peter Krempa 24 Feb '14

24 Feb '14

Hi, with my recent work into snapshots with native libgfapi support I've run into an issue with libvirt APIs used to delete snapshots by management apps. The management apps use the APIs to do the job: int virDomainBlockCommit(virDomainPtr dom, const char *disk, const char *base, const char *top, unsigned long bandwidth, unsigned int flags) int virDomainBlockPull(virDomainPtr dom, const char *disk, unsigned long bandwidth, unsigned int flags) int virDomainBlockRebase(virDomainPtr dom, const char *disk, const char *base, unsigned long bandwidth, unsigned int flags) As you can see in the prototypes of these functions (and from the docs for them which I'm not going to copy here) the user can provide the disk specification in two possible options: 1) a full path if it's unambiguous - this is file centric and requires the file to be in the local filesystem 2) a disk name "vda" - this is selected automatically by libvirt but allows to specify only the top image. For systems that want to use remote storage without local representation such as gluster+libgfapi, this doesn't allow to use the APIs to start block jobs. To solve this issue we need a way to specify paths on remote storage in some way. Below are two options we've discussed on IRC. 1) Use URIs along with the file path to specify disk images. This option would add a new, possibly well documented URIs to specify paths for disk images. These would be libvirt defined URIs (but surprisingly "similar" to qemu URIS) so that hypervisors with different storage specification would need a conversion. This would allow to specify the targets as: vda - disk name /path/to/file - legacy way, path file:///path/to/file - new way of file paths block:///dev/blah - new way, block devs gluster://server/vol/img - new way, remote images ... Possible caveats: RBD for example allows to use multiple hosts and we'd need to introduce a possibility to specify it if we'd add support for this on rbd. 2) Export the image chain in the XML and allow to use indexed disk names This option would require to export the backing chain in the XML in some way, either the existing disk source specification in multiple elements (which I don't like as it is a bit convoluted), or possibly again via URIs. Then the user would be allowed to specify vda[2] for the second backing image of the vda disk. With this the internal representations of the backing chain would be used without the need for the user to specify path. A possible caveat here is that if backing chains for some reason will be converted to backing trees, this approach will be invalid. 3) ? anyone suggesting something better? :) Thanks in advance for suggestions and/or new ideas. Peter

4 7

[libvirt] [PATCH] cpu: break out when a right cpuCandidate found
by Wangyufei (James) 24 Feb '14

24 Feb '14

>From 8123c5d64f940fa0fb0de32fc5e68035980b6b01 Mon Sep 17 00:00:00 2001 From: WangYufei <james.wangyufei(a)huawei.com> Date: Thu, 13 Feb 2014 07:17:11 +0000 Subject: [PATCH] cpu: break out when a right cpuCandidate found In function x86Decode there's a code segment in while cycle like this: if (cpuModel == NULL || cpuModel->nfeatures > cpuCandidate->nfeatures) { virCPUDefFree(cpuModel); cpuModel = cpuCandidate; cpuData = candidate->data; } else { virCPUDefFree(cpuCandidate); } when it finds the right cpuCandidate, it doesn't break out the cycle, but continues run in it, and cpuModel will never get a new value, it's meaningless. It should break out when a right cpuCndidate found. Signed-off-by: WangYufei <james.wangyufei(a)huawei.com> --- src/cpu/cpu_x86.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 56080ef..546b757 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1558,6 +1558,7 @@ x86Decode(virCPUDefPtr cpu, virCPUDefFree(cpuModel); cpuModel = cpuCandidate; cpuData = candidate->data; + break; } else { virCPUDefFree(cpuCandidate); } -- 1.7.12.4 Best Regards, -WangYufei

4 4

[libvirt] [PATCH] bhyve: implement node information reporting
by Roman Bogorodskiy 24 Feb '14

24 Feb '14

- Implement nodeGetCPUStats using nodeGetCPUStats() - Implement nodeGetMemoryStats using nodeGetMemoryStats() --- src/bhyve/bhyve_driver.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 7c6500f..35171d2 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -48,6 +48,7 @@ #include "virstring.h" #include "cpu/cpu.h" #include "viraccessapicheck.h" +#include "nodeinfo.h" #include "bhyve_driver.h" #include "bhyve_process.h" @@ -497,6 +498,32 @@ cleanup: } static int +bhyveNodeGetCPUStats(virConnectPtr conn, + int cpuNum, + virNodeCPUStatsPtr params, + int *nparams, + unsigned int flags) +{ + if (virNodeGetCPUStatsEnsureACL(conn) < 0) + return -1; + + return nodeGetCPUStats(cpuNum, params, nparams, flags); +} + +static int +bhyveNodeGetMemoryStats(virConnectPtr conn, + int cellNum, + virNodeMemoryStatsPtr params, + int *nparams, + unsigned int flags) +{ + if (virNodeGetMemoryStatsEnsureACL(conn) < 0) + return -1; + + return nodeGetMemoryStats(cellNum, params, nparams, flags); +} + +static int bhyveStateCleanup(void) { VIR_DEBUG("bhyve state cleanup"); @@ -594,6 +621,8 @@ static virDriver bhyveDriver = { .domainLookupByName = bhyveDomainLookupByName, /* 1.2.2 */ .domainDefineXML = bhyveDomainDefineXML, /* 1.2.2 */ .domainGetXMLDesc = bhyveDomainGetXMLDesc, /* 1.2.2 */ + .nodeGetCPUStats = bhyveNodeGetCPUStats, /* 1.2.2 */ + .nodeGetMemoryStats = bhyveNodeGetMemoryStats, /* 1.2.2 */ }; -- 1.8.4.3

2 2

[libvirt] [PATCH v3] Ensure systemd cgroup ownership is delegated to container with userns
by Daniel P. Berrange 24 Feb '14

24 Feb '14

From: Richard Weinberger <richard(a)nod.at> This function is needed for user namespaces, where we need to chmod() the cgroup to the initial uid/gid such that systemd is allowed to use the cgroup. Signed-off-by: Richard Weinberger <richard(a)nod.at> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Changed in v3: - Centralized all error reporting - Use virReportSystemError not VIR_WARN/VIR_ERROR --- src/libvirt_private.syms | 1 + src/lxc/lxc_cgroup.c | 12 +++++++++ src/util/vircgroup.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 5 ++++ 4 files changed, 88 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0b28bac..cfa9f75 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1056,6 +1056,7 @@ virCgroupSetMemory; virCgroupSetMemoryHardLimit; virCgroupSetMemorySoftLimit; virCgroupSetMemSwapHardLimit; +virCgroupSetOwner; virCgroupSupportsCpuBW; diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index cc0d5e8..39d955c 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -484,6 +484,18 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def) &cgroup) < 0) goto cleanup; + /* setup control group permissions for user namespace */ + if (def->idmap.uidmap) { + if (virCgroupSetOwner(cgroup, + def->idmap.uidmap[0].target, + def->idmap.gidmap[0].target, + (1 << VIR_CGROUP_CONTROLLER_SYSTEMD)) < 0) { + virCgroupFree(&cgroup); + cgroup = NULL; + goto cleanup; + } + } + cleanup: return cgroup; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index a6d60c5..18c891c 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3253,6 +3253,76 @@ cleanup: } +int virCgroupSetOwner(virCgroupPtr cgroup, + uid_t uid, + gid_t gid, + int controllers) +{ + int ret = -1; + size_t i; + char *base = NULL, *entry = NULL; + DIR *dh = NULL; + + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + struct dirent *de; + + if (!((1 << i) & controllers)) + continue; + + if (!cgroup->controllers[i].mountPoint) + continue; + + if (virAsprintf(&base, "%s%s", cgroup->controllers[i].mountPoint, + cgroup->controllers[i].placement) < 0) + goto cleanup; + + if (!(dh = opendir(base))) { + virReportSystemError(errno, + _("Unable to open dir '%s'"), base); + goto cleanup; + } + + while ((de = readdir(dh)) != NULL) { + if (STREQ(de->d_name, ".") || + STREQ(de->d_name, "..")) + continue; + + if (virAsprintf(&entry, "%s/%s", base, de->d_name) < 0) + goto cleanup; + + if (chown(entry, uid, gid) < 0) { + virReportSystemError(errno, + _("cannot chown '%s' to (%u, %u)"), + entry, uid, gid); + goto cleanup; + } + + VIR_FREE(entry); + } + + if (chown(base, uid, gid) < 0) { + virReportSystemError(errno, + _("cannot chown '%s' to (%u, %u)"), + base, uid, gid); + goto cleanup; + } + + VIR_FREE(base); + closedir(dh); + dh = NULL; + } + + ret = 0; + + cleanup: + if (dh) + closedir(dh); + VIR_FREE(entry); + VIR_FREE(base); + return ret; +} + + /** * virCgroupSupportsCpuBW(): * Check whether the host supports CFS bandwidth. diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index a70eb18..38d94f3 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -225,4 +225,9 @@ int virCgroupIsolateMount(virCgroupPtr group, bool virCgroupSupportsCpuBW(virCgroupPtr cgroup); +int virCgroupSetOwner(virCgroupPtr cgroup, + uid_t uid, + gid_t gid, + int controllers); + #endif /* __VIR_CGROUP_H__ */ -- 1.8.5.3

3 2

[libvirt] [PATCH v2] lxc: Add virCgroupSetOwner()
by Richard Weinberger 24 Feb '14

24 Feb '14

Add a new helper function to change the permissions of a control group. This function is needed for user namespaces, we need to chmod() the cgroup to the initial uid/gid such that systemd is allowed to use the cgroup. Signed-off-by: Richard Weinberger <richard(a)nod.at> --- Changes between v1 and v2: - Addressed Martin Kletzander's comments - Fixed opendir() error handling --- src/libvirt_private.syms | 1 + src/lxc/lxc_cgroup.c | 12 ++++++++++ src/util/vircgroup.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 5 ++++ 4 files changed, 78 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2c9536a..40e72f2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1056,6 +1056,7 @@ virCgroupSetMemory; virCgroupSetMemoryHardLimit; virCgroupSetMemorySoftLimit; virCgroupSetMemSwapHardLimit; +virCgroupSetOwner; virCgroupSupportsCpuBW; diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index cc0d5e8..39d955c 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -484,6 +484,18 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def) &cgroup) < 0) goto cleanup; + /* setup control group permissions for user namespace */ + if (def->idmap.uidmap) { + if (virCgroupSetOwner(cgroup, + def->idmap.uidmap[0].target, + def->idmap.gidmap[0].target, + (1 << VIR_CGROUP_CONTROLLER_SYSTEMD)) < 0) { + virCgroupFree(&cgroup); + cgroup = NULL; + goto cleanup; + } + } + cleanup: return cgroup; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index a6d60c5..4bef0db 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3253,6 +3253,66 @@ cleanup: } +int virCgroupSetOwner(virCgroupPtr cgroup, + uid_t uid, + gid_t gid, + int controllers) +{ + size_t i; + + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + char *base, *entry; + DIR *dh; + struct dirent *de; + + if (!((1 << i) & controllers)) + continue; + + if (!cgroup->controllers[i].mountPoint) + continue; + + if (virAsprintf(&base, "%s%s", cgroup->controllers[i].mountPoint, + cgroup->controllers[i].placement) < 0) { + return -1; + } + + dh = opendir(base); + if (!dh) { + VIR_ERROR(_("Unable to open %s: %s"), base, strerror(errno)); + VIR_FREE(base); + return -1; + } + + while ((de = readdir(dh)) != NULL) { + if (STREQ(de->d_name, ".") || + STREQ(de->d_name, "..")) + continue; + + if (virAsprintf(&entry, "%s/%s", base, de->d_name) < 0) { + VIR_FREE(base); + closedir(dh); + return -1; + } + + if (chown(entry, uid, gid) < 0) + VIR_WARN(_("cannot chown '%s' to (%u, %u): %s"), entry, uid, gid, + strerror(errno)); + + VIR_FREE(entry); + } + closedir(dh); + + if (chown(base, uid, gid) < 0) + VIR_WARN(_("cannot chown '%s' to (%u, %u): %s"), entry, uid, gid, + strerror(errno)); + + VIR_FREE(base); + } + + return 0; +} + + /** * virCgroupSupportsCpuBW(): * Check whether the host supports CFS bandwidth. diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index a70eb18..38d94f3 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -225,4 +225,9 @@ int virCgroupIsolateMount(virCgroupPtr group, bool virCgroupSupportsCpuBW(virCgroupPtr cgroup); +int virCgroupSetOwner(virCgroupPtr cgroup, + uid_t uid, + gid_t gid, + int controllers); + #endif /* __VIR_CGROUP_H__ */ -- 1.8.4.5

2 3

[libvirt] Error while running event-test.c in Libvirt package
by Avanti Ajay 24 Feb '14

24 Feb '14

Hello, I am trying to run event-test.c code available in libvirt-0.10.2 package under the folder /examples/domain-events/events-c. I am getting the following error /usr/bin/ld: cannot find -lvirt collect2: ld returned 1 exit status Please help me to solve this issue.

2 1

[libvirt] [libvirt-glib 0/2] Fix make distcheck
by Christophe Fergeau 24 Feb '14

24 Feb '14

Hey, After the introduction of the GTest unit tests, make distcheck still has a few issues, with this series, make distcheck passes on my box (using glib 2.38). Christophe

2 4

[libvirt] [PATCH glib] Disable test suite unless glib >= 2.38
by Daniel P. Berrange 24 Feb '14

24 Feb '14

The TAP harness for glib only works with version 2.38 or later, so must be disabled for earlier versions Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 8 +++++++- tests/Makefile.am | 18 ++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 4ad636a..d5b2971 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,7 @@ AM_SILENT_RULES([yes]) LIBVIRT_REQUIRED=0.10.2 AC_SUBST([LIBVIRT_REQUIRED]) dnl used in the .spec file GLIB2_REQUIRED=2.22.0 +GLIB2_TEST_REQUIRED=2.38.0 GOBJECT2_REQUIRED=2.10.0 GIO_REQUIRED=2.10.0 GOBJECT_INTROSPECTION_REQUIRED=0.10.8 @@ -91,12 +92,17 @@ m4_if(m4_version_compare([2.61a.100], LIBVIRT_GLIB_COMPILE_WARNINGS PKG_CHECK_MODULES(LIBVIRT, libvirt >= $LIBVIRT_REQUIRED) -PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED) +enable_tests=no +PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_TEST_REQUIRED, + [enable_tests=yes], + [PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED)]) PKG_CHECK_MODULES(GTHREAD2, gthread-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(GOBJECT2, gobject-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(GIO2, gio-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED) +AM_CONDITIONAL([ENABLE_TESTS], [test "$enable_tests" = "yes"]) + LIBVIRT_GLIB_GETTEXT dnl Should be in m4/virt-gettext.m4 but intltoolize is too dnl dumb to find it there diff --git a/tests/Makefile.am b/tests/Makefile.am index 56887ce..8cb98e5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,11 @@ +EXTRA_DIST = \ + xml/gconfig-domain.xml \ + xml/gconfig-domain-clock.xml \ + xml/gconfig-domain-os.xml \ + $(NULL) + +if ENABLE_TESTS + include $(top_srcdir)/build-aux/glib-tap.mk AM_CFLAGS = \ @@ -14,7 +22,9 @@ LDADD = \ test_programs = test-gconfig test-events -dist_test_data = \ - xml/gconfig-domain.xml \ - xml/gconfig-domain-clock.xml \ - xml/gconfig-domain-os.xml +else +EXTRA_DIST += \ + test-events.c \ + test-gconfig.c \ + $(NULL) +endif -- 1.8.5.3

3 2

[libvirt] [PATCH] build: fix build on 32-bit hosts
by Eric Blake 22 Feb '14

22 Feb '14

vircgrouptest.c: In function 'testCgroupGetPercpuStats': vircgrouptest.c:543: warning: integer constatnt is too large for 'long' type Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tests/vircgrouptest.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 5c14efb..5d5eccc 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Red Hat, Inc. + * Copyright (C) 2013-2014 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 @@ -540,7 +540,7 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) // TODO: mock nodeGetCPUCount() as well & check 2nd cpu, too unsigned long long expected[] = { - 1413142688153030 + 1413142688153030ULL }; if ((rv = virCgroupNewPartition("/virtualmachines", true, @@ -632,8 +632,8 @@ static int testCgroupGetBlkioIoServiced(const void *args ATTRIBUTE_UNUSED) int rv, ret = -1; const long long expected_values[] = { - 119084214273, - 822880960513, + 119084214273ULL, + 822880960513ULL, 9665167, 73283807 }; @@ -681,14 +681,14 @@ static int testCgroupGetBlkioIoDeviceServiced(const void *args ATTRIBUTE_UNUSED) size_t i; int rv, ret = -1; const long long expected_values0[] = { - 59542107136, - 411440480256, + 59542107136ULL, + 411440480256ULL, 4832583, 36641903 }; const long long expected_values1[] = { - 59542107137, - 411440480257, + 59542107137ULL, + 411440480257ULL, 4832584, 36641904 }; -- 1.8.5.3

1 0

[libvirt] [PATCH] maint: update to latest gnulib, for older autoconf
by Eric Blake 22 Feb '14

22 Feb '14

Based on a report from Pavel Hrdina, gnulib was fixed to support AC_PROG_SED even when using ancient autoconf 2.59 of RHEL 5. * .gnulib: Update to latest, to fix build on RHEL 5. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. * .gnulib 3f51bf4...72fb907 (3): > m4: fix gl_TIMER_TIME() detection of threads on uClibc > maintainer-makefiles: provide AC_PROG_SED for older autoconf > exclude: add support for posix regexps .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 3f51bf4..72fb907 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 3f51bf41c8be8b310f57caff371377414701d5cc +Subproject commit 72fb9075b2812765d2ce55a1a26c3764392377cb -- 1.8.5.3

1 0

[libvirt] [PATCH 0/4] Improve logging when QEMU caps fails
by Daniel P. Berrange 21 Feb '14

21 Feb '14

This improves the logging when we have a failure to probe QEMU capabilities for any binary. Daniel P. Berrange (4): Send virLogMetadata fields onto the journal Include error domain and code in log messages from errors Add comments describing the different log sources Generate a unique journald log for QEMU capabilities failure src/qemu/qemu_capabilities.c | 28 ++++++++++++++++++++++++++-- src/util/virerror.c | 8 +++++++- src/util/virlog.c | 18 ++++++++++++++++-- src/util/virlog.h | 10 +++++----- 4 files changed, 54 insertions(+), 10 deletions(-) -- 1.8.5.3

2 8

[libvirt] [PATCH] XML: Escape double-hyphens in XML comment
by Philipp Hahn 21 Feb '14

21 Feb '14

To quote <http://www.w3.org/TR/REC-xml/#sec-comments>: > For compatibility, the string "--" (double-hyphen) must not occur within comments. For example this breaks creating snapshots: $ virsh snapshot-create-as $VM "comment--bug" $ xmllint --noout /var/lib/libvirt/qemu/snapshot/$VM/comment--bug.xml /var/lib/libvirt/qemu/snapshot/$VM/comment--bug.xml:4: parser error : Comment not terminated <domain...<devices>...<disk...<source dev="/dev/sda"/>... It might break on the "/" as this is the only prohibited character for QEMU domains, as the name is directly used as a file name. To fix such broken files (by hand), remove the broken comment by doing something like this after making sure libvirtd is stopped: sed -i -ne '/^<domainsnapshot>$/,$p' /var/lib/libvirt/qemu/snapshot/*/*.xml sed -i -ne '/^<domain /,$p' /etc/libvirt/qemu/*.xml sed -i -ne '/^<pool /,$p' /etc/libvirt/storage/*.xml @Debian: The bug is also in libvirt-0.9.12. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/util/virxml.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/src/util/virxml.c b/src/util/virxml.c index dd530a6..ad45e68 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -798,6 +798,34 @@ const char *virXMLPickShellSafeComment(const char *str1, const char *str2) return NULL; } +/* + * Break sequence of hyphens by inserting (arbitrarily chosen) backslashes. + * <http://www.w3.org/TR/REC-xml/#sec-comments>: + * > For compatibility, the string "--" (double-hyphen) must not occur within + * > comments. + */ +static int virXMLEmitEscapedComment(int fd, + const char *str) +{ + size_t len; + + if (!strstr(str, "--")) { + len = strlen(str); + if (safewrite(fd, str, len) != len) + return -1; + return 0; + } + + for (;*str;str++) { + if (safewrite(fd, str, 1) != 1) + return -1; + if (str[0] == '-' && str[1] == '-') + if (safewrite(fd, "\\", 1) != 1) + return -1; + } + return 0; +} + static int virXMLEmitWarning(int fd, const char *name, const char *cmd) @@ -822,16 +850,14 @@ static int virXMLEmitWarning(int fd, if (safewrite(fd, prologue, len) != len) return -1; - len = strlen(cmd); - if (safewrite(fd, cmd, len) != len) + if (virXMLEmitEscapedComment(fd, cmd) < 0) return -1; if (name) { if (safewrite(fd, " ", 1) != 1) return -1; - len = strlen(name); - if (safewrite(fd, name, len) != len) + if (virXMLEmitEscapedComment(fd, name) < 0) return -1; } -- 1.8.5.3

3 3

[libvirt] ANNOUNCE: libvirt-glib release 0.1.8
by Daniel P. Berrange 21 Feb '14

21 Feb '14

I am pleased to announce that a new release of the libvirt-glib package, version 0.1.8, is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) Changes in this release: - Add getter/setter for UUID in domain config - Remove dead code / unused variables - Add missing symbol exports - Add support for setting nwfilters in domain config - Switch to standard gobject introspection autotools macros - Fix typo preventing removal of clock config - Add getter/setters for disk driver type - Add unit tests based on glib tap harness - Add test for validating symbol file exports - Add getters for domain graphics config params - Add more getters for domain timer config - Add support for hpet timer type - Fix event loop impl on win32 - Fix parent class/object of pit timer class - Fix misc API doc bugs - Add more getters for domain clock config - Fix removal of domain CPU feature flags - Fix removal of capabilities CPU topology - Misc fixes to glib event loop integration libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable forever, with libvirt-glib we are not yet guaranteeing that libvirt-glib libraries are API/ABI permanently stable. As of the 0.0.8 release, we have tentatively frozen the API/ABI with the intent of being longterm stable hereafter, but there is still a small chance we might find flaws requiring an API/ABI change. The likelihood of this is low, however, and we will strive to avoid it. Follow up comments about libvirt-glib should be directed to the regular libvir-list(a)redhat.com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH 0/5] Get AppArmor to work for LXC containers
by Cédric Bosdonnat 21 Feb '14

21 Feb '14

This patch series, implements the AppArmor support for LXC containers. examples/apparmor/libvirt-lxc only allows the minimum, users will be able to add more in the generated profile. Cédric Bosdonnat (5): LXC driver: generate apparmor profiles for guests Make sure apparmor is started before libvirtd Set default lxc security_driver to none apparmor: add debug traces when changing profile. add support for apparmor in lxc-enter-namespace daemon/libvirtd.service.in | 1 + examples/apparmor/Makefile.am | 2 ++ examples/apparmor/TEMPLATE | 2 +- examples/apparmor/libvirt-lxc | 17 ++++++++++ src/libvirt-lxc.c | 13 ++++++++ src/lxc/lxc.conf | 2 ++ src/security/security_apparmor.c | 15 ++++++--- src/security/virt-aa-helper.c | 69 +++++++++++++++++++++++++++++----------- 8 files changed, 97 insertions(+), 24 deletions(-) create mode 100644 examples/apparmor/libvirt-lxc -- 1.8.5.2

3 7

[libvirt] [PATCH v2 glib] gobject-stream: fix issue found by coverity
by Pavel Hrdina 21 Feb '14

21 Feb '14

The coverity server found issue in gvir_stream_close function that we ignore return values of g_input_stream_close and g_output_stream_close, but we also ignore the error message and we assume that it's closed without error. Now we will check return values and also propagate the error message to the upper layers. We should try to close both streams even if closing the first one will fails. We can propagate only one error message. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- libvirt-gobject/libvirt-gobject-stream.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 1572022..46dbd9a 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -102,17 +102,31 @@ static GOutputStream* gvir_stream_get_output_stream(GIOStream *io_stream) static gboolean gvir_stream_close(GIOStream *io_stream, GCancellable *cancellable, - G_GNUC_UNUSED GError **error) + GError **error) { GVirStream *self = GVIR_STREAM(io_stream); + GError *local_error = NULL; + gboolean i_ret = TRUE, o_ret = TRUE; + + g_return_val_if_fail(error == NULL || *error == NULL, FALSE); if (self->priv->input_stream) - g_input_stream_close(self->priv->input_stream, cancellable, NULL); + i_ret = g_input_stream_close(self->priv->input_stream, cancellable, &local_error); + + if (local_error) + g_propagate_error(error, local_error); if (self->priv->output_stream) - g_output_stream_close(self->priv->output_stream, cancellable, NULL); + o_ret = g_output_stream_close(self->priv->output_stream, cancellable, &local_error); + + if (local_error) { + if (i_ret) + g_propagate_error(error, local_error); + else + g_error_free(local_error); + } - return TRUE; /* FIXME: really close the stream? */ + return (i_ret && o_ret); } -- 1.8.3.1

2 2

[libvirt] [PATCH v12 00/11] Write separate module for hostdev passthrough
by Chunyan Liu 21 Feb '14

21 Feb '14

These patches implements a separate module for hostdev passthrough so that it could be shared by different drivers and can maintain a global state of a host device. patch 1/11: pci/usb/scsi used_by should include driver and domain info to check conflict among different drivers. patch 2/11~5/11: extract qemu specific code outside, to prepare for hostdev common library patch 6/11: move hostdev functions from qemu_hostdev.c to common library and maintain insistent device state. patch 7/11: add a unit test for hostdev common library. patch 8/11: switch qemu driver to use the common library instead of its own hostdev passthrough APIs. patch 9/11: switch lxc driver to use the common library instead of its own hostdev passthrough APIs. patch 10/11: add a hostdev pci backend type for xen usage. patch 11/11: add pci passthrough to libxl driver. --- Changes to v11: * rebase to latest shareable scsi hostdev changes * split v11 1/6 (add hostdev common library): add some small patches to extract qemu specific codes outside first before adding hostdev common library patch, for easier review. Chunyan Liu (11): change used_by: specify both driver and domain qemu_hostdev: move cfg->relaxedACS as a flag qemu_hostdev: move COLD_BOOT as a flag qemu_hostdev: parse BACKEND_DEFAULT outside qemu_hostdev: add/remove share device outside add hostdev passthrough common library add unit test for hostdev common library change qemu driver to use hostdev common library change lxc driver to use hostdev common library add hostdev pci backend type for xen add pci passthrough for libxl driver .gitignore | 1 + docs/schemas/domaincommon.rng | 1 + po/POTFILES.in | 3 +- src/Makefile.am | 3 +- src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 21 + src/libxl/libxl_conf.c | 63 + src/libxl/libxl_conf.h | 4 + src/libxl/libxl_domain.c | 9 + src/libxl/libxl_driver.c | 448 +++++- src/lxc/lxc_conf.h | 4 - src/lxc/lxc_driver.c | 47 +- src/lxc/lxc_hostdev.c | 413 ----- src/lxc/lxc_hostdev.h | 43 - src/lxc/lxc_process.c | 24 +- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_conf.h | 11 +- src/qemu/qemu_domain.c | 22 + src/qemu/qemu_driver.c | 83 +- src/qemu/qemu_hostdev.c | 89 +- src/qemu/qemu_hostdev.h | 5 +- src/qemu/qemu_hotplug.c | 144 +- src/qemu/qemu_process.c | 61 +- src/util/virhostdev.c | 1787 ++++++++++++++++++++ src/util/virhostdev.h | 134 ++ src/util/virpci.c | 30 +- src/util/virpci.h | 9 +- src/util/virscsi.c | 30 +- src/util/virscsi.h | 7 +- src/util/virusb.c | 29 +- src/util/virusb.h | 8 +- tests/Makefile.am | 5 + .../qemuxml2argv-hostdev-pci-address.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 2 + tests/virhostdevtest.c | 473 ++++++ tests/virscsitest.c | 6 +- 38 files changed, 3292 insertions(+), 737 deletions(-) delete mode 100644 src/lxc/lxc_hostdev.c delete mode 100644 src/lxc/lxc_hostdev.h create mode 100644 src/util/virhostdev.c create mode 100644 src/util/virhostdev.h create mode 100644 tests/virhostdevtest.c

4 24

[libvirt] [PATCH] Ignore additional fields in iscsiadm output
by Ján Tomko 21 Feb '14

21 Feb '14

There has been a new field introduced in iscsiadm --mode session output [1], but our regex only expects four fields. This breaks startup of iscsi pools: error: Failed to start pool iscsi error: internal error: cannot find session Fix this by ignoring anything after the fourth field. https://bugzilla.redhat.com/show_bug.cgi?id=1067173 [1] https://github.com/mikechristie/open-iscsi/commit/181af9a --- src/storage/storage_backend_iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 556c2cc..1149e43 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -102,7 +102,7 @@ virStorageBackendISCSISession(virStoragePoolObjPtr pool, * Pull out 2nd and 4th fields */ const char *regexes[] = { - "^tcp:\\s+\\[(\\S+)\\]\\s+\\S+\\s+(\\S+)\\s*$" + "^tcp:\\s+\\[(\\S+)\\]\\s+\\S+\\s+(\\S+).*$" }; int vars[] = { 2, -- 1.8.3.2

2 2

[libvirt] [PATCH] Add a stub for virCgroupGetDomainTotalCpuStats
by Ján Tomko 21 Feb '14

21 Feb '14

Commit 6515889 broke the build on FreeBSD: In function `qemuDomainGetCPUStats': /../../src/qemu/qemu_driver.c:16102: undefined reference to `virCgroupGetDomainTotalCpuStats' --- Pushed as a build-breaker. src/util/vircgroup.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 268a4ae..2dba10c 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -4261,6 +4261,17 @@ virCgroupGetCpuacctStat(virCgroupPtr group ATTRIBUTE_UNUSED, int +virCgroupGetDomainTotalCpuStats(virCgroupPtr group ATTRIBUTE_UNUSED, + virTypedParameterPtr params ATTRIBUTE_UNUSED, + int nparams ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Control groups not supported on this platform")); + return -1; +} + + +int virCgroupSetFreezerState(virCgroupPtr group ATTRIBUTE_UNUSED, const char *state ATTRIBUTE_UNUSED) { -- 1.8.3.2

1 0

[libvirt] [PATCHv4 00/10] Add BlkIO and CPU/mem stat API implementations for lxc
by Thorsten Behrens 21 Feb '14

21 Feb '14

This patch set adds block io, memory and domain cpu statistics API slot implementations to the LXC driver, in order to get linux container monitoring and accounting a bit closer to qemu standards. The last patch is a tad quirky (happy to hear suggestions on alternative ways), in that it widens the permissible value set at the .domainBlockStats slot: for lxc guests, it is relatively likely to have zero disk devices, since host filesystems can be used via passthrough bind mounts. Therefore, passing the zero-length string as device path, is interpreted as 'return summary stats for the entire domains's block io'. v4 addresses the last remaining review comments. Thorsten Behrens (10): Add util virCgroupGetBlkioIo*Serviced methods. Implement domainMemoryStats API slot for LXC driver. Make qemuGetDomainTotalCPUStats a virCgroup function. Implement domainGetCPUStats for lxc driver. Implement lxcDomainBlockStats* for lxc driver Widening API change - accept empty path for virDomainBlockStats Add unit test for virCgroupGetBlkioIo*Serviced Add unit test for virCgroupGetMemoryUsage. Fix misspelled cpuacct.usage_percpu in cgroup mock. Add unit test for virCgroupGetPercpuStats. src/libvirt.c | 8 +- src/libvirt_private.syms | 4 + src/lxc/lxc_driver.c | 300 +++++++++++++++++++++++++++++++++ src/qemu/qemu_driver.c | 54 +----- src/util/vircgroup.c | 382 +++++++++++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 24 +++ tests/testutilslxc.h | 3 + tests/vircgroupmock.c | 100 ++++++++++- tests/vircgrouptest.c | 230 ++++++++++++++++++++++++++ tools/virsh-domain-monitor.c | 11 +- tools/virsh.pod | 5 +- 11 files changed, 1059 insertions(+), 62 deletions(-) -- 1.8.4.5

4 21

[libvirt] [libvirt-python PATCH] generator: Skip exporting only sentinels
by Martin Kletzander 21 Feb '14

21 Feb '14

When enum type has '_LAST' in its name, but is not the last type in that enum, it's skipped even though it shouldn't be. Currently, this is the case for only VIR_NETWORK_UPDATE_COMMAND_ADD_LAST inside an enum virNetworkUpdateCommand. Also, since _LAST types can have other enums instead of values, that needs to be filtered out using a try-except when converting the value. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- generator.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/generator.py b/generator.py index 42f3913..0e9600f 100755 --- a/generator.py +++ b/generator.py @@ -227,10 +227,9 @@ def enum(type, name, value): value = 1 elif value == 'VIR_DOMAIN_AFFECT_CONFIG': value = 2 - if name[-5:] != '_LAST': - if onlyOverrides and name not in enums[type]: - return - enums[type][name] = value + if onlyOverrides and name not in enums[type]: + return + enums[type][name] = value def lxc_enum(type, name, value): if type not in lxc_enums: @@ -1765,13 +1764,23 @@ def buildWrappers(module): # # Generate enum constants # + def enumsSortKey(data): + value = data[1] + try: + value = int(value) + except ValueError: + value = float('inf') + return value + enumvals = list(enums.items()) if enumvals is not None: enumvals.sort(key=lambda x: x[0]) for type,enum in enumvals: classes.write("# %s\n" % type) items = list(enum.items()) - items.sort(key=lambda i: int(i[1])) + items.sort(key=enumsSortKey) + if items[-1][0].endswith('_LAST'): + del items[-1] for name,value in items: classes.write("%s = %s\n" % (name,value)) classes.write("\n") -- 1.9.0

2 2

[libvirt] [PATCH] virsh: fix memory leak in virsh when starting a guest with invalid fd
by Jincheng Miao 21 Feb '14

21 Feb '14

When start a guest with --pass-fd, if the argument of --pass-fd is invalid, virsh will exit, but doesn't free the variable 'dom'. The valgrind said: ... ==24569== 63 (56 direct, 7 indirect) bytes in 1 blocks are definitely lost in loss record 130 of 234 ==24569== at 0x4C2A1D4: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==24569== by 0x4E879A4: virAllocVar (viralloc.c:544) ==24569== by 0x4EBD625: virObjectNew (virobject.c:190) ==24569== by 0x4F3A18A: virGetDomain (datatypes.c:226) ==24569== by 0x4F9311F: remoteDomainLookupByName (remote_driver.c:6636) ==24569== by 0x4F44F20: virDomainLookupByName (libvirt.c:2277) ==24569== by 0x12F616: vshCommandOptDomainBy (virsh-domain.c:105) ==24569== by 0x131C79: cmdStart (virsh-domain.c:3330) ==24569== by 0x12C4AB: vshCommandRun (virsh.c:1752) ==24569== by 0x127001: main (virsh.c:3218) https://bugzilla.redhat.com/show_bug.cgi?id=1067338 Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index c3db94c..57653a2 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3428,11 +3428,11 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) if (virDomainGetID(dom) != (unsigned int)-1) { vshError(ctl, "%s", _("Domain is already active")); virDomainFree(dom); - return false; + goto cleanup; } if (cmdStartGetFDs(ctl, cmd, &nfds, &fds) < 0) - return false; + goto cleanup; if (vshCommandOptBool(cmd, "paused")) flags |= VIR_DOMAIN_START_PAUSED; -- 1.8.5.3

2 2

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 20 Feb '14

20 Feb '14

Among other things, gnulib now allows overriding of sed during 'make syntax-check'. * .gnulib: Update to latest, for maint.mk improvements. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the maintainer rule, before we freeze. I still need to revive Roman's work on using $(SED) and/or portable sed constructs in our cfg.mk, but that can occur after freeze if necessary, while the hard part of the gnulib submodule should be done before freeze. * .gnulib d5fec6c...3f51bf4 (9): > maintainer-makefiles: use $(SED) for syntax check > update from texinfo > savedir: add sorting arg to savedir, streamsavedir; remove fdsavedir > autoupdate > update from texinfo > update from texinfo > file-type: add support for doors and other less-common file types > update from texinfo > autoupdate .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index d5fec6c..3f51bf4 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit d5fec6c22f03c6a73d62260c9ce091c10c0a9cbd +Subproject commit 3f51bf41c8be8b310f57caff371377414701d5cc -- 1.8.5.3

1 0

Re: [libvirt] [libvirt-users] event-test.py cannot detects domain shutdown
by Cole Robinson 20 Feb '14

20 Feb '14

On 02/18/2014 05:12 AM, Kim Larry wrote: > 2014년 2월 11일 오후 10:00에 Eric Blake <eblake(a)redhat.com> 작성: > >> On 02/11/2014 12:20 AM, Kim Larry wrote: >> >>>>> libvirtd version is 1.1.4 and using Xen for hypervisor. >>>> I'm not as familiar with the xen hypervisor as with qemu; it may just be >>>> the case that no one has coded the xen driver to send a shutdown event. >>>> At any rate, I can confirm that with the qemu driver, shutdown events >>>> are delivered. >> >>> It is a bit weird that all except shutdown event are coded... >>> If it is true, do I have to just wait? >> >> https://rwmj.wordpress.com/2010/11/08/want-help-dont-email-me-directly/ >> >> Or you could look into the source code and provide a patch; but >> discussing this on the list is a better way to get a reaction from >> someone familiar with the xen code. >> >> -- >> Eric Blake eblake redhat com +1-919-301-3266 >> Libvirt virtualization library http://libvirt.org > > > Ah, I forgot to add libvirt-users in Cc... sorry. > > The thing I found today is that if libvirt uses xend driver, shutdown events > are delivered, but if libvirt uses libxl drvier, doesn't show up anything. It > seems there are bugs on shutdown event, so I did dig into the libvirt source > briefly, but I couldn't find where libxl driver calls event callback. > > Any help will be greatly appreciated. Especially someone who is familiar with > xen code. > Jim, does this sound familiar? - Cole

2 4

[libvirt] [PATCH] libxl: always use libxlVmCleanupJob in shutdown thread
by Jim Fehlig 20 Feb '14

20 Feb '14

Commit e4a0e900 missed calling libxlVmCleanupJob in the shutdown handler when processing a reboot event. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index f7ca91c..9f87e71 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -393,7 +393,7 @@ libxlDomainShutdownThread(void *opaque) break; case LIBXL_SHUTDOWN_REASON_REBOOT: libxl_domain_destroy(ctx, vm->def->id, NULL); - libxlVmCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + libxlVmCleanupJob(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN); libxlVmStart(driver, vm, 0, -1); break; default: -- 1.8.1.4

2 2

[libvirt] [PATCH] qemu: adjust maxmem/maxvcpu computation
by Eric Blake 20 Feb '14

20 Feb '14

https://bugzilla.redhat.com/show_bug.cgi?id=1038363 If a domain has a different maximum for persistent and live maxmem or max vcpus, then it is possible to hit cases where libvirt refuses to adjust the current values or gets halfway through the adjustment before failing. Better is to determine up front if the change is possible for all requested flags. * src/qemu/qemu_driver.c (qemuDomainSetMemoryFlags): Compute correct maximum if both live and config are being set. (qemuDomainSetVcpusFlags): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_driver.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a0b3ce3..288b98b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2242,8 +2242,16 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, } else { /* resize the current memory */ + unsigned long oldmax = 0; - if (newmem > vm->def->mem.max_balloon) { + if (flags & VIR_DOMAIN_AFFECT_LIVE) + oldmax = vm->def->mem.max_balloon; + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + if (!oldmax || oldmax > persistentDef->mem.max_balloon) + oldmax = persistentDef->mem.max_balloon; + } + + if (newmem > oldmax) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("cannot set memory higher than max memory")); goto endjob; @@ -4121,6 +4129,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, virDomainDefPtr persistentDef; int ret = -1; bool maximum; + unsigned int maxvcpus = 0; virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; qemuAgentCPUInfoPtr cpuinfo = NULL; @@ -4168,11 +4177,17 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto endjob; } - if (!maximum && nvcpus > vm->def->maxvcpus) { + if (flags & VIR_DOMAIN_AFFECT_LIVE) + maxvcpus = vm->def->maxvcpus; + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + if (!maxvcpus || maxvcpus > persistentDef->maxvcpus) + maxvcpus = persistentDef->maxvcpus; + } + if (!maximum && nvcpus > maxvcpus) { virReportError(VIR_ERR_INVALID_ARG, _("requested vcpus is greater than max allowable" " vcpus for the domain: %d > %d"), - nvcpus, vm->def->maxvcpus); + nvcpus, maxvcpus); goto endjob; } -- 1.8.5.3

2 3

[libvirt] [PATCH 0/4] add 'virsh event' and friends
by Eric Blake 20 Feb '14

20 Feb '14

Inspired by my work on qemu monitor events; Dan correctly argued that if we're going to expose those through virsh, we also need to expose regular events. Patch 5/4 still coming, which adds handlers for the remaining 15 domain event types. Eric Blake (4): virsh: common code for parsing --seconds virsh: common code for waiting for an event virsh: add event command, for lifecycle events virsh: add net-event command tools/virsh-domain.c | 410 +++++++++++++++++++++++++++++++++++++++++++------- tools/virsh-network.c | 171 ++++++++++++++++++++- tools/virsh.c | 186 ++++++++++++++++++++++- tools/virsh.h | 17 ++- tools/virsh.pod | 30 ++++ 5 files changed, 752 insertions(+), 62 deletions(-) -- 1.8.5.3

2 12

[libvirt] [PATCH] Rename virDomainGetRootFilesystem to virDomainGetFilesystemForTarget
by Daniel P. Berrange 20 Feb '14

20 Feb '14

The virDomainGetRootFilesystem method can be generalized to allow any filesystem path to be obtained. While doing this, start a new test case for purpose of testing various helper methods in the domain_conf.{c,h} files, such as this one. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 1 + src/conf/domain_conf.c | 5 +- src/conf/domain_conf.h | 3 +- src/libvirt_private.syms | 2 +- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_process.c | 2 +- tests/Makefile.am | 6 ++ tests/domainconfdata/getfilesystem.xml | 28 ++++++++ tests/domainconftest.c | 120 +++++++++++++++++++++++++++++++++ tests/testutils.c | 57 ++++++++++++++++ tests/testutils.h | 5 ++ 11 files changed, 225 insertions(+), 6 deletions(-) create mode 100644 tests/domainconfdata/getfilesystem.xml create mode 100644 tests/domainconftest.c diff --git a/.gitignore b/.gitignore index d5a6cf5..cbb3e8a 100644 --- a/.gitignore +++ b/.gitignore @@ -147,6 +147,7 @@ /tests/commandtest /tests/conftest /tests/cputest +/tests/domainconftest /tests/domainsnapshotxml2xmltest /tests/esxutilstest /tests/eventtest diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0079234..dd36026 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17827,12 +17827,13 @@ virDiskNameToBusDeviceIndex(virDomainDiskDefPtr disk, } virDomainFSDefPtr -virDomainGetRootFilesystem(virDomainDefPtr def) +virDomainGetFilesystemForTarget(virDomainDefPtr def, + const char *path) { size_t i; for (i = 0; i < def->nfss; i++) { - if (STREQ(def->fss[i]->dst, "/")) + if (STREQ(def->fss[i]->dst, path)) return def->fss[i]; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 647d115..ea7f1a1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2541,7 +2541,8 @@ int virDiskNameToBusDeviceIndex(virDomainDiskDefPtr disk, int *busIdx, int *devIdx); -virDomainFSDefPtr virDomainGetRootFilesystem(virDomainDefPtr def); +virDomainFSDefPtr virDomainGetFilesystemForTarget(virDomainDefPtr def, + const char *path); int virDomainFSIndexByName(virDomainDefPtr def, const char *name); int virDomainVideoDefaultType(const virDomainDef *def); int virDomainVideoDefaultRAM(const virDomainDef *def, int type); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2dbb8f8..a870e9c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -225,7 +225,7 @@ virDomainFSTypeFromString; virDomainFSTypeToString; virDomainFSWrpolicyTypeFromString; virDomainFSWrpolicyTypeToString; -virDomainGetRootFilesystem; +virDomainGetFilesystemForTarget; virDomainGraphicsAuthConnectedTypeFromString; virDomainGraphicsAuthConnectedTypeToString; virDomainGraphicsDefFree; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c6bdc8c..c32b085 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1823,7 +1823,7 @@ static int lxcContainerChild(void *data) if (lxcContainerSetID(vmDef) < 0) goto cleanup; - root = virDomainGetRootFilesystem(vmDef); + root = virDomainGetFilesystemForTarget(vmDef, "/"); if (argv->nttyPaths) { const char *tty = argv->ttyPaths[0]; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index cc9c1a2..f0190a0 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -934,7 +934,7 @@ virLXCProcessReadLogOutput(virDomainObjPtr vm, static int virLXCProcessEnsureRootFS(virDomainObjPtr vm) { - virDomainFSDefPtr root = virDomainGetRootFilesystem(vm->def); + virDomainFSDefPtr root = virDomainGetFilesystemForTarget(vm->def, "/"); if (root) return 0; diff --git a/tests/Makefile.am b/tests/Makefile.am index 568b7a0..90fb3a0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -65,6 +65,7 @@ EXTRA_DIST = \ commanddata \ confdata \ cputestdata \ + domainconfdata \ domainschemadata \ domainschematest \ domainsnapshotschematest \ @@ -141,6 +142,7 @@ test_programs = virshtest sockettest \ virportallocatortest \ sysinfotest \ virstoragetest \ + domainconftest \ $(NULL) if WITH_REMOTE @@ -893,6 +895,10 @@ sysinfotest_SOURCES = \ sysinfotest.c testutils.h testutils.c sysinfotest_LDADD = $(LDADDS) +domainconftest_SOURCES = \ + domainconftest.c testutils.h testutils.c +domainconftest_LDADD = $(LDADDS) + fdstreamtest_SOURCES = \ fdstreamtest.c testutils.h testutils.c fdstreamtest_LDADD = $(LDADDS) diff --git a/tests/domainconfdata/getfilesystem.xml b/tests/domainconfdata/getfilesystem.xml new file mode 100644 index 0000000..2ee78b4 --- /dev/null +++ b/tests/domainconfdata/getfilesystem.xml @@ -0,0 +1,28 @@ +<domain type='test'> + <name>demo</name> + <uuid>8369f1ac-7e46-e869-4ca5-759d51478066</uuid> + <memory unit='KiB'>500000</memory> + <currentMemory unit='KiB'>500000</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <init>/bin/sh</init> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/'/> + <target dir='/'/> + </filesystem> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/'/> + <target dir='/dev'/> + </filesystem> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/domainconftest.c b/tests/domainconftest.c new file mode 100644 index 0000000..d38ef5c --- /dev/null +++ b/tests/domainconftest.c @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2013 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include "testutils.h" +#include "virerror.h" +#include "viralloc.h" +#include "virlog.h" + +#include "domain_conf.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +static virCapsPtr caps; +static virDomainXMLOptionPtr xmlopt; + +struct testGetFilesystemData { + const char *filename; + const char *path; + bool expectEntry; +}; + +static int testGetFilesystem(const void *opaque) +{ + int ret = -1; + char *xmlData = NULL; + virDomainDefPtr def = NULL; + char *filename = NULL; + const struct testGetFilesystemData *data = opaque; + virDomainFSDefPtr fsdef; + + if (virAsprintf(&filename, "%s/domainconfdata/%s.xml", + abs_srcdir, data->filename) < 0) + goto cleanup; + + if (virtTestLoadFile(filename, &xmlData) < 0) + goto cleanup; + + if (!(def = virDomainDefParseString(xmlData, caps, xmlopt, + 1 << VIR_DOMAIN_VIRT_TEST, 0))) + goto cleanup; + + fsdef = virDomainGetFilesystemForTarget(def, + data->path); + if (!fsdef) { + if (data->expectEntry) { + fprintf(stderr, "Expected FS for path '%s' in '%s'\n", + data->path, filename); + goto cleanup; + } + } else { + if (!data->expectEntry) { + fprintf(stderr, "Unexpected FS for path '%s' in '%s'\n", + data->path, filename); + goto cleanup; + } + } + + ret = 0; + +cleanup: + virDomainDefFree(def); + VIR_FREE(xmlData); + VIR_FREE(filename); + return ret; +} + +static int +mymain(void) +{ + int ret = 0; + + if ((caps = virTestGenericCapsInit()) == NULL) + goto cleanup; + + if (!(xmlopt = virTestGenericDomainXMLConfInit())) + goto cleanup; + +#define DO_TEST_GET_FS(fspath, expect) \ + do { \ + struct testGetFilesystemData data = { \ + .filename = "getfilesystem", \ + .path = fspath, \ + .expectEntry = expect, \ + }; \ + if (virtTestRun("Get FS " fspath, testGetFilesystem, &data) < 0) \ + ret = -1; \ + } while (0) + + DO_TEST_GET_FS("/", true); + DO_TEST_GET_FS("/dev", true); + DO_TEST_GET_FS("/dev/pts", false); + DO_TEST_GET_FS("/doesnotexist", false); + + virObjectUnref(caps); + virObjectUnref(xmlopt); + + cleanup: + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) diff --git a/tests/testutils.c b/tests/testutils.c index 32fe374..ac2a654 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -645,3 +645,60 @@ int virtTestClearLineRegex(const char *pattern, return 0; } + + +virCapsPtr virTestGenericCapsInit(void) +{ + virCapsPtr caps; + virCapsGuestPtr guest; + + if ((caps = virCapabilitiesNew(VIR_ARCH_X86_64, + 0, 0)) == NULL) + return NULL; + + if ((guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_I686, + "/usr/bin/acme-virt", NULL, + 0, NULL)) == NULL) + goto error; + + if (!virCapabilitiesAddGuestDomain(guest, "test", NULL, NULL, 0, NULL)) + goto error; + + + if ((guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_X86_64, + "/usr/bin/acme-virt", NULL, + 0, NULL)) == NULL) + goto error; + + if (!virCapabilitiesAddGuestDomain(guest, "test", NULL, NULL, 0, NULL)) + goto error; + + + if (virTestGetDebug()) { + char *caps_str; + + caps_str = virCapabilitiesFormatXML(caps); + if (!caps_str) + goto error; + + fprintf(stderr, "Generic driver capabilities:\n%s", caps_str); + + VIR_FREE(caps_str); + } + + return caps; + +error: + virObjectUnref(caps); + return NULL; +} + +static virDomainDefParserConfig virTestGenericDomainDefParserConfig; +static virDomainXMLPrivateDataCallbacks virTestGenericPrivateDataCallbacks; + +virDomainXMLOptionPtr virTestGenericDomainXMLConfInit(void) +{ + return virDomainXMLOptionNew(&virTestGenericDomainDefParserConfig, + &virTestGenericPrivateDataCallbacks, + NULL); +} diff --git a/tests/testutils.h b/tests/testutils.h index 674d3df..8d2048b 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -27,6 +27,8 @@ # include "viralloc.h" # include "virfile.h" # include "virstring.h" +# include "capabilities.h" +# include "domain_conf.h" # define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */ # define EXIT_AM_HARDFAIL 99 /* tell Automake that the framework is broken */ @@ -102,4 +104,7 @@ int virtTestMain(int argc, return virtTestMain(argc, argv, func); \ } +virCapsPtr virTestGenericCapsInit(void); +virDomainXMLOptionPtr virTestGenericDomainXMLConfInit(void); + #endif /* __VIT_TEST_UTILS_H__ */ -- 1.8.4.2

2 2