* virt-top/virt_top.ml: qemu:/// URIs (and others) don't support

	  virConnectGetHostname.  Catch this exception.

diff --git a/ChangeLog b/ChangeLog
index 0fe5499..ce8db67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-09-20  Richard Jones  <rjones@redhat.com>
 
+       * virt-top/virt_top.ml: qemu:/// URIs (and others) don't support
+         virConnectGetHostname.  Catch this exception.
+
        * Makefile.in: Disable virt-df in this release until I have
          time to fix it properly.
        * Makefile.in: Fix 'check-manifest' rule.  Added 'make release'.

diff --git a/virt-top/virt_top.ml b/virt-top/virt_top.ml
index a621a18..a5953f3 100644 (file)
--- a/virt-top/virt_top.ml
+++ b/virt-top/virt_top.ml
@@ -137,6 +137,9 @@ OPTIONS" in
   let hostname =
     try C.get_hostname conn
     with
+    (* qemu:/// and other URIs didn't support virConnectGetHostname until
+     * libvirt 0.3.3.  Before that they'd throw a virterror. *)
+    | Libvirt.Virterror _
     | Invalid_argument "virConnectGetHostname not supported" -> "unknown" in
 
   let libvirt_version =