Merge.

diff --combined lib/virt_mem_utsname.ml
index 0ae8871,149e735..6a725f5
--- 1/lib/virt_mem_utsname.ml
--- 2/lib/virt_mem_utsname.ml
+++ b/lib/virt_mem_utsname.ml
@@@ -47,7 -47,7 +47,7 @@@ let parse_utsname bits 
    | { _ } ->
        None
  
 -let find_utsname debug ({ domname = name; mem = mem } as image, ksymmap) =
 +let find_utsname debug ({ domname = name; mem = mem } as image) ksymmap =
    let utsname =
      (* In Linux 2.6.25, the symbol is init_uts_ns.
       * http://lxr.linux.no/linux/init/version.c
@@@ -78,6 -78,8 +78,8 @@@
          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