Commit 60386ea2 authored by Julio Montes's avatar Julio Montes Committed by Paolo Bonzini
Browse files

hw/i386: Fix linker error when ISAPC is disabled 



v2: include config-devices.h to use CONFIG_IDE_ISA

Message-Id: <20190705143554.10295-2-julio.montes@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarJulio Montes <julio.montes@intel.com>
parent 6c22ea9d

hw/i386/pc_piix.c

+9 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */



#include "qemu/osdep.h"

#include "config-devices.h"



#include "qemu/units.h"

#include "hw/hw.h"
@@ -61,9 +62,11 @@ 


#define MAX_IDE_BUS 2



#ifdef CONFIG_IDE_ISA

static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };

static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };

static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };

#endif



/* PC hardware initialisation */

static void pc_init1(MachineState *machine,
@@ -254,7 +257,10 @@ static void pc_init1(MachineState *machine, 
        }

        idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");

        idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");

    } else {

        pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);

    }

#ifdef CONFIG_IDE_ISA

else {

        for(i = 0; i < MAX_IDE_BUS; i++) {

            ISADevice *dev;

            char busname[] = "ide.0";
@@ -268,9 +274,9 @@ static void pc_init1(MachineState *machine, 
            busname[4] = '0' + i;

            idebus[i] = qdev_get_child_bus(DEVICE(dev), busname);

        }

    }



        pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);

    }

#endif



    if (pcmc->pci_enabled && machine_usb(machine)) {

        pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");