From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH OSSTEST v2 05/13] sg-run-job: remove
 save/restore dependency on local migration support
Date: Mon, 13 Jul 2015 12:22:41 +0100
Message-ID: <1436786561.7019.104.camel@citrix.com>
References: <1436718036-7985-1-git-send-email-wei.liu2@citrix.com>
	<1436718036-7985-6-git-send-email-wei.liu2@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=629d1b08a=Ian.Campbell@citrix.com>)
	id 1ZEbot-0003UI-Do
	for xen-devel@lists.xenproject.org; Mon, 13 Jul 2015 11:22:47 +0000
In-Reply-To: <1436718036-7985-6-git-send-email-wei.liu2@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Wei Liu <wei.liu2@citrix.com>
Cc: Xen-devel <xen-devel@lists.xenproject.org>, ian.jackson@eu.citrix.com
List-Id: xen-devel@lists.xenproject.org

On Sun, 2015-07-12 at 17:20 +0100, Wei Liu wrote:
> Since we've introduced different checks for save / restore and local
> migration, it's possible to run save / restore tests without running
> local migration tests.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
>  sg-run-job | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/sg-run-job b/sg-run-job
> index 16fcfc1..172214e 100755
> --- a/sg-run-job
> +++ b/sg-run-job
> @@ -302,13 +302,20 @@ proc run-job/test-pair {} {
>  proc test-guest-migr {g} {
>      set to_reap [spawn-ts . = ts-migrate-support-check + host $g 1]
>      set can_migrate [reap-ts $to_reap]
> -    if {!$can_migrate} return
> +    set to_reap [spawn-ts . = ts-saverestore-support-check + host]

ts-migrate-support-check takes the guest name, even though it doesn't
actually need it today. I think this is justifiable because the decision
as to whether migration or s/r could be achieve _might_ be dependent on
the guest cfg.

Thus I think ts-saverrestore-support-check ought to take $g too for
consistency with that and with ts-guest-migrate too.

Or $g it could be removed from the migrate check, but that's not my
preference.

> +    set can_saverestore [reap-ts $to_reap]
>  
>      foreach iteration {{} .2} {
> -        run-ts . =$iteration ts-guest-saverestore + host $g
> -        run-ts . =$iteration ts-guest-localmigrate + host $g
> +        if {$can_saverestore} {
> +            run-ts . =$iteration ts-guest-saverestore + host $g
> +        }
> +        if {$can_migrate} {
> +            run-ts . =$iteration ts-guest-localmigrate + host $g
> +        }
> +    }
> +    if {$can_migrate} {
> +        run-ts . = ts-guest-localmigrate x10 + host $g
>      }
> -    run-ts . = ts-guest-localmigrate x10 + host $g
>  }
>  
>  proc test-guest {g} {