diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | virt-top/virt_top.ml | 17 |
2 files changed, 18 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2007-09-19 Richard Jones <rjones@redhat.com> + + * virt-top/virt_top.ml: Ignore transient error from + C.num_of_defined_domains when it cannot contact xend; that + was causing virt-top to exit when xend was restarted. + 2007-09-18 Richard Jones <rjones@redhat.com> * virt-df/virt_df.ml: Handle domains with partition-backed diff --git a/virt-top/virt_top.ml b/virt-top/virt_top.ml index e2a7435..a621a18 100644 --- a/virt-top/virt_top.ml +++ b/virt-top/virt_top.ml @@ -486,11 +486,18 @@ let redraw, clear_pcpu_display_data = ) ids in (* Inactive domains. *) - let n = C.num_of_defined_domains conn in - let names = - if n > 0 then Array.to_list (C.list_defined_domains conn n) - else [] in - let doms_inactive = List.map (fun name -> name, Inactive) names in + let doms_inactive = + try + let n = C.num_of_defined_domains conn in + let names = + if n > 0 then Array.to_list (C.list_defined_domains conn n) + else [] in + List.map (fun name -> name, Inactive) names + with + (* Ignore transient errors, in particular errors from + * num_of_defined_domains if it cannot contact xend. + *) + | Libvirt.Virterror _ -> [] in doms @ doms_inactive in |