From ce3a9c56b712731dd6ac3694f7e8ac117e2a61dc Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Wed, 31 Mar 2010 13:19:34 +0100 Subject: [PATCH] New API: guestfs_zero_device to zero whole devices. --- daemon/zero.c | 37 +++++++++++++++++++++++++++++++++++++ src/MAX_PROC_NR | 2 +- src/generator.ml | 11 ++++++++++- 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/daemon/zero.c b/daemon/zero.c index 4d06505..6e62e15 100644 --- a/daemon/zero.c +++ b/daemon/zero.c @@ -20,6 +20,7 @@ #include #include +#include #include #include #include @@ -55,3 +56,39 @@ do_zero (const char *device) return 0; } + +int +do_zero_device (const char *device) +{ + int64_t size = do_blockdev_getsize64 (device); + if (size == -1) + return -1; + + int fd = open (device, O_WRONLY); + if (fd == -1) { + reply_with_perror ("%s", device); + return -1; + } + + char buf[1024*1024]; + memset (buf, 0, sizeof buf); + + while (size > 0) { + size_t n = size > sizeof buf ? sizeof buf : size; + ssize_t r = write (fd, buf, n); + if (r == -1) { + reply_with_perror ("write: %s (with %" PRId64 " bytes left to write)", + device, size); + close (fd); + return -1; + } + size -= r; + } + + if (close (fd) == -1) { + reply_with_perror ("close: %s", device); + return -1; + } + + return 0; +} diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR index 2c36bbd..9be0dc9 100644 --- a/src/MAX_PROC_NR +++ b/src/MAX_PROC_NR @@ -1 +1 @@ -227 +228 diff --git a/src/generator.ml b/src/generator.ml index f519c4d..f206be1 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -2294,7 +2294,7 @@ How many blocks are zeroed isn't specified (but it's I enough to securely wipe the device). It should be sufficient to remove any partition tables, filesystem superblocks and so on. -See also: C."); +See also: C, C."); ("grub_install", (RErr, [Pathname "root"; Device "device"]), 86, [], (* Test disabled because grub-install incompatible with virtio-blk driver. @@ -4346,6 +4346,15 @@ or file C to another destination device or file C. Note this will fail if the source is too short or if the destination is not large enough."); + ("zero_device", (RErr, [Device "device"]), 228, [DangerWillRobinson], + [InitBasicFSonLVM, Always, TestRun ( + [["zero_device"; "/dev/VG/LV"]])], + "write zeroes to an entire device", + "\ +This command writes zeroes over the entire C. Compare +with C which just zeroes the first few blocks of +a device."); + ] let all_functions = non_daemon_functions @ daemon_functions -- 1.8.3.1