From patchwork Mon Apr 28 10:41:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 29194 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f69.google.com (mail-pb0-f69.google.com [209.85.160.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 43036202FE for ; Mon, 28 Apr 2014 10:42:35 +0000 (UTC) Received: by mail-pb0-f69.google.com with SMTP id md12sf20938559pbc.8 for ; Mon, 28 Apr 2014 03:42:34 -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=ZbVypv1lkZuz2ihpeFLLADl87dKZNOEMZ21t5uSEoFc=; b=TA0D6gUmYd0JPDV/F9X3f8L/gJ68TUHqelCuWUvg3EmSV4iqxeauZBia/biXa5zqV0 m1evAG4Hb5sJPDdH9iWU1zCOhjX1XdGTCrjKAGqDLyOG21zuY5aYJpcW2sKKkCp10JB9 z29OlgHSvvoQrxf2K6QahczszTp28weVL1L8AW/ev7rb6ja8WKjWQ8vaCrUKgunlAiqH 7FCz8bS/x23bLfgU9n1H0Bmq/bEsg1qLlyVN5fSjeDrQJeVfSrr15PB1yL0JaYPzfjj7 fSWqM4lbKkl5ChwCbn3aDQMnPrsG7XoGAei8AxQOtIRfWE9Qi+XpLTNQDj1GSA96EVlc xn3w== X-Gm-Message-State: ALoCoQmwlTLDNFtucyp7tH17RBgnmllHAj/SKFp7bdDXTDfrbgsbjGpBIDihOPTXU2DjF6XV9qse X-Received: by 10.66.189.228 with SMTP id gl4mr12021352pac.26.1398681754316; Mon, 28 Apr 2014 03:42:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.201 with SMTP id k67ls2598067qge.22.gmail; Mon, 28 Apr 2014 03:42:34 -0700 (PDT) X-Received: by 10.220.105.130 with SMTP id t2mr23159605vco.18.1398681754137; Mon, 28 Apr 2014 03:42:34 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id b5si3527371vej.83.2014.04.28.03.42.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 03:42:34 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hr9so8031871vcb.1 for ; Mon, 28 Apr 2014 03:42:34 -0700 (PDT) X-Received: by 10.58.185.145 with SMTP id fc17mr23919827vec.14.1398681754052; Mon, 28 Apr 2014 03:42:34 -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.220.221.72 with SMTP id ib8csp107026vcb; Mon, 28 Apr 2014 03:42:33 -0700 (PDT) X-Received: by 10.221.62.131 with SMTP id xa3mr23163508vcb.13.1398681753774; Mon, 28 Apr 2014 03:42:33 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id q1si3523687ves.171.2014.04.28.03.42.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 28 Apr 2014 03:42:33 -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 1Wej0O-0007tp-U6; Mon, 28 Apr 2014 10:41:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wej0M-0007qb-8W for xen-devel@lists.xen.org; Mon, 28 Apr 2014 10:41:46 +0000 Received: from [193.109.254.147:59029] by server-15.bemta-14.messagelabs.com id B9/39-15813-9603E535; Mon, 28 Apr 2014 10:41:45 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1398681701!1303545!3 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23104 invoked from network); 28 Apr 2014 10:41:44 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 28 Apr 2014 10:41:44 -0000 X-IronPort-AV: E=Sophos;i="4.97,943,1389744000"; d="scan'208";a="124285713" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 28 Apr 2014 10:41:44 +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; Mon, 28 Apr 2014 06:41:43 -0400 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Wej0I-0007Zk-IQ; Mon, 28 Apr 2014 11:41:43 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Mon, 28 Apr 2014 11:41:42 +0100 From: Ian Campbell To: Date: Mon, 28 Apr 2014 11:41:28 +0100 Message-ID: <1398681696-2773-7-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1398681672.29700.55.camel@kazak.uk.xensource.com> References: <1398681672.29700.55.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v2 07/15] TestSupport: allow caller of prepareguest_part_xencfg to specify viftype 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=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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: Signed-off-by: Ian Campbell --- Osstest/TestSupport.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 132e8e9..9d5762f 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1419,12 +1419,13 @@ sub prepareguest_part_xencfg ($$$$$) { my $onpoweroff= $xopts->{OnPowerOff} || 'destroy'; my $oncrash= $xopts->{OnCrash} || 'preserve'; my $vcpus= guest_var($gho, 'vcpus', $xopts->{DefVcpus} || 2); + my $viftype= "type=$xopts->{viftype}," if $xopts->{DefVcpus}; my $xoptcfg= $xopts->{ExtraConfig}; $xoptcfg='' unless defined $xoptcfg; my $xencfg= <{Ether}' ] +vif = [ '${viftype}mac=$gho->{Ether}' ] # on_poweroff = '$onpoweroff' on_reboot = '$onreboot' @@ -1519,6 +1520,7 @@ END $cfg .= "bios='$bios'\n"; } + $xopts{'viftype'} ||= "ioemu"; my $cfgpath= prepareguest_part_xencfg($ho, $gho, $ram_mb, \%xopts, $cfg); target_cmd_root($ho, <{Guest}.vncpw