From 4a3bd30e501987fce618accefa424daa2a9b598f Mon Sep 17 00:00:00 2001 From: Luyao Huang Date: Mon, 17 Aug 2015 17:56:48 +0800 Subject: [PATCH] virsh: Reset global error after successfull domain lookup When looking up a domain, we try to look up by ID, UUID and NAME consequently while not really caring which of those lookups succeeds. The problem is that if any of them fails, we dispatch the error from the driver and that means setting both threadlocal and global error. Let's say the last lookup (by NAME) succeeds and resets the threadlocal error as any other API does, however leaving the global error unchanged. If the underlying virsh command does not succeed afterwards, our cleanup routine in vshCommandRun ensures that no libvirt error will be forgotten and that's exactly where this global error comes in incorrectly. # virsh domif-setlink 123 vnet1 up error: interface (target: vnet1) not found error: Domain not found: no domain with matching id 123 This patch also resets the global error which would otherwise cause some minor confusion in reported error messages. https://bugzilla.redhat.com/show_bug.cgi?id=1254152 Signed-off-by: Luyao Huang Signed-off-by: Erik Skultety (cherry picked from commit 70f56dd72cdca309005c8234a8945721badbcfff) --- tools/virsh-domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4988ba2e43..43a1fbee6a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -97,6 +97,8 @@ vshLookupDomainInternal(vshControl *ctl, dom = virDomainLookupByName(ctl->conn, name); } + vshResetLibvirtError(); + if (!dom) vshError(ctl, _("failed to get domain '%s'"), name);