[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 3/5] Add vol-create-upload, vol-upload and vol-download commands to virsh



* tools/virsh.c: Add vol-create-upload, vol-upload
  and vol-download commands
---
 .x-sc_avoid_write |    1 +
 tools/virsh.c     |  230 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 231 insertions(+), 0 deletions(-)

diff --git a/.x-sc_avoid_write b/.x-sc_avoid_write
index f6fc1b2..0784984 100644
--- a/.x-sc_avoid_write
+++ b/.x-sc_avoid_write
@@ -5,5 +5,6 @@
 ^src/util/util\.c$
 ^src/xen/xend_internal\.c$
 ^daemon/libvirtd.c$
+^tools/virsh\.c$
 ^gnulib/
 ^tools/console.c$
diff --git a/tools/virsh.c b/tools/virsh.c
index 2837e0f..9075c0e 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -259,6 +259,8 @@ static char *vshCommandOptString(const vshCmd *cmd, const char *name,
                                  int *found);
 static long long vshCommandOptLongLong(const vshCmd *cmd, const char *name,
                                        int *found);
+static unsigned long long vshCommandOptULongLong(const vshCmd *cmd, const char *name,
+                                                 int *found);
 static int vshCommandOptBool(const vshCmd *cmd, const char *name);
 static char *vshCommandOptArgv(const vshCmd *cmd, int count);
 
@@ -6934,6 +6936,216 @@ cleanup:
     return ret;
 }
 
+
+static int
+cmdVolUploadSource(virStreamPtr st ATTRIBUTE_UNUSED,
+                   char *bytes, size_t nbytes, void *opaque)
+{
+    int *fd = opaque;
+
+    return read(*fd, bytes, nbytes);
+}
+
+
+/*
+ * "vol-upload" command
+ */
+static const vshCmdInfo info_vol_upload[] = {
+    {"help", gettext_noop("upload a file into a volume")},
+    {"desc", gettext_noop("Upload a file into a volume")},
+    {NULL, NULL}
+};
+
+static const vshCmdOptDef opts_vol_upload[] = {
+    {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")},
+    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol name, key or path")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file")},
+    {"offset", VSH_OT_INT, 0, N_("volume offset to upload to") },
+    {"length", VSH_OT_INT, 0, N_("amount of data to upload") },
+    {NULL, 0, 0, NULL}
+};
+
+/*
+ */
+static int
+cmdVolUpload (vshControl *ctl, const vshCmd *cmd)
+{
+    char *file = NULL;
+    virStorageVolPtr vol = NULL;
+    int ret = FALSE;
+    int fd = -1;
+    virStreamPtr st = NULL;
+    char *name = NULL;
+    int found;
+    unsigned long long offset, length;
+
+    if (!vshConnectionUsability(ctl, ctl->conn))
+        goto cleanup;
+
+    if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", &name))) {
+        return FALSE;
+    }
+
+    offset = vshCommandOptULongLong(cmd, "offset", &found);
+    if (!found)
+        offset = 0;
+
+    length = vshCommandOptULongLong(cmd, "length", &found);
+    if (!found)
+        length = 0;
+
+    file = vshCommandOptString (cmd, "file", NULL);
+    if (file == NULL)
+        goto cleanup;
+
+    if ((fd = open(file, O_RDONLY)) < 0) {
+        vshError(ctl, "cannot read %s", file);
+        goto cleanup;
+    }
+
+    st = virStreamNew(ctl->conn, 0);
+    if (virStorageVolUpload(vol, st, offset, length, 0) < 0) {
+        vshError(ctl, "cannot upload to volume %s", name);
+        goto cleanup;
+    }
+
+    if (virStreamSendAll(st, cmdVolUploadSource, &fd) < 0) {
+        vshError(ctl, "cannot send data to volume %s", name);
+        goto cleanup;
+    }
+
+    if (close(fd) < 0) {
+        vshError(ctl, "cannot close file %s", file);
+        virStreamAbort(st);
+        goto cleanup;
+    }
+    fd = -1;
+    if (virStreamFinish(st) < 0) {
+        vshError(ctl, "cannot close volume %s", name);
+        goto cleanup;
+    }
+
+    ret = TRUE;
+
+cleanup:
+    if (vol)
+        virStorageVolFree(vol);
+    if (st)
+        virStreamFree(st);
+    free(name);
+    free(file);
+    if (fd != -1)
+        close(fd);
+    return ret;
+}
+
+
+
+/*
+ * "vol-download" command
+ */
+static const vshCmdInfo info_vol_download[] = {
+    {"help", gettext_noop("Download a volume to a file")},
+    {"desc", gettext_noop("Download a volume to a file")},
+    {NULL, NULL}
+};
+
+static const vshCmdOptDef opts_vol_download[] = {
+    {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")},
+    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol name, key or path")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file")},
+    {"offset", VSH_OT_INT, 0, N_("volume offset to download from") },
+    {"length", VSH_OT_INT, 0, N_("amount of data to download") },
+    {NULL, 0, 0, NULL}
+};
+
+
+static int
+cmdVolDownloadSink(virStreamPtr st ATTRIBUTE_UNUSED,
+                   const char *bytes, size_t nbytes, void *opaque)
+{
+    int *fd = opaque;
+
+    return write(*fd, bytes, nbytes);
+}
+
+/*
+ */
+static int
+cmdVolDownload (vshControl *ctl, const vshCmd *cmd)
+{
+    char *file = NULL;
+    virStorageVolPtr vol = NULL;
+    int ret = FALSE;
+    int fd = -1;
+    virStreamPtr st = NULL;
+    char *name = NULL;
+    int found;
+    unsigned long long offset, length;
+
+    if (!vshConnectionUsability(ctl, ctl->conn))
+        goto cleanup;
+
+    if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", &name))) {
+        return FALSE;
+    }
+
+    offset = vshCommandOptULongLong(cmd, "offset", &found);
+    if (!found)
+        offset = 0;
+
+    length = vshCommandOptULongLong(cmd, "length", &found);
+    if (!found)
+        length = 0;
+
+    file = vshCommandOptString (cmd, "file", NULL);
+    if (file == NULL)
+        goto cleanup;
+
+    if ((fd = open(file, O_WRONLY|O_TRUNC|O_CREAT, 0600)) < 0) {
+        vshError(ctl, "cannot create %s", file);
+        goto cleanup;
+    }
+
+    st = virStreamNew(ctl->conn, 0);
+    if (virStorageVolDownload(vol, st, offset, length, 0) < 0) {
+        vshError(ctl, "cannot download from volume %s", name);
+        goto cleanup;
+    }
+
+    if (virStreamRecvAll(st, cmdVolDownloadSink, &fd) < 0) {
+        vshError(ctl, "cannot receive data from volume %s", name);
+        goto cleanup;
+    }
+
+    if (close(fd) < 0) {
+        vshError(ctl, "cannot close file %s", file);
+        virStreamAbort(st);
+        goto cleanup;
+    }
+    fd = -1;
+    if (virStreamFinish(st) < 0) {
+        vshError(ctl, "cannot close volume %s", name);
+        goto cleanup;
+    }
+
+    ret = TRUE;
+
+cleanup:
+    if (ret == FALSE)
+        unlink(file);
+    if (vol)
+        virStorageVolFree(vol);
+    if (st)
+        virStreamFree(st);
+    free(name);
+    free(file);
+    if (fd != -1)
+        close(fd);
+    return ret;
+}
+
+
 /*
  * "vol-delete" command
  */
@@ -9750,6 +9962,7 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd)
     return ret;
 }
 
+
 /*
  * "net-edit" command
  */
@@ -10391,6 +10604,7 @@ static const vshCmdDef storageVolCmds[] = {
     {"vol-create", cmdVolCreate, opts_vol_create, info_vol_create},
     {"vol-create-from", cmdVolCreateFrom, opts_vol_create_from, info_vol_create_from},
     {"vol-delete", cmdVolDelete, opts_vol_delete, info_vol_delete},
+    {"vol-download", cmdVolDownload, opts_vol_download, info_vol_download },
     {"vol-dumpxml", cmdVolDumpXML, opts_vol_dumpxml, info_vol_dumpxml},
     {"vol-info", cmdVolInfo, opts_vol_info, info_vol_info},
     {"vol-key", cmdVolKey, opts_vol_key, info_vol_key},
@@ -10398,6 +10612,7 @@ static const vshCmdDef storageVolCmds[] = {
     {"vol-name", cmdVolName, opts_vol_name, info_vol_name},
     {"vol-path", cmdVolPath, opts_vol_path, info_vol_path},
     {"vol-pool", cmdVolPool, opts_vol_pool, info_vol_pool},
+    {"vol-upload", cmdVolUpload, opts_vol_upload, info_vol_upload },
     {"vol-wipe", cmdVolWipe, opts_vol_wipe, info_vol_wipe},
     {NULL, NULL, NULL, NULL}
 };
@@ -10867,6 +11082,21 @@ vshCommandOptLongLong(const vshCmd *cmd, const char *name, int *found)
     return res;
 }
 
+static unsigned long long
+vshCommandOptULongLong(const vshCmd *cmd, const char *name, int *found)
+{
+    vshCmdOpt *arg = vshCommandOpt(cmd, name);
+    int num_found = FALSE;
+    unsigned long long res = 0;
+    char *end_p = NULL;
+
+    if ((arg != NULL) && (arg->data != NULL))
+        num_found = !virStrToLong_ull(arg->data, &end_p, 10, &res);
+    if (found)
+        *found = num_found;
+    return res;
+}
+
 /*
  * Returns TRUE/FALSE if the option exists
  */
-- 
1.7.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]