From nobody Fri Nov 11 01:24:35 2022 X-Original-To: dev-commits-src-all@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 4N7gwg2q8cz4f0YP; Fri, 11 Nov 2022 01:24:35 +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 4N7gwg2JnZz3GdS; Fri, 11 Nov 2022 01:24:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668129875; 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=FeGl+MTKT4knJZNaFCW8k2RkH7d/gmkQ9trcoR034iE=; b=LS85ZufiNBf4bawTTH9f7/lPZkCbAV0MITd7E4nsKjoZYaEII+PQNN9vtO2JPLP3fNk9Nu BxipGCKyK04NYmd+Jl0neM7ONU1zUJj5CR/GuwjwJw2Pr9vvd7OUIkYoa6cFlTcUH2Yx0+ woHrAtUMZif4Dx/UwI5Sl2cUNqJm99QAIyi3Ai7rXCLO46paXG9ijyU9TnQLlXjkwcIydX Kmzsaca8HillMQGlKZj33pX+yaOIOB8HAbGNQxIEG9x0k8fXnzQqXOFIgo/OZvGHG+9f3m LePJIMgre2KJ4b23BpDupmLhL0U6jtk9Mpkz1SHQuE0c+dSqaEgF/ZuICjzpnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668129875; 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=FeGl+MTKT4knJZNaFCW8k2RkH7d/gmkQ9trcoR034iE=; b=UStfoEyc8cyCgssuU7Qn9ucQ+tT2Fiwc/cMgxLzPSoiqOJN751zBn8IRNKIAl+vBNyzJMY D3MgT4rhrJVCikHiMs6KDpiqSmOsroE8EKzXorwwcKN68DkZfaYdC87GoO7ub73kT5H2Jj MNONtJjtXOQEUojMrO3fbJe/8fYId+0aI5YA5z5mMXpLR0YV1SNbzlxTHTkzO8fTdQC6lt xcvZngqf4xyS2VmDhSRuCUbsUKlTFo1baU26Dm2S38kcocUmJtNdxEYRkA+pm8MLSInj7M 7AKKaB01gKbu1gFKQLFoqh3FQeEoKjfr6I81pe9hsrTCmuMcMW6w5ppMUQLWFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668129875; a=rsa-sha256; cv=none; b=ghkhOXPShCE4tpHYzFwOpjDNKBS89AZ/1/xUPxejx0QoGBw5KBEFfAO3kScoEL7cAHbkgS RnrESwISqC0CEwZF+er/tqReznyK6O0zroUU/RK7bgNV4zNUw/sVB9tbdbiUtE2P0LN59l RJRn8W4EYIeG3X7QQO/PtSBJONA8pjzFo858Uy+fnXtrS/9TmMb1eFr6GmiQxAVofsc3WT 4QAiu9LkbzRK9ElerzcGxWWcPLgUVHYur7CP0tkVkRLLQI/8gSD98R9Rkt5YF9aM2PusvW QQjrmVg49iG9dkX+q6kcYkhx8itUZ73A9gLRNaU+lV6ifoTKE0SCxjxIIzIp9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N7gwg1QLZzNqC; Fri, 11 Nov 2022 01:24:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AB1OZn1027369; Fri, 11 Nov 2022 01:24:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AB1OZ11027368; Fri, 11 Nov 2022 01:24:35 GMT (envelope-from git) Date: Fri, 11 Nov 2022 01:24:35 GMT Message-Id: <202211110124.2AB1OZ11027368@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: ffbe54c2175c - stable/12 - bhyve virtio-scsi: Tidy warning and debug prints. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/12 X-Git-Reftype: branch X-Git-Commit: ffbe54c2175cf55a39f9123867c5b2598c93a029 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ffbe54c2175cf55a39f9123867c5b2598c93a029 commit ffbe54c2175cf55a39f9123867c5b2598c93a029 Author: John Baldwin AuthorDate: 2022-08-29 22:35:42 +0000 Commit: John Baldwin CommitDate: 2022-11-11 01:13:13 +0000 bhyve virtio-scsi: Tidy warning and debug prints. Use a consistent prefix ("virtio-scsi: ") similar to the e1000 device model. Reviewed by: mav, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36270 (cherry picked from commit 62806a7f31e3b4813c4e6b70534c41f91bfe4e12) --- usr.sbin/bhyve/pci_virtio_scsi.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c index 0c2342134b3d..542098631f90 100644 --- a/usr.sbin/bhyve/pci_virtio_scsi.c +++ b/usr.sbin/bhyve/pci_virtio_scsi.c @@ -87,8 +87,8 @@ __FBSDID("$FreeBSD$"); #define VIRTIO_SCSI_F_CHANGE (1 << 2) static int pci_vtscsi_debug = 0; -#define DPRINTF(params) if (pci_vtscsi_debug) PRINTLN params -#define WPRINTF(params) PRINTLN params +#define WPRINTF(msg, params...) PRINTLN("virtio-scsi: " msg, ##params) +#define DPRINTF(msg, params...) if (pci_vtscsi_debug) WPRINTF(msg, ##params) struct pci_vtscsi_config { uint32_t num_queues; @@ -288,8 +288,7 @@ pci_vtscsi_proc(void *arg) vq_endchains(q->vsq_vq, 0); pthread_mutex_unlock(&q->vsq_qmtx); - DPRINTF(("virtio-scsi: request completed", - req->vsr_idx)); + DPRINTF("request completed", req->vsr_idx); free(req); } @@ -304,7 +303,7 @@ pci_vtscsi_reset(void *vsc) sc = vsc; - DPRINTF(("vtscsi: device reset requested")); + DPRINTF("device reset requested"); vi_reset_dev(&sc->vss_vs); /* initialize config structure */ @@ -433,13 +432,13 @@ pci_vtscsi_tmf_handle(struct pci_vtscsi_softc *sc, struct sbuf *sb = sbuf_new_auto(); ctl_io_sbuf(io, sb); sbuf_finish(sb); - DPRINTF(("pci_virtio_scsi: %s", sbuf_data(sb))); + DPRINTF("%s", sbuf_data(sb)); sbuf_delete(sb); } err = ioctl(sc->vss_ctl_fd, CTL_IO, io); if (err != 0) - WPRINTF(("CTL_IO: err=%d (%s)", errno, strerror(errno))); + WPRINTF("CTL_IO: err=%d (%s)", errno, strerror(errno)); tmf->response = io->taskio.task_status; ctl_scsi_free_io(io); @@ -526,13 +525,13 @@ pci_vtscsi_request_handle(struct pci_vtscsi_queue *q, struct iovec *iov_in, struct sbuf *sb = sbuf_new_auto(); ctl_io_sbuf(io, sb); sbuf_finish(sb); - DPRINTF(("pci_virtio_scsi: %s", sbuf_data(sb))); + DPRINTF("%s", sbuf_data(sb)); sbuf_delete(sb); } err = ioctl(sc->vss_ctl_fd, CTL_IO, io); if (err != 0) { - WPRINTF(("CTL_IO: err=%d (%s)", errno, strerror(errno))); + WPRINTF("CTL_IO: err=%d (%s)", errno, strerror(errno)); cmd_wr->response = VIRTIO_SCSI_S_FAILURE; } else { cmd_wr->sense_len = MIN(io->scsiio.sense_len, @@ -629,7 +628,7 @@ pci_vtscsi_requestq_notify(void *vsc, struct vqueue_info *vq) pthread_cond_signal(&q->vsq_cv); pthread_mutex_unlock(&q->vsq_mtx); - DPRINTF(("virtio-scsi: request enqueued", idx)); + DPRINTF("request enqueued", idx); } } @@ -694,7 +693,7 @@ pci_vtscsi_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts) sc->vss_ctl_fd = open(devname, O_RDWR); if (sc->vss_ctl_fd < 0) { - WPRINTF(("cannot open %s: %s", devname, strerror(errno))); + WPRINTF("cannot open %s: %s", devname, strerror(errno)); free(sc); return (1); }