From nobody Mon Aug 29 16:45:43 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MGbsj3wGdz4bTRV; Mon, 29 Aug 2022 16:45:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MGbsj3Lj8z3KN0; Mon, 29 Aug 2022 16:45:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661791545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HkA0J0AWz+sHh66t5jFvB21yR1PlkFbcpY5ic6eWT7I=; b=T1kJp32HR+Hbgx1m4zEpUKbf1Ef5Xsz7vWBiA5VCaMZDdp90dOYCOIW1657FguGuLrCtyf HIQlCG9q3UNYuxkTAxEZZbw4ZQk4VfQ0xpv2foixNCGOvTLQJ2C6u+UyveGAP4WMxHzb6X Ho+aLYLB32eISubgY4ZNeMj3cw8iz2GtHVmO5YZ2bvGEOWkrUKR3JzJ3FTZ4SvpRcuWoIQ diM8Uuii7qONYpdj3kgC4mpbg3WFYOWY+B6VHMLVDusZnyW2sjt2Sh/jp2D7r/c3JUYppI pQzSc5nxHwIffQIOhsB6Q3S3Tkf+61LWVXocE85G13RIX0Z4D/NdYU+htY5ffg== Received: from [10.0.1.4] (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4MGbsh5B7Gz1JBZ; Mon, 29 Aug 2022 16:45:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <232d711c-83af-7701-00f2-6836c7de7038@FreeBSD.org> Date: Mon, 29 Aug 2022 09:45:43 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: git: 9e772f203ff2 - main - mana: Fix a couple i386 build errors Content-Language: en-US To: Wei Hu , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202208290635.27T6Zheu028340@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202208290635.27T6Zheu028340@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661791545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HkA0J0AWz+sHh66t5jFvB21yR1PlkFbcpY5ic6eWT7I=; b=Xp8eDGcYfAzjiDaSwz2FOfC+N+IvOKWS6DMj6qdFA/OnkOaW5iCw4KtxW/6ofpSe8fqWvG VkMt8aliv9KqRF4hXoopp2PcP7II+mmcGZdOmYoIi7Cbz4qieEWiD43mGpTUkF0x9ELXoL hPzGsBgylIzqDuqdjp7N2aiC8gDFOIXac6aHi4/HBXzmRT4r3PmCGQUFtZYYfkW1ILjjJY 6iuPKAO9r7AIu6uh53M5UJtdpOsBxvl3VgyV8k55Ut/nST2Bb82wG3yvUsWlt3wtoujDK6 1BW8eSUThLzclcZz2SfCMmlayGjD+u9Vc1tA30YBEAYo0JEm/SCbNYVMNNj2xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661791545; a=rsa-sha256; cv=none; b=RS+33zVaNn2qEewdqfLgfgUhwCg7I91KBGi5qWi+9hIhAk3+6agONg+4dOeJdscASXtc4l cR7TgewM0O3f5S8y7OPnSZkxBsv78YXQF1OV/cY6Da1ZNsTA4GnYZcjSEwDjCidaE12PnN 8fSfsb489BvyEXz3xPgo3KxT9BSFyvqN7pcFro61rF/hHmUxvQlBjh1qqP4fCIOiirUpnv tc3hdLtqPWSqhGhnMinLAAB217Riaz8Eztdpid5JGQnFfzFht0lF15DL4gNxrvra28hV6H jsQ0XMFrq2unSl9gqul336I4togZPw4KYEIIZmZcbdwjFX4H01zoQV8M2QsSdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 8/28/22 11:35 PM, Wei Hu wrote: > The branch main has been updated by whu: > > URL: https://cgit.FreeBSD.org/src/commit/?id=9e772f203ff2bd296d8ef234681b6db5d43c7582 > > commit 9e772f203ff2bd296d8ef234681b6db5d43c7582 > Author: Wei Hu > AuthorDate: 2022-08-29 06:30:49 +0000 > Commit: Wei Hu > CommitDate: 2022-08-29 06:35:02 +0000 > > mana: Fix a couple i386 build errors > > Fix a couple i386 build errors > > Fixes: b685df314f138 > Sponsored by: Microsoft > --- > sys/dev/mana/mana_en.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c > index e504df1c8a8d..5e5e3939753f 100644 > --- a/sys/dev/mana/mana_en.c > +++ b/sys/dev/mana/mana_en.c > @@ -1054,8 +1054,11 @@ mana_cfg_vport(struct mana_port_context *apc, uint32_t protection_dom_id, > apc->tx_shortform_allowed = resp.short_form_allowed; > apc->tx_vp_offset = resp.tx_vport_offset; > > +#if defined(__amd64__) > if_printf(apc->ndev, "Configured vPort %lu PD %u DB %u\n", > apc->port_handle, protection_dom_id, doorbell_pg_id); > +#endif > + > out: > if (err) > mana_uncfg_vport(apc); > @@ -1124,8 +1127,11 @@ mana_cfg_vport_steering(struct mana_port_context *apc, > err = EPROTO; > } > > +#if defined(__amd64__) > if_printf(ndev, "Configured steering vPort %lu entries %u\n", > apc->port_handle, num_entries); > +#endif > + > out: > free(req, M_DEVBUF); > return err; Normally the way we handle printing a uint64_t is to use the 'j' modifier and a uintmax_t cast, e.g.: if_printf(apc->ndev, "Configured vPort %ju PD %u DB %u\n", (uintmax_t)apc->port_handle, protection_dom_id, doorbell_pg_id); That would be better than making the prints specific to a single architecture. -- John Baldwin