From patchwork Fri Oct 7 16:34:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9366857 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 25B61608A6 for ; Fri, 7 Oct 2016 16:38:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 145D929779 for ; Fri, 7 Oct 2016 16:38:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08E522977C; Fri, 7 Oct 2016 16:38:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B19AF29779 for ; Fri, 7 Oct 2016 16:38:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsY7Y-0000XG-8N; Fri, 07 Oct 2016 16:35:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsY7W-0000WZ-Vw for xen-devel@lists.xenproject.org; Fri, 07 Oct 2016 16:35:39 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id E7/63-27233-ADEC7F75; Fri, 07 Oct 2016 16:35:38 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42JxWrrBXvfaue/ hBjvm61h83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBmfHy5hK2jgrWj9/4qxgfERVxcjJ4eEgL/E mXOr2UBsNgFdiaYtf4FsDg4RARWJ23sNQExmgVCJHS8sQSqEBUIkPn67ygJiswBV3Ps2lxHE5 hXwlGh88oQZYqKcxPnjP8FsTgEviV9t08HqhYBqviz5wg4yUkhATWLu+niIVkGJkzOfgJUwC0 hIHHzxAmoMt8Tt01OZJzDyzUJSNgtJ2QJGplWMGsWpRWWpRbpGJnpJRZnpGSW5iZk5uoYGxnq 5qcXFiempOYlJxXrJ+bmbGIHhVM/AwLiD8dVxv0OMkhxMSqK8Lyu/hwvxJeWnVGYkFmfEF5Xm pBYfYpTh4FCS4PU8C5QTLEpNT61Iy8wBBjZMWoKDR0mENwEkzVtckJhbnJkOkTrFqCglzusHk hAASWSU5sG1waLpEqOslDAvIwMDgxBPQWpRbmYJqvwrRnEORiVh3u0gU3gy80rgpr8CWswEtD h/6ReQxSWJCCmpBsbKzmurr++tZ38rcGRfnm2C6tMopwfNcrIrBCUE7+iUz5p8KvTD/1mvvM4 6+VYfUW4p9i/ecVf4+IEtdpvt1R2cV5uEiTkWffjwKVXvUO212xcNCo6I7/mxwSJO/fCq2efk 2Ex33/i5iuGj1+0Xxm83rGGdcXSJ4pQMxrDjAU8Fam49nnP37/1VSizFGYmGWsxFxYkA3sIK7 KECAAA= X-Env-Sender: prvs=081af608b=Ian.Jackson@citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1475858130!9669361!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54748 invoked from network); 7 Oct 2016 16:35:34 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 7 Oct 2016 16:35:34 -0000 X-IronPort-AV: E=Sophos;i="5.31,456,1473120000"; d="scan'208";a="391320935" From: Ian Jackson To: Date: Fri, 7 Oct 2016 17:34:44 +0100 Message-ID: <1475858096-16123-5-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1475858096-16123-1-git-send-email-ian.jackson@eu.citrix.com> References: <1475858096-16123-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 04/16] Support guest-specific "toolstack" for guest creation X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Some guests need creation in a special way. For example, rump kernels are ideally started with rumprun. Honour a guest var which specifies a toolstack name. Osstest::TestSupport::toolstack now takes an optional $gho so it can do this lookup when appropriate. After creation the guest is necessarily managed with the toolstack for the host, so we honour this (ie we pass the $gho) only for create. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index b18a19e..bc3ad13 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1583,7 +1583,7 @@ sub guest_create ($) { my ($gho) = @_; my $ho = $gho->{Host}; guest_prepare_disk($gho); - toolstack($ho)->create($gho); + toolstack($ho,$gho)->create($gho); } sub guest_prepare_disk ($) { @@ -2257,13 +2257,16 @@ sub guest_vncsnapshot_stash ($$$$) { target_getfile_root($ho,100, "$rfile", "$stash/$leaf"); } -sub toolstack ($) { - my ($ho) = @_; - return $ho->{_Toolstack} if $ho->{_Toolstack}; +sub toolstack ($;$) { + my ($ho,$gho) = @_; + + my $cache = $gho || $ho; + return $cache->{_Toolstack} if $cache->{_Toolstack}; my $tsname= $r{toolstack} || 'xend'; - $ho->{_Toolstack}= get_host_method_object($ho, 'Toolstack', $tsname); - return $ho->{_Toolstack}; + $tsname= guest_var($gho, 'toolstack', $tsname) if $gho; + $cache->{_Toolstack} = get_host_method_object($ho, 'Toolstack', $tsname); + return $cache->{_Toolstack}; } sub authorized_keys () {