From patchwork Tue Aug 25 11:40:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11735589 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B0C88109B for ; Tue, 25 Aug 2020 11:41:37 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8D011206F0 for ; Tue, 25 Aug 2020 11:41:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="LcE0rbr2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D011206F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXJu-00031u-3T; Tue, 25 Aug 2020 11:40:54 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXJs-00030H-H7 for xen-devel@lists.xenproject.org; Tue, 25 Aug 2020 11:40:52 +0000 X-Inumbo-ID: 19ef2a7e-e253-44c5-86ed-a40e61b03976 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 19ef2a7e-e253-44c5-86ed-a40e61b03976; Tue, 25 Aug 2020 11:40:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1598355648; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=UQrHws9+Gj61YGmU3rdj2iP+9quz3JW5H1z0XMLJwBM=; b=LcE0rbr2Fyj0KbfW9OOJK3r0zgyqcJdXgR3TPrFnAHDmbYppoTvfO5fh RhEOcQkkECTI5njZE8O2eIyz4w3bZ7RzLlKrsFbr+4DvdQZjZrA1R5CoX Q8q++SVoSZ0zP/VQPzbp4CVG7qGXbLxOv4A4uHV04skc1OSO3CgYXiXIW I=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 2RjV461DkSJwQDAAJMOlhPSc2qb1e9JxpnhDHi8Cm+slWLtPE8QMxQccG95aXn3WEw4REABaQF QJTnMXD76vUskGSTOZdoxMT5dUZvYQRAbO+yzv774S9ncKvwuNhjgD/mpfCfQWJe8G4ZxSRnDZ uNMBStyEXpPsdHabrQt1Q9f4WHziIP50HMllg0pTz6b7vkTTaE2mXu3xMqJ4ls5+k4b6rRmqmt 56w7uq3rR31e+2LzhFB7xf55vzTR6Mut0Py2NTtmr/K+e8YXW3CQHEGgkrJ8WgcuvjoWw+U44t h2g= X-SBRS: 2.7 X-MesageID: 25246373 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,352,1592884800"; d="scan'208";a="25246373" From: Ian Jackson To: CC: Ian Jackson Subject: [OSSTEST PATCH 01/12] ms-queuedaemon: Update for newer Tcl's socket channel ids Date: Tue, 25 Aug 2020 12:40:30 +0100 Message-ID: <20200825114041.16290-2-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200825114041.16290-1-ian.jackson@eu.citrix.com> References: <20200825114041.16290-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Now we have things like "sock55599edaf050" where previously we had something like "sock142". So the output is misaligned. Bump the sizes. And with these longer names, when showing the front of the queue only print the full first entry and the start of the next one. Signed-off-by: Ian Jackson --- ms-queuedaemon | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ms-queuedaemon b/ms-queuedaemon index a3a009ca..dc858863 100755 --- a/ms-queuedaemon +++ b/ms-queuedaemon @@ -91,7 +91,7 @@ proc log-event {m} { proc log-state {m} { global need_queue_run queue - set lhs [format "N=%d Q=%d (%-15.15s) " \ + set lhs [format "N=%d Q=%d (%-20.20s) " \ $need_queue_run [llength $queue] $queue] foreach-walker w { @@ -99,13 +99,13 @@ proc log-state {m} { if {[info exists queue_running]} { append lhs [format "R=%-3d " [llength $queue_running]] if {[info exists thinking]} { - append lhs [format "T=%-7s " $thinking] + append lhs [format "T=%-16s " $thinking] } else { - append lhs [format " "] + append lhs [format " "] } - append lhs [format "(%-15.15s) " $queue_running] + append lhs [format "(%-20.20s) " $queue_running] } else { - append lhs " " + append lhs " " } } From patchwork Tue Aug 25 11:40:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11735593 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 367EC109B for ; Tue, 25 Aug 2020 11:41:42 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 12C97206F0 for ; Tue, 25 Aug 2020 11:41:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="Z7XVzjVO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 12C97206F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXK0-00034u-73; Tue, 25 Aug 2020 11:41:00 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXJy-00030Q-Nl for xen-devel@lists.xenproject.org; Tue, 25 Aug 2020 11:40:58 +0000 X-Inumbo-ID: 94d20758-0b0e-4002-9eee-c79009b49236 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 94d20758-0b0e-4002-9eee-c79009b49236; Tue, 25 Aug 2020 11:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1598355652; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=rwWRXEC6We/jkqKgEfFKTqhfeAWnYjAzJRLNkGjEIRI=; b=Z7XVzjVOfRbz1/5SW1NV2Cy87W1KqpgrxvRrAxOV2KyRPIDGCYPIUNVV BMeuYWKS7btMyJsSnp+C+QeOCmLRld0Yj+3DHpA7/BdWZn16blnx/hRBd Taodcfco+3oJAugEIbvXP92sJ2l2RyGzsHIK1BOME2OLi9bQEFK6R4p5B w=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: kygFYLZqZJBqa7Qbz3vf597cUXJKpvpCaljMSIPoyGDrSgbItHL7Pg8gCngrgnpVJwXMbOaAZS lK2xd2w2BdXZujas5KR+i0onEpMunT+LetV/58lpQTKSQv1Q4Jvh7mBxjM8mQOCxwg9VRYXaau FKkjw/ZFjjUhVDSLMQ4wJuQGz/sDrMsn5jniSrzE03sdhdRXOt37TgJVYI7hZMqCa1jZpfF1/n 4XiQ5yovL9HY9xOffBPP2a2D9StrS7mVxjsjjaBU2EzhcK26n/i8uJ55SWL9Ed3AudWgy819R3 CjE= X-SBRS: 2.7 X-MesageID: 25567115 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,352,1592884800"; d="scan'208";a="25567115" From: Ian Jackson To: CC: Ian Jackson , Ian Jackson Subject: [OSSTEST PATCH 02/12] Executive.pm planner: fix typo Date: Tue, 25 Aug 2020 12:40:31 +0100 Message-ID: <20200825114041.16290-3-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200825114041.16290-1-ian.jackson@eu.citrix.com> References: <20200825114041.16290-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Signed-off-by: Ian Jackson --- Osstest/Executive.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index 61a99bc3..4151aa6c 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -693,7 +693,7 @@ sub plan_search ($$$$) { next PERIOD if $endevt->{Time} <= $try_time; # this period is entirely before the proposed slot; - # it doesn't overlap, but most check subsequent periods + # it doesn't overlap, but must check subsequent periods CHECK: { From patchwork Tue Aug 25 11:40:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11735597 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E170014F6 for ; Tue, 25 Aug 2020 11:41:54 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BCB62206F0 for ; Tue, 25 Aug 2020 11:41:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="SI3npBla" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCB62206F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXK4-00037B-HS; Tue, 25 Aug 2020 11:41:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXK2-00030H-HQ for xen-devel@lists.xenproject.org; Tue, 25 Aug 2020 11:41:02 +0000 X-Inumbo-ID: 96eb9674-f0d4-456b-b1fb-d7200e212ed8 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 96eb9674-f0d4-456b-b1fb-d7200e212ed8; Tue, 25 Aug 2020 11:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1598355651; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=gyJ7RHtgfyrPqUIh/7IbYslh5wQnqEn0AH6SJydkzDk=; b=SI3npBlavX4oIftRWNem//Of+f1zc0weFira30nfBod6xlfge4N7AAT0 KGTs7EFhQACQ4laL5RMhzzqF1ge18YAMzgt5v0fXklrYmCqyjcfrRR9f4 S5bqofwc9sE8Tk06IuM9O9c64hmCK4ws2AYIfQoHNZBjcJpQ+Rn6trK9U s=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: Ny6KDx10i0IsmUS09ysGVS60EPx2dP/HiTsa9AnMTScBb7sknxQrpArqzEHlSqnjraHU5xQWE8 rMdpRDh/gMnzKfcz5EDfA/zpvtbfVnXwFBIj9K1v8rnBiiwYcM9ihUKzbOaB8WCxS+4RWMM9Q0 PGworetgKns95pkz7qQJ8mBTSWD+yfX+NrDbEnqe+MnGhq828xZQ3fDXMfZyExQdXdq7A4YwLK NLgdxbPJLvrlrNzIBB+spjYFvuno7gDihHs4bKyRVucXup7Dde4p4FgeRJs5UdpLIKYSeKuPPL CaQ= X-SBRS: 2.7 X-MesageID: 25246378 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,352,1592884800"; d="scan'208";a="25246378" From: Ian Jackson To: CC: Ian Jackson , Ian Jackson Subject: [OSSTEST PATCH 03/12] README.planner: Document magic job hostflags Date: Tue, 25 Aug 2020 12:40:32 +0100 Message-ID: <20200825114041.16290-4-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200825114041.16290-1-ian.jackson@eu.citrix.com> References: <20200825114041.16290-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Signed-off-by: Ian Jackson --- README.planner | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/README.planner b/README.planner index c33aae11..f134d716 100644 --- a/README.planner +++ b/README.planner @@ -203,6 +203,66 @@ that shared systems get regrooved occasionally even if nothing decides to unshare them. +ts-hosts-allocate-Executive and hostflags +---------------------------------------- + +Within a job, the allocations are actually done by +ts-hosts-allocate-Executive. It is told what to do by its command +line arguments, which are (usually) simply IDENTs. + +The IDENTs provide the key for runvars which control the host +allocation algorithm. Principally, these are the runvars which define +the job's hostflags + all_hostflags + IDENT_hostflags + runtime_IDENT_hostflags +(all of these are comma-separated lists). + +Each such hostflag must, in general, be set for a particular host, for +that host to be eligible. But there are some special forms of job +hostflag: + + share-SHARING + + The host may be shared with other jobs. Typically used for + builds. SHARING is a string which denotes the "scope" of the + sharing - jobs with the same SHARING should set the host up + identically. The osstest test harness revision is automatically + appended and therefore does not need to be included. + + equiv-FORMALTOKEN + + For each equiv-FORMALTOKEN job flag set on one or more IDENTs, a + corresponding equiv-ACTUALTOKEN host flag must be set on the + corresponding hosts. So, for example, if the IDENTs src_host and + dst_host both have equiv-1 specified, then the two hosts chosen + for src_host and dst_host will have an actual hostflag in common + which matches the pattern equiv-*. + + diverse-FORMATLTOKEN + + For each diverse-FORMALTOKEN flag, the selected host will *not* be + the same as any other allocation with the same diverse-FORMALTOKEN + flag in the same *flight*. + + CONDNAME:CONDARGS... + + Looks up CONDNAME as Osstest::ResourceCondition::PROPNAME. + The selected host must match the appropriate condition. + CONDNAMEs are: + + PropEq:HOSTPROP:VAL + + Require the host property HOSTPROP to be equal to VAL, + according to string comparison. (Unset properties are + match an empty VAL.) + + PropMinVer:HOSTPROP:VAL + + Require the host property HOSTPROP to be at least VAL, according + to version number comparison (as implemented by dpkg and + coreutils). + Flights ------- From patchwork Tue Aug 25 11:40:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11735599 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1E61F14F6 for ; Tue, 25 Aug 2020 11:42:05 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EEC092075B for ; Tue, 25 Aug 2020 11:42:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="FGA4Cgh3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EEC092075B Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXK4-00037d-RI; Tue, 25 Aug 2020 11:41:04 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXK3-00030Q-Nq for xen-devel@lists.xenproject.org; Tue, 25 Aug 2020 11:41:03 +0000 X-Inumbo-ID: b19490b2-c058-4329-a9a1-733ef059d4d3 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b19490b2-c058-4329-a9a1-733ef059d4d3; Tue, 25 Aug 2020 11:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1598355652; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=+W+gxPv+xaht3JmfkVeGkYgcEA14CyqHNgRnc6oiKqI=; b=FGA4Cgh3mcYMKFfFFHPSPMJPMzEIWL/g7RVBlxWOqJ09EJ6PpYCBlK3F U0+v7W+ruojbhTqRcs51YNObOT92PpAtdwM9avk/1BXjKLB8vmIXHPFDA QXGqA+Nwy7ODhQccPen7c+89qQd7aDcHKYMjT+f30aAjRx1/VputdDze8 E=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: zXfyi3zCrZhMIFs2g0/BA0XJ9n+PpxsVEDM3EIr5SrNOKK9u8wmSU4IQaYUWQsgg0dC5jsNIi9 lhUstGcSUa/pHx0TsXUb9Ie2bG/zC/MxqhyECGmCrPpWkjKVg2YElhbMS5WE4/1Ho+TVrIEd0M IxdA2M7pxzKWcIkn8tWin4wKVdOY4JofLBlORW8OyBoxSkHGHu8jnumR9E0AwUy5PVk5ebxugj NcHsOue1EDezGLWSlEMi6XP/Y4T08/7VQjKDbqPGdTmWWWEEzk9ok7mlF5r+4a3UvIrINttGxv n1w= X-SBRS: 2.7 X-MesageID: 25246379 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,352,1592884800"; d="scan'208";a="25246379" From: Ian Jackson To: CC: Ian Jackson Subject: [OSSTEST PATCH 04/12] sg-run-job: Minor whitespace (formatting) changes Date: Tue, 25 Aug 2020 12:40:33 +0100 Message-ID: <20200825114041.16290-5-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200825114041.16290-1-ian.jackson@eu.citrix.com> References: <20200825114041.16290-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No functional change. Signed-off-by: Ian Jackson --- sg-run-job | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sg-run-job b/sg-run-job index df3d08d0..3db05b34 100755 --- a/sg-run-job +++ b/sg-run-job @@ -30,12 +30,12 @@ proc per-host-prep {} { per-host-ts . xen-boot/@ ts-host-reboot per-host-ts . host-ping-check-xen/@ ts-host-ping-check - per-host-ts . =(*) {ts-leak-check basis} + per-host-ts . =(*) { ts-leak-check basis } } proc per-host-finish {} { if {[nested-hosts-p]} { set broken fail } { set broken broken } - per-host-ts . = {ts-leak-check check} + per-host-ts . = { ts-leak-check check } per-host-ts !$broken capture-logs/@(*) ts-logs-capture } @@ -96,7 +96,7 @@ proc run-job {job} { if {![nested-hosts-p]} break - per-host-ts . final-poweroff {ts-host-powercycle --power=0} + per-host-ts . final-poweroff { ts-host-powercycle --power=0 } set need_xen_hosts [lunappend nested_layers_hosts] } @@ -549,7 +549,7 @@ proc setup-test-pair {} { run-ts . = ts-debian-install dst_host run-ts . = ts-debian-fixup dst_host + debian run-ts . = ts-guests-nbd-mirror + dst_host src_host + debian - per-host-ts . =(*) {ts-leak-check basis} + per-host-ts . =(*) { ts-leak-check basis } run-ts . = ts-guest-start + src_host + debian } proc need-hosts/test-pair {} { return {src_host dst_host} } From patchwork Tue Aug 25 11:40:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11735603 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 03925109B for ; Tue, 25 Aug 2020 11:42:07 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D479D20706 for ; Tue, 25 Aug 2020 11:42:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="XMy/gy2v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D479D20706 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXKA-0003Cc-F4; Tue, 25 Aug 2020 11:41:10 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXK8-00030Q-O9 for xen-devel@lists.xenproject.org; Tue, 25 Aug 2020 11:41:08 +0000 X-Inumbo-ID: 6bcfeaa4-eb51-4150-8c69-93c5cd2732e4 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6bcfeaa4-eb51-4150-8c69-93c5cd2732e4; Tue, 25 Aug 2020 11:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1598355653; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=vzNPBAJhowa+pV/8E3AV2P0Ul1PqQ2F1jjONTEMhGAA=; b=XMy/gy2v2Z7fgkee7LoKw7uzO0KExafmY87O8CrbGXaesgTZ325i79q2 6Pis/7e08iCQwOQJczrv6+0O6oskAUPxS8j4PK8rmvxWtoGxmn00cb6Yl g0GzX5b1caa2mnS/+GPxzrJk/QKWQKvu5RBq1dKMErZY48Z19StqjQqlG M=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 4t+ME1OGRVj6Rh9rektQjTmUrg6+tuuu0QA4AgD8135fN0HzyTSd7ALKiiyk1Acc3UPGvcAu2R tcWEMWPjdGkV+bm+uaFGZa+YO4+1yZHRBatcWUIqugBbaL1mIg6gekMuQZKo2p2NdNIZEFUWeI 0JK9sLGPRmCORlp59O8SkQqA3gbapgKZ8oro6FftusyXEw3lJMXmWjNQkWyoca1WJseHyM3eGg 4p4USDYf8KqsSH0a4Jltd/oFYloC4uypFy0xCOPdOD6VXScWX/ozHRCNvl4gIvPh+ZigxkUduA 2Cw= X-SBRS: 2.7 X-MesageID: 25567116 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,352,1592884800"; d="scan'208";a="25567116" From: Ian Jackson To: CC: Ian Jackson , Ian Jackson Subject: [OSSTEST PATCH 05/12] show_abs_time: Represent undef $timet as Date: Tue, 25 Aug 2020 12:40:34 +0100 Message-ID: <20200825114041.16290-6-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200825114041.16290-1-ian.jackson@eu.citrix.com> References: <20200825114041.16290-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This can happen, for example, if a badly broken flight has steps which are STARTING and have NULL in the start time column, and is then reported using sg-report-flight. Signed-off-by: Ian Jackson --- Osstest.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/Osstest.pm b/Osstest.pm index b2b6b741..734c0ef6 100644 --- a/Osstest.pm +++ b/Osstest.pm @@ -457,6 +457,7 @@ sub visible_undef ($) { sub show_abs_time ($) { my ($timet) = @_; + return '' unless defined $timet; return strftime "%Y-%m-%d %H:%M:%S Z", gmtime $timet; } From patchwork Tue Aug 25 11:40:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11735609 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B2C9514F6 for ; Tue, 25 Aug 2020 11:42:16 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8D9272075F for ; Tue, 25 Aug 2020 11:42:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="X2gWnzbl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D9272075F Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXKF-0003Hi-RN; Tue, 25 Aug 2020 11:41:15 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXKD-00030Q-OM for xen-devel@lists.xenproject.org; Tue, 25 Aug 2020 11:41:13 +0000 X-Inumbo-ID: 40e0b126-323d-4f92-9d1c-23933f2ef573 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 40e0b126-323d-4f92-9d1c-23933f2ef573; Tue, 25 Aug 2020 11:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1598355653; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=V3dp6ogsZeukd7HS+zQVWguTAl6WZQIGCg2gBghL8Mo=; b=X2gWnzbl0fF8sry1mfJonU+Gpe60I6jcYXg9iDf62mTEhp7gLPybGR+3 EFffTSn21HgixsUxsDaQRo4SKNy1X4T81T+HgqT0XP4T3hFWf/JILLx+v xxNiB+NbaqN5I/ftr4PhRVycz4igYO1bZgCEYkkH7Z2X7FJMRdRKlqQBP c=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: Gvnj0CSp6Em3Zzjaj5uTubKIe75V6DoY+SaLrnfEwETAWouiVxd3qB+oTgj7mByusc+klmg8Cx QhjN6K3nAfVb7qMvlnG/QBHXLJHrbr7sisTv6VsfsWqKNZh7n9r1DtzHbBEhg4IHpPMDs9od+B ksN3eneoQ9cNqCaIoh//6sz3LR5OP22CupYEITr39PiGNN9PLHmWrccD3h55bO92Ue+hMFShx7 4QTU+qjHz0uEC4lONWxpKnZ2VqP37O7+TinWvlOmE/cctgtG+SY9GH8kr5zzircKrzbcRznSiP eXw= X-SBRS: 2.7 X-MesageID: 25223287 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,352,1592884800"; d="scan'208";a="25223287" From: Ian Jackson To: CC: Ian Jackson Subject: [OSSTEST PATCH 06/12] duration estimator: Fix a warning Date: Tue, 25 Aug 2020 12:40:35 +0100 Message-ID: <20200825114041.16290-7-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200825114041.16290-1-ian.jackson@eu.citrix.com> References: <20200825114041.16290-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" $onhost can be undef. Fixes this warning: Use of uninitialized value $onhost in concatenation (.) or string at Osstest/Executive.pm line 1293. Signed-off-by: Ian Jackson --- Osstest/Executive.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index 4151aa6c..b3aecfc5 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -1274,7 +1274,8 @@ END return sub { my ($job, $hostidname, $onhost, $uptoincl_testid) = @_; - my $memokey = "$job $hostidname $onhost ".($uptoincl_testid//""); + my $memokey = + "$job $hostidname ".($onhost//"")." ".($uptoincl_testid//""); my $memo = $our_memo->{$memokey}; return @$memo if $memo; From patchwork Tue Aug 25 11:40:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11735595 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A1C8F14F6 for ; Tue, 25 Aug 2020 11:41:51 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7CE0920782 for ; Tue, 25 Aug 2020 11:41:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="C8XcZC1+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7CE0920782 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXK8-0003AJ-5R; Tue, 25 Aug 2020 11:41:08 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXK7-00030H-HV for xen-devel@lists.xenproject.org; Tue, 25 Aug 2020 11:41:07 +0000 X-Inumbo-ID: bff63fa1-7ebc-4673-b89b-d5d18b63e45e Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id bff63fa1-7ebc-4673-b89b-d5d18b63e45e; Tue, 25 Aug 2020 11:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1598355652; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=FPSVuoZ1/NaPKMpmiA5UPv5xn1sYXBosGGVvcCDS9fQ=; b=C8XcZC1+D8SnFU+wyhQ6xonw62Z+edTGrAB2PGJVN/1kGqe+eRQM0Afq vI1ljYM1oCfPN6Un4qlrDan+gBpxLB/U2Z/+B64YXzlBAyDU/g+wIiTNn nq1bTWQwupboBWrqCHDIaAs9gMaFiENh6w/4RxNHSa/pwgJmNE5rIlLTl I=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: st/jv3GJc7gpum5yvOnFHw1+1PcWHAhV6oTtS0z9o2yHy7lD7TuiM/SQ+LcSWUzYwl1wdLzKXp UbPEt06zH6hVWQO5M7ZhI90gAHj5wfYLxYmYde3AwpZ1UTYgJ+Cvu4QJ46qFgp3funzXHKxDFB Y0G2j+c15EGCzUB2WRuKeUCzOy+U6kfmzcE3NnEdseId0F0mihrb+9X8XhDuppV+MjEFb6iEEN bt3YObAGyDmhuOGaNTqhQuRETGQO+QW2/QdfpPAGzRtXmyVNJNRR+xE7ZOR24J5y4Smy4XHtal W/s= X-SBRS: 2.7 X-MesageID: 25246380 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,352,1592884800"; d="scan'208";a="25246380" From: Ian Jackson To: CC: Ian Jackson , Ian Jackson Subject: [OSSTEST PATCH 07/12] ts-hosts-allocate-Executive: Add a comment about a warning Date: Tue, 25 Aug 2020 12:40:36 +0100 Message-ID: <20200825114041.16290-8-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200825114041.16290-1-ian.jackson@eu.citrix.com> References: <20200825114041.16290-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Signed-off-by: Ian Jackson --- ts-hosts-allocate-Executive | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ts-hosts-allocate-Executive b/ts-hosts-allocate-Executive index 698437c0..8f7a1af0 100755 --- a/ts-hosts-allocate-Executive +++ b/ts-hosts-allocate-Executive @@ -1035,6 +1035,10 @@ sub actual_allocation ($) { if ($shared->{ntasks}) { warn "resource $shrestype $shared->{resname} allegedly". " available but wrong state $shared->{state} and tasks"; + # This can happen if following a failed prep by + # another job, the other shares are still owned by the + # now-dead task. If so that share will become allocatable + # (and therefore not be counted in `ntasks') in due course. return undef; # someone was preparing it but they aren't any more From patchwork Tue Aug 25 11:40:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11735591 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69196109B for ; Tue, 25 Aug 2020 11:41:41 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 45398206F0 for ; Tue, 25 Aug 2020 11:41:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="fxrTzWe8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45398206F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXJp-00030X-Qv; Tue, 25 Aug 2020 11:40:49 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXJo-00030Q-Rx for xen-devel@lists.xenproject.org; Tue, 25 Aug 2020 11:40:48 +0000 X-Inumbo-ID: 7c133b02-b6ff-4413-815f-ddae1da630c9 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7c133b02-b6ff-4413-815f-ddae1da630c9; Tue, 25 Aug 2020 11:40:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1598355647; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=KfSlZLk/KOh1OUKHe06qR7J7T5mdZ2Yh0iKTX9+NwSw=; b=fxrTzWe8+1ST06NeWGvHT813psnXDWwSKx88/nCCxs/bqiqtB5BbtG3Z Jo0ifueZGcrh14nGsrz9YA0ZhMwqRoISdXSEYhD43nWXk3kY60iAKfWQL up9fIYRVwJJQc9PURngQ+y9tj2kKsX3O3FwtD9rIFz/cCJC0t3TGpHLsO g=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: b2YfxzFhg0jEXB75IrztMS+OLjzt8Z3KZPr3Oy4LpaIADProea7Z8l7JdymTFbba06vFfsJ5jl ERxkpWAZOTjOKUjr6t++ZENnZ9rU/KWetOZKb++JFkjJ5PrvKH2uTn2qysVAgC09YV1367koDw TtjcQBwm9tCHHFg0p5uNNey7M/XbcfQT3V8zjV65vlW2YWteqsDFYF+Jb73UPFxo7rzbayqwvL 5i2M4ngp3Vk8rrczwjsbce/SvRc1ztRmGf0n2cr+kKsu31D+tGgVPgT1hF23rHrIAWoEc+ois/ /Kg= X-SBRS: 2.7 X-MesageID: 25539846 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,352,1592884800"; d="scan'208";a="25539846" From: Ian Jackson To: CC: Ian Jackson Subject: [OSSTEST PATCH 08/12] target setup refactoring: Move target_kernkind_check Date: Tue, 25 Aug 2020 12:40:37 +0100 Message-ID: <20200825114041.16290-9-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200825114041.16290-1-ian.jackson@eu.citrix.com> References: <20200825114041.16290-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This is OK because nothing in access() looks at the rootdev or console runvars, which are what target_kernkind_check sets. No functional change other than perhaps to log output. Signed-off-by: Ian Jackson --- ts-debian-fixup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-debian-fixup b/ts-debian-fixup index 528fb03b..34051137 100755 --- a/ts-debian-fixup +++ b/ts-debian-fixup @@ -209,8 +209,8 @@ sub writecfg () { savecfg(); ether(); -target_kernkind_check($gho); access(); +target_kernkind_check($gho); debian_overlays($ho, \&overlay); target_cmd_root($ho, < X-Patchwork-Id: 11735605 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B4579109B for ; Tue, 25 Aug 2020 11:42:10 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8F49220706 for ; Tue, 25 Aug 2020 11:42:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="OFmbD+MP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F49220706 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXJu-00032P-Jl; Tue, 25 Aug 2020 11:40:54 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXJt-00030Q-NZ for xen-devel@lists.xenproject.org; Tue, 25 Aug 2020 11:40:53 +0000 X-Inumbo-ID: ded55b50-ed58-4048-a483-3bdad4bbe1b6 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ded55b50-ed58-4048-a483-3bdad4bbe1b6; Tue, 25 Aug 2020 11:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1598355648; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=SUSJm7AFgIqRKTJLWc2VDqdelazeb0VtX7atdfIVoUE=; b=OFmbD+MP+cGVehf1F/6R2ZpbklcD/lbAhX4rnPbyXQoFrQdwOye/A8oO uQOvRh6XBAbmZWV7Hp+n5MDbB4iLha7/hgDAcrrMA8DyVA/zsGt/6ldz6 YMlA0GCToBdQzPPU2THJRp6exic7gqWlONNtfxwir/i0f1gZPvx0IzykS Y=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: rx2bRs+MM7BNmbNgKWlkOJxBxXgnnJmWDW28qwxANextgJ+PnUu9uCJUhTsP6am/sRAFJBW53a 0larcz3rlf9tJ50uo3ivYUlhD4CG3D7rTWXWqEEYohiiNqAw1EWTikCD8pHKtZZQQZ6gNDQiDM rUYfsZ3QprTV8fDNWKS/tqfIhAyJbkUbw7zoncxk7+3FqoA15uWeWrhG4FYnJ32QuDQGQUVOpR JfknKoyGD9an7DeYoOKGTSxN12C809Se0WlvR4AuCJcbWbiD6nvrDXZhQTSvZKrWg1HxJRf2XM y9U= X-SBRS: 2.7 X-MesageID: 25539848 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,352,1592884800"; d="scan'208";a="25539848" From: Ian Jackson To: CC: Ian Jackson Subject: [OSSTEST PATCH 09/12] target setup refactoring: Move target_kernkind_console_inittab Date: Tue, 25 Aug 2020 12:40:38 +0100 Message-ID: <20200825114041.16290-10-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200825114041.16290-1-ian.jackson@eu.citrix.com> References: <20200825114041.16290-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" We move this earlier. This is OK because it depends only on the console runvar (inside the sub; this is set by target_kernkind_check), $ho and $gho (which are set by this point); and $mountpoint$ (which is set by access(). No functional change. Signed-off-by: Ian Jackson --- ts-debian-fixup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts-debian-fixup b/ts-debian-fixup index 34051137..2184212b 100755 --- a/ts-debian-fixup +++ b/ts-debian-fixup @@ -79,10 +79,9 @@ END } our $extra; +our $console; sub console () { - my $console= - target_kernkind_console_inittab($ho,$gho,"$mountpoint"); return unless length $console; my $xextra= "console=$console earlyprintk=xen"; @@ -211,6 +210,7 @@ savecfg(); ether(); access(); target_kernkind_check($gho); +$console = target_kernkind_console_inittab($ho,$gho,"$mountpoint"); debian_overlays($ho, \&overlay); target_cmd_root($ho, < X-Patchwork-Id: 11735587 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 574D2109B for ; Tue, 25 Aug 2020 11:41:18 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 32830206F0 for ; Tue, 25 Aug 2020 11:41:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="eG7QL5IS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 32830206F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXJy-000348-UO; Tue, 25 Aug 2020 11:40:58 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXJx-00030H-HE for xen-devel@lists.xenproject.org; Tue, 25 Aug 2020 11:40:57 +0000 X-Inumbo-ID: 5974acae-9f55-4d84-9fe4-0900222a81a2 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 5974acae-9f55-4d84-9fe4-0900222a81a2; Tue, 25 Aug 2020 11:40:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1598355649; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=VUeC03OjFuTQDzzPTDaScnLT3rnuSOzDlR6ls8+1gsc=; b=eG7QL5ISIfnmsUClBo/8XGwR/oNGVnbnaLJr3Y2RLCSOQ44KYeMn+15F qGC19vc2jMv+iL7L+yCmoTyFONQrVmwYR//RqK44G6VP0gP0rcG5+/QF3 h+nKOVOvuYbmrziFVd+jeA+idbEKqF0wo5JKCL3xWsst7jHZ5/RsLC973 o=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: pomW1TMtNuGay6tK8pD0paEZ2SyWz0knx1vh+t8K/n897v+/qTp0hyuHXcbJAtxJXOEFlD97Ph US5AB6IBZF5mI+u8ILVpebmEWdIetEmDurt4qHcYaCMZGZZBGShuxUzQisM3CPNc8AhyUrTE8h 2AtS8TpM7gEy7Q+sBRsI8y5wjdn8EBe991hwbuI2AdriPkbAz1IYC58WiIvCxlLDPGssEkjss2 gN14EN5KIO9N1NiMgTMIj2wUtQGRhGMywUjTZ11nIG3eN2dG1ELpV4DulSdpgBjz71u1/xNtRK Om8= X-SBRS: 2.7 X-MesageID: 25539847 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,352,1592884800"; d="scan'208";a="25539847" From: Ian Jackson To: CC: Ian Jackson Subject: [OSSTEST PATCH 10/12] target setup refactoring: Merge target_kernkind_* Date: Tue, 25 Aug 2020 12:40:39 +0100 Message-ID: <20200825114041.16290-11-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200825114041.16290-1-ian.jackson@eu.citrix.com> References: <20200825114041.16290-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Combine these two functions. Rename them to a name which doesn't mention "kernkind". No functional change. Signed-off-by: Ian Jackson --- Osstest/Debian.pm | 3 +-- Osstest/TestSupport.pm | 11 ++++------- ts-debian-fixup | 3 +-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index b140ede2..85fd16da 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -68,8 +68,7 @@ sub debian_boot_setup ($$$$$;$) { # $xenhopt==undef => is actually a guest, do not set up a hypervisor my ($ho, $want_kernver, $want_xsm, $xenhopt, $distpath, $hooks) = @_; - target_kernkind_check($ho); - target_kernkind_console_inittab($ho,$ho,"/"); + target_setup_rootdev_console_inittab($ho,$ho,"/"); my $kopt; my $console= target_var($ho,'console'); diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index faac106f..fd7b238b 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -105,7 +105,7 @@ BEGIN { host_get_free_memory target_ping_check_down target_ping_check_up - target_kernkind_check target_kernkind_console_inittab + target_setup_rootdev_console_inittab target_var target_var_prefix selectguest prepareguest more_prepareguest_hvm guest_template @@ -2562,8 +2562,9 @@ sub target_var ($$) { return undef; } -sub target_kernkind_check ($) { - my ($gho) = @_; +sub target_setup_rootdev_console_inittab ($$$) { + my ($ho, $gho, $root) = @_; + my $pfx= target_var_prefix($gho); my $kernkind= $r{$pfx."kernkind"} // 'pvops'; my $isguest= exists $gho->{Guest}; @@ -2573,10 +2574,6 @@ sub target_kernkind_check ($) { } elsif ($kernkind !~ m/2618/) { store_runvar($pfx."console", 'xvc0') if $isguest; } -} - -sub target_kernkind_console_inittab ($$$) { - my ($ho, $gho, $root) = @_; my $inittabpath= "$root/etc/inittab"; my $console= target_var($gho,'console'); diff --git a/ts-debian-fixup b/ts-debian-fixup index 2184212b..a878fe50 100755 --- a/ts-debian-fixup +++ b/ts-debian-fixup @@ -209,8 +209,7 @@ sub writecfg () { savecfg(); ether(); access(); -target_kernkind_check($gho); -$console = target_kernkind_console_inittab($ho,$gho,"$mountpoint"); +$console = target_setup_rootdev_console_inittab($ho,$gho,"$mountpoint"); debian_overlays($ho, \&overlay); target_cmd_root($ho, < X-Patchwork-Id: 11735607 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DD75109B for ; Tue, 25 Aug 2020 11:42:12 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A00C2075F for ; Tue, 25 Aug 2020 11:42:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="C7+NgVqt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A00C2075F Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXKI-0003Ki-Bw; Tue, 25 Aug 2020 11:41:18 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXKH-00030H-Hg for xen-devel@lists.xenproject.org; Tue, 25 Aug 2020 11:41:17 +0000 X-Inumbo-ID: 29920a8b-3c64-4a28-ab21-6454ac762236 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 29920a8b-3c64-4a28-ab21-6454ac762236; Tue, 25 Aug 2020 11:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1598355653; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=SVuGQtvcGVVfaf+v1DRdEz59cBEmccl8FT7QK9fAm0E=; b=C7+NgVqtb8ohDcctDETFZDX1N03eQNmX2vVDy6/Tsr3OnvyuIpMRF8hG kki6P+EXNAhyAa9H9oMOjE8xS+CD92Gq9khkG1yk72dz1HffBibsmadld MMtWNn0fRd7jWEWlG3Ksu+edGgRr4caFv+0firQeR0QlCl/Deu7REH8eD I=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: Bqsw/AzjpiKXJfTQi+M8+BPCBeEleqZfzUDnFiKHSNZvhHmwUs1gKrlAqfnufBtXkEz+JdcVMa mu7Kv1LE4BMzvuuxfObXGOW5756c0B5XGLp95DC6jxFYQiEJIeuys42Q2ACJ7a1smCM4tXhmKC 8vgyL2fmH2LF0OcDzEXXVxmuEJCyRv2zCFTuMmjV4vJLYfPfZ0dPuCUIBTtKs/ZEkWTNc/QFOa Tq77eaOnHzWWbvJ2zQXv/d+v0TE5MJYcfOlYwqb0cYXh5j0H9AhAIBFB6GTEF55zuk5nmcq6Yi EP0= X-SBRS: 2.7 X-MesageID: 26171003 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,352,1592884800"; d="scan'208";a="26171003" From: Ian Jackson To: CC: Ian Jackson Subject: [OSSTEST PATCH 11/12] target setup refactoring: Add a doc comment Date: Tue, 25 Aug 2020 12:40:40 +0100 Message-ID: <20200825114041.16290-12-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200825114041.16290-1-ian.jackson@eu.citrix.com> References: <20200825114041.16290-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index fd7b238b..d9bb2585 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2563,6 +2563,9 @@ sub target_var ($$) { } sub target_setup_rootdev_console_inittab ($$$) { + # Operators on $gho. + # $gho's filesystem is accessed via $ho and $mountpoint; + # so maybe $gho is $ho and $mountpoint is "/". my ($ho, $gho, $root) = @_; my $pfx= target_var_prefix($gho); From patchwork Tue Aug 25 11:40:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11735611 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4DAD214F6 for ; Tue, 25 Aug 2020 11:42:20 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 287F420706 for ; Tue, 25 Aug 2020 11:42:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="FK1Tz2Gt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 287F420706 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXKO-0003Ra-LQ; Tue, 25 Aug 2020 11:41:24 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kAXKN-00030Q-Oj for xen-devel@lists.xenproject.org; Tue, 25 Aug 2020 11:41:23 +0000 X-Inumbo-ID: a31bb248-9b3e-4317-986c-21dc4149b4ac Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a31bb248-9b3e-4317-986c-21dc4149b4ac; Tue, 25 Aug 2020 11:40:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1598355655; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=m89Gy/SwvYlwh9agO/GAobe4rWC2d8lDXSHoo3JP6AU=; b=FK1Tz2GtWY9oY4YrF9f020RwyaCynwgtIOi3zwNdaL9KUtvxefISNmAl jf0eNrcBzxTuI+Z+jRH9B/GKsKOL8S84lyrZ4DmB91uhE1ygdRs6ZVQTy +1ObXBX5eJ8oYe2WmA8avRP6wbEtD+6MGeL55ZTB8rmNbOFCOmS7AmVCI I=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: Ux+WzGNr5lq4Mwo1Y3778+QhYc+hqjD3GDdlPw1zVkHFLP2x65oSkzb6c1KMxFu8hx0I8+do+2 1lKOh73ObQIo0G+2jLrJt2OuS/cFc0jR76HWUL+aPiT5STxTWpn9CxsLMgNqlzSwwsb/AjcVXB YoRDUAGI5Pw9ykkSV6EqL43KKU4AO7YJJvba1tY/iCr5JXF6xkOE9ocsRpAVUTpFsriwZ6ENBV z1KmcADbJ6StdEvPH4vCQSVHsvZMhzWCzjDocMFhwB9QmEUC0IQYJTUAQXN6sgXEhIbx7CO0Tg bhw= X-SBRS: 2.7 X-MesageID: 25223289 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,352,1592884800"; d="scan'208";a="25223289" From: Ian Jackson To: CC: Ian Jackson , Boris Ostrovsky , Juergen Gross , "Stefano Stabellini" , Konrad Rzeszutek Wilk , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Wei Liu , Paul Durrant , Oleksandr Andrushchenko , Andrew Cooper , Olivier Lambert Subject: [OSSTEST PATCH 12/12] abolish "kernkind"; desupport non-pvops kernels Date: Tue, 25 Aug 2020 12:40:41 +0100 Message-ID: <20200825114041.16290-13-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200825114041.16290-1-ian.jackson@eu.citrix.com> References: <20200825114041.16290-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This was for distinguishing the old-style Xenolinux kernels from pvops kernels. We have not actually tested any non-pvops kernels for a very very long time. Delete this now because the runvar is slightly in the way of test host reuse. (Sorry for the wide CC but it seems better to make sure anyone who might object can do so.) All this machinery exists just to configure the guest console device (Xenolinux used "xvc" rather than "hvc") and the guest root block device (Xenolinux stole "hda"/"sda" rather than using "xvda"). Specifically, in this commit: * In what is now target_setup_rootdev_console_inittab, do not look at any kernkind runvar and simply do what we would if it were "pvops" or unset, as it is in all current jobs. * Remove the runvar from all jobs creation and example runes. (This has no functional change even for jobs running with the previous osstest code because we have defaulted to "pvops" for a very long time.) We retain the setting of the shell variable "kernbuild", because that ends up in build jobs names. All our kernel build jobs now end in -pvops and I intend to retain that name component since abolishing it is nontrivial. Signed-off-by: Ian Jackson CC: Boris Ostrovsky CC: Juergen Gross CC: Stefano Stabellini CC: Konrad Rzeszutek Wilk CC: Roger Pau Monné CC: Wei Liu CC: Paul Durrant CC: Konrad Rzeszutek Wilk CC: Juergen Gross CC: Oleksandr Andrushchenko CC: Andrew Cooper CC: Olivier Lambert --- Osstest/TestSupport.pm | 9 ++------- README | 2 +- make-hosts-flight | 1 - mfi-common | 7 ++----- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index d9bb2585..99c7654d 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2569,14 +2569,9 @@ sub target_setup_rootdev_console_inittab ($$$) { my ($ho, $gho, $root) = @_; my $pfx= target_var_prefix($gho); - my $kernkind= $r{$pfx."kernkind"} // 'pvops'; my $isguest= exists $gho->{Guest}; - if ($kernkind eq 'pvops') { - store_runvar($pfx."rootdev", 'xvda') if $isguest; - store_runvar($pfx."console", 'hvc0'); - } elsif ($kernkind !~ m/2618/) { - store_runvar($pfx."console", 'xvc0') if $isguest; - } + store_runvar($pfx."rootdev", 'xvda') if $isguest; + store_runvar($pfx."console", 'hvc0'); my $inittabpath= "$root/etc/inittab"; my $console= target_var($gho,'console'); diff --git a/README b/README index 2804ecf3..ba4bea1d 100644 --- a/README +++ b/README @@ -861,7 +861,7 @@ echo $flight job=play-amd64-amd64-xen-boot ./cs-job-create $flight $job play-xen-boot-x5 \ all_hostflags=arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test \ - arch=amd64 toolstack=xl enable_xsm=false kernkind=pvops \ + arch=amd64 toolstack=xl enable_xsm=false \ host=$host # Reuse the binaries from the Xen template job for both the hypervisor diff --git a/make-hosts-flight b/make-hosts-flight index e2c3776a..63ac7b71 100755 --- a/make-hosts-flight +++ b/make-hosts-flight @@ -73,7 +73,6 @@ hosts_iterate () { local freebsd_runvars set_freebsd_runvars true runvars+=" - kernkind=pvops all_host_di_version=$di_version all_host_suite=$suite $freebsd_runvars diff --git a/mfi-common b/mfi-common index e577449f..34b0c116 100644 --- a/mfi-common +++ b/mfi-common @@ -619,9 +619,8 @@ test_matrix_iterate () { case $kern in '') kernbuild=pvops - kernkind=pvops ;; - *) echo >&2 "kernkind ? $kern"; exit 1 ;; + *) echo >&2 "kernbuild ? $kern"; exit 1 ;; esac for dom0arch in i386 amd64 armhf arm64; do @@ -639,8 +638,7 @@ test_matrix_iterate () { arch_runvars=\"\$ARCH_RUNVARS_$dom0arch\" " - debian_runvars="debian_kernkind=$kernkind \ - debian_arch=$dom0arch \ + debian_runvars="debian_arch=$dom0arch \ debian_suite=$guestsuite \ " @@ -659,7 +657,6 @@ test_matrix_iterate () { most_runvars=" arch=$dom0arch \ kernbuildjob=${bfi}build-$dom0arch-$kernbuild \ - kernkind=$kernkind \ $arch_runvars $hostos_runvars "