On Tue, Feb 18, 2020 at 11:05:11AM -0600, Eric Blake wrote:
static const char *sonames[] = { - /* Prefer the newest library in case multiple exist. */ + /* Prefer the newest library in case multiple exist. Check two + * possible directories: the usual VDDK installation puts .so + * files in an arch-specific subdirectory of $libdir (although + * only VDDK 5 supported 32-bit); but in our testsuite is easier + * to write if we point libdir directly to a stub .so. + */ + "lib64/libvixDiskLib.so.6", "libvixDiskLib.so.6", + "lib64/libvixDiskLib.so.5", + "lib32/libvixDiskLib.so.5", "libvixDiskLib.so.5",
Should we put #ifdef around the lib64/ and lib32/ versions? Another alternative might be to get rid of the lib32/ version entirely, only compile the plugin for x86-64, and set the minimum version of VDDK in the docs to 5.5.5 (see nbdkit-vddk-plugin.pod section "SUPPORTED VERSIONS OF VDDK"). But the series looks good now, so ACK Thanks for the tremendous amount of effort that went into the apparently simple change :-) Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org