- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: Add more human-friendly output of domblkstat command
by Peter Krempa 29 Aug '11

29 Aug '11

Users of virsh complain that output of the domblkstat command is not intuitive enough. This patch adds explanation of fields returned by this command to the help section for domblkstat and the man page of virsh. Also a switch --human is added for domblkstat that prints the fields with more descriptive texts. https://bugzilla.redhat.com/show_bug.cgi?id=731656 --- tools/virsh.c | 52 +++++++++++++++++++++++++++++++++++++++++----------- tools/virsh.pod | 11 ++++++++++- 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 15b9bdd..41ba1e4 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1054,13 +1054,21 @@ cleanup: */ static const vshCmdInfo info_domblkstat[] = { {"help", N_("get device block stats for a domain")}, - {"desc", N_("Get device block stats for a running domain.")}, + {"desc", N_("Get device block stats for a running domain.\n\n" + " Explanation of fields:\n" + " rd_req - count of read requests\n" + " rd_bytes - count of read bytes\n" + " wr_req - count of write requests\n" + " wr_bytes - count of written bytes\n" + " errs - error count")}, {NULL,NULL} }; static const vshCmdOptDef opts_domblkstat[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"human", VSH_OT_BOOL, 0, N_("print a more human readable output")}, + {NULL, 0, 0, NULL} }; @@ -1070,6 +1078,7 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; const char *name = NULL, *device = NULL; struct _virDomainBlockStats stats; + int humanReadable = vshCommandOptBool(cmd, "human"); if (!vshConnectionUsability (ctl, ctl->conn)) return false; @@ -1088,20 +1097,41 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) return false; } - if (stats.rd_req >= 0) - vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); + if (humanReadable) { + /* human friendly output */ + vshPrint(ctl, N_("Device: %s\n"), device); + + if (stats.rd_req >= 0) + vshPrint (ctl, N_("read request count: %lld\n"), stats.rd_req); + + if (stats.rd_bytes >= 0) + vshPrint (ctl, N_("number of read bytes: %lld\n"), stats.rd_bytes); + + if (stats.wr_req >= 0) + vshPrint (ctl, N_("write request count: %lld\n"), stats.wr_req); - if (stats.rd_bytes >= 0) - vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); + if (stats.wr_bytes >= 0) + vshPrint (ctl, N_("number of written bytes: %lld\n"), stats.wr_bytes); - if (stats.wr_req >= 0) - vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); + if (stats.errs >= 0) + vshPrint (ctl, N_("error count: %lld\n"), stats.errs); + } else { + /* script friendly output */ + if (stats.rd_req >= 0) + vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); + + if (stats.rd_bytes >= 0) + vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); - if (stats.wr_bytes >= 0) - vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); + if (stats.wr_req >= 0) + vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); - if (stats.errs >= 0) - vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + if (stats.wr_bytes >= 0) + vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); + + if (stats.errs >= 0) + vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + } virDomainFree(dom); return true; diff --git a/tools/virsh.pod b/tools/virsh.pod index 81d7a1e..620097d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -419,10 +419,19 @@ the B<shutdown> command instead. However, this does not delete any storage volumes used by the guest, and if the domain is persistent, it can be restarted later. -=item B<domblkstat> I<domain> I<block-device> +=item B<domblkstat> I<domain> I<block-device> [I<--human>] Get device block stats for a running domain. +Use I<--human> for a more human readable output. + +B<Explanation of fields:> + rd_req - count of read requests + rd_bytes - count of read bytes + wr_req - count of write requests + wr_bytes - count of written bytes + errs - error count + =item B<domifstat> I<domain> I<interface-device> Get network interface stats for a running domain. -- 1.7.3.4

1 0

[libvirt] [BUGFIX][PATCH] remove saved garbages after persistent migration
by KAMEZAWA Hiroyuki 28 Aug '11

28 Aug '11

>From e1e8d5ceb4a9f7c59e20dfb8c168b781435c1613 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> Date: Fri, 26 Aug 2011 12:08:11 +0900 Subject: [PATCH] Fix persistent migration config save When a user migrates a domain by command as libvirt saves vm's domain XML config in destination host after migration. But it saves vm->def. Then, the saved XML contains some garbages. <domain type='kvm' id='50'> ^^^^^^^^ ... <console type='pty' tty='/dev/pts/5'> ^^^^^^^^^^^^^^^^^ Avoid saving unnecessary things by saving persistent vm definition. --- src/qemu/qemu_migration.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a38c0d9..524b8bf 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2484,11 +2484,12 @@ qemuMigrationFinish(struct qemud_driver *driver, qemuMigrationVPAssociatePortProfiles(vm->def); if (flags & VIR_MIGRATE_PERSIST_DEST) { + virDomainDefPtr vmdef; if (vm->persistent) newVM = 0; vm->persistent = 1; - - if (virDomainSaveConfig(driver->configDir, vm->def) < 0) { + vmdef = virDomainObjGetPersistentDef(driver->caps, vm); + if (virDomainSaveConfig(driver->configDir, vmdef) < 0) { /* Hmpf. Migration was successful, but making it persistent * was not. If we report successful, then when this domain * shuts down, management tools are in for a surprise. On the -- 1.7.4.1

3 3

[libvirt] ALERT Virtualization Automatic Builder
by berrange＠redhat.com 27 Aug '11

27 Aug '11

Overall status: failed Start date: Sun Aug 28 2011 Start time: 07:05:01 UTC / 03:05:01 EDT Build counter: 1314515101 Build timestamp: 1314515101 URL: http://builder.virt-tools.org/index.html Module: libvirt Status: failed URL: http://builder.virt-tools.org/module-libvirt.html

1 0

[libvirt] [PATCH 0/3] Enable automatic kill of running guests
by Daniel P. Berrange 26 Aug '11

26 Aug '11

I am building an application which uses KVM to run specific tasks, rather than as a general purpose guest OS. I want to ensure that when the app exits, the guest goes away too. To enable this, this series introduces the concept of 'autokill', whereby a guest is forcably destroyed when the virConnectPtr that launched it closes. This also lets us fix a long standing problem with migration leaving an unkillable guest

3 13

[libvirt] [PATCH] maint: fix spelling errors on lose
by Eric Blake 26 Aug '11

26 Aug '11

* docs/drvqemu.html.in: Fix typo. * src/libvirt.c (virDomainCreateXML, virDomainCreateWithFlags): Likewise. --- Pushing under the trivial rule. I lose my sanity when people are too loose with their spelling, resulting in this common typo :) docs/drvqemu.html.in | 2 +- src/libvirt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 038ecc6..4da3817 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -208,7 +208,7 @@ chmod o+x /path/to/directory <p> If the QEMU driver is configured to run virtual machines as non-root, - then they will already loose all their process capabilities at time + then they will already lose all their process capabilities at time of startup. The Linux capability feature is thus aimed primarily at the scenario where the QEMU processes are running as root. In this case, before launching a QEMU virtual machine, libvirtd will use diff --git a/src/libvirt.c b/src/libvirt.c index b8fe1b1..65a099b 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1820,7 +1820,7 @@ virDomainGetConnect (virDomainPtr dom) * If the VIR_DOMAIN_START_AUTODESTROY flag is set, the guest * domain will be automatically destroyed when the virConnectPtr * object is finally released. This will also happen if the - * client application crashes / looses its connection to the + * client application crashes / loses its connection to the * libvirtd daemon. Any domains marked for auto destroy will * block attempts at migration or save-to-file * @@ -7071,7 +7071,7 @@ error: * If the VIR_DOMAIN_START_AUTODESTROY flag is set, the guest * domain will be automatically destroyed when the virConnectPtr * object is finally released. This will also happen if the - * client application crashes / looses its connection to the + * client application crashes / loses its connection to the * libvirtd daemon. Any domains marked for auto destroy will * block attempts at migration or save-to-file * -- 1.7.4.4

1 0

[libvirt] [PATCH] Fix generator to cope with call-by-ref long types
by Jim Fehlig 26 Aug '11

26 Aug '11

From: Matthias Bolte <matthias.bolte(a)googlemail.com> Tested-by: Jim Fehlig <jfehlig(a)novell.com> Matthias provided this patch to fix an issue I encountered in the generator with APIs containing call-by-ref long type, e.g. int virDomainMigrateGetMaxSpeed(virDomainPtr domain, unsigned long *bandwidth, unsigned int flags); --- src/rpc/gendispatch.pl | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 0d344e8..f671ff0 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -640,10 +640,11 @@ elsif ($opt_b) { } elsif ($ret_member =~ m/^(?:unsigned )?hyper (\S+)<\S+>;/) { # error out on unannotated arrays die "hyper array without insert@<offset> annotation: $ret_member"; - } elsif ($ret_member =~ m/^(unsigned )?hyper (\S+);/) { + } elsif ($ret_member =~ m/^(unsigned )?hyper (\S+);(?:\s*\/\*\s*insert@(\d+)\s*\*\/)?/) { my $type_name = $1; my $ret_name = $2; my $ret_assign; + my $insert = $3; if (hyper_to_long($call->{ProcName}, "ret", $ret_name)) { my $sign = ""; $sign = "U" if ($1); @@ -657,7 +658,13 @@ elsif ($opt_b) { push(@vars_list, "$type_name $ret_name"); push(@ret_list, $ret_assign); - $single_ret_var = $ret_name; + + if ($insert) { + splice(@args_list, int($insert), 0, "&$ret_name"); + $single_ret_var = undef; + } else { + $single_ret_var = $ret_name; + } if ($call->{ProcName} eq "DomainGetMaxMemory" or $call->{ProcName} eq "NodeGetFreeMemory") { @@ -1285,6 +1292,24 @@ elsif ($opt_k) { $single_ret_var = "int rv = -1"; $single_ret_type = "int"; + } elsif ($ret_member =~ m/^(unsigned )?hyper (\S+);\s*\/\*\s*insert@(\d+)\s*\*\//) { + my $type_name = $1; + my $sign = ""; $sign = "U" if ($1); + my $ret_name = $2; + my $insert = $3; + + if (hyper_to_long($call->{ProcName}, "ret", $ret_name)) { + $type_name .= "long"; + push(@ret_list, "if ($ret_name) HYPER_TO_${sign}LONG(*$ret_name, ret.$ret_name);"); + } else { + $type_name .= "long long"; + push(@ret_list, "if ($ret_name) *$ret_name = ret.$ret_name;"); + } + + splice(@args_list, int($insert), 0, ("$type_name *$ret_name")); + push(@ret_list, "rv = 0;"); + $single_ret_var = "int rv = -1"; + $single_ret_type = "int"; } elsif ($ret_member =~ m/^unsigned hyper (\S+);/) { my $ret_name = $1; -- 1.7.5.4

2 2

[libvirt] [PATCHv2 0/5] Add basic driver for Microsoft Hyper-V
by Matthias Bolte 26 Aug '11

26 Aug '11

Version 2 of the Hyper-V driver. See the individual patches for the changes from version 1. Complete version 1 can be found here https://www.redhat.com/archives/libvir-list/2011-July/msg00766.html This series adds the basic driver and supports listing and retrieving information about existing domains and their lifecycle management. Matthias

2 19

[libvirt] [PATCH] schedinfo: update man page about virsh schedinfo command
by Taku Izumi 26 Aug '11

26 Aug '11

This patch updates the man page about virsh schedinfo command. - fix typo: 1844674407370955 -> 18446744073709551 - describe the value 0 of vcpu_period and vcpu_quota parameters Signd-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- tools/virsh.pod | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: libvirt/tools/virsh.pod =================================================================== --- libvirt.orig/tools/virsh.pod +++ libvirt/tools/virsh.pod @@ -736,8 +736,9 @@ B<Note>: The weight and cap parameters a XEN_CREDIT scheduler and are now I<DEPRECATED>. B<Note>: The vcpu_period parameter has a valid value range of 1000-1000000 or -0, and the vcpu_quota parameter has a valid value range of 1000-1844674407370955 -or less than 0. +0, and the vcpu_quota parameter has a valid value range of 1000-18446744073709551 +or less than 0. The value 0 for each parameters means no value, so it is +meaningless to specify 0 (Nothing happens). =item B<screenshot> I<domain-id> [I<imagefilepath>] [I<--screen> B<screenID>]

2 1

[libvirt] [PATCH] rpc: Don't close connection if program is unknown
by Jiri Denemark 26 Aug '11

26 Aug '11

In case we add a new program in the future (we did that in the past and we are going to do it again soon) current daemon will behave badly with new client that wants to use the new program. Before the RPC rewrite we used to just sent an error reply to any request with unknown program. With the RPC rewrite in 0.9.3 the daemon just closes the connection through which such request was sent. This patch fixes this regression. --- src/rpc/virnetserver.c | 18 +++++++++--------- src/rpc/virnetserverprogram.c | 36 ++++++++++++++++++++++++++++++------ src/rpc/virnetserverprogram.h | 4 ++++ 3 files changed, 43 insertions(+), 15 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 1a49dbb..fd8781d 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -143,10 +143,12 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque) } if (!prog) { - VIR_DEBUG("Cannot find program %d version %d", - job->msg->header.prog, - job->msg->header.vers); - goto error; + if (virNetServerProgramUnknownError(job->client, + job->msg, + &job->msg->header) < 0) + goto error; + else + goto cleanup; } virNetServerProgramRef(prog); @@ -159,20 +161,18 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque) goto error; virNetServerLock(srv); + +cleanup: virNetServerProgramFree(prog); virNetServerUnlock(srv); virNetServerClientFree(job->client); - VIR_FREE(job); return; error: - virNetServerUnlock(srv); - virNetServerProgramFree(prog); virNetMessageFree(job->msg); virNetServerClientClose(job->client); - virNetServerClientFree(job->client); - VIR_FREE(job); + goto cleanup; } diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index ca80ae0..ac3f0fd 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -110,7 +110,8 @@ static virNetServerProgramProcPtr virNetServerProgramGetProc(virNetServerProgram static int -virNetServerProgramSendError(virNetServerProgramPtr prog, +virNetServerProgramSendError(unsigned program, + unsigned version, virNetServerClientPtr client, virNetMessagePtr msg, virNetMessageErrorPtr rerr, @@ -119,13 +120,13 @@ virNetServerProgramSendError(virNetServerProgramPtr prog, int serial) { VIR_DEBUG("prog=%d ver=%d proc=%d type=%d serial=%d msg=%p rerr=%p", - prog->program, prog->version, procedure, type, serial, msg, rerr); + program, version, procedure, type, serial, msg, rerr); virNetMessageSaveError(rerr); /* Return header. */ - msg->header.prog = prog->program; - msg->header.vers = prog->version; + msg->header.prog = program; + msg->header.vers = version; msg->header.proc = procedure; msg->header.type = type; msg->header.serial = serial; @@ -170,7 +171,8 @@ virNetServerProgramSendReplyError(virNetServerProgramPtr prog, * For data streams, errors are sent back as data streams * For method calls, errors are sent back as method replies */ - return virNetServerProgramSendError(prog, + return virNetServerProgramSendError(prog->program, + prog->version, client, msg, rerr, @@ -187,7 +189,8 @@ int virNetServerProgramSendStreamError(virNetServerProgramPtr prog, int procedure, int serial) { - return virNetServerProgramSendError(prog, + return virNetServerProgramSendError(prog->program, + prog->version, client, msg, rerr, @@ -197,6 +200,27 @@ int virNetServerProgramSendStreamError(virNetServerProgramPtr prog, } +int virNetServerProgramUnknownError(virNetServerClientPtr client, + virNetMessagePtr msg, + virNetMessageHeaderPtr req) +{ + virNetMessageError rerr; + + virNetError(VIR_ERR_RPC, + _("Cannot find program %d version %d"), req->prog, req->vers); + + memset(&rerr, 0, sizeof(rerr)); + return virNetServerProgramSendError(req->prog, + req->vers, + client, + msg, + &rerr, + req->proc, + VIR_NET_REPLY, + req->serial); +} + + static int virNetServerProgramDispatchCall(virNetServerProgramPtr prog, virNetServerPtr server, diff --git a/src/rpc/virnetserverprogram.h b/src/rpc/virnetserverprogram.h index ca31b7e..06b16d7 100644 --- a/src/rpc/virnetserverprogram.h +++ b/src/rpc/virnetserverprogram.h @@ -86,6 +86,10 @@ int virNetServerProgramSendStreamError(virNetServerProgramPtr prog, int procedure, int serial); +int virNetServerProgramUnknownError(virNetServerClientPtr client, + virNetMessagePtr msg, + virNetMessageHeaderPtr req); + int virNetServerProgramSendStreamData(virNetServerProgramPtr prog, virNetServerClientPtr client, virNetMessagePtr msg, -- 1.7.6.1

2 2

[libvirt] [PATCH 0/3 TCK] Some tests for snapshot management
by Daniel P. Berrange 26 Aug '11

26 Aug '11

All these tests fail with current GIT, but are intended to work with Eric's snapshot series applied. The first test in this list, however, does not pass. Eric's current tree forbids calling 'Destroy' on a transient guest which has snapshots present. IMHO this is wrong, because the guest may itself exit at any time, which leaves us in the same state as is 'Destroy' had been called wrt snapshots. IMHO, we should be allowed to call 'virDomainDestroy' on a transient guest with snapshots, and then later 'virDomainCreateXML' to re-create the guest and still have access to the snapshots In other words, just because a transient guest is not currently present, does not mean we should forget about its snapshots as a management app can re-create it again at any time. Forbidding virDomainUndefine with snapshots is more reasonable, but I think its still possible to argue that it should be allowed and that a later virDomainDefine with the same name+uuid should resurrect any previous snapshots.

2 10