search for: guestfs___add_string

...if (n >= 7 && STREQ (&vfs_type[n-7], "_member")) - return; + return 0; /* Ignore LUKS-encrypted partitions. These are also containers. */ if (STREQ (vfs_type, "crypto_LUKS")) - return; + return 0; v = vfs_type; } guestfs___add_string (g, sb, device); guestfs___add_string (g, sb, v); + + return 0; } /* We should ignore partitions that have MBR type byte 0x42, because -- 1.8.4.2

...7], "_member")) > - return; > + return 0; > > /* Ignore LUKS-encrypted partitions. These are also containers. > */ if (STREQ (vfs_type, "crypto_LUKS")) > - return; > + return 0; > > v = vfs_type; > } > > guestfs___add_string (g, sb, device); > guestfs___add_string (g, sb, v); > + > + return 0; > } > > /* We should ignore partitions that have MBR type byte 0x42, because Looks good to me. -- Pino Toscano

In the kernel and qemu communities it is routine for patches that will be backported to stable branches to be posted for review. I'm proposing we do the same for libguestfs stable branches. All of the attached have been tested with 'make check-release'. Rich.

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.

Tested with 'make check-release'. tests/parallel (in check-slow) failed, although it does regularly and that seems to be because of libvirt. Rich.