From nobody Tue Oct 24 19:00:20 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 4SFLwh4pyQz4yNDY; Tue, 24 Oct 2023 19:00:20 +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 4SFLwh47xwz4GlL; Tue, 24 Oct 2023 19:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698174020; 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=U6ljV1xCtvCchPk5FtEfNTnNXHJJcNtrUKW8NS2OnYE=; b=xKVvMs7woUyWmAHFOK66IQkUFvYHOoiEbyZWSmqwqJzcwOOJ+BAIlUiHrCtNSOgsRZZANF BsuSHBxLI9pM+ZHi9Aw+1SitoiWpOJgxAjo4sv9RzoJVo+MhCu91gCv72fbWg8+/5xV1zx Vl0VrFTWAS7mcd1RHssnMEKBTy4ApEypfC3wFTllWcW1wQWaNuv8aiLo7kbU6iQFcBMmro xavmg7coBPcbZAzxCnvCCyGOTIidJZbTHJZ/NWjleMUvF2gvaFVG2is64RsYQKrHhZI2S3 7/gnwqy9gS8HKMyV/i/0Ftk+fnFE77L4t5H01AMHxUzgkCaJ/oBt5fzNsBkOag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698174020; a=rsa-sha256; cv=none; b=yBVbrZg6oCvdwsRfYr7Yf1pb4iOxtoG2Y54zfeQGtv60bISh5x1sR2ZPq4YpRY59BAP9JM +jTQRzTXloBsdhO6A0aQmsdzEvLkhkAGwZn3yws8YzweyuveZrGDBgSTl8XSLLzkISQjJ7 zdiKk89JRtW1apDQkErSJXZg8VS0xBa01f9eNFDlESpguqhRvF6M9HHwMqRHvQUtgjkzAe AD7K1M/psAVSc2EA0qjBuIB38vbkm5Nn0ZNiTo/+sgb6lvMYB5voeteoorpQGGWSmHak8k BA/6iJztgyzx/fOWEefVJF6dB3dj7A8LX3Pq3LD2kiJIXm2nVnoKhU/izgTcaw== 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=1698174020; 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=U6ljV1xCtvCchPk5FtEfNTnNXHJJcNtrUKW8NS2OnYE=; b=NEj2pVBPXIizeK/Kva9AZnv/ivwJD+AhkzP7xcf5Y7s9Kq8m+Vv97PkVVi9graWsTgdKsQ o8n5tW//g3crqVSX05keJszAiEXWlKCrhPV1nMrIcOsQxMJcr+R/7lWTpsa21Pk6+LPknl 9j5wh91qNI06YydT/Hviq51RteSQrcLPN0DX8j0az7M/fhJzh7rhXd5wOhZva2uU7p0w1X XUuuB8lrZpzj+vg/mu4jTpZjU5tMwSHw8J5xjt1C+6pmX6owsVCNyTTbAvSw2lLr00nB+W H9OWtX6YAdOTmxlxq2TrG4v4Mg9vRj/5BAJmfONhWYr3o2hPGfpDJ49599djRA== 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 4SFLwh3DpkzZXv; Tue, 24 Oct 2023 19:00:20 +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 39OJ0KsL032929; Tue, 24 Oct 2023 19:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OJ0KPn032926; Tue, 24 Oct 2023 19:00:20 GMT (envelope-from git) Date: Tue, 24 Oct 2023 19:00:20 GMT Message-Id: <202310241900.39OJ0KPn032926@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: 13c8d5bf334d - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 13c8d5bf334d6afe66c125fc9ab1ace62e3364fc Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=13c8d5bf334d6afe66c125fc9ab1ace62e3364fc commit 13c8d5bf334d6afe66c125fc9ab1ace62e3364fc Author: John Baldwin AuthorDate: 2023-10-13 19:26:58 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:44:10 +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 5ffb65269608..b69c099225db 100644 --- a/usr.sbin/bhyve/pci_ahci.c +++ b/usr.sbin/bhyve/pci_ahci.c @@ -118,7 +118,6 @@ static FILE *dbg; #else #define DPRINTF(format, arg...) #endif -#define WPRINTF(format, arg...) printf(format, ##arg) #define AHCI_PORT_IDENT 20 + 1 @@ -343,7 +342,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) { @@ -1802,7 +1801,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; @@ -1847,7 +1846,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; } @@ -2134,7 +2133,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; @@ -2209,7 +2208,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); } @@ -2307,7 +2306,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);