From patchwork Tue Jun 17 15:26:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 32061 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8585A206A0 for ; Tue, 17 Jun 2014 15:27:44 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id tr6sf42633639ieb.11 for ; Tue, 17 Jun 2014 08:27:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=JoHVwnIz9F8KTd03mV++Ev5+mKCJy1C8A/IxNJZgh9Q=; b=dVBLi9P98jPqNeC23wCwrKbyBZfoXHqNFTHjsV4jaglglAVtxsKREBgg5FneZGfC/O bcfNfANpc7l4eLvDyhw3rX/gq5r3NVQ0dkfnhLxUczkn9DhaDcyGPjo7l0rG2FSM5Ql3 WG0dK62gPsA+d5Wk85mEFajcwW5+ikwUKFnI4eiUjvNeINo4xsdezqHqSxCpg+ZhrKKl Hsu7XhXOs/R4/7cm0NGPXm9yJERstm63w+RPn8yNf+8S74NWQnaTr7K20h8Q08VBs4GM KGHUy6jsz0YaKcKLldF4SxmRnraJ2YP0kS2ASJhRYZXWxjkZSwPxzbUjI07OC549BUyD PcJQ== X-Gm-Message-State: ALoCoQk67wCVugI7bqljBisN60z8rSyD4MKewTtWjsj9g0WO+qSq0PoZTKMKXxZ3H4ZcgxsYjbKg X-Received: by 10.42.249.207 with SMTP id ml15mr264253icb.21.1403018863988; Tue, 17 Jun 2014 08:27:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.6 with SMTP id j6ls965134qge.89.gmail; Tue, 17 Jun 2014 08:27:43 -0700 (PDT) X-Received: by 10.220.103.141 with SMTP id k13mr11094350vco.25.1403018863891; Tue, 17 Jun 2014 08:27:43 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id vs2si2919781vcb.69.2014.06.17.08.27.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Jun 2014 08:27:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id i13so4090878veh.36 for ; Tue, 17 Jun 2014 08:27:43 -0700 (PDT) X-Received: by 10.221.5.1 with SMTP id oe1mr22563036vcb.10.1403018863807; Tue, 17 Jun 2014 08:27:43 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp217959vcb; Tue, 17 Jun 2014 08:27:43 -0700 (PDT) X-Received: by 10.53.1.71 with SMTP id be7mr787476vdd.92.1403018863494; Tue, 17 Jun 2014 08:27:43 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id sy10si5603230veb.103.2014.06.17.08.27.43 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 17 Jun 2014 08:27:43 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WwvHN-0005r1-Aw; Tue, 17 Jun 2014 15:26:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WwvHL-0005q8-CS for xen-devel@lists.xen.org; Tue, 17 Jun 2014 15:26:31 +0000 Received: from [193.109.254.147:53376] by server-8.bemta-14.messagelabs.com id 0C/1F-01877-62E50A35; Tue, 17 Jun 2014 15:26:30 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1403018788!11897229!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19732 invoked from network); 17 Jun 2014 15:26:29 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 17 Jun 2014 15:26:29 -0000 X-IronPort-AV: E=Sophos;i="5.01,494,1400025600"; d="scan'208";a="144521692" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 17 Jun 2014 15:26:29 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Tue, 17 Jun 2014 11:26:28 -0400 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=kazak.uk.xensource.com.) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1WwvHH-00010a-Ke; Tue, 17 Jun 2014 16:26:27 +0100 From: Ian Campbell To: Date: Tue, 17 Jun 2014 16:26:23 +0100 Message-ID: <1403018787-25442-5-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1403018758.25074.5.camel@kazak.uk.xensource.com>#> References: <1403018758.25074.5.camel@kazak.uk.xensource.com>#> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH RFC OSSTEST 5/9] TestSupport: guest_create takes a $ho. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Add looks up the toolstack from it. This is now consistent with guest_destroy. Signed-off-by: Ian Campbell --- Osstest/TestSupport.pm | 5 +++-- ts-debian-hvm-install | 7 ++----- ts-redhat-install | 7 ++----- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 11a036f..1444629 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1278,8 +1278,9 @@ sub guest_destroy ($$) { } sub guest_create ($$) { - my ($gho,$toolstack) = @_; - target_cmd_root($gho->{Host}, "$toolstack create $gho->{CfgPath}", 100); + my ($ho,$gho) = @_; + my $ts= toolstack($ho); + target_cmd_root($ho, $ts->{Command}." create $gho->{CfgPath}", 100); } diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install index 0148eef..f274630 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -41,9 +41,6 @@ our $disk_mb= 10000; our $guesthost= "$gn.guest.osstest"; our $gho; -our $toolstack= toolstack($ho)->{Command}; - - sub preseed () { my $preseed_file = preseed_base('wheezy','',()); @@ -183,7 +180,7 @@ logm("Host has $host_freemem_mb MB free memory, setting guest memory size to $ra if (!$stage) { prep(); - guest_create($gho,$toolstack); + guest_create($ho,$gho); } else { $gho= selectguest($gn,$gho); } @@ -193,6 +190,6 @@ if ($stage<2) { } guest_editconfig_nocd($gho,$emptyiso); -guest_create($gho,$toolstack); +guest_create($ho,$gho); guest_await_dhcp_tcp($gho,300); guest_check_up($gho); diff --git a/ts-redhat-install b/ts-redhat-install index a0b1fab..0b4ee17 100755 --- a/ts-redhat-install +++ b/ts-redhat-install @@ -37,9 +37,6 @@ our $disk_mb= 50000; our $guesthost= "$gn.guest.osstest"; our $gho; -our $xl= toolstack($ho)->{Command}; - - sub kickstart () { my $cryptpw= '$6$anjRJmBbJcrNJGWN$rqvGUhu8ITjvErdIA5C//w2R6b/6wAjHbaF7XF8u3lZg1XI3StthPIE6UII08scOFwASMOepCGpgtsYeCpjqb.'; my $authkeys= authorized_keys(); @@ -152,7 +149,7 @@ sub prep () { if (!$stage) { prep(); - guest_create($gho,$xl); + guest_create($ho,$gho); } else { $gho= selectguest($gn,$gho); } @@ -162,6 +159,6 @@ if ($stage<2) { } guest_editconfig_nocd($gho,$emptyiso); -guest_create($gho,$xl); +guest_create($ho,$gho); guest_await_dhcp_tcp($gho,300); guest_check_up($gho);