diff options
| author | Roman Penyaev <r.peniaev@gmail.com> | 2024-11-29 11:32:39 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2024-12-02 16:23:12 +0400 |
| commit | e6214fd6d48e704ed3aed6ea2053a9756d0ca13f (patch) | |
| tree | b7ba9041f83f03d90e2a740afa7212fe8237f073 | |
| parent | 188df56eab8ed960e407762e31a35fc666355132 (diff) | |
| download | focaccia-qemu-e6214fd6d48e704ed3aed6ea2053a9756d0ca13f.tar.gz focaccia-qemu-e6214fd6d48e704ed3aed6ea2053a9756d0ca13f.zip | |
chardev/char-mux: make boolean bit check instead of find_next_bit()
This patch simplifies (and makes less confusing) bit checks by replacing `find_next_bit()` calls with boolean AND operation. Resolves: Coverity CID 1563776 Signed-off-by: Roman Penyaev <r.peniaev@gmail.com> Reviewed-by: "Marc-André Lureau" <marcandre.lureau@redhat.com> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Clément Mathieu--Drif <clement.mathieu--drif@eviden.com> Cc: qemu-devel@nongnu.org Message-ID: <20241129103239.464061-3-r.peniaev@gmail.com>
| -rw-r--r-- | chardev/char-mux.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chardev/char-mux.c b/chardev/char-mux.c index 9d67b8bd9a..e13042d381 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -336,15 +336,12 @@ bool mux_chr_attach_frontend(MuxChardev *d, CharBackend *b, bool mux_chr_detach_frontend(MuxChardev *d, unsigned int tag) { - unsigned int bit; - - bit = find_next_bit(&d->mux_bitset, MAX_MUX, tag); - if (bit != tag) { + if (!(d->mux_bitset & (1ul << tag))) { return false; } - d->mux_bitset &= ~(1ul << bit); - d->backends[bit] = NULL; + d->mux_bitset &= ~(1ul << tag); + d->backends[tag] = NULL; return true; } @@ -353,7 +350,7 @@ void mux_set_focus(Chardev *chr, unsigned int focus) { MuxChardev *d = MUX_CHARDEV(chr); - assert(find_next_bit(&d->mux_bitset, MAX_MUX, focus) == focus); + assert(d->mux_bitset & (1ul << focus)); if (d->focus != -1) { mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_OUT); |