From nobody Tue Oct 24 19:00:34 2023 X-Original-To: dev-commits-src-branches@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 4SFLwy6dKqz4yNRG; Tue, 24 Oct 2023 19:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFLwy66Nnz4Hk0; Tue, 24 Oct 2023 19:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698174034; 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; bh=uleR6FDax54Yx7zVEiMYmN9vhvAVxQIwYcVCJLUc8Kw=; b=WinEiCu3wzNvK4F2fK+Uy9qX4iYKfS26gY5I4m7zEF8QkeZlvr9QGACBiSPHgZUT99jNNn S0Zeq1MDZ2v4DGOczopxVcUF/XIHMK3H/Ba+iaw1qZcIWDNX/jHgW076Xem5kTZo9+By8D TbEKPEvrp63F1mVVsqMD5OSG0ANIALGgeDqKH2IKX6ZA7UdFE76iLzQIhYnPgXuFFbsctr Y/2rYkAdagdfJKd8DoH2/8MClemwNwYRT8esWiLA9BY4ydlVFETttCRIUrjP5hUPKim+Xp 0W7y89VSxX6yArGigpw7JaAmLRLM2dJRoSu/v+Yesk2pI8YWos6d0Q6qi8ToVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698174034; a=rsa-sha256; cv=none; b=AbHkw73C2M9U6iqGPsfHKuTQTYkAJczHNlwLzkdjpUN4/PPempFpPM6Y+9YSbGYRwdT+ZC UBtH5UjakdLU3d2C+eUHHf+qUL4Ug5ZsY5yLmiurZfPAPzUDtVHpJFutUebD8Ln+3t4Eog ttCzxA264eYbUfJOHAuOsxNa9vFAhsBpoApy8+Yv0ZN4WuBUxvIPRp5F0RBD/XndIe3ZS1 mQ03HU90y7RFbLuqrbIR/FTnvzw8LGRhuO5tKX1AVrGEOtPm12eA2cAV2nmgDhe1MGhXjH vQmG98B1AHgJCzKUcIrNncY/czVkvn585CRayQwxc8wH7EpxWXu7TlImxiCQTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698174034; 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; bh=uleR6FDax54Yx7zVEiMYmN9vhvAVxQIwYcVCJLUc8Kw=; b=lx2oZnoRqylnF4vYm6WKdYAYygNxj3HJqlNfXlnEoO0jrvTo4DzaGNuqlRQZGnI/yt9j2B O+zsYbnbRI6XYkihWpGYcev6gT9uQuiykQCwmncsOb5Z+Y3K0rN6NTJEen2kipsuQ21h0m IRBYDJxYD0WrQwhj8tJZWboIvJJo7mGYhqLfxj1IZPNrxmvf9nxdW6Uxu2Kvs1IAnGKVDf fQ8wm8sw0YAM+90dN4qukp8kdOtmqxAWMYp7VyA5a7TdhuAigr9H0xsm55tc+p/SRap6h+ fbgCaGK6f49o0uKD1xizdrh4MDB+nFok7p78QqjjuvLP62JHR47TmbzAjcsgvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLwy5CbvzZXy; Tue, 24 Oct 2023 19:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39OJ0YgB033392; Tue, 24 Oct 2023 19:00:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OJ0YUL033390; Tue, 24 Oct 2023 19:00:34 GMT (envelope-from git) Date: Tue, 24 Oct 2023 19:00:34 GMT Message-Id: <202310241900.39OJ0YUL033390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0e0d2636d4b1 - stable/13 - bhyve ahci: Replace WPRINTF with EPRINTLN List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e0d2636d4b1d6ed9aabaf873461db6f330bc4b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0e0d2636d4b1d6ed9aabaf873461db6f330bc4b5 commit 0e0d2636d4b1d6ed9aabaf873461db6f330bc4b5 Author: John Baldwin AuthorDate: 2023-10-13 19:26:58 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:44:14 +0000 bhyve ahci: Replace WPRINTF with EPRINTLN Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D42181 (cherry picked from commit edd2a9b887864d07ac5af480b4b8f35cb76443f6) --- usr.sbin/bhyve/pci_ahci.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c index 61679b1b2245..863c504d2dc6 100644 --- a/usr.sbin/bhyve/pci_ahci.c +++ b/usr.sbin/bhyve/pci_ahci.c @@ -117,7 +117,6 @@ static FILE *dbg; #else #define DPRINTF(format, arg...) #endif -#define WPRINTF(format, arg...) printf(format, ##arg) #define AHCI_PORT_IDENT 20 + 1 @@ -342,7 +341,7 @@ ahci_write_fis(struct ahci_port *p, enum sata_fis_type ft, uint8_t *fis) irq = (fis[1] & (1 << 6)) ? AHCI_P_IX_PS : 0; break; default: - WPRINTF("unsupported fis type %d", ft); + EPRINTLN("unsupported fis type %d", ft); return; } if (fis[2] & ATA_S_ERROR) { @@ -1801,7 +1800,7 @@ ahci_handle_cmd(struct ahci_port *p, int slot, uint8_t *cfis) handle_packet_cmd(p, slot, cfis); break; default: - WPRINTF("Unsupported cmd:%02x", cfis[2]); + EPRINTLN("Unsupported cmd:%02x", cfis[2]); ahci_write_fis_d2h(p, slot, cfis, (ATA_E_ABORT << 8) | ATA_S_READY | ATA_S_ERROR); break; @@ -1846,7 +1845,7 @@ ahci_handle_slot(struct ahci_port *p, int slot) #endif if (cfis[0] != FIS_TYPE_REGH2D) { - WPRINTF("Not a H2D FIS:%02x", cfis[0]); + EPRINTLN("Not a H2D FIS:%02x", cfis[0]); return; } @@ -2133,7 +2132,7 @@ pci_ahci_port_write(struct pci_ahci_softc *sc, uint64_t offset, uint64_t value) case AHCI_P_TFD: case AHCI_P_SIG: case AHCI_P_SSTS: - WPRINTF("pci_ahci_port: read only registers 0x%"PRIx64"", offset); + EPRINTLN("pci_ahci_port: read only registers 0x%"PRIx64"", offset); break; case AHCI_P_SCTL: p->sctl = value; @@ -2208,7 +2207,7 @@ pci_ahci_write(struct pci_devinst *pi, int baridx, uint64_t offset, int size, else if (offset < (uint64_t)AHCI_OFFSET + sc->ports * AHCI_STEP) pci_ahci_port_write(sc, offset, value); else - WPRINTF("pci_ahci: unknown i/o write offset 0x%"PRIx64"", offset); + EPRINTLN("pci_ahci: unknown i/o write offset 0x%"PRIx64"", offset); pthread_mutex_unlock(&sc->mtx); } @@ -2306,7 +2305,7 @@ pci_ahci_read(struct pci_devinst *pi, int baridx, uint64_t regoff, int size) value = pci_ahci_port_read(sc, offset); else { value = 0; - WPRINTF("pci_ahci: unknown i/o read offset 0x%"PRIx64"", + EPRINTLN("pci_ahci: unknown i/o read offset 0x%"PRIx64"", regoff); } value >>= 8 * (regoff & 0x3);