| Message ID | 20220704152303.760983-3-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests: introduce a tree-wide code style checking facility | expand |
On Mon, 4 Jul 2022 at 16:23, Daniel P. Berrangé <berrange@redhat.com> wrote: > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > block/vhdx-log.c | 2 +- > hw/xtensa/sim.c | 4 ++-- > nbd/client.c | 4 ++-- > target/i386/cpu-dump.c | 3 ++- > ui/spice-display.c | 4 ++-- > 5 files changed, 9 insertions(+), 8 deletions(-) > diff --git a/nbd/client.c b/nbd/client.c > index 30d5383cb1..fee3959d24 100644 > --- a/nbd/client.c > +++ b/nbd/client.c > @@ -832,8 +832,8 @@ static int nbd_list_meta_contexts(QIOChannel *ioc, > Error **errp) > { > int ret; > - int seen_any = false; > - int seen_qemu = false; > + bool seen_any = false; > + bool seen_qemu = false; > > if (nbd_send_meta_query(ioc, NBD_OPT_LIST_META_CONTEXT, > info->name, NULL, errp) < 0) { The code in this function does a bitwise OR into seen_qemu later -- bitwise OR into a bool also seems like bad style that something is probably going to complain about. (I guess currently -Wbool-operation doesn't care about it or else we don't enable that, but it might in future.) The other changes look OK. -- PMM
diff --git a/block/vhdx-log.c b/block/vhdx-log.c index ff0d4e0da0..8f34755a6f 100644 --- a/block/vhdx-log.c +++ b/block/vhdx-log.c @@ -215,7 +215,7 @@ exit: static bool vhdx_log_hdr_is_valid(VHDXLogEntries *log, VHDXLogEntryHeader *hdr, BDRVVHDXState *s) { - int valid = false; + bool valid = false; if (hdr->signature != VHDX_LOG_SIGNATURE) { goto exit; diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index 946c71cb5b..70fce7fb85 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -97,9 +97,9 @@ void xtensa_sim_load_kernel(XtensaCPU *cpu, MachineState *machine) { const char *kernel_filename = machine->kernel_filename; #if TARGET_BIG_ENDIAN - int big_endian = true; + int big_endian = 1; #else - int big_endian = false; + int big_endian = 0; #endif if (kernel_filename) { diff --git a/nbd/client.c b/nbd/client.c index 30d5383cb1..fee3959d24 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -832,8 +832,8 @@ static int nbd_list_meta_contexts(QIOChannel *ioc, Error **errp) { int ret; - int seen_any = false; - int seen_qemu = false; + bool seen_any = false; + bool seen_qemu = false; if (nbd_send_meta_query(ioc, NBD_OPT_LIST_META_CONTEXT, info->name, NULL, errp) < 0) { diff --git a/target/i386/cpu-dump.c b/target/i386/cpu-dump.c index 08ac957e99..43521c74c8 100644 --- a/target/i386/cpu-dump.c +++ b/target/i386/cpu-dump.c @@ -275,7 +275,8 @@ static void dump_apic_icr(APICCommonState *s, CPUX86State *env) static void dump_apic_interrupt(const char *name, uint32_t *ireg_tab, uint32_t *tmr_tab) { - int i, empty = true; + int i; + bool empty = true; qemu_printf("%s\t ", name); for (i = 0; i < 256; i++) { diff --git a/ui/spice-display.c b/ui/spice-display.c index 494168e7fe..5d3b64413f 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -541,14 +541,14 @@ static int interface_get_command(QXLInstance *sin, QXLCommandExt *ext) { SimpleSpiceDisplay *ssd = container_of(sin, SimpleSpiceDisplay, qxl); SimpleSpiceUpdate *update; - int ret = false; + int ret = 0; qemu_mutex_lock(&ssd->lock); update = QTAILQ_FIRST(&ssd->updates); if (update != NULL) { QTAILQ_REMOVE(&ssd->updates, update, next); *ext = update->ext; - ret = true; + ret = 1; } qemu_mutex_unlock(&ssd->lock);
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- block/vhdx-log.c | 2 +- hw/xtensa/sim.c | 4 ++-- nbd/client.c | 4 ++-- target/i386/cpu-dump.c | 3 ++- ui/spice-display.c | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-)