From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 8 Mar 2011 10:41:48 +0000 (+0000)
Subject: docs: Fix documentation for virt-top -c option.
X-Git-Tag: 1.0.6~6
X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=commitdiff_plain;h=ad0221b4eed02049674ca4584fa4c585f0f3203f;ds=sidebyside

docs: Fix documentation for virt-top -c option.

Because of changes in libvirt, this no longer connects to Xen by
default.  Instead the default is to connect to the libvirt default
hypervisor (which could be Xen, KVM or others).  Update the --help
documentation and manual page accordingly.
---

diff --git a/virt-top/virt-top.pod b/virt-top/virt-top.pod
index d479b63..225c5ea 100755
--- a/virt-top/virt-top.pod
+++ b/virt-top/virt-top.pod
@@ -43,16 +43,21 @@ Batch mode.  In this mode keypresses are ignored.
 
 =item B<-c uri> or B<--connect uri>
 
-Connect to URI given.  The default is to connect to the Xen
-hypervisor.
+Connect to the libvirt URI given.
 
 To connect to QEMU/KVM you would normally do I<-c qemu:///system>
 
+To connect to Xen on the same host, do I<-c xen:///>
+
 To connect to libvirtd on a remote machine you would normally do
-I<-c xen://host/>
+I<-c qemu://host/system>
+
+If this option is not given then virt-top connects by default
+to whatever is the default hypervisor for libvirt, although
+this can be overridden by setting environment variables.
 
-Full details on connection URIs is available at
-L<http://libvirt.org/uri.html>
+See the libvirt documentation at L<http://libvirt.org/uri.html>
+for further information.
 
 =item B<-d delay>
 
diff --git a/virt-top/virt_top.ml b/virt-top/virt_top.ml
index cb50ca0..ef5ac67 100644
--- a/virt-top/virt_top.ml
+++ b/virt-top/virt_top.ml
@@ -172,9 +172,9 @@ let start_up () =
     "-b", Arg.Set batch_mode,
       " " ^ s_"Batch mode";
     "-c", Arg.String set_uri,
-      "uri " ^ s_"Connect to URI (default: Xen)";
+      "uri " ^ s_"Connect to libvirt URI";
     "--connect", Arg.String set_uri,
-      "uri " ^ s_"Connect to URI (default: Xen)";
+      "uri " ^ s_"Connect to libvirt URI";
     "--csv", Arg.String set_csv,
       "file " ^ s_"Log statistics to CSV file";
     "--no-csv-cpu", Arg.Clear csv_cpu,
@@ -272,7 +272,7 @@ OPTIONS" in
 	prerr_endline (Libvirt.Virterror.to_string err);
 	(* If non-root and no explicit connection URI, print a warning. *)
 	if Unix.geteuid () <> 0 && name = None then (
-	  print_endline (s_"NB: If you want to monitor a local Xen hypervisor, you usually need to be root");
+	  print_endline (s_"NB: If you want to monitor a local hypervisor, you usually need to be root");
 	);
 	exit 1 in