- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: use keepalive protocol in virsh for migration
by Guannan Ren 04 Jun '12

04 Jun '12

Bugzilla:https://bugzilla.redhat.com/show_bug.cgi?id=822839 For non-p2p migration, if the network is down in the process of migrate, The virsh client will hang up for a fair long time. The patch will add keepalive into virsh to determine the status of network connection with remote libvirtd, aboring migration job after 30 seconds later since disconnection. --- tools/virsh.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 5226bd8..9099328 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -414,13 +414,14 @@ typedef struct __vshCtrlData { vshControl *ctl; const vshCmd *cmd; int writefd; + virConnectPtr dconn; } vshCtrlData; typedef void (*jobWatchTimeoutFunc) (vshControl *ctl, virDomainPtr dom, void *opaque); static bool -vshWatchJob(vshControl *ctl, +vshWatchJob(vshCtrlData *data, virDomainPtr dom, bool verbose, int pipe_fd, @@ -3277,6 +3278,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.cmd = cmd; data.writefd = p[1]; + data.dconn = NULL; if (virThreadCreate(&workerThread, true, @@ -3284,7 +3286,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) &data) < 0) goto cleanup; - ret = vshWatchJob(ctl, dom, verbose, p[0], 0, NULL, NULL, _("Save")); + ret = vshWatchJob(&data, dom, verbose, p[0], 0, NULL, NULL, _("Save")); virThreadJoin(&workerThread); @@ -3584,6 +3586,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.cmd = cmd; data.writefd = p[1]; + data.dconn = NULL; if (virThreadCreate(&workerThread, true, @@ -3591,7 +3594,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) &data) < 0) goto cleanup; - ret = vshWatchJob(ctl, dom, verbose, p[0], 0, + ret = vshWatchJob(&data, dom, verbose, p[0], 0, NULL, NULL, _("Managedsave")); virThreadJoin(&workerThread); @@ -4062,6 +4065,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.cmd = cmd; data.writefd = p[1]; + data.dconn = NULL; if (virThreadCreate(&workerThread, true, @@ -4069,7 +4073,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) &data) < 0) goto cleanup; - ret = vshWatchJob(ctl, dom, verbose, p[0], 0, NULL, NULL, _("Dump")); + ret = vshWatchJob(&data, dom, verbose, p[0], 0, NULL, NULL, _("Dump")); virThreadJoin(&workerThread); @@ -7189,6 +7193,10 @@ doMigrate (void *opaque) dconn = virConnectOpenAuth (desturi, virConnectAuthPtrDefault, 0); if (!dconn) goto out; + data->dconn = dconn; + if (virConnectSetKeepAlive(dconn, 5, 5) < 0) + vshDebug(ctl, VSH_ERR_WARNING, "migrate: Failed to start keepalive\n"); + ddom = virDomainMigrate2(dom, dconn, xml, flags, dname, migrateuri, 0); if (ddom) { virDomainFree(ddom); @@ -7244,7 +7252,7 @@ vshMigrationTimeout(vshControl *ctl, } static bool -vshWatchJob(vshControl *ctl, +vshWatchJob(vshCtrlData *data, virDomainPtr dom, bool verbose, int pipe_fd, @@ -7262,6 +7270,7 @@ vshWatchJob(vshControl *ctl, char retchar; bool functionReturn = false; sigset_t sigmask, oldsigmask; + vshControl *ctl = data->ctl; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); @@ -7305,6 +7314,13 @@ repoll: goto cleanup; } + if (data->dconn && virConnectIsAlive(data->dconn) <= 0) { + virDomainAbortJob(dom); + vshError(ctl, "%s", + _("Lost connection to destination host")); + goto cleanup; + } + GETTIMEOFDAY(&curr); if (timeout && (((int)(curr.tv_sec - start.tv_sec) * 1000 + (int)(curr.tv_usec - start.tv_usec) / 1000) > @@ -7378,13 +7394,14 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.cmd = cmd; data.writefd = p[1]; + data.dconn = NULL; if (virThreadCreate(&workerThread, true, doMigrate, &data) < 0) goto cleanup; - functionReturn = vshWatchJob(ctl, dom, verbose, p[0], timeout, + functionReturn = vshWatchJob(&data, dom, verbose, p[0], timeout, vshMigrationTimeout, NULL, _("Migration")); virThreadJoin(&workerThread); -- 1.7.7.5

2 3

[libvirt] [PATCH] syntax-check: Don't check virsh.c for preprocessor indentation
by Michal Privoznik 04 Jun '12

04 Jun '12

With recent re-edit commits we have #define and #include not indented as it ought to be from preprocessor POV. However, these are part of a function, therefore they are indented well. To solve this, skip preprocessor indentation check on virsh.c --- cfg.mk | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/cfg.mk b/cfg.mk index 5d38137..0153024 100644 --- a/cfg.mk +++ b/cfg.mk @@ -830,3 +830,6 @@ exclude_file_name_regexp--sc_unmarked_diagnostics = \ ^(docs/apibuild.py|tests/virt-aa-helper-test)$$ exclude_file_name_regexp--sc_size_of_brackets = cfg.mk + +exclude_file_name_regexp--sc_preprocessor_indentation = \ + ^tools/virsh.c$$ -- 1.7.8.5

2 1

[libvirt] [libvirt-glib] API to get/set domain title
by Zeeshan Ali (Khattak) 04 Jun '12

04 Jun '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain.c | 33 ++++++++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.h | 2 ++ libvirt-gconfig/libvirt-gconfig.sym | 2 ++ 3 files changed, 37 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 7477400..d5a676a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -39,6 +39,7 @@ G_DEFINE_TYPE(GVirConfigDomain, gvir_config_domain, GVIR_CONFIG_TYPE_OBJECT); enum { PROP_0, PROP_NAME, + PROP_TITLE, PROP_DESCRIPTION, PROP_MEMORY, PROP_VCPU, @@ -56,6 +57,9 @@ static void gvir_config_domain_get_property(GObject *object, case PROP_NAME: g_value_set_string(value, gvir_config_domain_get_name(domain)); break; + case PROP_TITLE: + g_value_set_string(value, gvir_config_domain_get_title(domain)); + break; case PROP_DESCRIPTION: g_value_set_string(value, gvir_config_domain_get_description(domain)); break; @@ -85,6 +89,9 @@ static void gvir_config_domain_set_property(GObject *object, case PROP_NAME: gvir_config_domain_set_name(domain, g_value_get_string(value)); break; + case PROP_TITLE: + gvir_config_domain_set_title(domain, g_value_get_string(value)); + break; case PROP_DESCRIPTION: gvir_config_domain_set_description(domain, g_value_get_string(value)); break; @@ -121,6 +128,14 @@ static void gvir_config_domain_class_init(GVirConfigDomainClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property(object_class, + PROP_TITLE, + g_param_spec_string("title", + "Title", + "A short description - title - of the domain", + NULL, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(object_class, PROP_DESCRIPTION, g_param_spec_string("description", "Description", @@ -216,6 +231,12 @@ const char *gvir_config_domain_get_name(GVirConfigDomain *domain) "name"); } +const char *gvir_config_domain_get_title(GVirConfigDomain *domain) +{ + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(domain), + "title"); +} + /** * gvir_config_domain_set_name: * @domain: a #GVirConfigDomain @@ -228,6 +249,18 @@ void gvir_config_domain_set_name(GVirConfigDomain *domain, const char *name) g_object_notify(G_OBJECT(domain), "name"); } +/** + * gvir_config_domain_set_title: + * @domain: a #GVirConfigDomain + * @title: (allow-none): + */ +void gvir_config_domain_set_title(GVirConfigDomain *domain, const char *title) +{ + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(domain), + "title", title); + g_object_notify(G_OBJECT(domain), "title"); +} + const char *gvir_config_domain_get_description(GVirConfigDomain *domain) { return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(domain), diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index 5deb58e..af8b86a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -120,6 +120,8 @@ void gvir_config_domain_set_os(GVirConfigDomain *domain, GVirConfigDomainOs *os); void gvir_config_domain_set_seclabel(GVirConfigDomain *domain, GVirConfigDomainSeclabel *seclabel); +const char *gvir_config_domain_get_title(GVirConfigDomain *domain); +void gvir_config_domain_set_title(GVirConfigDomain *domain, const char *title); void gvir_config_domain_set_devices(GVirConfigDomain *domain, GList *devices); void gvir_config_domain_add_device(GVirConfigDomain *domain, diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 10057a8..761a96b 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -377,6 +377,8 @@ LIBVIRT_GCONFIG_0.0.8 { LIBVIRT_GCONFIG_0.0.9 { global: gvir_config_domain_get_os; + gvir_config_domain_get_title; + gvir_config_domain_set_title; gvir_config_domain_get_virt_type; gvir_config_domain_os_get_arch; -- 1.7.10.2

2 1

[libvirt] [PATCH] Fixes for check and rpm builds without sanlock (and qemu)
by Martin Kletzander 04 Jun '12

04 Jun '12

Apart from the non-sanlock check build, there is also a little fix for qemu (EXTRA_DIST had qemu.conf and others inside even if the build was supposed to be without qemu). --- libvirt.spec.in | 5 +++++ src/Makefile.am | 6 +++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index d4e43f6..3c544f1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1232,6 +1232,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug %endif %find_lang %{name} +%if ! %{with_sanlock} +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug +%endif + %if ! %{with_lxc} rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug diff --git a/src/Makefile.am b/src/Makefile.am index 23747d7..e56a8ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -785,9 +785,9 @@ augeas_DATA += qemu/libvirtd_qemu.aug augeastest_DATA += qemu/test_libvirtd_qemu.aug CLEANFILES += qemu/test_libvirtd_qemu.aug -endif EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \ qemu/test_libvirtd_qemu.aug.in qemu/THREADS.txt +endif if WITH_LXC @@ -1147,6 +1147,7 @@ else check-augeas-lxc: endif +if HAVE_SANLOCK test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ locking/qemu-sanlock.conf $(AUG_GENTEST) $(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ @@ -1155,6 +1156,9 @@ check-augeas-sanlock: test_libvirt_sanlock.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \ fi +else +check-augeas-sanlock: +endif # # Build our version script. This is composed of three parts: -- 1.7.8.6

3 10

[libvirt] [PATCH] fix sync issue in virnetclientstream
by Radu Caragea 04 Jun '12

04 Jun '12

Hello, I have come across a synchronization issue in virnetclientstream.c The stream lock is unlocked twice instead of being locked and then unlocked. Probably a typo. Best regards, Radu Caragea

2 1

[libvirt] can't get right capabilities
by Li Zhang 04 Jun '12

04 Jun '12

Hi, I am trying to use x86 machine to create VMs. But one error occurs. [root@mcd kvm-test]# virsh create test.xml error: Failed to create domain from test.xml error: unknown OS type hvm My xml file is as the following: <domain type='kvm'> <name>test</name> <memory>524288</memory> <memorybacking> <hugepages/> </memorybacking> <vcpu>2</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> </os> <features> <acpi/> </features> <clock offset='utc'/> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk' > <driver name='qemu' type='raw'/> <source file='/home/zhlbj/kvm-test/disk1'/> <target dev='sda' bus='scsi'/> </disk> <interface type='bridge'> <source bridge='virbr0'/> <mac address='52:54:00:19:bc:0c'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <memballoon model="none"/> </devices> </domain> I check kvm module, it is available. [root@mcd kvm-test]# lsmod |grep kvm kvm_intel 119308 4 kvm 344876 1 kvm_intel But I tried the capabilities, it is not right. There is no guest capabilities. <capabilities> <host> <uuid>d4ff0166-0f8b-e111-ab17-78a277034000</uuid> <cpu> <arch>x86_64</arch> <model>Nehalem</model> <vendor>Intel</vendor> <topology sockets='1' cores='4' threads='1'/> <feature name='rdtscp'/> <feature name='avx'/> <feature name='osxsave'/> <feature name='xsave'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> <feature name='pdcm'/> <feature name='xtpr'/> <feature name='tm2'/> <feature name='est'/> <feature name='smx'/> <feature name='vmx'/> <feature name='ds_cpl'/> <feature name='monitor'/> <feature name='dtes64'/> <feature name='pclmuldq'/> <feature name='pbe'/> <feature name='tm'/> <feature name='ht'/> <feature name='ss'/> <feature name='acpi'/> <feature name='ds'/> <feature name='vme'/> </cpu> <power_management> <suspend_mem/> <suspend_disk/> <suspend_hybrid/> </power_management> <migration_features> <live/> <uri_transports> <uri_transport>tcp</uri_transport> </uri_transports> </migration_features> <secmodel> <model>selinux</model> <doi>0</doi> </secmodel> </host> </capabilities> This problem occurs some times. When I tried to find this problem, it didn't occur. Now it occurs again. It's a little strange. Is there anything I miss? -- Best Regards Li IBM LTC, China System&Technology Lab, Beijing

4 6

[libvirt] [PATCH v3 0/2] Make virsh *edit more bearable
by Michal Privoznik 02 Jun '12

02 Jun '12

If there's an error in XML, all changes made by user are lost. Users (read /me) tends to get angry with this. Allow them to get back and re-edit. diff to v2: -some bugfixes (like flawn in snapshot edit) -new EDIT_FREE to avoid leaks (Both suggested by Eric) diff to v1: -Eric's review suggestions included Michal Privoznik (2): virsh: Switch from generated cmd*Edit commands to nongenerated virsh: Allow users to reedit rejected XML cfg.mk | 4 +- po/POTFILES.in | 1 + tools/Makefile.am | 40 +---- tools/console.c | 40 +++-- tools/console.h | 2 + tools/virsh-edit.c | 148 +++++++++++++++ tools/virsh.c | 509 +++++++++++++++++++++++----------------------------- 7 files changed, 407 insertions(+), 337 deletions(-) create mode 100644 tools/virsh-edit.c -- 1.7.8.5

2 5

[libvirt] [PATCH] qemu: Move -name arg to be the 1st so it's visible in "ps x"
by Marti Raudsepp 01 Jun '12

01 Jun '12

Hi list, Currently, monitoring QEMU virtual machines with standard Unix sysadmin tools is harder than it has to be. The QEMU command line is often miles long and mostly redundant, it's hard to tell which process is which. This patch reorders the QEMU -name argument to be the first, so it's immediately visible in "ps x", htop and "atop -c" output. Patch attached and also available from my github fork (master @ git://github.com/intgr/libvirt.git) Regards, Marti

2 3

[libvirt] [PATCH] qemu: fix netdev alias name assignment wrt type='hostdev'
by Laine Stump 01 Jun '12

01 Jun '12

This patch resolves: https://bugzilla.redhat.com/show_bug.cgi?id=827519 The problem is that an interface with type='hostdev' will have an alias of the form "hostdev%d", while the function that looks through existing netdevs to determine the name to use for a new addition will fail if there's an existing entry that does not match the form "net%d". This is another of the handful of places that need an exception due to the hybrid nature of <interface type='hostdev'> (which is not exactly an <interface> or a <hostdev>, but is both at the same time). --- src/qemu/qemu_command.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9f99dce..1a240fb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -548,6 +548,11 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx) idx = 0; for (i = 0 ; i < def->nnets ; i++) { int thisidx; + + if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) { + /* type='hostdev' interfaces have a hostdev%d alias */ + continue; + } if ((thisidx = qemuDomainDeviceAliasIndex(&def->nets[i]->info, "net")) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to determine device index for network device")); -- 1.7.10.2

2 1

Re: [libvirt] hello:about libvirt collectd monitor plugin
by Richard W.M. Jones 01 Jun '12

01 Jun '12

On Fri, Jun 01, 2012 at 04:36:17PM +0800, xingxing gao wrote: > hi,rjones: > i am using libvirt and qemu-kvm on rhel,in these days i need to > monitor the vm's performance on my computer,and i've found the > wonderful tool---collectd and the lovely plugin for libvirt,but i > found that the libvirt plugin seems didnot collect the memory info of > the vm,so i ask you for help,thanks!!!^^ The libvirt collectd plugin predates support for memory statistics. Therefore it would need to be extended to add this feature. Patches for this best sent to the collectd project. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org

2 1