All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH for-4.2] hw/i386: Fix compiler warning when CONFIG_IDE_ISA is disabled
@ 2019-11-15 14:50 Thomas Huth
  2019-11-15 15:34 ` Michael S. Tsirkin
  2019-11-15 15:54 ` Peter Maydell
  0 siblings, 2 replies; 12+ messages in thread
From: Thomas Huth @ 2019-11-15 14:50 UTC (permalink / raw)
  To: qemu-devel, Paolo Bonzini, Michael S. Tsirkin, Marcel Apfelbaum
  Cc: qemu-trivial, Philippe Mathieu-Daudé, Eduardo Habkost

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 <thuth@redhat.com>
---
 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],
-- 
2.23.0



^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2019-11-18  9:30 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-15 14:50 [PATCH for-4.2] hw/i386: Fix compiler warning when CONFIG_IDE_ISA is disabled Thomas Huth
2019-11-15 15:34 ` Michael S. Tsirkin
2019-11-15 15:54 ` Peter Maydell
2019-11-15 15:54   ` Thomas Huth
2019-11-15 16:13     ` Paolo Bonzini
2019-11-15 16:13       ` Thomas Huth
2019-11-15 20:33         ` Philippe Mathieu-Daudé
2019-11-15 16:15     ` Peter Maydell
2019-11-15 16:12       ` Thomas Huth
2019-11-15 20:31         ` Philippe Mathieu-Daudé
2019-11-18  9:25           ` Markus Armbruster
2019-11-18  9:28             ` Thomas Huth

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.