svn commit: r293823 - in user/ngie/more-tests2: sbin/geom sbin/geom/class sbin/geom/core/tests sys/dev/sfxge/common tools/regression/geom tools/regression/geom_gpt
Garrett Cooper
ngie at FreeBSD.org
Wed Jan 13 09:25:04 UTC 2016
Author: ngie
Date: Wed Jan 13 09:25:01 2016
New Revision: 293823
URL: https://svnweb.freebsd.org/changeset/base/293823
Log:
MFhead @ r293822 changes for posterity's sake (and diff reduce)
Added:
user/ngie/more-tests2/tools/regression/geom/
- copied from r293822, head/tools/regression/geom/
user/ngie/more-tests2/tools/regression/geom_gpt/
- copied from r293822, head/tools/regression/geom_gpt/
Deleted:
user/ngie/more-tests2/sbin/geom/core/tests/
Modified:
user/ngie/more-tests2/sbin/geom/Makefile
user/ngie/more-tests2/sbin/geom/class/Makefile
user/ngie/more-tests2/sys/dev/sfxge/common/efx.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_filter.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_types.h
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mcdi.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_nvram.c
user/ngie/more-tests2/sys/dev/sfxge/common/siena_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/siena_mcdi.c
Directory Properties:
user/ngie/more-tests2/ (props changed)
user/ngie/more-tests2/sys/ (props changed)
Modified: user/ngie/more-tests2/sbin/geom/Makefile
==============================================================================
--- user/ngie/more-tests2/sbin/geom/Makefile Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sbin/geom/Makefile Wed Jan 13 09:25:01 2016 (r293823)
@@ -20,14 +20,8 @@ LIBADD= geom util
.else
-.include <src.opts.mk>
-
SUBDIR= core class
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
-
.include <bsd.subdir.mk>
.endif
Modified: user/ngie/more-tests2/sbin/geom/class/Makefile
==============================================================================
--- user/ngie/more-tests2/sbin/geom/class/Makefile Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sbin/geom/class/Makefile Wed Jan 13 09:25:01 2016 (r293823)
@@ -21,8 +21,4 @@ SUBDIR+=shsec
SUBDIR+=stripe
SUBDIR+=virstor
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
-
.include <bsd.subdir.mk>
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/efx.h
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/efx.h Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/efx.h Wed Jan 13 09:25:01 2016 (r293823)
@@ -2235,14 +2235,14 @@ efx_filter_supported_filters(
extern void
efx_filter_spec_init_rx(
- __inout efx_filter_spec_t *spec,
+ __out efx_filter_spec_t *spec,
__in efx_filter_priority_t priority,
__in efx_filter_flag_t flags,
__in efx_rxq_t *erp);
extern void
efx_filter_spec_init_tx(
- __inout efx_filter_spec_t *spec,
+ __out efx_filter_spec_t *spec,
__in efx_txq_t *etp);
extern __checkReturn efx_rc_t
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/efx_filter.c
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/efx_filter.c Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/efx_filter.c Wed Jan 13 09:25:01 2016 (r293823)
@@ -292,7 +292,7 @@ fail1:
void
efx_filter_spec_init_rx(
- __inout efx_filter_spec_t *spec,
+ __out efx_filter_spec_t *spec,
__in efx_filter_priority_t priority,
__in efx_filter_flag_t flags,
__in efx_rxq_t *erp)
@@ -311,7 +311,7 @@ efx_filter_spec_init_rx(
void
efx_filter_spec_init_tx(
- __inout efx_filter_spec_t *spec,
+ __out efx_filter_spec_t *spec,
__in efx_txq_t *etp)
{
EFSYS_ASSERT3P(spec, !=, NULL);
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/efx_impl.h
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/efx_impl.h Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/efx_impl.h Wed Jan 13 09:25:01 2016 (r293823)
@@ -1120,7 +1120,7 @@ efx_vpd_hunk_next(
__in size_t size,
__out efx_vpd_tag_t *tagp,
__out efx_vpd_keyword_t *keyword,
- __out_bcount_opt(*paylenp) unsigned int *payloadp,
+ __out_opt unsigned int *payloadp,
__out_opt uint8_t *paylenp,
__inout unsigned int *contp);
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.h
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.h Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.h Wed Jan 13 09:25:01 2016 (r293823)
@@ -54,7 +54,7 @@ struct efx_mcdi_req_s {
uint8_t *emr_in_buf;
size_t emr_in_length;
/* Outputs: retcode, buffer, length, and length used*/
- int emr_rc;
+ efx_rc_t emr_rc;
uint8_t *emr_out_buf;
size_t emr_out_length;
size_t emr_out_length_used;
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/efx_types.h
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/efx_types.h Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/efx_types.h Wed Jan 13 09:25:01 2016 (r293823)
@@ -536,7 +536,7 @@ extern int fix_lint;
(_oword).eo_u32[3]) == ~((uint32_t)0))
#define EFX_QWORD_IS_SET64(_qword) \
- (((_qword).eq_u64[0]) == ~((uint32_t)0))
+ (((_qword).eq_u64[0]) == ~((uint64_t)0))
#define EFX_QWORD_IS_SET32(_qword) \
(((_qword).eq_u32[0] & \
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/hunt_impl.h
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/hunt_impl.h Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/hunt_impl.h Wed Jan 13 09:25:01 2016 (r293823)
@@ -289,10 +289,10 @@ ef10_mcdi_poll_response(
extern void
ef10_mcdi_read_response(
- __in efx_nic_t *enp,
- __out void *bufferp,
- __in size_t offset,
- __in size_t length);
+ __in efx_nic_t *enp,
+ __out_bcount(length) void *bufferp,
+ __in size_t offset,
+ __in size_t length);
extern void
ef10_mcdi_request_copyout(
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mcdi.c
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mcdi.c Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mcdi.c Wed Jan 13 09:25:01 2016 (r293823)
@@ -307,10 +307,10 @@ ef10_mcdi_poll_response(
void
ef10_mcdi_read_response(
- __in efx_nic_t *enp,
- __out void *bufferp,
- __in size_t offset,
- __in size_t length)
+ __in efx_nic_t *enp,
+ __out_bcount(length) void *bufferp,
+ __in size_t offset,
+ __in size_t length)
{
const efx_mcdi_transport_t *emtp = enp->en_mcdi.em_emtp;
efsys_mem_t *esmp = emtp->emt_dma_mem;
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/hunt_nvram.c
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/hunt_nvram.c Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/hunt_nvram.c Wed Jan 13 09:25:01 2016 (r293823)
@@ -240,7 +240,7 @@ fail1:
static efx_rc_t
tlv_init_cursor(
- __in tlv_cursor_t *cursor,
+ __out tlv_cursor_t *cursor,
__in uint32_t *block,
__in uint32_t *limit)
{
@@ -255,7 +255,7 @@ tlv_init_cursor(
static efx_rc_t
tlv_init_cursor_from_size(
- __in tlv_cursor_t *cursor,
+ __out tlv_cursor_t *cursor,
__in uint8_t *block,
__in size_t size)
{
@@ -1103,7 +1103,7 @@ ef10_nvram_segment_write_tlv(
__in boolean_t write)
{
efx_rc_t rc;
- int status;
+ efx_rc_t status;
size_t original_segment_size;
size_t modified_segment_size;
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/siena_impl.h
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/siena_impl.h Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/siena_impl.h Wed Jan 13 09:25:01 2016 (r293823)
@@ -127,10 +127,10 @@ siena_mcdi_poll_response(
extern void
siena_mcdi_read_response(
- __in efx_nic_t *enp,
- __out void *bufferp,
- __in size_t offset,
- __in size_t length);
+ __in efx_nic_t *enp,
+ __out_bcount(length) void *bufferp,
+ __in size_t offset,
+ __in size_t length);
extern void
siena_mcdi_request_copyout(
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/siena_mcdi.c
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/siena_mcdi.c Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/siena_mcdi.c Wed Jan 13 09:25:01 2016 (r293823)
@@ -216,10 +216,10 @@ siena_mcdi_poll_response(
void
siena_mcdi_read_response(
- __in efx_nic_t *enp,
- __out void *bufferp,
- __in size_t offset,
- __in size_t length)
+ __in efx_nic_t *enp,
+ __out_bcount(length) void *bufferp,
+ __in size_t offset,
+ __in size_t length)
{
efx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);
unsigned int pdur;
More information about the svn-src-user
mailing list