* tools/virsh.c (cmdUndefine, cmdSave, cmdSaveImageDumpxml) (cmdSaveImageEdit, cmdManagedSave, cmdRestore, cmdDump) (cmdVcpuPin, cmdSetvcpus, cmdSetmem, cmdSetmaxmem, cmdDumpXML) (cmdDomXMLFromNative, cmdDomXMLToNative, doMigrate) (cmdInterfaceEdit, cmdInterfaceDumpXML, cmdEdit): Match coding style for flags. --- tools/virsh.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index ee5d3bf..c360a20 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1443,7 +1443,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; bool ret = true; const char *name = NULL; - int flags = 0; + unsigned int flags = 0; int managed_save = vshCommandOptBool(cmd, "managed-save"); int has_managed_save = 0; int rc = -1; @@ -1651,7 +1651,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) const char *name = NULL; const char *to = NULL; bool ret = false; - int flags = 0; + unsigned int flags = 0; const char *xmlfile = NULL; char *xml = NULL; @@ -1713,7 +1713,7 @@ cmdSaveImageDumpxml(vshControl *ctl, const vshCmd *cmd) { const char *file = NULL; bool ret = false; - int flags = 0; + unsigned int flags = 0; char *xml = NULL; if (vshCommandOptBool(cmd, "security-info")) @@ -1810,7 +1810,7 @@ cmdSaveImageEdit(vshControl *ctl, const vshCmd *cmd) char *tmp = NULL; char *doc = NULL; char *doc_edited = NULL; - int flags = VIR_DOMAIN_XML_SECURE; + unsigned int flags = VIR_DOMAIN_XML_SECURE; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -1888,7 +1888,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; const char *name; bool ret = false; - int flags = 0; + unsigned int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -2246,7 +2246,7 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) { const char *from = NULL; bool ret = false; - int flags = 0; + unsigned int flags = 0; const char *xmlfile = NULL; char *xml = NULL; @@ -2309,7 +2309,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) const char *name = NULL; const char *to = NULL; bool ret = false; - int flags = 0; + unsigned int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -3412,7 +3412,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) int live = vshCommandOptBool(cmd, "live"); int current = vshCommandOptBool(cmd, "current"); bool query = false; /* Query mode if no cpulist */ - int flags = 0; + unsigned int flags = 0; if (current) { if (live || config) { @@ -3645,7 +3645,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) int config = vshCommandOptBool(cmd, "config"); int live = vshCommandOptBool(cmd, "live"); int current = vshCommandOptBool(cmd, "current"); - int flags = 0; + unsigned int flags = 0; if (current) { if (live || config) { @@ -3859,7 +3859,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) int config = vshCommandOptBool(cmd, "config"); int live = vshCommandOptBool(cmd, "live"); int current = vshCommandOptBool(cmd, "current"); - int flags = 0; + unsigned int flags = 0; if (current) { if (live || config) { @@ -3948,7 +3948,7 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) int config = vshCommandOptBool(cmd, "config"); int live = vshCommandOptBool(cmd, "live"); int current = vshCommandOptBool(cmd, "current"); - int flags = VIR_DOMAIN_MEM_MAXIMUM; + unsigned int flags = VIR_DOMAIN_MEM_MAXIMUM; if (current) { if (live || config) { @@ -4612,7 +4612,7 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; bool ret = true; char *dump; - int flags = 0; + unsigned int flags = 0; int inactive = vshCommandOptBool(cmd, "inactive"); int secure = vshCommandOptBool(cmd, "security-info"); int update = vshCommandOptBool(cmd, "update-cpu"); @@ -4665,7 +4665,7 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) const char *configFile = NULL; char *configData; char *xmlData; - int flags = 0; + unsigned int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -4711,7 +4711,7 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) const char *xmlFile = NULL; char *configData; char *xmlData; - int flags = 0; + unsigned int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -4879,7 +4879,7 @@ doMigrate (void *opaque) const char *desturi = NULL; const char *migrateuri = NULL; const char *dname = NULL; - int flags = 0; + unsigned int flags = 0; vshCtrlData *data = opaque; vshControl *ctl = data->ctl; const vshCmd *cmd = data->cmd; @@ -5653,7 +5653,7 @@ cmdInterfaceEdit (vshControl *ctl, const vshCmd *cmd) char *doc = NULL; char *doc_edited = NULL; char *doc_reread = NULL; - int flags = VIR_INTERFACE_XML_INACTIVE; + unsigned int flags = VIR_INTERFACE_XML_INACTIVE; if (!vshConnectionUsability(ctl, ctl->conn)) goto cleanup; @@ -6194,7 +6194,7 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) virInterfacePtr iface; bool ret = true; char *dump; - int flags = 0; + unsigned int flags = 0; int inactive = vshCommandOptBool(cmd, "inactive"); if (inactive) @@ -11696,7 +11696,7 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) char *doc = NULL; char *doc_edited = NULL; char *doc_reread = NULL; - int flags = VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_INACTIVE; + unsigned int flags = VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_INACTIVE; if (!vshConnectionUsability(ctl, ctl->conn)) goto cleanup; -- 1.7.4.4