From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 04/25] nvme: remove constant argument to tracepoint
Date: Fri, 21 Apr 2023 11:32:55 +0200 [thread overview]
Message-ID: <20230421093316.17941-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com>
The last argument to -pci_nvme_err_startfail_virt_state is always "OFFLINE"
due to the enclosing "if" condition requiring !sctrl->scs. Reported by
Coverity.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/nvme/ctrl.c | 4 +---
hw/nvme/trace-events | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index ac24eeb5ed5a..f59dfe1cbe96 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -7158,9 +7158,7 @@ static int nvme_start_ctrl(NvmeCtrl *n)
if (pci_is_vf(PCI_DEVICE(n)) && !sctrl->scs) {
trace_pci_nvme_err_startfail_virt_state(le16_to_cpu(sctrl->nvi),
- le16_to_cpu(sctrl->nvq),
- sctrl->scs ? "ONLINE" :
- "OFFLINE");
+ le16_to_cpu(sctrl->nvq));
return -1;
}
if (unlikely(n->cq[0])) {
diff --git a/hw/nvme/trace-events b/hw/nvme/trace-events
index 7f7837e1a281..9afddf3b951c 100644
--- a/hw/nvme/trace-events
+++ b/hw/nvme/trace-events
@@ -187,7 +187,7 @@ pci_nvme_err_startfail_asqent_sz_zero(void) "nvme_start_ctrl failed because the
pci_nvme_err_startfail_acqent_sz_zero(void) "nvme_start_ctrl failed because the admin completion queue size is zero"
pci_nvme_err_startfail_zasl_too_small(uint32_t zasl, uint32_t pagesz) "nvme_start_ctrl failed because zone append size limit %"PRIu32" is too small, needs to be >= %"PRIu32""
pci_nvme_err_startfail(void) "setting controller enable bit failed"
-pci_nvme_err_startfail_virt_state(uint16_t vq, uint16_t vi, const char *state) "nvme_start_ctrl failed due to ctrl state: vi=%u vq=%u %s"
+pci_nvme_err_startfail_virt_state(uint16_t vq, uint16_t vi) "nvme_start_ctrl failed due to ctrl state: vi=%u vq=%u"
pci_nvme_err_invalid_mgmt_action(uint8_t action) "action=0x%"PRIx8""
pci_nvme_err_ignored_mmio_vf_offline(uint64_t addr, unsigned size) "addr 0x%"PRIx64" size %d"
--
2.40.0
next prev parent reply other threads:[~2023-04-21 9:36 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-21 9:32 [PULL 00/25] First batch of misc patches for QEMU 8.1 Paolo Bonzini
2023-04-21 9:32 ` [PULL 01/25] mtest2make.py: teach suite name that are just "PROJECT" Paolo Bonzini
2023-04-21 9:32 ` [PULL 02/25] build-sys: prevent meson from downloading wrapped subprojects Paolo Bonzini
2023-04-21 9:32 ` [PULL 03/25] build-sys: add slirp.wrap Paolo Bonzini
2023-04-21 9:32 ` Paolo Bonzini [this message]
2023-04-21 9:32 ` [PULL 05/25] vnc: avoid underflow when accessing user-provided address Paolo Bonzini
2023-04-21 9:32 ` [PULL 06/25] tests: bios-tables-test: replace memset with initializer Paolo Bonzini
2023-04-21 9:32 ` [PULL 07/25] configure: Avoid -Werror=maybe-uninitialized Paolo Bonzini
2023-04-21 9:32 ` [PULL 08/25] target/i386: Avoid unreachable variable declaration in mmu_translate() Paolo Bonzini
2023-04-21 9:33 ` [PULL 09/25] lasi: fix RTC migration Paolo Bonzini
2023-04-21 9:33 ` [PULL 10/25] coverity: update COMPONENTS.md Paolo Bonzini
2023-04-21 9:33 ` [PULL 11/25] target/mips: tcg: detect out-of-bounds accesses to cpu_gpr and cpu_gpr_hi Paolo Bonzini
2023-04-21 9:33 ` [PULL 12/25] qapi-gen: mark coroutine QMP command functions as coroutine_fn Paolo Bonzini
2023-04-21 9:33 ` [PULL 13/25] io: mark mixed functions that can suspend Paolo Bonzini
2023-04-21 9:33 ` [PULL 14/25] migration: " Paolo Bonzini
2023-04-21 9:33 ` [PULL 15/25] monitor: " Paolo Bonzini
2023-04-21 9:33 ` [PULL 16/25] target/i386: Change wrong XFRM value in SGX CPUID leaf Paolo Bonzini
2023-04-21 9:33 ` [PULL 17/25] block-backend: remove qatomic_mb_read() Paolo Bonzini
2023-04-21 9:33 ` [PULL 18/25] postcopy-ram: do not use qatomic_mb_read Paolo Bonzini
2023-04-21 9:33 ` [PULL 19/25] qemu-coroutine: remove qatomic_mb_read() Paolo Bonzini
2023-04-21 9:33 ` [PULL 20/25] docs: explain effect of smp_read_barrier_depends() on modern architectures Paolo Bonzini
2023-04-21 9:33 ` [PULL 21/25] nbd: a BlockExport always has a BlockBackend Paolo Bonzini
2023-04-21 9:33 ` [PULL 22/25] coverity: unify Fedora dockerfiles Paolo Bonzini
2023-04-21 9:33 ` [PULL 23/25] configure: Honour cross-prefix when finding ObjC compiler Paolo Bonzini
2023-04-21 9:33 ` [PULL 24/25] tests: libvirt-ci: Update to commit '2fa24dce8bc' Paolo Bonzini
2023-04-21 9:33 ` [PULL 25/25] tests: lcitool: Switch to OpenSUSE Leap 15.4 Paolo Bonzini
2023-04-22 7:31 ` [PULL 00/25] First batch of misc patches for QEMU 8.1 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230421093316.17941-5-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).