Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 803e4670 编写于 作者: P Peter Krempa
浏览文件
操作

virsh-domain: Simplify usage of --current, --live and --config flags 

This patch uses the new helper to avoid the more complex check for
domain state modification flags.
上级 1f0cac35
隐藏空白更改
内联 并排
Showing with 118 addition and 182 deletion
tools/virsh-domain.c
浏览文件 @ 803e4670
...@@ -1021,25 +1021,21 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) ...@@ -1021,25 +1021,21 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd)
int nparams = 0; int nparams = 0;
int maxparams = 0; int maxparams = 0;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
unsigned int flags = 0, i = 0; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
unsigned int i = 0;
int rv = 0; int rv = 0;
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
bool config = vshCommandOptBool(cmd, "config"); bool config = vshCommandOptBool(cmd, "config");
bool live = vshCommandOptBool(cmd, "live"); bool live = vshCommandOptBool(cmd, "live");
bool ret = false; bool ret = false;
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false; if (config)
} flags |= VIR_DOMAIN_AFFECT_CONFIG;
flags = VIR_DOMAIN_AFFECT_CURRENT; if (live)
} else { flags |= VIR_DOMAIN_AFFECT_LIVE;
if (config)
flags |= VIR_DOMAIN_AFFECT_CONFIG;
if (live)
flags |= VIR_DOMAIN_AFFECT_LIVE;
}
if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) if (!(dom = vshCommandOptDomain(ctl, cmd, &name)))
goto cleanup; goto cleanup;
...@@ -1206,23 +1202,18 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) ...@@ -1206,23 +1202,18 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
unsigned int i = 0; unsigned int i = 0;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
bool ret = false; bool ret = false;
unsigned int flags = 0; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
bool config = vshCommandOptBool(cmd, "config"); bool config = vshCommandOptBool(cmd, "config");
bool live = vshCommandOptBool(cmd, "live"); bool live = vshCommandOptBool(cmd, "live");
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false; if (config)
} flags |= VIR_DOMAIN_AFFECT_CONFIG;
flags = VIR_DOMAIN_AFFECT_CURRENT; if (live)
} else { flags |= VIR_DOMAIN_AFFECT_LIVE;
if (config)
flags |= VIR_DOMAIN_AFFECT_CONFIG;
if (live)
flags |= VIR_DOMAIN_AFFECT_LIVE;
}
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;
...@@ -2475,7 +2466,7 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) ...@@ -2475,7 +2466,7 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd)
virDomainPtr dom; virDomainPtr dom;
const char *name = NULL, *device = NULL, const char *name = NULL, *device = NULL,
*inboundStr = NULL, *outboundStr = NULL; *inboundStr = NULL, *outboundStr = NULL;
unsigned int flags = 0; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
int nparams = 0; int nparams = 0;
int maxparams = 0; int maxparams = 0;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
...@@ -2486,18 +2477,13 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) ...@@ -2486,18 +2477,13 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd)
virNetDevBandwidthRate inbound, outbound; virNetDevBandwidthRate inbound, outbound;
int i; int i;
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false; if (config)
} flags |= VIR_DOMAIN_AFFECT_CONFIG;
flags = VIR_DOMAIN_AFFECT_CURRENT; if (live)
} else { flags |= VIR_DOMAIN_AFFECT_LIVE;
if (config)
flags |= VIR_DOMAIN_AFFECT_CONFIG;
if (live)
flags |= VIR_DOMAIN_AFFECT_LIVE;
}
if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) if (!(dom = vshCommandOptDomain(ctl, cmd, &name)))
return false; return false;
...@@ -4027,23 +4013,18 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) ...@@ -4027,23 +4013,18 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd)
int nupdates = 0; int nupdates = 0;
int i, ret; int i, ret;
bool ret_val = false; bool ret_val = false;
unsigned int flags = 0; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
bool config = vshCommandOptBool(cmd, "config"); bool config = vshCommandOptBool(cmd, "config");
bool live = vshCommandOptBool(cmd, "live"); bool live = vshCommandOptBool(cmd, "live");
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false; if (config)
} flags |= VIR_DOMAIN_AFFECT_CONFIG;
flags = VIR_DOMAIN_AFFECT_CURRENT; if (live)
} else { flags |= VIR_DOMAIN_AFFECT_LIVE;
if (config)
flags |= VIR_DOMAIN_AFFECT_CONFIG;
if (live)
flags |= VIR_DOMAIN_AFFECT_LIVE;
}
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;
...@@ -5567,23 +5548,18 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) ...@@ -5567,23 +5548,18 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd)
bool live = vshCommandOptBool(cmd, "live"); bool live = vshCommandOptBool(cmd, "live");
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
bool query = false; /* Query mode if no cpulist */ bool query = false; /* Query mode if no cpulist */
unsigned int flags = 0; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false; if (config)
} flags |= VIR_DOMAIN_AFFECT_CONFIG;
flags = VIR_DOMAIN_AFFECT_CURRENT; if (live)
} else { flags |= VIR_DOMAIN_AFFECT_LIVE;
if (config) /* none of the options were specified */
flags |= VIR_DOMAIN_AFFECT_CONFIG; if (!current && !live && !config)
if (live) flags = -1;
flags |= VIR_DOMAIN_AFFECT_LIVE;
/* neither option is specified */
if (!live && !config)
flags = -1;
}
if (vshCommandOptStringReq(ctl, cmd, "cpulist", &cpulist) < 0) if (vshCommandOptStringReq(ctl, cmd, "cpulist", &cpulist) < 0)
return false; return false;
...@@ -5721,23 +5697,18 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) ...@@ -5721,23 +5697,18 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd)
bool live = vshCommandOptBool(cmd, "live"); bool live = vshCommandOptBool(cmd, "live");
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
bool query = false; /* Query mode if no cpulist */ bool query = false; /* Query mode if no cpulist */
unsigned int flags = 0; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false; if (config)
} flags |= VIR_DOMAIN_AFFECT_CONFIG;
flags = VIR_DOMAIN_AFFECT_CURRENT; if (live)
} else { flags |= VIR_DOMAIN_AFFECT_LIVE;
if (config) /* none of the options were specified */
flags |= VIR_DOMAIN_AFFECT_CONFIG; if (!current && !live && !config)
if (live) flags = -1;
flags |= VIR_DOMAIN_AFFECT_LIVE;
/* neither option is specified */
if (!live && !config)
flags = -1;
}
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;
...@@ -5845,23 +5816,18 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) ...@@ -5845,23 +5816,18 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd)
bool config = vshCommandOptBool(cmd, "config"); bool config = vshCommandOptBool(cmd, "config");
bool live = vshCommandOptBool(cmd, "live"); bool live = vshCommandOptBool(cmd, "live");
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
unsigned int flags = 0; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false; if (config)
} flags |= VIR_DOMAIN_AFFECT_CONFIG;
flags = VIR_DOMAIN_AFFECT_CURRENT; if (live)
} else { flags |= VIR_DOMAIN_AFFECT_LIVE;
if (config) /* none of the options were specified */
flags |= VIR_DOMAIN_AFFECT_CONFIG; if (!current && !live && !config && !maximum)
if (live) flags = -1;
flags |= VIR_DOMAIN_AFFECT_LIVE;
/* neither option is specified */
if (!live && !config && !maximum)
flags = -1;
}
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;
...@@ -6542,18 +6508,13 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) ...@@ -6542,18 +6508,13 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
bool ret = false; bool ret = false;
unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false; if (config)
} flags |= VIR_DOMAIN_AFFECT_CONFIG;
flags = VIR_DOMAIN_AFFECT_CURRENT; if (live)
} else { flags |= VIR_DOMAIN_AFFECT_LIVE;
if (config)
flags |= VIR_DOMAIN_AFFECT_CONFIG;
if (live)
flags |= VIR_DOMAIN_AFFECT_LIVE;
}
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;
...@@ -6959,23 +6920,18 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) ...@@ -6959,23 +6920,18 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd)
bool config = vshCommandOptBool(cmd, "config"); bool config = vshCommandOptBool(cmd, "config");
bool live = vshCommandOptBool(cmd, "live"); bool live = vshCommandOptBool(cmd, "live");
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
unsigned int flags = 0; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false; if (config)
} flags |= VIR_DOMAIN_AFFECT_CONFIG;
flags = VIR_DOMAIN_AFFECT_CURRENT; if (live)
} else { flags |= VIR_DOMAIN_AFFECT_LIVE;
if (config) /* none of the options were specified */
flags |= VIR_DOMAIN_AFFECT_CONFIG; if (!current && !live && !config)
if (live) flags = -1;
flags |= VIR_DOMAIN_AFFECT_LIVE;
/* neither option is specified */
if (!live && !config)
flags = -1;
}
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;
...@@ -7061,22 +7017,18 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) ...@@ -7061,22 +7017,18 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd)
bool config = vshCommandOptBool(cmd, "config"); bool config = vshCommandOptBool(cmd, "config");
bool live = vshCommandOptBool(cmd, "live"); bool live = vshCommandOptBool(cmd, "live");
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
unsigned int flags = VIR_DOMAIN_MEM_MAXIMUM; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT | VIR_DOMAIN_MEM_MAXIMUM;
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false; if (config)
} flags |= VIR_DOMAIN_AFFECT_CONFIG;
} else { if (live)
if (config) flags |= VIR_DOMAIN_AFFECT_LIVE;
flags |= VIR_DOMAIN_AFFECT_CONFIG; /* none of the options were specified */
if (live) if (!current && !live && !config)
flags |= VIR_DOMAIN_AFFECT_LIVE; flags = -1;
/* neither option is specified */
if (!live && !config)
flags = -1;
}
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;
...@@ -7198,23 +7150,18 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) ...@@ -7198,23 +7150,18 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd)
unsigned int i = 0; unsigned int i = 0;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
bool ret = false; bool ret = false;
unsigned int flags = 0; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
bool config = vshCommandOptBool(cmd, "config"); bool config = vshCommandOptBool(cmd, "config");
bool live = vshCommandOptBool(cmd, "live"); bool live = vshCommandOptBool(cmd, "live");
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false; if (config)
} flags |= VIR_DOMAIN_AFFECT_CONFIG;
flags = VIR_DOMAIN_AFFECT_CURRENT; if (live)
} else { flags |= VIR_DOMAIN_AFFECT_LIVE;
if (config)
flags |= VIR_DOMAIN_AFFECT_CONFIG;
if (live)
flags |= VIR_DOMAIN_AFFECT_LIVE;
}
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;
...@@ -7369,24 +7316,19 @@ cmdNumatune(vshControl * ctl, const vshCmd * cmd) ...@@ -7369,24 +7316,19 @@ cmdNumatune(vshControl * ctl, const vshCmd * cmd)
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
const char *nodeset = NULL; const char *nodeset = NULL;
bool ret = false; bool ret = false;
unsigned int flags = 0; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
bool config = vshCommandOptBool(cmd, "config"); bool config = vshCommandOptBool(cmd, "config");
bool live = vshCommandOptBool(cmd, "live"); bool live = vshCommandOptBool(cmd, "live");
const char *mode = NULL; const char *mode = NULL;
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false; if (config)
} flags |= VIR_DOMAIN_AFFECT_CONFIG;
flags = VIR_DOMAIN_AFFECT_CURRENT; if (live)
} else { flags |= VIR_DOMAIN_AFFECT_LIVE;
if (config)
flags |= VIR_DOMAIN_AFFECT_CONFIG;
if (live)
flags |= VIR_DOMAIN_AFFECT_LIVE;
}
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;
...@@ -9895,7 +9837,7 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) ...@@ -9895,7 +9837,7 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd)
const char *doc = NULL; const char *doc = NULL;
xmlNodePtr disk_node = NULL; xmlNodePtr disk_node = NULL;
const char *disk_xml = NULL; const char *disk_xml = NULL;
int flags = 0; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
bool config, live, current, force = false; bool config, live, current, force = false;
bool eject, insert, update = false; bool eject, insert, update = false;
bool ret = false; bool ret = false;
...@@ -9931,19 +9873,13 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) ...@@ -9931,19 +9873,13 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd)
action = "update"; action = "update";
} }
if (current) { VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
if (live || config) { VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
vshError(ctl, "%s", _("--current must be specified exclusively"));
return false;
}
flags = VIR_DOMAIN_AFFECT_CURRENT;
} else {
if (config)
flags |= VIR_DOMAIN_AFFECT_CONFIG;
if (live)
flags |= VIR_DOMAIN_AFFECT_LIVE;
}
if (config)
flags |= VIR_DOMAIN_AFFECT_CONFIG;
if (live)
flags |= VIR_DOMAIN_AFFECT_LIVE;
if (force) if (force)
flags |= VIR_DOMAIN_DEVICE_MODIFY_FORCE; flags |= VIR_DOMAIN_DEVICE_MODIFY_FORCE;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或