From patchwork Fri Nov 15 14:50:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1195703 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="MNPEXhlI"; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 47F1xL4vdBz9s4Y for ; Sat, 16 Nov 2019 02:10:12 +1100 (AEDT) Received: from localhost ([::1]:40578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVdEf-0001WV-UC for incoming@patchwork.ozlabs.org; Fri, 15 Nov 2019 10:10:09 -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 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= 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) 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 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_Mathieu-Daud=C3=A9?= , Eduardo Habkost Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When CONFIG_IDE_ISA is disabled, compilation currently fails: hw/i386/pc_piix.c: In function ‘pc_init1’: hw/i386/pc_piix.c:81:9: error: unused variable ‘i’ [-Werror=unused-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é --- 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 = X86_MACHINE(machine); MemoryRegion *system_memory = get_system_memory(); MemoryRegion *system_io = 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 = 0; i < MAX_IDE_BUS; i++) { + for (int i = 0; i < MAX_IDE_BUS; i++) { ISADevice *dev; char busname[] = "ide.0"; dev = isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i],