From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A49BC433E0 for ; Mon, 15 Mar 2021 16:23:23 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 335EC64E09 for ; Mon, 15 Mar 2021 16:23:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 335EC64E09 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLq02-0005PN-4J for qemu-devel@archiver.kernel.org; Mon, 15 Mar 2021 12:23:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLpxl-0002tU-U6 for qemu-devel@nongnu.org; Mon, 15 Mar 2021 12:21:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lLpxi-0003pg-F5 for qemu-devel@nongnu.org; Mon, 15 Mar 2021 12:21:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615825257; 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=N8e5YyKG9C6C9WyBvZqB5DSUnWdg51NL/7FUXMV+u5U=; b=IVsRuZINe3oua5aIac/jllcXxqCfiNYS2MyQJLuYc3GBkCiFCv+keki2Tx3fk2BbvWym18 9eseZLHIEIwcNaHBzVCQgJQ2WGRUrMkct9Wgo6qE/9yZ5ZUkl9mQub1y8SBL5snfpfArSz nHjrG2DwiwK+iua5qEMcR4VvtXiFsPU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-505-35baqUt7PWqsFznzMgc-bQ-1; Mon, 15 Mar 2021 12:20:56 -0400 X-MC-Unique: 35baqUt7PWqsFznzMgc-bQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D388BA40C0; Mon, 15 Mar 2021 16:20:54 +0000 (UTC) Received: from thuth.remote.csb (ovpn-112-72.ams2.redhat.com [10.36.112.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 628F65D705; Mon, 15 Mar 2021 16:20:50 +0000 (UTC) Subject: Re: compile warning in i8259.c To: Christian Borntraeger , qemu-devel@nongnu.org, qemu-s390x References: <21da022d-7349-ceca-ca88-b7987ac2eb0d@de.ibm.com> From: Thomas Huth Message-ID: <8ba68f46-3bd8-b8ee-b45d-4f3235b38583@redhat.com> Date: Mon, 15 Mar 2021 17:20:49 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <21da022d-7349-ceca-ca88-b7987ac2eb0d@de.ibm.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 15/03/2021 16.44, Christian Borntraeger wrote: > On 15.03.21 16:14, Christian Borntraeger wrote: >> For some time now I do see the following, when I compile x86-softmmu on s390: >> >> FAILED: libcommon.fa.p/hw_intc_i8259.c.o >> cc -Ilibcommon.fa.p -I. -I.. -Iqapi -Itrace -Iui -Iui/shader >> -I/usr/include/capstone -I/usr/include/glib-2.0 >> -I/usr/lib64/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid >> -I/usr/include/gio-unix-2.0 -I/usr/include/libusb-1.0 >> -I/usr/include/vte-2.91 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz >> -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/fribidi >> -I/usr/include/libxml2 -I/usr/include/cairo -I/usr/include/pixman-1 >> -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 >> -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 >> -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include >> -I/usr/include/at-spi-2.0 -I/usr/include/virgl -I/usr/include/p11-kit-1 >> -I/usr/include/SDL2 -I/usr/include/cacard -I/usr/include/nss3 >> -I/usr/include/nspr4 -I/usr/include/slirp -fdiagnostics-color=auto -pipe >> -Wall -Winvalid-pch -Werror -std=gnu99 -O2 -g -isystem >> /home/cborntra/REPOS/qemu/linux-headers -isystem linux-headers -iquote . >> -iquote /home/cborntra/REPOS/qemu -iquote >> /home/cborntra/REPOS/qemu/include -iquote >> /home/cborntra/REPOS/qemu/disas/libvixl -iquote >> /home/cborntra/REPOS/qemu/tcg/s390 -iquote >> /home/cborntra/REPOS/qemu/accel/tcg -pthread -U_FORTIFY_SOURCE >> -D_FORTIFY_SOURCE=2 -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 >> -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef >> -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common >> -fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits >> -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers >> -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined >> -Wimplicit-fallthrough=2 -Wno-missing-include-dirs >> -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIC >> -DSTRUCT_IOVEC_DEFINED -D_REENTRANT -Wno-undef -D_DEFAULT_SOURCE >> -D_XOPEN_SOURCE=600 -DNCURSES_WIDECHAR -MD -MQ >> libcommon.fa.p/hw_intc_i8259.c.o -MF libcommon.fa.p/hw_intc_i8259.c.o.d -o >> libcommon.fa.p/hw_intc_i8259.c.o -c ../hw/intc/i8259.c >> ../hw/intc/i8259.c: In function ‘pic_read_irq’: >> ../hw/intc/i8259.c:203:13: error: ‘irq2’ may be used uninitialized in this >> function [-Werror=maybe-uninitialized] >>    203 |         irq = irq2 + 8; >>        |         ~~~~^~~~~~~~~~ >> cc1: all warnings being treated as errors >> >> >> Due to other compile warnings I find this hard to bisect. Has anyone seen >> this as well? > > cc Michael, Paolo, > > Something like > > diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c > index 344fd04db14d..7335b7a06a67 100644 > --- a/hw/intc/i8259.c > +++ b/hw/intc/i8259.c > @@ -176,7 +176,7 @@ static void pic_intack(PICCommonState *s, int irq) >  int pic_read_irq(DeviceState *d) >  { >      PICCommonState *s = PIC_COMMON(d); > -    int irq, irq2, intno; > +    int irq, irq2 = 0, intno; > >      irq = pic_get_irq(s); >      if (irq >= 0) { > > > would do the trick. Let me know if I should do a proper patch or if you want > to have things solved differently. Alternate idea, merge the two "irq == 2" blocks: diff a/hw/intc/i8259.c b/hw/intc/i8259.c --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -179,19 +179,19 @@ int pic_read_irq(DeviceState *d) int irq, irq2, intno; irq = pic_get_irq(s); - if (irq >= 0) { - if (irq == 2) { - irq2 = pic_get_irq(slave_pic); - if (irq2 >= 0) { - pic_intack(slave_pic, irq2); - } else { - /* spurious IRQ on slave controller */ - irq2 = 7; - } - intno = slave_pic->irq_base + irq2; + if (irq == 2) { + irq2 = pic_get_irq(slave_pic); + if (irq2 >= 0) { + pic_intack(slave_pic, irq2); } else { - intno = s->irq_base + irq; + /* spurious IRQ on slave controller */ + irq2 = 7; } + intno = slave_pic->irq_base + irq2; + pic_intack(s, irq); + irq = irq2 + 8; + } else if (irq >= 0) { + intno = s->irq_base + irq; pic_intack(s, irq); } else { /* spurious IRQ on host controller */ @@ -199,10 +199,6 @@ int pic_read_irq(DeviceState *d) intno = s->irq_base + irq; } - if (irq == 2) { - irq = irq2 + 8; - } - #ifdef DEBUG_IRQ_LATENCY printf("IRQ%d latency=%0.3fus\n", irq, It's a bigger patch, but the code is IMHO easier to read afterwards (less indentation). Thomas