[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Xen-devel] [Patch 1/2] tools/libxc: goto correct label on error paths



On 01/27/2014 04:25 PM, Andrew Cooper wrote:
Both of these "goto finish;" statements are actually errors, and need to "goto
out;" instead, which will correctly destroy the domain and return an error,
rather than trying to finish the migration (and in at least one scenario,
return success).

Signed-off-by: Andrew Cooper<andrew.cooper3@xxxxxxxxxx>
CC: Ian Campbell<Ian.Campbell@xxxxxxxxxx>
CC: Ian Jackson<Ian.Jackson@xxxxxxxxxxxxx>
CC: George Dunlap<george.dunlap@xxxxxxxxxxxxx>

Right -- I can't imagine any goodness coming from jumping to "finish" in those cases...

Release-acked-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>

---
  tools/libxc/xc_domain_restore.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c
index ca2fb51..5ba47d7 100644
--- a/tools/libxc/xc_domain_restore.c
+++ b/tools/libxc/xc_domain_restore.c
@@ -1778,14 +1778,14 @@ int xc_domain_restore(xc_interface *xch, int io_fd, 
uint32_t dom,
if ( pagebuf_get(xch, ctx, &pagebuf, io_fd, dom) ) {
          PERROR("error when buffering batch, finishing");
-        goto finish;
+        goto out;
      }
      memset(&tmptail, 0, sizeof(tmptail));
      tmptail.ishvm = hvm;
      if ( buffer_tail(xch, ctx, &tmptail, io_fd, max_vcpu_id, vcpumap,
                       ext_vcpucontext, vcpuextstate, vcpuextstate_size) < 0 ) {
          ERROR ("error buffering image tail, finishing");
-        goto finish;
+        goto out;
      }
      tailbuf_free(&tailbuf);
      memcpy(&tailbuf, &tmptail, sizeof(tailbuf));


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.