* [freebsd-master test] 124935: trouble: blocked/broken
@ 2018-07-04 2:52 osstest service owner
2018-07-04 6:49 ` Roger Pau Monné
2018-07-04 10:30 ` Ian Jackson
0 siblings, 2 replies; 10+ messages in thread
From: osstest service owner @ 2018-07-04 2:52 UTC (permalink / raw)
To: xen-devel, osstest-admin, royger
flight 124935 freebsd-master real [real]
http://logs.test-lab.xenproject.org/osstest/logs/124935/
Failures and problems with tests :-(
Tests which did not succeed and are blocking,
including tests which could not be run:
build-amd64-freebsd <job status> broken
build-amd64-freebsd 5 host-install(5) broken REGR. vs. 124909
Tests which did not succeed, but are not blocking:
build-amd64-freebsd-again 1 build-check(1) blocked n/a
version targeted for testing:
freebsd 6159d2f2e4cfd059a14b898d24fb488a53b45b4f
baseline version:
freebsd 877de141ef18a3ef2ad631f2342353a2eb55f4aa
Last test of basis 124909 2018-07-02 05:09:50 Z 1 days
Testing same since 124935 2018-07-03 08:05:46 Z 0 days 1 attempts
------------------------------------------------------------
People who touched revisions under test:
alc <alc@FreeBSD.org>
allanjude <allanjude@FreeBSD.org>
cy <cy@FreeBSD.org>
ed <ed@FreeBSD.org>
ian <ian@FreeBSD.org>
manu <manu@FreeBSD.org>
mav <mav@FreeBSD.org>
mmacy <mmacy@FreeBSD.org>
rmacklem <rmacklem@FreeBSD.org>
trasz <trasz@FreeBSD.org>
tuexen <tuexen@FreeBSD.org>
jobs:
build-amd64-freebsd-again blocked
build-amd64-freebsd broken
------------------------------------------------------------
sg-report-flight on osstest.test-lab.xenproject.org
logs: /home/logs/logs
images: /home/logs/images
Logs, config files, etc. are available at
http://logs.test-lab.xenproject.org/osstest/logs
Explanation of these reports, and of osstest in general, is at
http://xenbits.xen.org/gitweb/?p=osstest.git;a=blob;f=README.email;hb=master
http://xenbits.xen.org/gitweb/?p=osstest.git;a=blob;f=README;hb=master
Test harness code can be found at
http://xenbits.xen.org/gitweb?p=osstest.git;a=summary
broken-job build-amd64-freebsd broken
broken-step build-amd64-freebsd host-install(5)
Not pushing.
------------------------------------------------------------
commit 6159d2f2e4cfd059a14b898d24fb488a53b45b4f
Author: cy <cy@FreeBSD.org>
Date: Tue Jul 3 02:54:32 2018 +0000
When toggling the display using the "m" command to toggle from 'cpu'
mode to 'io' mode, an artifact remains because the buffer is not
"finished" with a NULL terminator using sbuf_finish().
An example of this is, when the "m" command is entered, the title line
will contain COMMANDND instead of COMMAND. This commit fixes this.
commit 71bf69db2d82e955b654ec565a84ac817faf6191
Author: mmacy <mmacy@FreeBSD.org>
Date: Tue Jul 3 02:50:07 2018 +0000
expose thread_lite definition to tied modules
commit 9a526826f9d35a9df3c8aa50b99efea53cbd7f7d
Author: mmacy <mmacy@FreeBSD.org>
Date: Tue Jul 3 01:55:09 2018 +0000
make critical_{enter, exit} inline
Avoid pulling in all of the <sys/proc.h> dependencies by
automatically generating a stripped down thread_lite exporting
only the fields of interest. The field declarations are type checked
against the original and the offsets of the generated result is
automatically checked.
kib has expressed disagreement and would have preferred to simply
use genassym style offsets (which loses type check enforcement).
jhb has expressed dislike of it due to header pollution and a
duplicate structure. He would have preferred to just have defined
thread in _thread.h. Nonetheless, he admits that this is the only
viable solution at the moment.
The impetus for this came from mjg's D15331:
"Inline critical_enter/exit for amd64"
Reviewed by: jeff
Differential Revision: https://reviews.freebsd.org/D16078
commit 043b125ccdc97098db729a86a907de07cec8af1a
Author: ian <ian@FreeBSD.org>
Date: Mon Jul 2 22:59:29 2018 +0000
Doh! Commit the proper default values, not my local tweaks.
commit 87936c96ece0141050e247890cb7800b1a1b617a
Author: ian <ian@FreeBSD.org>
Date: Mon Jul 2 22:58:04 2018 +0000
Move the passphrase and iteration count into variables.
This is purely to make it easier to tweak them locally; the machine I have
for testing takes forever to do 50,000 pw strengthening iterations, and
we're not testing the strength of geli's anti-pw-guessing logic here
(especially given that our test passphrase is "passphrase", except that
I tend to tweak that also, to 'x', because typing is hard).
Some day these should be settable as cmdline args. But then, some day this
whole script should probably get a rewrite. :)
commit e5cefdc937098f14c169d5a0713d1380c6dfb6da
Author: ian <ian@FreeBSD.org>
Date: Mon Jul 2 22:51:48 2018 +0000
Allow making just one flavor of boot-test image based on cmdline args.
commit 4f38afcf69c71827f5749c92dd34b30240e6b772
Author: mav <mav@FreeBSD.org>
Date: Mon Jul 2 20:56:17 2018 +0000
Cut currdev dev and path fields for ZFS on the last colon.
Previously the code cut those fields on second colon, that prevented
boot from boot environments with colon in their names. This change
moves the limitation from dev field to path, which is empty by default.
Reviewed by: allanjude, tsoome
MFC after: 2 weeks
Sponsored by: iXsystems, Inc.
Differential Revision: https://reviews.freebsd.org/D16068
commit 40fc34fd82d496461b73cf521ac7317e96f972db
Author: mmacy <mmacy@FreeBSD.org>
Date: Mon Jul 2 19:48:38 2018 +0000
inline atomics and allow tied modules to inline locks
- inline atomics in modules on i386 and amd64 (they were always
inline on other arches)
- allow modules to opt in to inlining locks by specifying
MODULE_TIED=1 in the makefile
Reviewed by: kib
Sponsored by: Limelight Networks
Differential Revision: https://reviews.freebsd.org/D16079
commit b0543434f322800bcfc479d6f94bbf2195735fc3
Author: rmacklem <rmacklem@FreeBSD.org>
Date: Mon Jul 2 19:33:26 2018 +0000
Document the "#mds_path" suffix for the "-p" command line option.
r335871 added support for an optional suffix of "#mds_path" that can be
applied to each entry in the "-p" option argument. This specifies that
the DS should be used to store files for the file system on the MDS
at "mds_path".
This patch documents this optional suffix.
This is a content change.
commit 3df81046a1f315ee774967e042eadc889be50fde
Author: rmacklem <rmacklem@FreeBSD.org>
Date: Mon Jul 2 19:26:31 2018 +0000
Add an optional feature to the pNFS server.
Without this patch, the pNFS server distributes the data storage files across
all of the specified DSs.
A tester noted that it would be nice if a system administrator could control
which DSs are used to store the file data for a given exported MDS file system.
This patch adds an optional suffix for each entry in the "-p" option argument
that specifies "store file data for this MDS file system" in this DS.
The patch should only affect sites using the pNFS server (specified via the
"-p" command line option for nfsd.
The interface between the nfsd and the kernel has changed with this patch,
so anyone using the "-p" option needs to rebuild their nfsd from sources
with this patch applied to them.
Discussed with: james.rose@framestore.com
commit 59f9a8892a610124decd3d4f0446f70d5ca6fa46
Author: rmacklem <rmacklem@FreeBSD.org>
Date: Mon Jul 2 19:21:33 2018 +0000
Add an optional feature to the pNFS server.
Without this patch, the pNFS server distributes the data storage files across
all of the specified DSs.
A tester noted that it would be nice if a system administrator could control
which DSs are used to store the file data for a given exported MDS file system.
This patch adds the kernel support to do this. It also makes a slight semantic
change to nfsv4_findmirror(), since some uses of it no longer require that
the DS being searched for have a current mirror.
A patch that will be committed in a few minutes will modify the nfsd daemon
to support this feature.
The patch should only affect sites using the pNFS server (specified via the
"-p" command line option for nfsd.
Suggested by: james.rose@framestore.com
commit d191c118a7d66684fcbc7f77cdb4410a9ddc0f3e
Author: manu <manu@FreeBSD.org>
Date: Mon Jul 2 18:23:43 2018 +0000
stand: uboot: Do not panic if we can't find a boot device
It is really anoying to panic when there is no boot device as you
cannot see the availables ones.
commit 1548e64fc6a11f3bc851e81d61eaeeb1dfc638e3
Author: allanjude <allanjude@FreeBSD.org>
Date: Mon Jul 2 18:19:08 2018 +0000
stand/common/disk.c: Read partition table relative to the start of the disk
If a disk is of an oddball size, like the 200mb + 512b used in rootgen.sh,
when disk_open() is called on a GELI encrypted partition, attempts to read
the partition table fail, as they pass through the decryption process which
turns the already plaintext data into jibberish.
When reading the partition table, always pass a slice and partition setting
of -1, and an offset of 0. Setting the slice to -1 prevents a false
positive when checking the slice against the cache of GELI encrypted
slices.
Reviewed by: imp, ian
Sponsored by: Klara Systems
Differential Revision: https://reviews.freebsd.org/D15847
commit b9b81e32655b9395e45f1f16e3774f6f38b5e933
Author: rmacklem <rmacklem@FreeBSD.org>
Date: Mon Jul 2 17:50:46 2018 +0000
Fix the server side krpc so that the kernel nfsd threads terminate.
Occationally the kernel nfsd threads would not terminate when a SIGKILL
was posted for the kernel process (called nfsd (slave)). When this occurred,
the thread associated with the process (called "ismaster") had returned from
svc_run_internal() and was sleeping waiting for the other threads to terminate.
The other threads (created by kthread_start()) were still in svc_run_internal()
handling NFS RPCs.
The only way this could occur is for the "ismaster" thread to return from
svc_run_internal() without having called svc_exit().
There was only one place in the code where this could happen and this patch
stops that from happening.
Since the problem is intermittent, I cannot be sure if this has fixed the
problem, but I have not seen an occurrence of the problem with this patch
applied.
Reviewed by: kib
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D16087
commit c365e5c3d1f0b9c35dbd36040cff4c0cea67e923
Author: alc <alc@FreeBSD.org>
Date: Mon Jul 2 17:18:46 2018 +0000
Introduce vm_phys_enq_range(), and call it in vm_phys_alloc_npages()
and vm_phys_alloc_seg_contig() instead of vm_phys_free_contig(). In
short, vm_phys_enq_range() is simpler and faster than the more general
vm_phys_free_contig(), and in the case of vm_phys_alloc_seg_contig(),
vm_phys_free_contig() was placing the excess physical pages at the
wrong end of the queues.
In collaboration with: Doug Moore <dougm@rice.edu>
commit bcab7689a8b1ac9864b55a726d1fc2eb81b3ad5a
Author: trasz <trasz@FreeBSD.org>
Date: Mon Jul 2 14:15:30 2018 +0000
Change the group and the permissions on /dev/acpi, to make "acpiconf"
work when called by members of the 'operator' group. They are already
allowed to eg power off the system (via suid shutdown(8)), so they
might as well be permitted to suspend it.
Tested by: xmj@
Reviewed by: delphij@
MFC after: 2 weeks
Relnotes: yes
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D16062
commit 5102fab09b5c26d2eac7a757dd4883ac374322fd
Author: ed <ed@FreeBSD.org>
Date: Mon Jul 2 11:02:27 2018 +0000
Document that syslogd -v has no effect when RFC 5424 mode is enabled.
The variable it sets, LogFacPri, is only used in the RFC 3164 formatting
codepath.
PR: 229457
Reported by: Andre Albsmeier
MFC after: 1 week
commit 6ee03e0408438510695601643e028a626842ba6a
Author: ed <ed@FreeBSD.org>
Date: Mon Jul 2 10:57:22 2018 +0000
Restore the order in which RFC 3164 messages with fac/pri are formatted.
The refactoring of the syslogd code to format messages using iovecs
slightly altered the output of syslogd by placing the facility/priority
after the hostname, as opposed to printing it right before. This change
reverts the behaviour to be consistent with how it was before.
PR: 229457
Reported by: Andre Albsmeier
MFC after: 1 week
commit 6633065e9f07f00868478492607f2ecb0ddcdb8a
Author: tuexen <tuexen@FreeBSD.org>
Date: Mon Jul 2 09:14:00 2018 +0000
Allow three digits of module id without breaking table alignment.
commit 4ca86b4e0c138d88fc09713c3ce994e63c7fd87b
Author: tuexen <tuexen@FreeBSD.org>
Date: Mon Jul 2 09:11:30 2018 +0000
Keep table aligned when address pointer is not of max length.
commit 632274707c64fbd94d04e350f9cc86095f94c2e9
Author: tuexen <tuexen@FreeBSD.org>
Date: Mon Jul 2 09:09:07 2018 +0000
Improve consistency of indentation. Whitespace change only.
commit c7b15ce78190cb29f4b4349cc1bcb63b037f9d5b
Author: mmacy <mmacy@FreeBSD.org>
Date: Mon Jul 2 05:19:44 2018 +0000
inpcb: don't gratuitously defer frees
Don't defer frees in sysctl handlers. It isn't necessary
and it just confuses things.
revert: r333911, r334104, and r334125
Requested by: jtl
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [freebsd-master test] 124935: trouble: blocked/broken
2018-07-04 2:52 [freebsd-master test] 124935: trouble: blocked/broken osstest service owner
@ 2018-07-04 6:49 ` Roger Pau Monné
2018-07-04 10:55 ` Ian Jackson
2018-07-04 10:30 ` Ian Jackson
1 sibling, 1 reply; 10+ messages in thread
From: Roger Pau Monné @ 2018-07-04 6:49 UTC (permalink / raw)
To: osstest service owner; +Cc: xen-devel
On Wed, Jul 04, 2018 at 02:52:05AM +0000, osstest service owner wrote:
> flight 124935 freebsd-master real [real]
> http://logs.test-lab.xenproject.org/osstest/logs/124935/
>
> Failures and problems with tests :-(
>
> Tests which did not succeed and are blocking,
> including tests which could not be run:
> build-amd64-freebsd <job status> broken
> build-amd64-freebsd 5 host-install(5) broken REGR. vs. 124909
This failure is caused because the host is set to boot from UEFI, and
there's no logic yet in osstest to install FreeBSD from UEFI.
Is there anyway to prevent the FreeBSD jobs from running in
albana{0|1} (or UEFI boxes in general)?
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [freebsd-master test] 124935: trouble: blocked/broken
2018-07-04 2:52 [freebsd-master test] 124935: trouble: blocked/broken osstest service owner
2018-07-04 6:49 ` Roger Pau Monné
@ 2018-07-04 10:30 ` Ian Jackson
2018-07-04 10:48 ` Roger Pau Monné
1 sibling, 1 reply; 10+ messages in thread
From: Ian Jackson @ 2018-07-04 10:30 UTC (permalink / raw)
To: royger, xen-devel
osstest service owner writes ("[freebsd-master test] 124935: trouble: blocked/broken"):
> flight 124935 freebsd-master real [real]
> http://logs.test-lab.xenproject.org/osstest/logs/124935/
>
> Failures and problems with tests :-(
>
> Tests which did not succeed and are blocking,
> including tests which could not be run:
> build-amd64-freebsd <job status> broken
> build-amd64-freebsd 5 host-install(5) broken REGR. vs. 124909
DYK what this is ?
It seems to get as far as this:
Jul 4 02:08:30.920132 Succeed to download NBP file.
Jul 4 02:08:30.932138 [0m[30m[40m[2J[01;01H[0m[37m[40merror: serial port `0' isn't found.
Jul 4 02:08:31.040099
error: can't find command `timeout'.
The stuff from 02:23:37 onwards is the results of the ts-logs-capture
sending debug keys on the serial port, so isn't interesting.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [freebsd-master test] 124935: trouble: blocked/broken
2018-07-04 10:30 ` Ian Jackson
@ 2018-07-04 10:48 ` Roger Pau Monné
0 siblings, 0 replies; 10+ messages in thread
From: Roger Pau Monné @ 2018-07-04 10:48 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Wed, Jul 04, 2018 at 11:30:42AM +0100, Ian Jackson wrote:
> osstest service owner writes ("[freebsd-master test] 124935: trouble: blocked/broken"):
> > flight 124935 freebsd-master real [real]
> > http://logs.test-lab.xenproject.org/osstest/logs/124935/
> >
> > Failures and problems with tests :-(
> >
> > Tests which did not succeed and are blocking,
> > including tests which could not be run:
> > build-amd64-freebsd <job status> broken
> > build-amd64-freebsd 5 host-install(5) broken REGR. vs. 124909
>
> DYK what this is ?
>
> It seems to get as far as this:
>
> Jul 4 02:08:30.920132 Succeed to download NBP file.
> Jul 4 02:08:30.932138 [0m[30m[40m[2J[01;01H[0m[37m[40merror: serial port `0' isn't found.
> Jul 4 02:08:31.040099
> error: can't find command `timeout'.
I have no idea what NBP is. I don't think it's related to the FreeBSD
installer at all.
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [freebsd-master test] 124935: trouble: blocked/broken
2018-07-04 6:49 ` Roger Pau Monné
@ 2018-07-04 10:55 ` Ian Jackson
2018-07-04 10:56 ` [OSSTEST PATCH 1/3] resource allocation: PropCompareBase: Break out _get_val Ian Jackson
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Ian Jackson @ 2018-07-04 10:55 UTC (permalink / raw)
To: Roger Pau Monné; +Cc: xen-devel
Roger Pau Monné writes ("Re: [Xen-devel] [freebsd-master test] 124935: trouble: blocked/broken"):
> This failure is caused because the host is set to boot from UEFI, and
> there's no logic yet in osstest to install FreeBSD from UEFI.
Oh. (Please disregard my other mail.)
> Is there anyway to prevent the FreeBSD jobs from running in
> albana{0|1} (or UEFI boxes in general)?
For now I have unset the `freebsd-10' hostflag. Tht should do the
trick.
There is also the PropEq resour resourcecondition which could be used
for this, but I notice that:
* PropCompareBase does not honour host properties set in the
configuration files rather than the database;
* PropCompareBase would need a way to specify what the default
is if the condition is not found.
I will send some patches to fix that in a moment.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [OSSTEST PATCH 1/3] resource allocation: PropCompareBase: Break out _get_val
2018-07-04 10:55 ` Ian Jackson
@ 2018-07-04 10:56 ` Ian Jackson
2018-07-04 10:56 ` [OSSTEST PATCH 2/3] resource allocation: PropEq, PropMinVer: Honour HostProp_ Ian Jackson
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Ian Jackson @ 2018-07-04 10:56 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monné, Ian Jackson
This is going to make defaulting etc. a bit easier.
No functional change.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Roger Pau Monné <royger@FreeBSD.org>
---
Osstest/ResourceCondition/PropCompareBase.pm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/Osstest/ResourceCondition/PropCompareBase.pm b/Osstest/ResourceCondition/PropCompareBase.pm
index 5306bb8..1e3aa85 100644
--- a/Osstest/ResourceCondition/PropCompareBase.pm
+++ b/Osstest/ResourceCondition/PropCompareBase.pm
@@ -44,7 +44,7 @@ sub new {
}, $class;
}
-sub check {
+sub _get_val ($$$) {
my ($pc, $restype, $resname) = @_;
# Using _cached avoids needing to worry about $dbh_tests being
@@ -57,9 +57,14 @@ END
my $row= $hpropq->fetchrow_arrayref();
$hpropq->finish();
+
+ my $v = $row->[0];
+ return $v;
+}
- my $propval = $row->[0];
-
+sub check {
+ my ($pc, $restype, $resname) = @_;
+ my $proval = $pc->_get_val($pc, $restype, $resname);
return $pc->_check($propval);
}
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [OSSTEST PATCH 2/3] resource allocation: PropEq, PropMinVer: Honour HostProp_...
2018-07-04 10:55 ` Ian Jackson
2018-07-04 10:56 ` [OSSTEST PATCH 1/3] resource allocation: PropCompareBase: Break out _get_val Ian Jackson
@ 2018-07-04 10:56 ` Ian Jackson
2018-07-04 10:56 ` [OSSTEST PATCH 3/3] resource allocation: PropEq, PropMinVer: support defaults Ian Jackson
2018-07-04 10:59 ` [freebsd-master test] 124935: trouble: blocked/broken Ian Jackson
3 siblings, 0 replies; 10+ messages in thread
From: Ian Jackson @ 2018-07-04 10:56 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monné, Ian Jackson
We need to take these from the config too.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Roger Pau Monné <royger@FreeBSD.org>
---
Osstest/ResourceCondition/PropCompareBase.pm | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Osstest/ResourceCondition/PropCompareBase.pm b/Osstest/ResourceCondition/PropCompareBase.pm
index 1e3aa85..e1efe5f 100644
--- a/Osstest/ResourceCondition/PropCompareBase.pm
+++ b/Osstest/ResourceCondition/PropCompareBase.pm
@@ -47,6 +47,11 @@ sub new {
sub _get_val ($$$) {
my ($pc, $restype, $resname) = @_;
+ if ($restype eq 'host') {
+ my $v = $c{"HostProp_${resname}"};
+ return $v if defined $v;
+ }
+
# Using _cached avoids needing to worry about $dbh_tests being
# closed/reopened between invocations
my $hpropq = $dbh_tests->prepare_cached(<<END);
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [OSSTEST PATCH 3/3] resource allocation: PropEq, PropMinVer: support defaults
2018-07-04 10:55 ` Ian Jackson
2018-07-04 10:56 ` [OSSTEST PATCH 1/3] resource allocation: PropCompareBase: Break out _get_val Ian Jackson
2018-07-04 10:56 ` [OSSTEST PATCH 2/3] resource allocation: PropEq, PropMinVer: Honour HostProp_ Ian Jackson
@ 2018-07-04 10:56 ` Ian Jackson
2018-07-04 10:59 ` [freebsd-master test] 124935: trouble: blocked/broken Ian Jackson
3 siblings, 0 replies; 10+ messages in thread
From: Ian Jackson @ 2018-07-04 10:56 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monné, Ian Jackson
Now you can pass another :-separated argument, the default value to
use if none is specified.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Roger Pau Monné <royger@FreeBSD.org>
---
Osstest/ResourceCondition/PropCompareBase.pm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/Osstest/ResourceCondition/PropCompareBase.pm b/Osstest/ResourceCondition/PropCompareBase.pm
index e1efe5f..5aff8f3 100644
--- a/Osstest/ResourceCondition/PropCompareBase.pm
+++ b/Osstest/ResourceCondition/PropCompareBase.pm
@@ -34,13 +34,14 @@ BEGIN {
}
sub new {
- my ($class, $name, $prop, $val) = @_;
+ my ($class, $name, $prop, $val, $defval) = @_;
die "propname: $prop?" unless propname_check($prop);
return bless {
Prop => $prop,
- Val => $val
+ Val => $val,
+ DefaultVal => $val,
}, $class;
}
@@ -64,7 +65,11 @@ END
$hpropq->finish();
my $v = $row->[0];
- return $v;
+ return $v if defined $v;
+
+ return $pc->{DefaultVal};
+ # if no default specified, returns undef
+ # then _check gets to decide what to do
}
sub check {
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [freebsd-master test] 124935: trouble: blocked/broken
2018-07-04 10:55 ` Ian Jackson
` (2 preceding siblings ...)
2018-07-04 10:56 ` [OSSTEST PATCH 3/3] resource allocation: PropEq, PropMinVer: support defaults Ian Jackson
@ 2018-07-04 10:59 ` Ian Jackson
2018-07-04 11:21 ` Roger Pau Monné
3 siblings, 1 reply; 10+ messages in thread
From: Ian Jackson @ 2018-07-04 10:59 UTC (permalink / raw)
To: Roger Pau Monné, xen-devel
Ian Jackson writes ("Re: [Xen-devel] [freebsd-master test] 124935: trouble: blocked/broken"):
> I will send some patches to fix that in a moment.
With those patches, I think adding this "flag" to an appropriate
hostflags runvar will DTRT:
PropEq:Firmware:bios:bios
But I haven't tested that.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [freebsd-master test] 124935: trouble: blocked/broken
2018-07-04 10:59 ` [freebsd-master test] 124935: trouble: blocked/broken Ian Jackson
@ 2018-07-04 11:21 ` Roger Pau Monné
0 siblings, 0 replies; 10+ messages in thread
From: Roger Pau Monné @ 2018-07-04 11:21 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Wed, Jul 04, 2018 at 11:59:20AM +0100, Ian Jackson wrote:
> Ian Jackson writes ("Re: [Xen-devel] [freebsd-master test] 124935: trouble: blocked/broken"):
> > I will send some patches to fix that in a moment.
>
> With those patches, I think adding this "flag" to an appropriate
> hostflags runvar will DTRT:
> PropEq:Firmware:bios:bios
Thanks!
> But I haven't tested that.
So something like:
---8<---
diff --git a/make-freebsd-flight b/make-freebsd-flight
index 4e92f51a..5cb88f9d 100755
--- a/make-freebsd-flight
+++ b/make-freebsd-flight
@@ -44,7 +44,7 @@ for arch in "$arches"; do
$arch_runvars \
tree_freebsd=$TREE_FREEBSD \
revision_freebsd=$REVISION_FREEBSD \
- host_hostflags=arch-$arch,purpose-build \
+ host_hostflags=arch-$arch,purpose-build,PropEq:Firmware:bios:bios \
all_host_os=freebsd \
$freebsd_runvars
@@ -56,7 +56,7 @@ for arch in "$arches"; do
$arch_runvars \
tree_freebsd=$TREE_FREEBSD \
revision_freebsd=$REVISION_FREEBSD \
- host_hostflags=arch-$arch,purpose-build \
+ host_hostflags=arch-$arch,purpose-build,PropEq:Firmware:bios:bios \
all_host_os=freebsd \
freebsdbuildjob=build-$arch-freebsd \
recipe_testinstall=true
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-07-04 11:22 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-04 2:52 [freebsd-master test] 124935: trouble: blocked/broken osstest service owner
2018-07-04 6:49 ` Roger Pau Monné
2018-07-04 10:55 ` Ian Jackson
2018-07-04 10:56 ` [OSSTEST PATCH 1/3] resource allocation: PropCompareBase: Break out _get_val Ian Jackson
2018-07-04 10:56 ` [OSSTEST PATCH 2/3] resource allocation: PropEq, PropMinVer: Honour HostProp_ Ian Jackson
2018-07-04 10:56 ` [OSSTEST PATCH 3/3] resource allocation: PropEq, PropMinVer: support defaults Ian Jackson
2018-07-04 10:59 ` [freebsd-master test] 124935: trouble: blocked/broken Ian Jackson
2018-07-04 11:21 ` Roger Pau Monné
2018-07-04 10:30 ` Ian Jackson
2018-07-04 10:48 ` Roger Pau Monné
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.