From patchwork Tue Oct 31 13:51:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 10034571 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 C3DBA602B9 for ; Tue, 31 Oct 2017 13:54:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7F3E28AC4 for ; Tue, 31 Oct 2017 13:54:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC52E28AF4; Tue, 31 Oct 2017 13:54:50 +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 D63F728AC4 for ; Tue, 31 Oct 2017 13:54:48 +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 1e9Wxg-00024H-M8; Tue, 31 Oct 2017 13:52:12 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e9Wxf-000232-1U for xen-devel@lists.xenproject.org; Tue, 31 Oct 2017 13:52:11 +0000 Received: from [193.109.254.147] by server-9.bemta-6.messagelabs.com id 99/59-30115-A0088F95; Tue, 31 Oct 2017 13:52:10 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRWlGSWpSXmKPExsXitHRDpC5Xw49 Ig5Zbkhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bH6cYFn1krPrYkNTA+Yeli5OSQEPCX2Pbn CBuIzSagLPGzsxfMFhHQk2g68JwRxGYWsJNofvQBrF5YIFBi/6Y77F2MHBwsAqoSi+dng4R5B SwlJrQvgRopL7Gr7SIriM0JFF//tIkdxBYSsJC4t+w7I4StINEx/RgTRK+gxMmZEOcwC0hIHH zxgnkCI+8sJKlZSFILGJlWMWoUpxaVpRbpGhrpJRVlpmeU5CZm5ugaGpjp5aYWFyemp+YkJhX rJefnbmIEhg0DEOxgvLwx4BCjJAeTkijvTsfvkUJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkeK/V /YgUEixKTU+tSMvMAQYwTFqCg0dJhFe2HijNW1yQmFucmQ6ROsVoyXHj4fU/TBwdN+8CyWczX zcwC7Hk5eelSonz/gSZJwDSkFGaBzcOFmWXGGWlhHkZgQ4U4ilILcrNLEGVf8UozsGoJMwrDr KWJzOvBG7rK6CDmIAO8pIAO6gkESEl1cBY3qKd/zfSYnaSx9TNdxerlk62bmv5Uch5s9PYXXb NMpZYRsdTu8/6ui1wftwVev6h7cnvBs1zzr1nfrBs75T3B2RWnmV8rnL1o9cNFZXQZbeXbOIw 5w3ZfE99lthugVXrFgfdS1dJmbyCRf23g9IeHfZ7yiI3szwXHkopLZ3Bv6FY+feFLLerSizFG YmGWsxFxYkAFWuxzq0CAAA= X-Env-Sender: prvs=470789eaf=wei.liu2@citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1509457928!103983624!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43861 invoked from network); 31 Oct 2017 13:52:10 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 31 Oct 2017 13:52:10 -0000 X-IronPort-AV: E=Sophos;i="5.44,324,1505779200"; d="scan'208";a="449211929" From: Wei Liu To: Xen-devel Date: Tue, 31 Oct 2017 13:51:53 +0000 Message-ID: <20171031135203.11537-10-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171031135203.11537-1-wei.liu2@citrix.com> References: <20171031135203.11537-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com, Wei Liu Subject: [Xen-devel] [OSSTEST PATCH v2 09/19] ts-debian-fixup: merge origin extra= to our own 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 The original extra= was not removed, so there were two extra= in the resulting config file. It wasn't a problem for xl because the second extra= took precedence. However libvirt tests would only pick up the first extra= -- they worked by chance. Fix this issue by merging the original. Signed-off-by: Wei Liu --- ts-debian-fixup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-debian-fixup b/ts-debian-fixup index f29971d..288766d 100755 --- a/ts-debian-fixup +++ b/ts-debian-fixup @@ -175,7 +175,7 @@ sub otherfixupcfg () { $extra .= " iommu=soft"; } - $cfg .= "\nextra='$extra'\n"; + $cfg =~ s/^extra\s*=\s*['"](.*)['"]/extra = '$1 $extra'/mg; }; sub writecfg () {