libxc: really tolerate empty PV records
authorJan Beulich <jbeulich@suse.com>
Thu, 1 Mar 2018 14:09:38 +0000 (15:09 +0100)
committerJan Beulich <jbeulich@suse.com>
Thu, 1 Mar 2018 14:09:38 +0000 (15:09 +0100)
Commit 119ee4d773 ("tools/libxc: Tolerate specific zero-content records
in migration v2 streams") meant tolerate those, but failed to set rc
accordingly.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
tools/libxc/xc_sr_restore_x86_pv.c

index ed0fd0ead9449271d4a2ae49dc34476406a0a8a4..d81dfdcca608cdbd12d07cd108c5be5c9f3d4eee 100644 (file)
@@ -770,6 +770,7 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx,
     {
         DBGPRINTF("Skipping empty %s record for vcpu %u\n",
                   rec_type_to_str(rec->type), vhdr->vcpu_id);
+        rc = 0;
         goto out;
     }