Re: [libvirt] [PATCH 7/7] VolumeCreateXMLFrom FS storage backend implementation.

Add an extra 'inputvol' parameter to the file volume building routines. This allows us to easily reuse the duplicate functionality.

@@ -1032,15 +1046,68 @@ static int createRaw(virConnectPtr conn, virReportSystemError(conn, errno, _("cannot extend file '%s'"), vol->target.path); - close(fd); - return -1; + goto cleanup; + } + + remain = vol->capacity; + + if (inputfd != -1) { + size_t bytes = 1024 * 1024; + int sparse_interval = 512; + int amtread = -1; + + while (amtread != 0) { + char buf[bytes];

+ char *tmp; + int newamt; + + if (remain < bytes) + bytes = remain; + + if ((amtread = saferead(inputfd, buf, bytes)) < 0) { + virReportSystemError(conn, errno, + _("failed reading from file '%s'"), + inputvol->target.path); + goto cleanup; + } + remain -= amtread; + + /* Loop over amt read in 512 byte increments, looking for sparse + * blocks */ + tmp = buf; + newamt = amtread; + do { + int interval = ((sparse_interval > newamt) ? newamt + : sparse_interval ); + int sparse_counter = interval; + + while (sparse_counter-- && *(tmp+sparse_counter) == '\0') + continue; + + if (sparse_counter < 0) { + if (lseek(fd, interval, SEEK_CUR) < 0) { + virReportSystemError(conn, errno, + _("cannot extend file '%s'"), + vol->target.path); + goto cleanup; + } + } else if (safewrite(fd, tmp, interval) < 0) { + virReportSystemError(conn, errno, + _("failed writing to file '%s'"), + vol->target.path); + goto cleanup; + + } + + tmp += interval; + } while ((newamt -= sparse_interval) > 0); + }