Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EB5C4C43334 for ; Thu, 7 Jul 2022 16:42:15 +0000 (UTC) Received: from localhost ([::1]:45086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9UZy-0002ml-Gy for qemu-devel@archiver.kernel.org; Thu, 07 Jul 2022 12:42:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9UVm-0008QW-UI for qemu-devel@nongnu.org; Thu, 07 Jul 2022 12:37:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42622) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9UVh-0006n8-Me for qemu-devel@nongnu.org; Thu, 07 Jul 2022 12:37:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657211868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bMMjerKu54ASLmvNQKBsHfVmkcYnelUQhRuCMaz1ryw=; b=VWlO+Onj8Tj1+oE+5+0PPUYXywMvCy49iOKxa+1bI4MgWdPoMWN1oxDd/P9k2SNZiiPsID K98/FVwsr3DBK9k3Pi59woK/OHG1r0LEV1Ev/eNpT09GkOnloP3z8mdvmIqCqPtCdFHTJP bf9vI/Ad3wO6yVK9Y6ErF+TRn2fu8VM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-433-YdhMwuzeMzahxNCM1oeUbg-1; Thu, 07 Jul 2022 12:37:44 -0400 X-MC-Unique: YdhMwuzeMzahxNCM1oeUbg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C257D94B872; Thu, 7 Jul 2022 16:37:26 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A91C40315C; Thu, 7 Jul 2022 16:37:25 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Blake , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v3 2/9] misc: fix mixups of bool constants with int variables Date: Thu, 7 Jul 2022 17:37:13 +0100 Message-Id: <20220707163720.1421716-3-berrange@redhat.com> In-Reply-To: <20220707163720.1421716-1-berrange@redhat.com> References: <20220707163720.1421716-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Daniel P. Berrangé --- block/vhdx-log.c | 2 +- hw/xtensa/sim.c | 4 ++-- nbd/client.c | 8 +++++--- target/i386/cpu-dump.c | 3 ++- ui/spice-display.c | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) 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..637811fc3f 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) { @@ -863,7 +863,9 @@ static int nbd_list_meta_contexts(QIOChannel *ioc, return ret; } seen_any = true; - seen_qemu |= strstart(context, "qemu:", NULL); + if (strstart(context, "qemu:", NULL)) { + seen_qemu = true; + } info->contexts = g_renew(char *, info->contexts, ++info->n_contexts); info->contexts[info->n_contexts - 1] = context; } 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); -- 2.36.1