search for: compresslevel

On Tue, Mar 03, 2015 at 03:48:02AM -0500, Chen Hanxiao wrote: > Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> > + if (compresslevel >= 0) { > + snprintf (compresslevel_s, sizeof compresslevel_s, "%d", compresslevel); > + ADD_ARG (argv, i, "-c"); > + ADD_ARG (argv, i, compresslevel_s); > + } Because compresslevel is an optional parameter, you can't just use it directly like this....

This series adds new APIs to support btrfstune. Chen Hanxiao (2): New API: btrfs-image New API: btrfs_image_restore daemon/btrfs.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++ generator/actions.ml | 45 +++++++++++++++++++++++++++ src/MAX_PROC_NR | 2 +- 3 files changed, 133 insertions(+), 1 deletion(-) -- 2.1.0

...D_EXT_CMD(str_umount, umount); +GUESTFSD_EXT_CMD(str_btrfsimage, btrfs-image); int optgroup_btrfs_available (void) @@ -2005,3 +2006,51 @@ do_btrfstune_enable_skinny_metadata_extent_refs (const char *device) return 0; } + +int +do_btrfs_image (char *const *sources, const char *image, + int compresslevel, int numthreads) +{ + size_t nr_sources = count_strings (sources); + const size_t MAX_ARGS = 64 + nr_sources; + const char *argv[MAX_ARGS]; + size_t i = 0, j; + CLEANUP_FREE char *err = NULL; + CLEANUP_FREE char *out = NULL; + char compresslevel_s[64]; + char numthreads_s[64]; + int r; +...

...D_EXT_CMD(str_umount, umount); +GUESTFSD_EXT_CMD(str_btrfsimage, btrfs-image); int optgroup_btrfs_available (void) @@ -2040,3 +2041,45 @@ do_btrfstune_enable_skinny_metadata_extent_refs (const char *device) return 0; } + +int +do_btrfs_image (char *const *sources, const char *image, + int compresslevel) +{ + size_t nr_sources = count_strings (sources); + const size_t MAX_ARGS = 64 + nr_sources; + const char *argv[MAX_ARGS]; + size_t i = 0, j; + CLEANUP_FREE char *err = NULL; + CLEANUP_FREE char *out = NULL; + char compresslevel_s[64]; + int r; + + if (nr_sources == 0) { + reply_wit...

...D_EXT_CMD(str_umount, umount); +GUESTFSD_EXT_CMD(str_btrfsimage, btrfs-image); int optgroup_btrfs_available (void) @@ -2005,3 +2006,54 @@ do_btrfstune_enable_skinny_metadata_extent_refs (const char *device) return 0; } + +int +do_btrfs_image (char *const *sources, const char *image, + int compresslevel, int numthreads) +{ + size_t nr_sources = count_strings (sources); + const size_t MAX_ARGS = 64 + nr_sources; + const char *argv[MAX_ARGS]; + size_t i = 0, j; + CLEANUP_FREE char *err = NULL; + CLEANUP_FREE char *out = NULL; + char compresslevel_s[64]; + char numthreads_s[64]; + int r; +...

...estlog))) File "/etc/cron.weekly/dconf", line 267, in diff fromfd = dzopen(fromfile) File "/etc/cron.weekly/dconf", line 142, in dzopen return gzip.open(filename, arg) File "/usr/lib/python2.3/gzip.py", line 49, in open return GzipFile(filename, mode, compresslevel) File "/usr/lib/python2.3/gzip.py", line 94, in __init__ fileobj = self.myfileobj = __builtin__.open(filename, mode or 'rb') IOError: [Errno 2] No such file or directory: '/dconf-fs11-20070610-042246.log.gz'

...t; -error: + error: reply_with_error ("%s: could not parse btrfs scrub status.", lines[i]); free (ret); return NULL; @@ -2116,7 +2116,7 @@ do_btrfstune_enable_skinny_metadata_extent_refs (const char *device) int do_btrfs_image (char *const *sources, const char *image, - int compresslevel) + int compresslevel) { size_t nr_sources = count_strings (sources); const size_t MAX_ARGS = 64 + nr_sources; @@ -2127,14 +2127,14 @@ do_btrfs_image (char *const *sources, const char *image, int r; if (nr_sources == 0) { - reply_with_error ("list of sources must be non-em...

...if (count_strings (lines) < 2) { + if (guestfs_int_count_strings (lines) < 2) { reply_with_error ("truncated output from 'btrfs scrub status -R' command"); return NULL; } @@ -2124,7 +2124,7 @@ int do_btrfs_image (char *const *sources, const char *image, int compresslevel) { - const size_t nr_sources = count_strings (sources); + const size_t nr_sources = guestfs_int_count_strings (sources); const size_t MAX_ARGS = 64 + nr_sources; const char *argv[MAX_ARGS]; size_t i = 0, j; @@ -2229,7 +2229,7 @@ do_btrfs_filesystem_show (const char *device) if (!li...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67

Various changes/fixes to use smaller stack frames. Rich.

...(const char *device) return 0; } +#if defined(__GNUC__) && GUESTFS_GCC_VERSION >= 40800 /* gcc >= 4.8.0 */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wstack-usage=10000" +#endif + int do_btrfs_image (char *const *sources, const char *image, int compresslevel) @@ -2140,6 +2163,10 @@ do_btrfs_image (char *const *sources, const char *image, return 0; } +#if defined(__GNUC__) && GUESTFS_GCC_VERSION >= 40800 /* gcc >= 4.8.0 */ +#pragma GCC diagnostic pop +#endif + int do_btrfs_replace (const char *srcdev, const char *targetdev, co...

...); ADD_ARG (argv, i, device); ADD_ARG (argv, i, NULL); @@ -2137,7 +2130,7 @@ do_btrfs_image (char *const *sources, const char *image, return -1; } - ADD_ARG (argv, i, str_btrfsimage); + ADD_ARG (argv, i, "btrfs-image"); if ((optargs_bitmask & GUESTFS_BTRFS_IMAGE_COMPRESSLEVEL_BITMASK) && compresslevel >= 0) { @@ -2182,7 +2175,7 @@ do_btrfs_replace (const char *srcdev, const char *targetdev, return -1; } - ADD_ARG (argv, i, str_btrfs); + ADD_ARG (argv, i, "btrfs"); ADD_ARG (argv, i, "replace"); ADD_ARG (argv, i, &qu...

...;); ADD_ARG (argv, i, device); ADD_ARG (argv, i, NULL); @@ -2137,7 +2133,7 @@ do_btrfs_image (char *const *sources, const char *image, return -1; } - ADD_ARG (argv, i, str_btrfsimage); + ADD_ARG (argv, i, "btrfsimage"); if ((optargs_bitmask & GUESTFS_BTRFS_IMAGE_COMPRESSLEVEL_BITMASK) && compresslevel >= 0) { @@ -2182,7 +2178,7 @@ do_btrfs_replace (const char *srcdev, const char *targetdev, return -1; } - ADD_ARG (argv, i, str_btrfs); + ADD_ARG (argv, i, "btrfs"); ADD_ARG (argv, i, "replace"); ADD_ARG (argv, i, &qu...

...; tests = [ InitPartition, Always, TestRun ( @@ -9345,7 +9345,7 @@ This enable skinny metadata extent refs." }; { defaults with name = "btrfs_image"; added = (1, 29, 32); - style = RErr, [DeviceList "source"; Pathname "image"], [OInt "compresslevel"]; + style = RErr, [StringList (Device, "source"); String (Pathname, "image")], [OInt "compresslevel"]; optional = Some "btrfs"; camel_name = "BTRFSImage"; tests = [ InitEmpty, Always, TestRun ( @@ -9366,7 +9366,7 @@ All dat...

Very large but mechanical change to the generator. Rich.

This is a follow-up to the other generator changes in: https://www.redhat.com/archives/libguestfs/2017-February/msg00217.html Rich.

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’

This is just the utilities part of the patch series from: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html I believe this addresses everything raised in comments on that patch series. Rich.

This turned out to be rather more involved than I thought. We have lots of utility functions, spread all over the repository, with not a lot of structure. This moves many of them under common/ and structures them so there are clear dependencies. This doesn't complete the job by any means. Other items I had on my to-do list for this change were: - Split up mllib/common_utils into: -