From patchwork Sun Nov 9 09:49:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 40530 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 60116203C0 for ; Mon, 10 Nov 2014 19:12:34 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id d17sf5949805eek.3 for ; Mon, 10 Nov 2014 11:12:33 -0800 (PST) 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 :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=cCsW5SHK4z4UG/6ZTVnDZjz6zmAbSDtccix3Lk7KRao=; b=VqzUbNZ7KJ1Tl4PQ7L05hdMBgMZEQuvWEUuVq8EAy5ler/3bdBCwSYmCi9Dk3ehVoO bLu4q/vu5uT2ySuCcsLDBerm5DsM0YvhOdQ49NUH+ntloOR5Ykxn6pksDtfOK41myZq4 +1ACot/ZKmILDn9Bd6NluN4ctR/fW9rhuXBPJxkBHPhfn6gOtX8qdhaC758Eg/THGBgX w1LyG3BdWC1uFNdZNU0vwCRs/MhQscRNcSA8bmZydIZvtymMhiRwm787UcuAuHNh0Nqz TYR2sxJZxZud/ZPQNI8dMhQ2ObOR448tuRXn9qowxUiTSKPiyeftZ2UlKPXmOYtr6+55 bnlg== X-Gm-Message-State: ALoCoQkR2ZwpzOHF0I6O62yp24yYEAq5JvarE+Vdmh6BZbPxLrqWgAycydXSfiXYpwACLq/06aG2 X-Received: by 10.112.154.194 with SMTP id vq2mr917188lbb.10.1415646753520; Mon, 10 Nov 2014 11:12:33 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.170 with SMTP id l10ls398660lah.18.gmail; Mon, 10 Nov 2014 11:12:33 -0800 (PST) X-Received: by 10.112.136.37 with SMTP id px5mr31139746lbb.36.1415646753206; Mon, 10 Nov 2014 11:12:33 -0800 (PST) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id rg7si4855337lbb.135.2014.11.10.11.12.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Nov 2014 11:12:32 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by mail-la0-f52.google.com with SMTP id pv20so8356126lab.11 for ; Mon, 10 Nov 2014 11:12:32 -0800 (PST) X-Received: by 10.152.42.226 with SMTP id r2mr31567905lal.29.1415646752716; Mon, 10 Nov 2014 11:12:32 -0800 (PST) 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.112.184.201 with SMTP id ew9csp146920lbc; Mon, 10 Nov 2014 11:12:31 -0800 (PST) X-Received: by 10.107.10.92 with SMTP id u89mr35856165ioi.46.1415646751388; Mon, 10 Nov 2014 11:12:31 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id m14si29006194icp.91.2014.11.10.11.12.30 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 10 Nov 2014 11:12:31 -0800 (PST) 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 1XnP7a-0003HU-Fr; Sun, 09 Nov 2014 09:49:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnP7Y-0003Gf-Cb for xen-devel@lists.xen.org; Sun, 09 Nov 2014 09:49:20 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id DA/E8-29352-F983F545; Sun, 09 Nov 2014 09:49:19 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1415526557!11364949!1 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.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31011 invoked from network); 9 Nov 2014 09:49:19 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2014 09:49:19 -0000 X-IronPort-AV: E=Sophos;i="5.07,345,1413244800"; d="scan'208";a="190957755" 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; Sun, 9 Nov 2014 04:49:16 -0500 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 1XnP7T-0007Sb-RQ; Sun, 09 Nov 2014 09:49:16 +0000 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Sun, 09 Nov 2014 09:49:15 +0000 From: Ian Campbell To: Date: Sun, 9 Nov 2014 09:49:15 +0000 Message-ID: <1415526555-3609-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.1 MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST] ts-host-install: Ensure $dtbs is always a valid string 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.215.52 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: Otherwise on non-ARM platforms we get warnings about uninitialised values. Signed-off-by: Ian Campbell --- ts-host-install | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ts-host-install b/ts-host-install index 5840e27..c39c5e7 100755 --- a/ts-host-install +++ b/ts-host-install @@ -196,8 +196,9 @@ SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="$ho->{Ether}", A END } - my $dtbs = "fdtdir /$d_i/dtbs" - if -e "$ho->{Tftp}{Path}/$d_i/dtbs"; + my $dtbs = ""; + $dtbs = "fdtdir /$d_i/dtbs" + if -e "fdtdir /$d_i/dtbs""$ho->{Tftp}{Path}/$d_i/dtbs"; file_simple_write_contents("$initrd_overlay.cpio", sub { contents_make_cpio($_[0], 'newc', "$initrd_overlay.d");