Merge

diff --git a/lib/virt_mem_utsname.ml b/lib/virt_mem_utsname.ml
index 0ae8871..6a725f5 100644 (file)
--- a/lib/virt_mem_utsname.ml
+++ b/lib/virt_mem_utsname.ml
@@ -78,6 +78,8 @@ let find_utsname debug ({ domname = name; mem = mem } as image) ksymmap =
          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, utsname

diff --git a/po/virt-mem.pot b/po/virt-mem.pot
index bb1fad1..6388ec1 100644 (file)
--- a/po/virt-mem.pot
+++ b/po/virt-mem.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-07 17:07+0000\n"
+"POT-Creation-Date: 2008-08-08 13:47+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../dmesg/virt_dmesg.ml:73
+#: ../ps/virt_ps.ml:40
+msgid "%s: %s: unknown kernel version\nTry a newer version of virt-mem, or if the guest is not from a\nsupported Linux distribution, see this page about adding support:\n  http://et.redhat.com/~rjones/virt-mem/faq.html\\n"
+msgstr ""
+
+#: ../ps/virt_ps.ml:53
+msgid "%s: could not find init_task in kernel image\\n"
+msgstr ""
+
+#: ../dmesg/virt_dmesg.ml:72
 msgid "%s: could not find kernel log buffer in kernel image\\n"
 msgstr ""
 
-#: ../lib/virt_mem.ml:360
+#: ../ps/virt_ps.ml:35
+msgid "%s: could not guess kernel version\\n"
+msgstr ""
+
+#: ../lib/virt_mem.ml:352
 msgid "%s: domain is not running"
 msgstr ""
 
@@ -29,79 +41,79 @@ msgstr ""
 msgid "%s: no system_utsname in kernel image\\n"
 msgstr ""
 
-#: ../lib/virt_mem.ml:355
+#: ../lib/virt_mem.ml:347
 msgid "%s: unknown domain (not a UUID, name or ID of any active domain)"
 msgstr ""
 
-#: ../lib/virt_mem.ml:471 ../lib/virt_mem.ml:406
+#: ../lib/virt_mem.ml:463 ../lib/virt_mem.ml:398
 msgid "%s: use -A to define architecture (i386/x86-64 only) for this image"
 msgstr ""
 
-#: ../lib/virt_mem.ml:462 ../lib/virt_mem.ml:397
+#: ../lib/virt_mem.ml:454 ../lib/virt_mem.ml:389
 msgid "%s: use -E to define endianness for this image"
 msgstr ""
 
-#: ../lib/virt_mem.ml:475 ../lib/virt_mem.ml:412
+#: ../lib/virt_mem.ml:467 ../lib/virt_mem.ml:404
 msgid "%s: use -T to define kernel load address for this image"
 msgstr ""
 
-#: ../lib/virt_mem.ml:455 ../lib/virt_mem.ml:390
+#: ../lib/virt_mem.ml:447 ../lib/virt_mem.ml:382
 msgid "%s: use -W to define word size for this image"
 msgstr ""
 
-#: ../lib/virt_mem.ml:264 ../lib/virt_mem.ml:262
+#: ../lib/virt_mem.ml:258 ../lib/virt_mem.ml:256
 msgid "Connect to URI"
 msgstr ""
 
-#: ../lib/virt_mem.ml:266
+#: ../lib/virt_mem.ml:260
 msgid "Debug mode (default: false)"
 msgstr ""
 
-#: ../lib/virt_mem.ml:270
+#: ../lib/virt_mem.ml:264
 msgid "Display version and exit"
 msgstr ""
 
-#: ../lib/virt_mem.ml:331
+#: ../lib/virt_mem.ml:323
 msgid "NB: If you want to monitor a local Xen hypervisor, you usually need to be root"
 msgstr ""
 
-#: ../lib/virt_mem.ml:254
+#: ../lib/virt_mem.ml:248
 msgid "Set kernel architecture, endianness and word size"
 msgstr ""
 
-#: ../lib/virt_mem.ml:256
+#: ../lib/virt_mem.ml:250
 msgid "Set kernel endianness"
 msgstr ""
 
-#: ../lib/virt_mem.ml:258
+#: ../lib/virt_mem.ml:252
 msgid "Set kernel text address"
 msgstr ""
 
-#: ../lib/virt_mem.ml:260
+#: ../lib/virt_mem.ml:254
 msgid "Set kernel word size"
 msgstr ""
 
-#: ../lib/virt_mem.ml:268
+#: ../lib/virt_mem.ml:262
 msgid "Use saved kernel memory image"
 msgstr ""
 
-#: ../lib/virt_mem.ml:145
+#: ../lib/virt_mem.ml:139
 msgid "\\\n\n%s: %s\n\nDescription:\n%s\n\nOptions:"
 msgstr ""
 
-#: ../lib/virt_mem.ml:125
-msgid "\\\n\nvirt-mem: Tools for providing information about virtual machines\n\nCurrently available tools include:\n%s\n\nGeneral usage is:\n  <tool> [-options] [domains...]\n\nTo display extra help for a single tool, do:\n  virt-mem --help <tool>\n\nOptions:"
+#: ../lib/virt_mem.ml:119
+msgid "\\\n\nvirt-mem: Tools for providing information about virtual machines\n\nCurrently available tools include:\n%s\n\nGeneral usage is:\n  <tool> [-options] [domains...]\n\nTo display extra help for a single tool, do:\n  virt-mem help <tool>\n\nOptions:"
 msgstr ""
 
-#: ../dmesg/virt_dmesg.ml:77
+#: ../dmesg/virt_dmesg.ml:76
 msgid "\\\nvirt-dmesg prints the kernel messages for virtual machines running\nunder libvirt.  The output is similar to the ordinary dmesg command\nrun inside the virtual machine."
 msgstr ""
 
-#: ../lib/virt_mem.ml:308
+#: ../lib/virt_mem.ml:300
 msgid "\\\nvirt-mem: I could not work out which tool you are trying to run.\nUse 'virt-mem --help' for more help or read the manual page virt-mem(1)"
 msgstr ""
 
-#: ../ps/virt_ps.ml:66
+#: ../ps/virt_ps.ml:97
 msgid "\\\nvirt-ps prints a process listing for virtual machines running under\nlibvirt."
 msgstr ""
 
@@ -109,35 +121,23 @@ msgstr ""
 msgid "\\\nvirt-uname prints the uname information such as OS version,\narchitecture and node name for virtual machines running under\nlibvirt."
 msgstr ""
 
-#: ../lib/virt_mem.ml:571
-msgid "could not read kernel symbols"
-msgstr ""
-
-#: ../lib/virt_mem.ml:573
-msgid "could not read kernel version"
-msgstr ""
-
-#: ../lib/virt_mem.ml:575
-msgid "could not read process table"
-msgstr ""
-
-#: ../dmesg/virt_dmesg.ml:76
+#: ../dmesg/virt_dmesg.ml:75
 msgid "display kernel messages"
 msgstr ""
 
-#: ../ps/virt_ps.ml:65
+#: ../ps/virt_ps.ml:96
 msgid "list processes in virtual machine"
 msgstr ""
 
-#: ../lib/virt_mem.ml:177
+#: ../lib/virt_mem.ml:171
 msgid "set_endian: %s: unknown endianness"
 msgstr ""
 
-#: ../lib/virt_mem.ml:220
+#: ../lib/virt_mem.ml:214
 msgid "set_text_addr: %s: incorrect number of parameters to -T option"
 msgstr ""
 
-#: ../lib/virt_mem.ml:166
+#: ../lib/virt_mem.ml:160
 msgid "set_wordsize: %s: unknown wordsize"
 msgstr ""
 
@@ -145,11 +145,11 @@ msgstr ""
 msgid "uname command for virtual machines"
 msgstr ""
 
-#: ../lib/virt_mem.ml:425
+#: ../lib/virt_mem.ml:417
 msgid "virt-mem: error loading kernel memory: address out of range\nPossibly the '-T' command line parameter was used inconsistently."
 msgstr ""
 
-#: ../lib/virt_mem.ml:442
+#: ../lib/virt_mem.ml:434
 msgid "virt-mem: if -t given on command line, then no domain arguments should be listed"
 msgstr ""