search for: guestfs_add_drive_opts_cachemod

...a symbol defined for this kind of test: > > #ifndef GUESTFS_HAVE_ADD_DRIVE_OPTS > ... > > (from <guestfs.h>). The libguestfs on CentOS 6 does define GUESTFS_HAVE_ADD_DRIVE_OPTS (and the function family guestfs_add_drive_opts*), however, it only supports up through option 5 GUESTFS_ADD_DRIVE_OPTS_CACHEMODE. The compile failure was that GUESTFS_ADD_DRIVE_OPTS_PROTOCOL was undefined. (The documentation at http://libguestfs.org/guestfs.3.html#guestfs_add_drive doesn't list which version various options were added in, only that the function itself was added in 0.3, which predates 1.20.11). >...

...> > > #ifndef GUESTFS_HAVE_ADD_DRIVE_OPTS > > ... > > > > (from <guestfs.h>). > > The libguestfs on CentOS 6 does define GUESTFS_HAVE_ADD_DRIVE_OPTS (and > the function family guestfs_add_drive_opts*), however, it only supports > up through option 5 GUESTFS_ADD_DRIVE_OPTS_CACHEMODE. The compile > failure was that GUESTFS_ADD_DRIVE_OPTS_PROTOCOL was undefined. (The > documentation at http://libguestfs.org/guestfs.3.html#guestfs_add_drive > doesn't list which version various options were added in, only that the > function itself was added in 0.3, which predat...

CentOS 6 has libguestfs-devel 1.20.11, which predates the support in guestfs_add_drive_opts() for requesting an nbd drive instead of a local file. The guestfs plugin can still be built, so no configure changes are needed; but skip the tests that fail to compile so that 'make check' can at least complete. Signed-off-by: Eric Blake <eblake@redhat.com> --- Even with this patch,

...LEANUP_FREE_STRING_LIST char **devices = NULL; + CLEANUP_FREE_STRING_LIST char **partitions = NULL; + + for (i = 0; i < ndisks; ++i) { + if (guestfs_add_drive_opts (g, disks[i], + GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw", + GUESTFS_ADD_DRIVE_OPTS_CACHEMODE, "unsafe", + -1) == -1) + exit (EXIT_FAILURE); + } + + if (guestfs_launch (g) == -1) + exit (EXIT_FAILURE); + + /* Check the disks were added. */ + devices = guestfs_list_devices (g); + n = guestfs_int_count_strings (devices); + if (n != ndisk...