From nobody Sun Apr 28 06:49:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573830640; cv=none; d=zoho.com; s=zohoarc; b=lsENcF3wS7hUbgVKkw5Lx9r0tfXp4HHzOT2VWh4O0wWrWSBKMcUXQ/zGC6a9+IDDxcuWcCFxTLYCpGuctT7vYlXBLdSu04vDrhwDxOFuLLM3gDSx6qv2ZMl3oh4S48U/met9Iar/qlnryDieNPGQo/0BG+S34n18zkiUNvu9TxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573830640; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=/C08I94E41LhRbG7BjaHY25aetPMw9QUs0aFH5/d2/c=; b=eoDisZHbnt7mmVwghzf7lzlnZNKazUu3oByUtKb9gdiDgNJlGqO6CA8QPdtKpkKnJTWEkKlkdWqwBoBbCEAlP/DXK/DYNyIrPF9yc4NmvhVB3/SC6j2ptdbyqQ68T1MHXqi4c47Sc0Ch+fMzkUVzQahedtQ8tlg72hEnyk1sMXM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157383064007945.89575258132243; Fri, 15 Nov 2019 07:10:40 -0800 (PST) Received: from localhost ([::1]:40600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVdF5-00028s-D9 for importer@patchew.org; Fri, 15 Nov 2019 10:10:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40592) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVdEG-0001Ti-M0 for qemu-devel@nongnu.org; Fri, 15 Nov 2019 10:09:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVdEE-00088j-Of for qemu-devel@nongnu.org; Fri, 15 Nov 2019 10:09:43 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:40579 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVdEE-00088C-J9 for qemu-devel@nongnu.org; Fri, 15 Nov 2019 10:09:42 -0500 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-411-xqQ2s-ssNjCwKT03Gb6qhA-1; Fri, 15 Nov 2019 10:09:39 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E25CF2649B; Fri, 15 Nov 2019 15:09:37 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-84.ams2.redhat.com [10.36.117.84]) by smtp.corp.redhat.com (Postfix) with ESMTP id 628FF60C81; Fri, 15 Nov 2019 15:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573830582; 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; bh=/C08I94E41LhRbG7BjaHY25aetPMw9QUs0aFH5/d2/c=; b=MNPEXhlISZpPPR+Zomn3TInjoMOaSlzBtQsgaMkAQ/iEMJ4Und0vP7Bj+fjqkT6U7SZh6e 5tkjSzmvZCMKYTMU8kOgjwEEOF6QLrWDZGKy/Sci5gjqVbru6htSz4zm3NYf8tS2EYKN0v uSbacfeFatml5fzo6p5n1Cy583CEjJg= From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini , "Michael S. Tsirkin" , Marcel Apfelbaum Subject: [PATCH for-4.2] hw/i386: Fix compiler warning when CONFIG_IDE_ISA is disabled Date: Fri, 15 Nov 2019 15:50:49 +0100 Message-Id: <20191115145049.26868-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: xqQ2s-ssNjCwKT03Gb6qhA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" When CONFIG_IDE_ISA is disabled, compilation currently fails: hw/i386/pc_piix.c: In function =E2=80=98pc_init1=E2=80=99: hw/i386/pc_piix.c:81:9: error: unused variable =E2=80=98i=E2=80=99 [-Werro= r=3Dunused-variable] Move the variable declaration to the right code block to avoid this problem. Fixes: 4501d317b50e ("hw/i386/pc: Extract pc_i8259_create()") Signed-off-by: Thomas Huth Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 2aefa3b8df..d187db761c 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -78,7 +78,6 @@ static void pc_init1(MachineState *machine, X86MachineState *x86ms =3D X86_MACHINE(machine); MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *system_io =3D get_system_io(); - int i; PCIBus *pci_bus; ISABus *isa_bus; PCII440FXState *i440fx_state; @@ -253,7 +252,7 @@ static void pc_init1(MachineState *machine, } #ifdef CONFIG_IDE_ISA else { - for(i =3D 0; i < MAX_IDE_BUS; i++) { + for (int i =3D 0; i < MAX_IDE_BUS; i++) { ISADevice *dev; char busname[] =3D "ide.0"; dev =3D isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], --=20 2.23.0