From 4a3ae388baf286af8ea2c0d6c064ac45f05e11cb Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 22 Feb 2016 13:45:53 +0100 Subject: [PATCH] cmdSaveImageEdit: Prefer VSH_EXCLUSIVE_OPTIONS over by hand check Since we have the macro there's no need for us to unwind it by hand and check for mutually exclusive flags ourselves. Signed-off-by: Michal Privoznik --- tools/virsh-domain.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0be92805d7..bfcc0b38f6 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4542,10 +4542,7 @@ cmdSaveImageEdit(vshControl *ctl, const vshCmd *cmd) * However, in the edit cycle, we let the user retry if the define * step fails, but the define step will always fail on invalid * flags, so we reject it up front to avoid looping. */ - if (define_flags == (VIR_DOMAIN_SAVE_RUNNING | VIR_DOMAIN_SAVE_PAUSED)) { - vshError(ctl, "%s", _("--running and --paused are mutually exclusive")); - return false; - } + VSH_EXCLUSIVE_OPTIONS("running", "paused"); if (vshCommandOptStringReq(ctl, cmd, "file", &file) < 0) return false; -- GitLab