Merge.

diff --cc 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
@@@ -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