virsh-snapshot.c: Switch to C99 initialization of vshCmdOptDef

This commit is contained in:
Michal Privoznik 2013-01-14 15:44:18 +01:00
parent 7c959c61de
commit 8571608924
1 changed files with 360 additions and 92 deletions

View File

@ -118,18 +118,62 @@ static const vshCmdInfo info_snapshot_create[] = {
}; };
static const vshCmdOptDef opts_snapshot_create[] = { static const vshCmdOptDef opts_snapshot_create[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {.name = "domain",
{"xmlfile", VSH_OT_DATA, 0, N_("domain snapshot XML")}, .type = VSH_OT_DATA,
{"redefine", VSH_OT_BOOL, 0, N_("redefine metadata for existing snapshot")}, .flags = VSH_OFLAG_REQ,
{"current", VSH_OT_BOOL, 0, N_("with redefine, set current snapshot")}, .help = N_("domain name, id or uuid")
{"no-metadata", VSH_OT_BOOL, 0, N_("take snapshot but create no metadata")}, },
{"halt", VSH_OT_BOOL, 0, N_("halt domain after snapshot is created")}, {.name = "xmlfile",
{"disk-only", VSH_OT_BOOL, 0, N_("capture disk state but not vm state")}, .type = VSH_OT_DATA,
{"reuse-external", VSH_OT_BOOL, 0, N_("reuse any existing external files")}, .flags = 0,
{"quiesce", VSH_OT_BOOL, 0, N_("quiesce guest's file systems")}, .help = N_("domain snapshot XML")
{"atomic", VSH_OT_BOOL, 0, N_("require atomic operation")}, },
{"live", VSH_OT_BOOL, 0, N_("take a live snapshot")}, {.name = "redefine",
{NULL, 0, 0, NULL} .type = VSH_OT_BOOL,
.flags = 0,
.help = N_("redefine metadata for existing snapshot")
},
{.name = "current",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("with redefine, set current snapshot")
},
{.name = "no-metadata",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("take snapshot but create no metadata")
},
{.name = "halt",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("halt domain after snapshot is created")
},
{.name = "disk-only",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("capture disk state but not vm state")
},
{.name = "reuse-external",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("reuse any existing external files")
},
{.name = "quiesce",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("quiesce guest's file systems")
},
{.name = "atomic",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("require atomic operation")
},
{.name = "live",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("take a live snapshot")
},
{.name = NULL}
}; };
static bool static bool
@ -296,22 +340,72 @@ static const vshCmdInfo info_snapshot_create_as[] = {
}; };
static const vshCmdOptDef opts_snapshot_create_as[] = { static const vshCmdOptDef opts_snapshot_create_as[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {.name = "domain",
{"name", VSH_OT_DATA, 0, N_("name of snapshot")}, .type = VSH_OT_DATA,
{"description", VSH_OT_DATA, 0, N_("description of snapshot")}, .flags = VSH_OFLAG_REQ,
{"print-xml", VSH_OT_BOOL, 0, N_("print XML document rather than create")}, .help = N_("domain name, id or uuid")
{"no-metadata", VSH_OT_BOOL, 0, N_("take snapshot but create no metadata")}, },
{"halt", VSH_OT_BOOL, 0, N_("halt domain after snapshot is created")}, {.name = "name",
{"disk-only", VSH_OT_BOOL, 0, N_("capture disk state but not vm state")}, .type = VSH_OT_DATA,
{"reuse-external", VSH_OT_BOOL, 0, N_("reuse any existing external files")}, .flags = 0,
{"quiesce", VSH_OT_BOOL, 0, N_("quiesce guest's file systems")}, .help = N_("name of snapshot")
{"atomic", VSH_OT_BOOL, 0, N_("require atomic operation")}, },
{"live", VSH_OT_BOOL, 0, N_("take a live snapshot")}, {.name = "description",
{"memspec", VSH_OT_DATA, VSH_OFLAG_REQ_OPT, .type = VSH_OT_DATA,
N_("memory attributes: [file=]name[,snapshot=type]")}, .flags = 0,
{"diskspec", VSH_OT_ARGV, 0, .help = N_("description of snapshot")
N_("disk attributes: disk[,snapshot=type][,driver=type][,file=name]")}, },
{NULL, 0, 0, NULL} {.name = "print-xml",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("print XML document rather than create")
},
{.name = "no-metadata",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("take snapshot but create no metadata")
},
{.name = "halt",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("halt domain after snapshot is created")
},
{.name = "disk-only",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("capture disk state but not vm state")
},
{.name = "reuse-external",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("reuse any existing external files")
},
{.name = "quiesce",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("quiesce guest's file systems")
},
{.name = "atomic",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("require atomic operation")
},
{.name = "live",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("take a live snapshot")
},
{.name = "memspec",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ_OPT,
.help = N_("memory attributes: [file=]name[,snapshot=type]")
},
{.name = "diskspec",
.type = VSH_OT_ARGV,
.flags = 0,
.help = N_("disk attributes: disk[,snapshot=type][,driver=type][,file=name]")
},
{.name = NULL}
}; };
static bool static bool
@ -448,12 +542,32 @@ static const vshCmdInfo info_snapshot_edit[] = {
}; };
static const vshCmdOptDef opts_snapshot_edit[] = { static const vshCmdOptDef opts_snapshot_edit[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {.name = "domain",
{"snapshotname", VSH_OT_DATA, 0, N_("snapshot name")}, .type = VSH_OT_DATA,
{"current", VSH_OT_BOOL, 0, N_("also set edited snapshot as current")}, .flags = VSH_OFLAG_REQ,
{"rename", VSH_OT_BOOL, 0, N_("allow renaming an existing snapshot")}, .help = N_("domain name, id or uuid")
{"clone", VSH_OT_BOOL, 0, N_("allow cloning to new name")}, },
{NULL, 0, 0, NULL} {.name = "snapshotname",
.type = VSH_OT_DATA,
.flags = 0,
.help = N_("snapshot name")
},
{.name = "current",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("also set edited snapshot as current")
},
{.name = "rename",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("allow renaming an existing snapshot")
},
{.name = "clone",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("allow cloning to new name")
},
{.name = NULL}
}; };
static bool static bool
@ -556,13 +670,27 @@ static const vshCmdInfo info_snapshot_current[] = {
}; };
static const vshCmdOptDef opts_snapshot_current[] = { static const vshCmdOptDef opts_snapshot_current[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {.name = "domain",
{"name", VSH_OT_BOOL, 0, N_("list the name, rather than the full xml")}, .type = VSH_OT_DATA,
{"security-info", VSH_OT_BOOL, 0, .flags = VSH_OFLAG_REQ,
N_("include security sensitive information in XML dump")}, .help = N_("domain name, id or uuid")
{"snapshotname", VSH_OT_DATA, 0, },
N_("name of existing snapshot to make current")}, {.name = "name",
{NULL, 0, 0, NULL} .type = VSH_OT_BOOL,
.flags = 0,
.help = N_("list the name, rather than the full xml")
},
{.name = "security-info",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("include security sensitive information in XML dump")
},
{.name = "snapshotname",
.type = VSH_OT_DATA,
.flags = 0,
.help = N_("name of existing snapshot to make current")
},
{.name = NULL}
}; };
static bool static bool
@ -782,10 +910,22 @@ static const vshCmdInfo info_snapshot_info[] = {
}; };
static const vshCmdOptDef opts_snapshot_info[] = { static const vshCmdOptDef opts_snapshot_info[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {.name = "domain",
{"snapshotname", VSH_OT_DATA, 0, N_("snapshot name")}, .type = VSH_OT_DATA,
{"current", VSH_OT_BOOL, 0, N_("info on current snapshot")}, .flags = VSH_OFLAG_REQ,
{NULL, 0, 0, NULL} .help = N_("domain name, id or uuid")
},
{.name = "snapshotname",
.type = VSH_OT_DATA,
.flags = 0,
.help = N_("snapshot name")
},
{.name = "current",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("info on current snapshot")
},
{.name = NULL}
}; };
static bool static bool
@ -1325,29 +1465,87 @@ static const vshCmdInfo info_snapshot_list[] = {
}; };
static const vshCmdOptDef opts_snapshot_list[] = { static const vshCmdOptDef opts_snapshot_list[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {.name = "domain",
{"parent", VSH_OT_BOOL, 0, N_("add a column showing parent snapshot")}, .type = VSH_OT_DATA,
{"roots", VSH_OT_BOOL, 0, N_("list only snapshots without parents")}, .flags = VSH_OFLAG_REQ,
{"leaves", VSH_OT_BOOL, 0, N_("list only snapshots without children")}, .help = N_("domain name, id or uuid")
{"no-leaves", VSH_OT_BOOL, 0, },
N_("list only snapshots that are not leaves (with children)")}, {.name = "parent",
{"metadata", VSH_OT_BOOL, 0, .type = VSH_OT_BOOL,
N_("list only snapshots that have metadata that would prevent undefine")}, .flags = 0,
{"no-metadata", VSH_OT_BOOL, 0, .help = N_("add a column showing parent snapshot")
N_("list only snapshots that have no metadata managed by libvirt")}, },
{"inactive", VSH_OT_BOOL, 0, {.name = "roots",
N_("filter by snapshots taken while inactive")}, .type = VSH_OT_BOOL,
{"active", VSH_OT_BOOL, 0, .flags = 0,
N_("filter by snapshots taken while active (system checkpoints)")}, .help = N_("list only snapshots without parents")
{"disk-only", VSH_OT_BOOL, 0, N_("filter by disk-only snapshots")}, },
{"internal", VSH_OT_BOOL, 0, N_("filter by internal snapshots")}, {.name = "leaves",
{"external", VSH_OT_BOOL, 0, N_("filter by external snapshots")}, .type = VSH_OT_BOOL,
{"tree", VSH_OT_BOOL, 0, N_("list snapshots in a tree")}, .flags = 0,
{"from", VSH_OT_DATA, 0, N_("limit list to children of given snapshot")}, .help = N_("list only snapshots without children")
{"current", VSH_OT_BOOL, 0, },
N_("limit list to children of current snapshot")}, {.name = "no-leaves",
{"descendants", VSH_OT_BOOL, 0, N_("with --from, list all descendants")}, .type = VSH_OT_BOOL,
{NULL, 0, 0, NULL} .flags = 0,
.help = N_("list only snapshots that are not leaves (with children)")
},
{.name = "metadata",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("list only snapshots that have metadata that would prevent undefine")
},
{.name = "no-metadata",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("list only snapshots that have no metadata managed by libvirt")
},
{.name = "inactive",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("filter by snapshots taken while inactive")
},
{.name = "active",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("filter by snapshots taken while active (system checkpoints)")
},
{.name = "disk-only",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("filter by disk-only snapshots")
},
{.name = "internal",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("filter by internal snapshots")
},
{.name = "external",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("filter by external snapshots")
},
{.name = "tree",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("list snapshots in a tree")
},
{.name = "from",
.type = VSH_OT_DATA,
.flags = 0,
.help = N_("limit list to children of given snapshot")
},
{.name = "current",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("limit list to children of current snapshot")
},
{.name = "descendants",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("with --from, list all descendants")
},
{.name = NULL}
}; };
static bool static bool
@ -1555,11 +1753,22 @@ static const vshCmdInfo info_snapshot_dumpxml[] = {
}; };
static const vshCmdOptDef opts_snapshot_dumpxml[] = { static const vshCmdOptDef opts_snapshot_dumpxml[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {.name = "domain",
{"snapshotname", VSH_OT_DATA, VSH_OFLAG_REQ, N_("snapshot name")}, .type = VSH_OT_DATA,
{"security-info", VSH_OT_BOOL, 0, .flags = VSH_OFLAG_REQ,
N_("include security sensitive information in XML dump")}, .help = N_("domain name, id or uuid")
{NULL, 0, 0, NULL} },
{.name = "snapshotname",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("snapshot name")
},
{.name = "security-info",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("include security sensitive information in XML dump")
},
{.name = NULL}
}; };
static bool static bool
@ -1614,10 +1823,22 @@ static const vshCmdInfo info_snapshot_parent[] = {
}; };
static const vshCmdOptDef opts_snapshot_parent[] = { static const vshCmdOptDef opts_snapshot_parent[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {.name = "domain",
{"snapshotname", VSH_OT_DATA, 0, N_("find parent of snapshot name")}, .type = VSH_OT_DATA,
{"current", VSH_OT_BOOL, 0, N_("find parent of current snapshot")}, .flags = VSH_OFLAG_REQ,
{NULL, 0, 0, NULL} .help = N_("domain name, id or uuid")
},
{.name = "snapshotname",
.type = VSH_OT_DATA,
.flags = 0,
.help = N_("find parent of snapshot name")
},
{.name = "current",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("find parent of current snapshot")
},
{.name = NULL}
}; };
static bool static bool
@ -1668,13 +1889,37 @@ static const vshCmdInfo info_snapshot_revert[] = {
}; };
static const vshCmdOptDef opts_snapshot_revert[] = { static const vshCmdOptDef opts_snapshot_revert[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {.name = "domain",
{"snapshotname", VSH_OT_DATA, 0, N_("snapshot name")}, .type = VSH_OT_DATA,
{"current", VSH_OT_BOOL, 0, N_("revert to current snapshot")}, .flags = VSH_OFLAG_REQ,
{"running", VSH_OT_BOOL, 0, N_("after reverting, change state to running")}, .help = N_("domain name, id or uuid")
{"paused", VSH_OT_BOOL, 0, N_("after reverting, change state to paused")}, },
{"force", VSH_OT_BOOL, 0, N_("try harder on risky reverts")}, {.name = "snapshotname",
{NULL, 0, 0, NULL} .type = VSH_OT_DATA,
.flags = 0,
.help = N_("snapshot name")
},
{.name = "current",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("revert to current snapshot")
},
{.name = "running",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("after reverting, change state to running")
},
{.name = "paused",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("after reverting, change state to paused")
},
{.name = "force",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("try harder on risky reverts")
},
{.name = NULL}
}; };
static bool static bool
@ -1738,14 +1983,37 @@ static const vshCmdInfo info_snapshot_delete[] = {
}; };
static const vshCmdOptDef opts_snapshot_delete[] = { static const vshCmdOptDef opts_snapshot_delete[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {.name = "domain",
{"snapshotname", VSH_OT_DATA, 0, N_("snapshot name")}, .type = VSH_OT_DATA,
{"current", VSH_OT_BOOL, 0, N_("delete current snapshot")}, .flags = VSH_OFLAG_REQ,
{"children", VSH_OT_BOOL, 0, N_("delete snapshot and all children")}, .help = N_("domain name, id or uuid")
{"children-only", VSH_OT_BOOL, 0, N_("delete children but not snapshot")}, },
{"metadata", VSH_OT_BOOL, 0, {.name = "snapshotname",
N_("delete only libvirt metadata, leaving snapshot contents behind")}, .type = VSH_OT_DATA,
{NULL, 0, 0, NULL} .flags = 0,
.help = N_("snapshot name")
},
{.name = "current",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("delete current snapshot")
},
{.name = "children",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("delete snapshot and all children")
},
{.name = "children-only",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("delete children but not snapshot")
},
{.name = "metadata",
.type = VSH_OT_BOOL,
.flags = 0,
.help = N_("delete only libvirt metadata, leaving snapshot contents behind")
},
{.name = NULL}
}; };
static bool static bool