search for: btrfs_imag

Apparently with newer btrfs-progs (seen with 4.4) 100M are not enough for a btrfs filesystem; hence double the size of the partitions created in the test of btrfs_image, so now 200M are enough for btrfs. --- generator/actions.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generator/actions.ml b/generator/actions.ml index 75d3fc5..9ea5736 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -12680,8 +12680,8 @@ This enable s...

...ck); GUESTFSD_EXT_CMD(str_mkfs_btrfs, mkfs.btrfs); GUESTFSD_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; + c...

...ck); GUESTFSD_EXT_CMD(str_mkfs_btrfs, mkfs.btrfs); GUESTFSD_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 compressleve...

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

...ck); GUESTFSD_EXT_CMD(str_mkfs_btrfs, mkfs.btrfs); GUESTFSD_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; + c...

...e "gfs2_fs.h" #include "ocfs2_fs.h" #include "nilfs_fs.h" +#include "btrfs_fs.h" /* * Slightly cleaned up version of jfs_superblock to @@ -461,6 +462,18 @@ static int nilfs2_image(const void *buf, unsigned long long *bytes) return 0; } +static int btrfs_image(const void *buf, unsigned long long *bytes) +{ + const struct btrfs_super_block *sb = + (const struct btrfs_super_block *)buf; + + if (!memcmp(&sb->magic, BTRFS_MAGIC, sizeof(BTRFS_MAGIC)-1)) { + *bytes = (unsigned long long)__le64_to_cpu(sb->total_bytes); + return 1; + } + return...

...+++++++++++++++++++++++++ generator/actions.ml | 22 ++++++++++++++++++++++ src/MAX_PROC_NR | 2 +- 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index be648bc..e036880 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2054,3 +2054,41 @@ do_btrfs_image (char *const *sources, const char *image, return 0; } + +int +do_btrfs_image_restore (const char *image, char *const *sources) +{ + 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 ch...

.../usr/kinit/fstype/fstype.c +++ b/usr/kinit/fstype/fstype.c @@ -37,6 +37,7 @@ #include "romfs_fs.h" #include "squashfs_fs.h" #include "xfs_sb.h" +#include "f2fs_fs.h" /* * Slightly cleaned up version of jfs_superblock to @@ -472,6 +473,18 @@ static int btrfs_image(const void *buf, unsigned long long *bytes) return 0; } +static int f2fs_image(const void *buf, unsigned long long *bytes) +{ + const struct f2fs_super_block *sb = + (const struct f2fs_super_block *)buf; + + if (sb->magic == __cpu_to_le32(F2FS_SUPER_MAGIC)) { + *bytes = 0; + return 1...

...ff-by: Benjamin Cama <benoar at free.fr> Signed-off-by: maximilian attems <max at stro.at> diff --git a/usr/kinit/fstype/fstype.c b/usr/kinit/fstype/fstype.c index d57b937..451d60c 100644 --- a/usr/kinit/fstype/fstype.c +++ b/usr/kinit/fstype/fstype.c @@ -460,7 +460,7 @@ static int btrfs_image(const void *buf, unsigned long long *bytes) (const struct btrfs_super_block *)buf; if (!memcmp(sb->magic, BTRFS_MAGIC, BTRFS_MAGIC_L)) { - *bytes = sb->total_bytes; + *bytes = (unsigned long long)__le64_to_cpu(sb->total_bytes); return 1; } return 0; commit 30c21662ec3c...

...ff-by: Benjamin Cama <benoar at free.fr> Signed-off-by: maximilian attems <max at stro.at> diff --git a/usr/kinit/fstype/fstype.c b/usr/kinit/fstype/fstype.c index d57b937..451d60c 100644 --- a/usr/kinit/fstype/fstype.c +++ b/usr/kinit/fstype/fstype.c @@ -460,7 +460,7 @@ static int btrfs_image(const void *buf, unsigned long long *bytes) (const struct btrfs_super_block *)buf; if (!memcmp(sb->magic, BTRFS_MAGIC, BTRFS_MAGIC_L)) { - *bytes = sb->total_bytes; + *bytes = (unsigned long long)__le64_to_cpu(sb->total_bytes); return 1; } return 0; commit 529d9d2653e0...

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

Split up the huge generator/actions.ml into several smaller files. Rich.

..., "device")], []; optional = Some "btrfs"; camel_name = "BTRFSTuneEnableSkinnyMetadataExtentRefs"; 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 &...

Very large but mechanical change to the generator. Rich.

See this bug for background information: https://bugzilla.redhat.com/show_bug.cgi?id=1350465 Thanks: Tomáš Golembiovský --- v2v/virt-v2v.pod | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index e68d75cf8..0943bf305 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -1909,18 +1909,32 @@ that

See this bug for background information: https://bugzilla.redhat.com/show_bug.cgi?id=1350465 --- v2v/virt-v2v.pod | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index e68d75cf8..93d1a9ecd 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -1909,18 +1909,33 @@ that guest through the RHV-M UI,

The existing mechanism was clunky, slow and used ~ 10 MB of local disk. Rich.

If the connection is not local, paths of disks will refer to the remote host, which were mistakenly handled as local paths (in the best case failing to open a non-existing disk, and in the worst case opening a different disk!). In case the disks are remote resources like ssh or ceph, nothing guarantees that the hostname can be reached from the local machine, or even that it is actually the same on

Hopefully this time ...