- Devel - libvirt List Archives

[libvirt] [PATCH] Fix memory leak in virDomainSnapshotDiskDefClear()
by Nehal J Wani 04 Mar '14

04 Mar '14

While running domainsnapshotxml2xmltest, it was found that valgrind pointed out the following memory leaks: ==32176== 42 (32 direct, 10 indirect) bytes in 1 blocks are definitely lost in loss record 42 of 66 ==32176== at 0x4A069EE: malloc (vg_replace_malloc.c:270) ==32176== by 0x4A06B62: realloc (vg_replace_malloc.c:662) ==32176== by 0x4C65A07: virReallocN (viralloc.c:243) ==32176== by 0x4C65B2E: virExpandN (viralloc.c:292) ==32176== by 0x4C65E30: virInsertElementsN (viralloc.c:434) ==32176== by 0x4CD71F3: virDomainDiskSourceDefParse (domain_conf.c:5078) ==32176== by 0x4CF6EF4: virDomainSnapshotDefParseNode (snapshot_conf.c:151) ==32176== by 0x4CF7314: virDomainSnapshotDefParseString (snapshot_conf.c:410) ==32176== by 0x41FB8D: testCompareXMLToXMLHelper (domainsnapshotxml2xmltest.c:100) ==32176== by 0x420FD1: virtTestRun (testutils.c:199) ==32176== by 0x41F859: mymain (domainsnapshotxml2xmltest.c:222) ==32176== by 0x42174D: virtTestMain (testutils.c:782) ==32176== ==32176== 128 (96 direct, 32 indirect) bytes in 1 blocks are definitely lost in loss record 51 of 66 ==32176== at 0x4A06BE0: realloc (vg_replace_malloc.c:662) ==32176== by 0x4C65A07: virReallocN (viralloc.c:243) ==32176== by 0x4C65B2E: virExpandN (viralloc.c:292) ==32176== by 0x4C65E30: virInsertElementsN (viralloc.c:434) ==32176== by 0x4CD71F3: virDomainDiskSourceDefParse (domain_conf.c:5078) ==32176== by 0x4CF6EF4: virDomainSnapshotDefParseNode (snapshot_conf.c:151) ==32176== by 0x4CF7314: virDomainSnapshotDefParseString (snapshot_conf.c:410) ==32176== by 0x41FB8D: testCompareXMLToXMLHelper (domainsnapshotxml2xmltest.c:100) ==32176== by 0x420FD1: virtTestRun (testutils.c:199) ==32176== by 0x41F859: mymain (domainsnapshotxml2xmltest.c:222) ==32176== by 0x42174D: virtTestMain (testutils.c:782) ==32176== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==32176== --- src/conf/snapshot_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 12b0930..475525f 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -82,6 +82,7 @@ virDomainSnapshotDiskDefClear(virDomainSnapshotDiskDefPtr disk) { VIR_FREE(disk->name); VIR_FREE(disk->file); + virDomainDiskHostDefFree(disk->nhosts, disk->hosts); } void virDomainSnapshotDefFree(virDomainSnapshotDefPtr def) -- 1.7.1

3 4

[libvirt] [PATCH v2 0/5] AppArmor support for lxc containers
by Cédric Bosdonnat 04 Mar '14

04 Mar '14

This is a repost of the previous patch series, with the following changes: * Dropped the patch setting "none" security driver as default in lxc.conf * Add a patch to implement support for "none" type with apparmor security model. Cédric Bosdonnat (5): LXC driver: generate apparmor profiles for guests Make sure apparmor is started before libvirtd apparmor: add debug traces when changing profile. add support for apparmor in lxc-enter-namespace apparmor: handle "none" type 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/security/security_apparmor.c | 24 +++++++++++--- src/security/virt-aa-helper.c | 69 +++++++++++++++++++++++++++++----------- 7 files changed, 103 insertions(+), 25 deletions(-) create mode 100644 examples/apparmor/libvirt-lxc -- 1.8.5.2

2 11

[libvirt] [PATCH] qemu: monitor: Fix error message and comment when getting cpu info
by Peter Krempa 04 Mar '14

04 Mar '14

In qemuMonitorJSONExtractCPUInfo an error message hinted on missing character device data which is wrong. Also a comment states that only qemu-kvm tree includes the thread_id field. This is no longer true. --- src/qemu/qemu_monitor_json.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5e825ac..9a5b812 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1220,13 +1220,13 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, int thread; if (!entry) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("character device information was missing array element")); + _("cpu information was missing an array element")); goto cleanup; } if (virJSONValueObjectGetNumberInt(entry, "thread_id", &thread) < 0) { - /* Only qemu-kvm tree includs thread_id, so treat this as - non-fatal, simply returning no data */ + /* Some older qemu versions don't report the thread_id, + * so treat this as non-fatal, simply returning no data */ ret = 0; goto cleanup; } -- 1.9.0

2 2

[libvirt] [PATCH] qemu: snapshot: Use better check when reverting external snapshots
by Peter Krempa 04 Mar '14

04 Mar '14

https://bugzilla.redhat.com/show_bug.cgi?id=1071264 Reverting of external snapshots is not supported currently. The check that is present doesn't properly check for all aspects that make a snapshot external. Use virDomainSnapshotIsExternal() to do the check. --- src/qemu/qemu_driver.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e04a328..4fbcb27 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13921,12 +13921,13 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, "to revert to inactive snapshot")); goto cleanup; } - if (snap->def->state == VIR_DOMAIN_DISK_SNAPSHOT) { + + if (virDomainSnapshotIsExternal(snap)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("revert to external disk snapshot not supported " - "yet")); + _("revert to external snapshot not supported yet")); goto cleanup; } + if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_FORCE)) { if (!snap->def->dom) { virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, -- 1.9.0

2 2

[libvirt] [PATCH] qemuBuildNicDevStr: Adapt to new advisory on multiqueue
by Michal Privoznik 04 Mar '14

04 Mar '14

As I did previously in 4f588a1b46, libvirt needs to set virtio vectors. Previously, we were advised to use vectors=N, where N = 2 * (number of queues) + 1 However, just recently this advisory has changed on the Multiquue wiki page [1] to: N = 2 * (number of queues) + 2 1: http://www.linux-kvm.org/page/Multiqueue#Enable_MQ_feature Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Notes: I've had some discussion with qemu developers that qemu is the best place to compute sane default [1]. And they agreed with me. However, until they will do so, libvirt should pass the correct value to make the whole feature work correctly. 1: https://bugzilla.redhat.com/show_bug.cgi?id=1005626 src/qemu/qemu_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ff0b2d5..18d0a64 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5036,8 +5036,8 @@ qemuBuildNicDevStr(virDomainDefPtr def, } if (usingVirtio && vhostfdSize > 1) { /* As advised at http://www.linux-kvm.org/page/Multiqueue - * we should add vectors=2*N+1 where N is the vhostfdSize */ - virBufferAsprintf(&buf, ",mq=on,vectors=%d", 2 * vhostfdSize + 1); + * we should add vectors=2*N+2 where N is the vhostfdSize */ + virBufferAsprintf(&buf, ",mq=on,vectors=%d", 2 * vhostfdSize + 2); } if (vlan == -1) virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias); -- 1.9.0

2 1

[libvirt] [PATCHv2 0/2] Check if systemd is the init before creating machines
by Ján Tomko 04 Mar '14

04 Mar '14

v1: https://www.redhat.com/archives/libvir-list/2014-February/msg01662.html v2: check if systemd1 is registered in ListNames instead of reading /proc/1/comm actually pass 'make check' in all three cases: * no systemd * systemd installed * systemd running Ján Tomko (2): Split out most of virDBusIsServiceEnabled Check if systemd is running before creating machines src/util/virdbus.c | 47 +++++++++++++++++++++++++++++++++++++---------- src/util/virdbus.h | 1 + src/util/virsystemd.c | 6 ++++++ tests/virsystemdmock.c | 24 +++++++++++++++++++++++- tests/virsystemdtest.c | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 104 insertions(+), 11 deletions(-) -- 1.8.3.2

2 6

[libvirt] [PATCH] Don't always skip virportallocatortest
by Ján Tomko 04 Mar '14

04 Mar '14

Include dlfcn.h before checking if RTLD_NEXT is defined --- tests/virportallocatortest.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 5a93dad..fd48c11 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -23,8 +23,11 @@ #include "virfile.h" #include "testutils.h" -#if HAVE_DLFCN_H && defined(RTLD_NEXT) +#if HAVE_DLFCN_H +# include <dlfcn.h> +#endif +#if defined(RTLD_NEXT) # ifdef MOCK_HELPER # include "internal.h" # include <sys/socket.h> @@ -32,7 +35,6 @@ # include <arpa/inet.h> # include <netinet/in.h> # include <stdio.h> -# include <dlfcn.h> static bool host_has_ipv6 = false; static int (*realsocket)(int domain, int type, int protocol); @@ -265,7 +267,7 @@ mymain(void) VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libvirportallocatormock.so") # endif -#else /* ! HAVE_DLFCN_H */ +#else /* ! defined(RTLD_NEXT) */ int main(void) { -- 1.8.3.2

2 2

[libvirt] [PCTCH v2 0/2] fix query-command-line-options
by Amos Kong 04 Mar '14

04 Mar '14

This patchset fixed some issues of query-command-line-options: * some new options haven't arguments can't be queried. (eg: -enable-fips) * some legcy options have arguments can't be queried. (eg: -vnc display) More discussion: http://marc.info/?l=qemu-devel&m=139081830416684&w=2 V2: remove duplicate option tables, update schema Amos Kong (2): qmp: rename query_option_descs() to get_param_infolist() query-command-line-options: query all the options in qemu-options.hx qapi-schema.json | 8 ++++++-- util/qemu-config.c | 58 +++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 55 insertions(+), 11 deletions(-) -- 1.8.5.3

2 5

[libvirt] Libvirt Java Bindings - adding domain event support - pull request
by Chris Ellis 03 Mar '14

03 Mar '14

Hi all I'm new to this list, I've been making use of the Libvirt Java bindings recently. I wanted to make use of domain events yesterday so my application can be alerted when the state of a domain changes etc. However I quickly discovered that domain events are completely broken in the current Java bindings. Whilst some of the Libvirt functions required to support domain events are exposed, the critical underpinnings are not. Specifically there is no support for setting up the event loop. So I have implemented support for domain events in the Java bindings. Currently I've only implemented the following domain event IDs: * VIR_DOMAIN_EVENT_ID_LIFECYCLE * VIR_DOMAIN_EVENT_ID_REBOOT * VIR_DOMAIN_EVENT_ID_RTC_CHANGE Implementing these is enough to test that my implementation is sane, I'm hoping to implement the majority of the other events soon. Events can be listened to by, registering via the Connect object, as follows: con.domainEventRegisterAny(DomainEventID.VIR_DOMAIN_EVENT_ID_LIFECYCLE, new DomainLifecycleEventHandler() { @Override public void onStarted(Connect connection, Domain domain, DomainEventType event, DomainEventStartedDetailType detail) throws LibvirtException { System.out.println("Got start event: " + event + "::" + detail + " for domain " + domain.getName()); } }); I've put my clone of the libvirt-java git repository on Github, my modifications to the Java binding are in a separate branch and should be simple to merge. The changes can be viewed at: https://github.com/intrbiz/libvirt-java/compare/master...ce-domain-events I'm keen to get these enhancements / fixes merged into libvirt-java. I would also like to submit further fixes to race conditions in the free() handling. Any advice / thoughts / comments welcome. Regards, Chris Ellis

4 4

[libvirt] Build failed in Jenkins: libvirt-syntax-check #2035
by Jenkins CI 03 Mar '14

03 Mar '14

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/2035/> ------------------------------------------ Started by upstream project "libvirt-build" build number 2286 Building on master in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson2145980330175113322.sh + make syntax-check GEN bracket-spacing-check GFDL_version 0.53 GFDL_version TAB_in_indentation 0.37 TAB_in_indentation Wundef_boolean 0.21 Wundef_boolean avoid_attribute_unused_in_header 0.25 avoid_attribute_unused_in_header avoid_ctype_macros 0.62 avoid_ctype_macros avoid_if_before_free 4.83 avoid_if_before_free avoid_strcase 0.63 avoid_strcase avoid_write 0.31 avoid_write bindtextdomain 0.30 bindtextdomain cast_of_argument_to_free 0.54 cast_of_argument_to_free cast_of_x_alloc_return_value 0.55 cast_of_x_alloc_return_value changelog 0.31 changelog const_long_option 0.58 const_long_option copyright_check 0.81 copyright_check copyright_format 1.60 copyright_format copyright_usage 1.65 copyright_usage correct_id_types 0.67 correct_id_types error_message_period 0.53 error_message_period error_message_warn_fatal 0.52 error_message_warn_fatal flags_debug 1.11 flags_debug flags_usage 1.04 flags_usage forbid_const_pointer_typedef 1.12 forbid_const_pointer_typedef libvirt_unmarked_diagnostics 1.59 libvirt_unmarked_diagnostics m4_quote_check 0.25 m4_quote_check makefile_TAB_only_indentation 0.22 makefile_TAB_only_indentation makefile_at_at_check 0.20 makefile_at_at_check makefile_conditionals 0.21 makefile_conditionals po_check 15.16 po_check preprocessor_indentation cppi: src/nwfilter/nwfilter_dhcpsnoop.c: line 272: not properly indented maint.mk: incorrect preprocessor indentation make: *** [sc_preprocessor_indentation] Error 1 Build step 'Execute shell' marked build as failure

2 2

Re: [libvirt] Compiling libvirt RPC client library for QNX
by Panday Ritesh Sharma (rpanday) 03 Mar '14

03 Mar '14

On 25/02/14 9:18 PM, "Panday Ritesh Sharma (rpanday)" <rpanday(a)cisco.com> wrote: >Hi Roman, >Sorry !!! I did not understand "Once again, please don't top-post on >technical lists." > >I should not include 'libvirt-list(a)redhat.com' in my mail thread ? > >I have already used the option '--without-libvirtd' and hence the result. > >We are using a wrapper of make for compilation for QNX. So I need to know, >when I am compiling this client library on linux with '--without-libvirtd' >option, what all .c files and libraries are being used. Then I will take >those .c files to my build environment and link that to the libraries >needed. I will have to see whether those libraries are present in my QNX >build environment. Please helpŠ > > >Regards >Ritesh Sharma > > >On 25/02/14 8:57 PM, "Eric Blake" <eblake(a)redhat.com> wrote: > >>On 02/25/2014 08:10 AM, Panday Ritesh Sharma (rpanday) wrote: >> >>Once again, please don't top-post on technical lists. >> >>> Hi Eric, >>> I used the option '--without-macvtap' and I was able to compile on my >>> linux box. When I compiled, I see many libraries are getting built. But >>>as >>> I have explained my requirement earlier, I just need a RPC client >>>library, >>> essentially the option '--with-remote'. >> >>To build just the client library, use ./configure --without-libvirtd. >> >>> >>> If I check .c files I see only './src/libvirt.c' and './tools/virsh.c' >>>are >>> the two files where '# ifdef WITH_REMOTE' is present. >>> >>> Does it mean that as per my requirement I only need to compile these >>>files? >> >>No. You must unpack the ENTIRE tarball, and then use the configure >>options to control which files are built. Some of the logic on what to >>build is in the makefiles, and another consideration is that there are a >>LOT of library files that are used in both libvirt.so (your client >>library) and in libvirtd (the daemon executable that you are not >>building). >> >>> >>> My intent is to have a library with minimal files which suffice to my >>> requirement. Because that way it will be easier for me to compile them >>>on >>> QNX. >> >>Using configure options to compile fewer files is reasonable. Omitting >>files from the tarball is not. >> >>> >>> You have mentioned on another thread that in a weeks time some new >>>version >>> of libvirt will come which we can compile for non-linux machines ? What >>> change is coming in that version ? The latest version of libvirt can >>>not >>> be compiled for QNX ? >> >>The latest version is currently 1.2.1, but 1.2.2-rc0 was just announced >>and 1.2.2 is expected next week if all goes well. If you could test >>1.2.2-rc0 on QNX, we can still fix issues that you turn up before 1.2.2 >>goes stable. >> >> >>-- >>Eric Blake eblake redhat com +1-919-301-3266 >>Libvirt virtualization library http://libvirt.org Adding [libvirt-list] Hi Eric, This time I am writing a the bottom of this thread, is this correct ? Write way of mailing ? Could you please reply my query ? Regards Ritesh Sharma >> >

3 8

[libvirt] [PATCH 0/3] nwfilter: Fix some issues in DHCP Snooping code
by Stefan Berger 03 Mar '14

03 Mar '14

The following 3 patches fix some issues in the DHCP Snooping code. Stefan Berger (3): nwfilter: Cap the poll timeout in the DHCP Snooping code nwfilter: Display the pcap errror message nwfilter: Increase buffer size for libpcap src/nwfilter/nwfilter_dhcpsnoop.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) -- 1.8.1.4

2 8

[libvirt] [PATCH] dnsmasq: allowing RFC 2782 compliant srv records
by Steven Malin 03 Mar '14

03 Mar '14

Hello, I want to provide a patch which allows RFC 2782 compliant dns srv records in the network configs. If you have questions, please contact me. Kind Regards, Steven Malin --- src/conf/network_conf.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index bac0465..9a4285b 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -961,9 +961,11 @@ virNetworkDNSSrvDefParseXML(const char *networkName, goto error; } - /* Check whether protocol value is the supported one */ + /* Check whether protocol value is supported (also RFC 2782 compliant) */ if (def->protocol && STRNEQ(def->protocol, "tcp") && - (STRNEQ(def->protocol, "udp"))) { + STRNEQ(def->protocol, "udp") && + STRNEQ(def->protocol, "_tcp") && + STRNEQ(def->protocol, "_udp")) { virReportError(VIR_ERR_XML_DETAIL, _("Invalid protocol attribute value '%s' " "in DNS SRV record of network %s"), -- 1.7.1

2 1

[libvirt] [PATCH] qemu: Implement a stub cpuArchDriver.baseline() handler for arm
by Oleg Strikov 03 Mar '14

03 Mar '14

Openstack Nova calls virConnectBaselineCPU() during initialization of the instance to get a full list of CPU features. This patch adds a stub to arm-specific code to handle this request (no actual work is done). Signed-off-by: Oleg Strikov <oleg.strikov(a)canonical.com> --- This is a port of the following aarch64-specific change: http://libvirt.org/git/?p=libvirt.git;a=commit;h=69fba97f631c26a322bf9f2949… Only function names were changed. --- src/cpu/cpu_arm.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 5baff42..ec80b35 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -86,6 +86,29 @@ ArmGuestData(virCPUDefPtr host ATTRIBUTE_UNUSED, return VIR_CPU_COMPARE_IDENTICAL; } +static virCPUDefPtr +ArmBaseline(virCPUDefPtr *cpus, + unsigned int ncpus ATTRIBUTE_UNUSED, + const char **models ATTRIBUTE_UNUSED, + unsigned int nmodels ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virCPUDefPtr cpu = NULL; + + virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, NULL); + + if (VIR_ALLOC(cpu) < 0 || + VIR_STRDUP(cpu->model, cpus[0]->model) < 0) { + virCPUDefFree(cpu); + return NULL; + } + + cpu->type = VIR_CPU_TYPE_GUEST; + cpu->match = VIR_CPU_MATCH_EXACT; + + return cpu; +} + struct cpuArchDriver cpuDriverArm = { .name = "arm", .arch = archs, @@ -96,7 +119,7 @@ struct cpuArchDriver cpuDriverArm = { .free = ArmDataFree, .nodeData = ArmNodeData, .guestData = ArmGuestData, - .baseline = NULL, + .baseline = ArmBaseline, .update = ArmUpdate, .hasFeature = NULL, }; -- 1.7.9.5

2 1

Re: [libvirt] [PATCH 4/4] qemu: add unit tests for the capabilities xml
by Francesco Romani 03 Mar '14

03 Mar '14

----- Original Message ----- > From: "Eric Blake" <eblake(a)redhat.com> > To: "Francesco Romani" <fromani(a)redhat.com>, libvir-list(a)redhat.com > Sent: Friday, February 28, 2014 12:49:25 AM > Subject: Re: [libvirt] [PATCH 4/4] qemu: add unit tests for the capabilities xml > > On 01/17/2014 08:31 AM, Francesco Romani wrote: > > the test is loosely inspired from qemucapabilitiestest > > and qemuxml2xmltest. > > > > Added a new test instead of extending an existing one because > > the feature being tested don't really fits nicely in any > > s/don't/doesn't/ s/fits/fit/ Will fix. > > existing place. > > --- > > .gitignore | 1 + > > tests/Makefile.am | 10 +- > > tests/qemucaps2xmldata/all_1.6.0-1.caps | 142 ++++++++++++++ > > tests/qemucaps2xmldata/all_1.6.0-1.xml | 51 +++++ > > tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 141 +++++++++++++ > > tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml | 51 +++++ > > tests/qemucaps2xmltest.c | 217 > > +++++++++++++++++++++ > > 7 files changed, 612 insertions(+), 1 deletion(-) > > create mode 100644 tests/qemucaps2xmldata/all_1.6.0-1.caps > > create mode 100644 tests/qemucaps2xmldata/all_1.6.0-1.xml > > create mode 100644 tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps > > create mode 100644 tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml > > create mode 100644 tests/qemucaps2xmltest.c > > Fails 'make check' for me: > > $ make -C tests check TESTS=qemucaps2xmltest \ > VERBOSE=yes VIR_TEST_DEBUG=1 > ... > > TEST: qemucaps2xmltest > 1) all_1.6.0-1 ... > Offset 393 > Expect [6</machine> > <machine>none</machine> > <machine canonical='pc-i440fx-1.6'>pc</machine> > <machine>pc-i440fx-1.5</machine> > <machine>pc-i440fx-1.4</machine> > ... > Actual [7</machine> > <machine>none</machine> > <machine canonical='pc-i440fx-1.7'>pc</machine> > <machine>pc-i440fx-1.6</machine> > <machine>pc-i440fx-1.5</machine> > > which means you wrote the test by probing the installed qemu, instead of > our testsuite helper binary, and my installed qemu 1.7 differs from your > setup of 1.6. That has to be fixed before this can be applied. Yes, I have qemu 1.6.1 in my test box, this is probably the reason why I haven't noticed this misbehaviour before. This is a point I wanted to discuss because I'm not sure how to properly achieve this. Please see below for my questions on this topic. > > > +++ b/tests/qemucaps2xmltest.c > > @@ -0,0 +1,217 @@ > > +/* > > > + > > + virQEMUCapsCacheAdd(cache, "kvm", qemuCaps); > > + virQEMUCapsCacheAdd(cache, "qemu", qemuCaps); > > + virQEMUCapsCacheAdd(cache, "qemu-system-x86_64", qemuCaps); > > + virQEMUCapsCacheAdd(cache, "qemu-system-i386", qemuCaps); > > + virQEMUCapsCacheAdd(cache, "/usr/bin/qemu-system-x86_64", qemuCaps); > > + virQEMUCapsCacheAdd(cache, "/usr/bin/qemu-system-i386", qemuCaps); > > Is this where the testsuite ended up probing the installed file system > instead of using only data from the testsuite? Yes, it is. What I want to achieve here is to pre-fill the capabilities cache, by using the function I exported in a previous patch on this series, with the test data. The intent is of course to use only the data from the testsuite and to be independent from the installed QEMU, if any, as you pointed out above. I tried a few different attempts but looks like I'm still missing the point. How can I improve this test to achieve this objective? There is an unit-test I can learn from? Any advice is welcome, I want to fix this. Thanks for the review and best regards, -- Francesco Romani RedHat Engineering Virtualization R & D Phone: 8261328 IRC: fromani

1 0

[libvirt] [PATCH] docs: typo fix
by Roman Bogorodskiy 03 Mar '14

03 Mar '14

* drvuml.html.in: (connected) s/toa PTY/to a PTY/ --- docs/drvuml.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/drvuml.html.in b/docs/drvuml.html.in index fe7769d..03c04ef 100644 --- a/docs/drvuml.html.in +++ b/docs/drvuml.html.in @@ -65,7 +65,7 @@ uml+ssh://root@example.com/system (remote access, SSH tunnelled) </p> <p> - Once booted the primary console is connected toa PTY, and + Once booted the primary console is connected to a PTY, and thus accessible with "virsh console" or equivalent tools </p> -- 1.8.4.2

2 2

[libvirt] [PATCHv2 0/2] Add virusbtest
by Ján Tomko 03 Mar '14

03 Mar '14

v1: https://www.redhat.com/archives/libvir-list/2014-February/msg01620.html v2: Split the mocked part into a separate file and only build the test on Linux. Remove 'serial' files. Get out of testDeviceFind earlier if failure is expected and use a switch. Switches are nice. Check number of returned devices more often in testUSBList, not just at the end. Ján Tomko (2): Add tests for virUSBDeviceFind functions Add a test for virUSBDeviceList functions .gitignore | 1 + cfg.mk | 3 +- tests/Makefile.am | 22 ++ tests/virusbmock.c | 99 +++++++ tests/virusbtest.c | 292 +++++++++++++++++++++ .../sys_bus_usb/devices/1-1.5.3.1/devnum | 1 + .../sys_bus_usb/devices/1-1.5.3.1/idProduct | 1 + .../sys_bus_usb/devices/1-1.5.3.1/idVendor | 1 + .../sys_bus_usb/devices/1-1.5.3.3/devnum | 1 + .../sys_bus_usb/devices/1-1.5.3.3/idProduct | 1 + .../sys_bus_usb/devices/1-1.5.3.3/idVendor | 1 + .../sys_bus_usb/devices/1-1.5.3/devnum | 1 + .../sys_bus_usb/devices/1-1.5.3/idProduct | 1 + .../sys_bus_usb/devices/1-1.5.3/idVendor | 1 + .../sys_bus_usb/devices/1-1.5.4/devnum | 1 + .../sys_bus_usb/devices/1-1.5.4/idProduct | 1 + .../sys_bus_usb/devices/1-1.5.4/idVendor | 1 + .../sys_bus_usb/devices/1-1.5.5/devnum | 1 + .../sys_bus_usb/devices/1-1.5.5/idProduct | 1 + .../sys_bus_usb/devices/1-1.5.5/idVendor | 1 + .../sys_bus_usb/devices/1-1.5.6/devnum | 1 + .../sys_bus_usb/devices/1-1.5.6/idProduct | 1 + .../sys_bus_usb/devices/1-1.5.6/idVendor | 1 + .../sys_bus_usb/devices/1-1.5/devnum | 1 + .../sys_bus_usb/devices/1-1.5/idProduct | 1 + .../sys_bus_usb/devices/1-1.5/idVendor | 1 + .../sys_bus_usb/devices/1-1.6/devnum | 1 + .../sys_bus_usb/devices/1-1.6/idProduct | 1 + .../sys_bus_usb/devices/1-1.6/idVendor | 1 + .../virusbtestdata/sys_bus_usb/devices/1-1/devnum | 1 + .../sys_bus_usb/devices/1-1/idProduct | 1 + .../sys_bus_usb/devices/1-1/idVendor | 1 + .../sys_bus_usb/devices/2-1.2/devnum | 1 + .../sys_bus_usb/devices/2-1.2/idProduct | 1 + .../sys_bus_usb/devices/2-1.2/idVendor | 1 + .../virusbtestdata/sys_bus_usb/devices/2-1/devnum | 1 + .../sys_bus_usb/devices/2-1/idProduct | 1 + .../sys_bus_usb/devices/2-1/idVendor | 1 + .../virusbtestdata/sys_bus_usb/devices/usb1/devnum | 1 + .../sys_bus_usb/devices/usb1/idProduct | 1 + .../sys_bus_usb/devices/usb1/idVendor | 1 + .../virusbtestdata/sys_bus_usb/devices/usb2/devnum | 1 + .../sys_bus_usb/devices/usb2/idProduct | 1 + .../sys_bus_usb/devices/usb2/idVendor | 1 + .../virusbtestdata/sys_bus_usb/devices/usb3/devnum | 1 + .../sys_bus_usb/devices/usb3/idProduct | 1 + .../sys_bus_usb/devices/usb3/idVendor | 1 + .../virusbtestdata/sys_bus_usb/devices/usb4/devnum | 1 + .../sys_bus_usb/devices/usb4/idProduct | 1 + .../sys_bus_usb/devices/usb4/idVendor | 1 + 50 files changed, 461 insertions(+), 1 deletion(-) create mode 100644 tests/virusbmock.c create mode 100644 tests/virusbtest.c create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.6/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.6/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.6/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1.2/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1.2/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1.2/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb1/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb1/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb1/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb2/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb2/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb2/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb3/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb3/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb3/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb4/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb4/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb4/idVendor -- 1.8.3.2

2 4

[libvirt] [PATCH] Fix indentation in virsystemdmock
by Ján Tomko 03 Mar '14

03 Mar '14

--- Pushed as trivial. tests/virsystemdmock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virsystemdmock.c b/tests/virsystemdmock.c index b3b82b4..0295231 100644 --- a/tests/virsystemdmock.c +++ b/tests/virsystemdmock.c @@ -92,7 +92,7 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio "s", &sub); if (!dbus_message_iter_append_basic(&sub, - DBUS_TYPE_STRING, + DBUS_TYPE_STRING, &svc1)) goto error; if (!getenv("FAIL_NO_SERVICE") && -- 1.8.3.2

1 0

[libvirt] [PATCH] Replace space with a tab in the Makefile
by Ján Tomko 03 Mar '14

03 Mar '14

All the other test_programs in the section use tabs and virportallocatortest sticks out with tab width other than 8. --- Pushed as trivial. tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1b752b2..cd91734 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -143,7 +143,7 @@ test_programs = virshtest sockettest \ virlockspacetest \ virlogtest \ virstringtest \ - virportallocatortest \ + virportallocatortest \ sysinfotest \ virstoragetest \ virnetdevbandwidthtest \ -- 1.8.3.2

1 0

[libvirt] [PATCH] Check if systemd is the init before creating machines
by Ján Tomko 03 Mar '14

03 Mar '14

If systemd is installed, but not the init system, systemd-machined fails with an unhelpful error message: Launch helper exited with unknown return code 1 Fall back to manual cgroup creation if systemd is installed, but it's not PID 1. [1] https://bugs.freedesktop.org/show_bug.cgi?id=69962 --- (Yes, Gentoo.) src/util/virsystemd.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 8adf209..0404a63 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -30,6 +30,7 @@ #include "virstring.h" #include "viralloc.h" #include "virutil.h" +#include "virfile.h" #include "virlog.h" #include "virerror.h" @@ -142,6 +143,28 @@ cleanup: return machinename; } +/* + * Returns 0 if systemd is the init, -2 if not + * -1 on fatal error + */ +static int +virSystemdIsInit(void) +{ + char *buf = NULL; + int ret = -2; + + if (virFileReadAll("/proc/1/comm", sizeof("systemd\n "), &buf) < 0) + return -1; + + if (STREQ(buf, "systemd\n")) + ret = 0; + else + VIR_DEBUG("systemd is not the init"); + + VIR_FREE(buf); + return ret; +} + /** * virSystemdCreateMachine: * @name: driver unique name of the machine @@ -173,6 +196,9 @@ int virSystemdCreateMachine(const char *name, if (ret < 0) return ret; + if ((ret = virSystemdIsInit()) < 0) + return ret; + if (!(conn = virDBusGetSystemBus())) return -1; -- 1.8.3.2

2 6

[libvirt] [PATCH] Bump version to 1.2.3 for new dev cycle
by Michal Privoznik 03 Mar '14

03 Mar '14

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f30ac76..a9339ce 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.2], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.3], [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]) -- 1.9.0

2 2

[libvirt] [PATCH] bhyve: add basic documentation
by Roman Bogorodskiy 01 Mar '14

01 Mar '14

--- docs/drivers.html.in | 1 + docs/drvbhyve.html.in | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ docs/index.html.in | 3 ++ docs/sitemap.html.in | 4 +++ src/README | 1 + 5 files changed, 92 insertions(+) create mode 100644 docs/drvbhyve.html.in diff --git a/docs/drivers.html.in b/docs/drivers.html.in index 7aa44f3..a1d4240 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -33,6 +33,7 @@ <li><strong><a href="drvhyperv.html">Microsoft Hyper-V</a></strong></li> <li><strong><a href="drvphyp.html">IBM PowerVM (phyp)</a></strong></li> <li><strong><a href="drvparallels.html">Parallels</a></strong></li> + <li><strong><a href="drvbhyve.html">Bhyve</a></strong> - The BSD Hypervisor</li> </ul> <h2><a name="storage">Storage drivers</a></h2> diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in new file mode 100644 index 0000000..5733cc2 --- /dev/null +++ b/docs/drvbhyve.html.in @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>Bhyve driver</h1> + + <ul id="toc"></ul> + +<p> +Bhyve is a FreeBSD hypervisor. It first appeared in FreeBSD 10.0. However, it's +recommended to keep tracking FreeBSD 10-STABLE to make sure all new features +of bhyve are supported. + +In order to enable bhyve on your FreeBSD host, you'll need to load <code>vmm</code> +kernel module. Additionally, <code>if_tap</code> and <code>if_bridge</code> modules +should be loaded for networking support. +</p> + +<p> +Additional information on bhyve could be obtained on <a href="http://bhyve.org/">bhyve.org</a>. +</p> + +<h2><a name="uri">Connections to the Bhyve driver</a></h2> +<p> +The libvirt bhyve driver is a single-instance privileged driver. Some sample +connection URIs are: +</p> + +<pre> +bhyve:///system (local access) +bhyve+unix:///system (local access) +bhyve+ssh://root@example.com/system (remote access, SSH tunnelled) +</pre> + +<h2><a name="exconfig">Example guest domain XML configurations</a></h2> + +<h3>Example config</h3> +<p> +Bhyve driver in libvirt is in its early stage and under active development. So it supports +only limited number of features bhyve provides. All the supported features could be found +in this sample domain XML. +</p> + +<p> +A limitation that is not obvious from this sample domain XML is that currently it's only +single network and single disk device are supported for each domain (as PCI slot allocation code +in libvirt bhyve driver yet to be implemented). +</p> + +<pre> +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <features> + <apic/> + <acpi/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/path/to/bhyve_freebsd.img'/> + <target dev='hda' bus='sata'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + </interface> + </devices> +</domain> +</pre> + + </body> +</html> diff --git a/docs/index.html.in b/docs/index.html.in index 16bd6d5..c94f444 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -75,6 +75,9 @@ The <a href="http://libvirt.org/drvparallels.html">Parallels</a> hypervisor </li> <li> + The <a href="http://libvirt.org/drvbhyve.html">Bhyve</a> hypervisor + </li> + <li> Virtual networks using bridging, NAT, VEPA and VN-LINK. </li> <li> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 7d0610b..78e84e3 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -248,6 +248,10 @@ <a href="drvparallels.html">Parallels</a> <span>Driver for Parallels Cloud Server</span> </li> + <li> + <a href="drvbhyve.html">Bhyve</a> + <span>Driver for bhyve</span> + </li> </ul> </li> <li> diff --git a/src/README b/src/README index 00d11d1..bb3cddf 100644 --- a/src/README +++ b/src/README @@ -25,6 +25,7 @@ There are two core shared modules to be aware of: Then there are the hypervisor implementations: + * bhyve - bhyve - The BSD Hypervisor * esx/ - VMware ESX and GSX support using vSphere API over SOAP * hyperv/ - Microsoft Hyper-V support using WinRM * lxc/ - Linux Native Containers -- 1.8.4.2

2 2

[libvirt] [PATCH] bhyve: defined domains should be persistent
by Roman Bogorodskiy 01 Mar '14

01 Mar '14

--- src/bhyve/bhyve_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 23fab90..9dbb299 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -335,6 +335,7 @@ bhyveDomainDefineXML(virConnectPtr conn, const char *xml) 0, &oldDef))) goto cleanup; def = NULL; + vm->persistent = 1; dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) -- 1.8.4.2

2 2

[libvirt] [PATCH] virsh: support remaining domain events
by Eric Blake 28 Feb '14

28 Feb '14

Earlier, I added 'virsh event' for lifecycle events, to get the concept approved; this patch finishes the support for all other events, although the user still has to register for one event type at a time. A future patch may add an --all parameter to make it possible to register for all events through a single call. * tools/virsh-domain.c (vshDomainEventWatchdogToString) (vshDomainEventIOErrorToString, vshGraphicsPhaseToString) (vshGraphicsAddressToString, vshDomainBlockJobStatusToString) (vshDomainEventDiskChangeToString) (vshDomainEventTrayChangeToString, vshEventGenericPrint) (vshEventRTCChangePrint, vshEventWatchdogPrint) (vshEventIOErrorPrint, vshEventGraphicsPrint) (vshEventIOErrorReasonPrint, vshEventBlockJobPrint) (vshEventDiskChangePrint, vshEventTrayChangePrint) (vshEventPMChangePrint, vshEventBalloonChangePrint) (vshEventDeviceRemovedPrint): New helper routines. (cmdEvent): Support full array of event callbacks. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/virsh-domain.c | 392 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 381 insertions(+), 11 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 8e42300..3cffc9c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10434,18 +10434,135 @@ vshDomainEventDetailToString(int event, int detail) return str ? _(str) : _("unknown"); } +VIR_ENUM_DECL(vshDomainEventWatchdog) +VIR_ENUM_IMPL(vshDomainEventWatchdog, + VIR_DOMAIN_EVENT_WATCHDOG_LAST, + N_("none"), + N_("pause"), + N_("reset"), + N_("poweroff"), + N_("shutdown"), + N_("debug")) + +static const char * +vshDomainEventWatchdogToString(int action) +{ + const char *str = vshDomainEventWatchdogTypeToString(action); + return str ? _(str) : _("unknown"); +} + +VIR_ENUM_DECL(vshDomainEventIOError) +VIR_ENUM_IMPL(vshDomainEventIOError, + VIR_DOMAIN_EVENT_IO_ERROR_LAST, + N_("none"), + N_("pause"), + N_("report")) + +static const char * +vshDomainEventIOErrorToString(int action) +{ + const char *str = vshDomainEventIOErrorTypeToString(action); + return str ? _(str) : _("unknown"); +} + +VIR_ENUM_DECL(vshGraphicsPhase) +VIR_ENUM_IMPL(vshGraphicsPhase, + VIR_DOMAIN_EVENT_GRAPHICS_LAST, + N_("connect"), + N_("initialize"), + N_("disconnect")) + +static const char * +vshGraphicsPhaseToString(int phase) +{ + const char *str = vshGraphicsPhaseTypeToString(phase); + return str ? _(str) : _("unknown"); +} + +VIR_ENUM_DECL(vshGraphicsAddress) +VIR_ENUM_IMPL(vshGraphicsAddress, + VIR_DOMAIN_EVENT_GRAPHICS_ADDRESS_LAST, + N_("IPv4"), + N_("IPv6"), + N_("unix")) + +static const char * +vshGraphicsAddressToString(int family) +{ + const char *str = vshGraphicsAddressTypeToString(family); + return str ? _(str) : _("unknown"); +} + +VIR_ENUM_DECL(vshDomainBlockJobStatus) +VIR_ENUM_IMPL(vshDomainBlockJobStatus, + VIR_DOMAIN_BLOCK_JOB_LAST, + N_("completed"), + N_("failed"), + N_("canceled"), + N_("ready")) + +static const char * +vshDomainBlockJobStatusToString(int status) +{ + const char *str = vshDomainBlockJobStatusTypeToString(status); + return str ? _(str) : _("unknown"); +} + +VIR_ENUM_DECL(vshDomainEventDiskChange) +VIR_ENUM_IMPL(vshDomainEventDiskChange, + VIR_DOMAIN_EVENT_DISK_CHANGE_LAST, + N_("changed"), + N_("dropped")) + +static const char * +vshDomainEventDiskChangeToString(int reason) +{ + const char *str = vshDomainEventDiskChangeTypeToString(reason); + return str ? _(str) : _("unknown"); +} + +VIR_ENUM_DECL(vshDomainEventTrayChange) +VIR_ENUM_IMPL(vshDomainEventTrayChange, + VIR_DOMAIN_EVENT_TRAY_CHANGE_LAST, + N_("opened"), + N_("closed")) + +static const char * +vshDomainEventTrayChangeToString(int reason) +{ + const char *str = vshDomainEventTrayChangeTypeToString(reason); + return str ? _(str) : _("unknown"); +} + +struct vshEventCallback { + const char *name; + virConnectDomainEventGenericCallback cb; +}; +typedef struct vshEventCallback vshEventCallback; + struct vshDomEventData { vshControl *ctl; bool loop; int count; + vshEventCallback *cb; }; typedef struct vshDomEventData vshDomEventData; -/* FIXME: Support all callbacks, not just lifecycle */ -VIR_ENUM_DECL(vshDomainEventId) -VIR_ENUM_IMPL(vshDomainEventId, - /* VIR_DOMAIN_EVENT_ID_LAST, */ 1, - "lifecycle") +static void +vshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + void *opaque) +{ + vshDomEventData *data = opaque; + + if (!data->loop && data->count) + return; + vshPrint(data->ctl, _("event '%s' for domain %s\n"), + data->cb->name, virDomainGetName(dom)); + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} static void vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -10466,6 +10583,257 @@ vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, vshEventDone(data->ctl); } +static void +vshEventRTCChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + long long utcoffset, + void *opaque) +{ + vshDomEventData *data = opaque; + + if (!data->loop && data->count) + return; + vshPrint(data->ctl, _("event 'rtc-change' for domain %s: %lld\n"), + virDomainGetName(dom), utcoffset); + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static void +vshEventWatchdogPrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int action, + void *opaque) +{ + vshDomEventData *data = opaque; + + if (!data->loop && data->count) + return; + vshPrint(data->ctl, _("event 'watchdog' for domain %s: %s\n"), + virDomainGetName(dom), vshDomainEventWatchdogToString(action)); + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static void +vshEventIOErrorPrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *srcPath, + const char *devAlias, + int action, + void *opaque) +{ + vshDomEventData *data = opaque; + + if (!data->loop && data->count) + return; + vshPrint(data->ctl, _("event 'io-error' for domain %s: %s (%s) %s\n"), + virDomainGetName(dom), srcPath, devAlias, + vshDomainEventIOErrorToString(action)); + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static void +vshEventGraphicsPrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int phase, + const virDomainEventGraphicsAddress *local, + const virDomainEventGraphicsAddress *remote, + const char *authScheme, + const virDomainEventGraphicsSubject *subject, + void *opaque) +{ + vshDomEventData *data = opaque; + size_t i; + + if (!data->loop && data->count) + return; + vshPrint(data->ctl, _("event 'graphics' for domain %s: " + "%s local[%s %s %s] remote[%s %s %s] %s"), + virDomainGetName(dom), vshGraphicsPhaseToString(phase), + vshGraphicsAddressToString(local->family), + local->node, local->service, + vshGraphicsAddressToString(remote->family), + remote->node, remote->service, + authScheme); + for (i = 0; i < subject->nidentity; i++) + vshPrint(data->ctl, " %s=%s", subject->identities[i].type, + subject->identities[i].name); + vshPrint(data->ctl, "\n"); + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static void +vshEventIOErrorReasonPrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *srcPath, + const char *devAlias, + int action, + const char *reason, + void *opaque) +{ + vshDomEventData *data = opaque; + + if (!data->loop && data->count) + return; + vshPrint(data->ctl, _("event 'io-error-reason' for domain %s: " + "%s (%s) %s due to %s\n"), + virDomainGetName(dom), srcPath, devAlias, + vshDomainEventIOErrorToString(action), reason); + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static void +vshEventBlockJobPrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *disk, + int type, + int status, + void *opaque) +{ + vshDomEventData *data = opaque; + + if (!data->loop && data->count) + return; + vshPrint(data->ctl, _("event 'block-job' for domain %s: %s for %s %s\n"), + virDomainGetName(dom), vshDomainBlockJobToString(type), + disk, vshDomainBlockJobStatusToString(status)); + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static void +vshEventDiskChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *oldSrc, + const char *newSrc, + const char *alias, + int reason, + void *opaque) +{ + vshDomEventData *data = opaque; + + if (!data->loop && data->count) + return; + vshPrint(data->ctl, + _("event 'disk-change' for domain %s disk %s: %s -> %s: %s\n"), + virDomainGetName(dom), alias, NULLSTR(oldSrc), NULLSTR(newSrc), + vshDomainEventDiskChangeToString(reason)); + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static void +vshEventTrayChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *alias, + int reason, + void *opaque) +{ + vshDomEventData *data = opaque; + + if (!data->loop && data->count) + return; + vshPrint(data->ctl, + _("event 'disk-change' for domain %s disk %s: %s\n"), + virDomainGetName(dom), alias, + vshDomainEventTrayChangeToString(reason)); + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static void +vshEventPMChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int reason ATTRIBUTE_UNUSED, + void *opaque) +{ + /* As long as libvirt.h doesn't define any reasons, we might as + * well treat all PM state changes as generic events. */ + vshEventGenericPrint(conn, dom, opaque); +} + +static void +vshEventBalloonChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + unsigned long long actual, + void *opaque) +{ + vshDomEventData *data = opaque; + + if (!data->loop && data->count) + return; + vshPrint(data->ctl, + _("event 'balloon-change' for domain %s: %lluKiB\n"), + virDomainGetName(dom), actual); + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static void +vshEventDeviceRemovedPrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *alias, + void *opaque) +{ + vshDomEventData *data = opaque; + + if (!data->loop && data->count) + return; + vshPrint(data->ctl, + _("event 'device-removed' for domain %s: %s\n"), + virDomainGetName(dom), alias); + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static vshEventCallback vshEventCallbacks[] = { + { "lifecycle", + VIR_DOMAIN_EVENT_CALLBACK(vshEventLifecyclePrint), }, + { "reboot", vshEventGenericPrint, }, + { "rtc-change", + VIR_DOMAIN_EVENT_CALLBACK(vshEventRTCChangePrint), }, + { "watchdog", + VIR_DOMAIN_EVENT_CALLBACK(vshEventWatchdogPrint), }, + { "io-error", + VIR_DOMAIN_EVENT_CALLBACK(vshEventIOErrorPrint), }, + { "graphics", + VIR_DOMAIN_EVENT_CALLBACK(vshEventGraphicsPrint), }, + { "io-error-reason", + VIR_DOMAIN_EVENT_CALLBACK(vshEventIOErrorReasonPrint), }, + { "control-error", vshEventGenericPrint, }, + { "block-job", + VIR_DOMAIN_EVENT_CALLBACK(vshEventBlockJobPrint), }, + { "disk-change", + VIR_DOMAIN_EVENT_CALLBACK(vshEventDiskChangePrint), }, + { "tray-change", + VIR_DOMAIN_EVENT_CALLBACK(vshEventTrayChangePrint), }, + { "pm-wakeup", + VIR_DOMAIN_EVENT_CALLBACK(vshEventPMChangePrint), }, + { "pm-suspend", + VIR_DOMAIN_EVENT_CALLBACK(vshEventPMChangePrint), }, + { "balloon-change", + VIR_DOMAIN_EVENT_CALLBACK(vshEventBalloonChangePrint), }, + { "pm-suspend-disk", + VIR_DOMAIN_EVENT_CALLBACK(vshEventPMChangePrint), }, + { "device-removed", + VIR_DOMAIN_EVENT_CALLBACK(vshEventDeviceRemovedPrint), }, +}; +verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); + static const vshCmdInfo info_event[] = { {.name = "event", .data = N_("Domain Events") @@ -10512,10 +10880,8 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) int event; if (vshCommandOptBool(cmd, "list")) { - size_t i; - - for (i = 0; i < 1 /* VIR_DOMAIN_EVENT_ID_LAST */; i++) - vshPrint(ctl, "%s\n", vshDomainEventIdTypeToString(i)); + for (event = 0; event < VIR_DOMAIN_EVENT_ID_LAST; event++) + vshPrint(ctl, "%s\n", vshEventCallbacks[event].name); return true; } @@ -10525,7 +10891,10 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) vshError(ctl, "%s", _("either --list or event type is required")); return false; } - if ((event = vshDomainEventIdTypeFromString(eventName) < 0)) { + for (event = 0; event < VIR_DOMAIN_EVENT_ID_LAST; event++) + if (STREQ(eventName, vshEventCallbacks[event].name)) + break; + if (event == VIR_DOMAIN_EVENT_ID_LAST) { vshError(ctl, _("unknown event type %s"), eventName); return false; } @@ -10533,6 +10902,7 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.loop = vshCommandOptBool(cmd, "loop"); data.count = 0; + data.cb = &vshEventCallbacks[event]; if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) return false; @@ -10542,7 +10912,7 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) goto cleanup; if ((eventId = virConnectDomainEventRegisterAny(ctl->conn, dom, event, - VIR_DOMAIN_EVENT_CALLBACK(vshEventLifecyclePrint), + data.cb->cb, &data, NULL)) < 0) goto cleanup; switch (vshEventWait(ctl)) { -- 1.8.5.3

2 4

[libvirt] KVM Domain memory and disk usage
by Qiang Fu 28 Feb '14

28 Feb '14

Hi all, I am trying to use virsh to get the memory and storage usage for KVM domain. Right now we can get domain memory statistics through the following virsh cmds: 1. dumpxml: this returns "memory" and "currentMemory" 2. dominfo: this returns "Max memory" and "Used memory" 3. dommemstat: this returns "actual" and "rss" We think "memory" (from dumpxml) = "Max memory" (from dominfo) and "currentMemory" (from dumpxml) = "Used memory" (from dominfo). Can anyone please help us to confirm this? We don't understand what does "actual" stand for in dommemstat. Can anyone please explain us about that? Finally, we want to get the memory utilization of the domain on VM level in percentage. And we derive it as: Utilization = rss / Used memory Can anyone please provide any comment on this? In terms of disk usage, it seems virsh / libvirt does not support any domain disk information right now. If not, can anyone please give us any idea how to get the domain disk information (size, used space and so on)? Thanks a lot, Bruce

3 5