diff options
| -rw-r--r-- | .tx/config | 1 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | contrib/intro/talk.txt | 1 | ||||
| -rw-r--r-- | examples/guestfs-faq.pod | 1 | ||||
| -rw-r--r-- | examples/guestfs-testing.pod | 1 | ||||
| -rw-r--r-- | generator/actions.ml | 2 | ||||
| -rw-r--r-- | generator/c.ml | 2 | ||||
| -rw-r--r-- | generator/gobject.ml | 2 | ||||
| -rw-r--r-- | generator/types.ml | 6 | ||||
| -rw-r--r-- | generator/utils.ml | 7 | ||||
| -rw-r--r-- | ruby/examples/guestfs-ruby.pod | 1 | ||||
| -rw-r--r-- | tests/xml/rhbz701814-faked.xml | 1 |
12 files changed, 11 insertions, 16 deletions
@@ -10,4 +10,3 @@ source_lang = en file_filter = po-docs/<lang>.po source_file = po-docs/libguestfs-docs.pot source_lang = en - @@ -402,7 +402,7 @@ virt-sysprep ideas Kazuo Moriwaka adds: - "yum clean all" (or the equivalent) to remove yum caches - - swap devices (both of block device and file) should be wiped. This may + - swap devices (both of block device and file) should be wiped. This may good for security purpose, and size. I found virt-sparsify can clear swap partition. - --script is nice. Defining default sysprep script directory diff --git a/contrib/intro/talk.txt b/contrib/intro/talk.txt index 6fda60b9..7d0e89b4 100644 --- a/contrib/intro/talk.txt +++ b/contrib/intro/talk.txt @@ -159,4 +159,3 @@ screenshots shown. But many people will simply want to mount a filesystem on the host using guestmount, and then use ordinary tools. At the bottom is a screenshot of GNOME Nautilus browsing into a guest filesystem. - diff --git a/examples/guestfs-faq.pod b/examples/guestfs-faq.pod index bebcee57..4405afc5 100644 --- a/examples/guestfs-faq.pod +++ b/examples/guestfs-faq.pod @@ -733,4 +733,3 @@ Richard W.M. Jones (C<rjones at redhat dot com>) =head1 COPYRIGHT Copyright (C) 2012 Red Hat Inc. - diff --git a/examples/guestfs-testing.pod b/examples/guestfs-testing.pod index 82036328..9bab630c 100644 --- a/examples/guestfs-testing.pod +++ b/examples/guestfs-testing.pod @@ -302,4 +302,3 @@ Richard W.M. Jones (C<rjones at redhat dot com>) =head1 COPYRIGHT Copyright (C) 2011-2012 Red Hat Inc. - diff --git a/generator/actions.ml b/generator/actions.ml index a3ff9ade..16b1518c 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -4029,7 +4029,7 @@ C<device>." }; name = "set_e2uuid"; style = RErr, [Device "device"; String "uuid"], []; proc_nr = Some 82; - tests = + tests = (let uuid = uuidgen () in [ InitBasicFS, Always, TestOutput ( [["set_e2uuid"; "/dev/sda1"; uuid]; diff --git a/generator/c.ml b/generator/c.ml index d15b4d99..a5220a57 100644 --- a/generator/c.ml +++ b/generator/c.ml @@ -531,7 +531,7 @@ extern GUESTFS_DLL_PUBLIC void *guestfs_next_private (guestfs_h *g, const char * * guestfs_protocol.h (which includes much unrelated and * XDR-dependent stuff that we don't want to be public, or required * by clients). - * + * * To reiterate, we will pass these structures to and from the client * with a simple assignment or memcpy, so the format must be * identical to what rpcgen / the RFC defines. diff --git a/generator/gobject.ml b/generator/gobject.ml index 0e96076b..2cd18096 100644 --- a/generator/gobject.ml +++ b/generator/gobject.ml @@ -814,7 +814,7 @@ guestfs_session_event_get_type(void) static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = {"; - + List.iter ( fun (name, _) -> let enum_name = "GUESTFS_SESSION_EVENT_" ^ String.uppercase name in diff --git a/generator/types.ml b/generator/types.ml index a9b94441..6469005f 100644 --- a/generator/types.ml +++ b/generator/types.ml @@ -23,14 +23,14 @@ type style = ret * args * optargs (* The [style] is a tuple which describes the return value and * arguments of a function. - * + * * [ret] is the return value, one of the [R*] values below. - * + * * The second element is the list of required arguments, a list of * [argt]s from the list below, eg. [Bool], [String] etc. Each has * a name so that for example [Int "foo"] corresponds in the C * bindings to an [int foo] parameter. - * + * * The third element is the list of optional arguments. These are * mapped to optional arguments in the language binding, eg. in * Perl to: diff --git a/generator/utils.ml b/generator/utils.ml index 8a716bb6..2d84bcd5 100644 --- a/generator/utils.ml +++ b/generator/utils.ml @@ -46,11 +46,12 @@ let string_of_errcode = function (* Generate a uuidgen-compatible UUID (used in tests). However to * avoid having the UUID change every time we rebuild the tests, * generate it as a function of the contents of the actions.ml file. - * + * * Originally I thought uuidgen was using RFC 4122, but it doesn't * appear to. - * - * Note that the format must be 01234567-0123-0123-0123-0123456789ab *) + * + * Note that the format must be 01234567-0123-0123-0123-0123456789ab + *) let uuidgen () = let s = Digest.to_hex (Digest.file "generator/actions.ml") in diff --git a/ruby/examples/guestfs-ruby.pod b/ruby/examples/guestfs-ruby.pod index a0d92d3f..e3b86481 100644 --- a/ruby/examples/guestfs-ruby.pod +++ b/ruby/examples/guestfs-ruby.pod @@ -52,4 +52,3 @@ Richard W.M. Jones (C<rjones at redhat dot com>) =head1 COPYRIGHT Copyright (C) 2010-2012 Red Hat Inc. - diff --git a/tests/xml/rhbz701814-faked.xml b/tests/xml/rhbz701814-faked.xml index ae31915c..2a60ee58 100644 --- a/tests/xml/rhbz701814-faked.xml +++ b/tests/xml/rhbz701814-faked.xml @@ -67,4 +67,3 @@ </memballoon> </devices> </domain> - |