From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Fri, 8 Aug 2008 13:51:00 +0000 (+0100)
Subject: Merge.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=0bb087262357335c4b12f189d568a6f4ba9f89fa;p=virt-mem.git

Merge.
---

0bb087262357335c4b12f189d568a6f4ba9f89fa
diff --cc lib/virt_mem_utsname.ml
index 0ae8871,149e735..6a725f5
--- a/lib/virt_mem_utsname.ml
+++ b/lib/virt_mem_utsname.ml
@@@ -78,6 -78,8 +78,8 @@@ let find_utsname debug ({ domname = nam
  	  parse_utsname bits
  	    with
  	      Not_found ->
- 		eprintf (f_"%s: could not find utsname in kernel image\n") name
+ 		eprintf (f_"%s: could not find utsname in kernel image\n")
+ 		  name;
+ 		None
    in
 -  (image, ksymmap, utsname)
 +  image, utsname