9:03 a.m.
Wrap the source code at 80 characters -- as widely as possible. We're
still left with a link, embedded in a comment:
https://code.vmware.com/docs/11750/virtual-disk-development-kit-programmi...
that makes the total width of "plugins/vddk/vddk.c" 131 characters. (But
that's just one line.)
Tested with:
$ truncate -s 1G f
(1) $ nbdkit vddk file=f
nbdkit: error:
/usr/local/lib/vmware-vix-disklib/lib64/libvixDiskLib.so.8: cannot open shared object
file: No such file or directory
If 'lib64/libvixDiskLib.so.8' is located on a non-standard path you may need to
set libdir=/path/to/vmware-vix-disklib-distrib.
See nbdkit-vddk-plugin(1) man page section "LIBRARY LOCATION" for details.
(2) pushd $HOME/tmp/vddk-5.1.1/vmware-vix-disklib-distrib/lib64
ln -s libvixDiskLib.so.5 libvixDiskLib.so.8
popd
nbdkit vddk file=f libdir=$HOME/tmp/vddk-5.1.1/vmware-vix-disklib-distrib
nbdkit: error: required VDDK symbol "VixDiskLib_Flush" is
missing. VDDK version must be >= 6.5. See nbdkit-vddk-plugin(1) man page section
"SUPPORTED VERSIONS OF VDDK". Original dlopen error:
/home/lacos/tmp/vddk-5.1.1/vmware-vix-disklib-distrib/lib64/libvixDiskLib.so.8: undefined
symbol: VixDiskLib_Flush
(3) $ nbdkit vddk file=f create=true
nbdkit: error: if using create=true you must specify the size using
the create-size parameter
(4) $ nbdkit vddk file=f create=true create-size=1
nbdkit: error: create-size must be greater than zero and a multiple
of 512
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2172516
Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
---
plugins/vddk/vddk.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/plugins/vddk/vddk.c b/plugins/vddk/vddk.c
index 1233c84eed0f..df69059d4218 100644
--- a/plugins/vddk/vddk.c
+++ b/plugins/vddk/vddk.c
@@ -205,7 +205,8 @@ vddk_config (const char *key, const char *value)
if (r64 == -1)
return -1;
if (r64 <= 0 || (r64 & 511) != 0) {
- nbdkit_error ("create-size must be greater than zero and a multiple of
512");
+ nbdkit_error ("create-size must be greater than zero and a multiple of "
+ "512");
return -1;
}
create_size = r64;
@@ -361,7 +362,8 @@ vddk_config_complete (void)
}
if (create_size == 0) {
- nbdkit_error ("if using create=true you must specify the size using the
create-size parameter");
+ nbdkit_error ("if using create=true you must specify the size using the
"
+ "create-size parameter");
return -1;
}
}
@@ -382,7 +384,8 @@ missing_required_symbol (const char *fn)
{
nbdkit_error ("required VDDK symbol \"%s\" is missing. "
"VDDK version must be >= 6.5. "
- "See nbdkit-vddk-plugin(1) man page section \"SUPPORTED
VERSIONS OF VDDK\". "
+ "See nbdkit-vddk-plugin(1) man page "
+ "section \"SUPPORTED VERSIONS OF VDDK\". "
"Original dlopen error: %s\n",
fn, dlerror ());
exit (EXIT_FAILURE);
@@ -455,7 +458,8 @@ load_library (bool load_error_is_fatal)
nbdkit_error ("%s\n\n"
"If '%s' is located on a non-standard path you may need
to\n"
"set libdir=/path/to/vmware-vix-disklib-distrib.\n\n"
- "See nbdkit-vddk-plugin(1) man page section \"LIBRARY
LOCATION\" for details.",
+ "See nbdkit-vddk-plugin(1) man page "
+ "section \"LIBRARY LOCATION\" for details.",
orig_error ? : "(unknown error)", libs[0].soname);
exit (EXIT_FAILURE);
}