From nobody Sun May 19 03:54:33 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; 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562169158; cv=none; d=zoho.com; s=zohoarc; b=ByVL9Yu1cmYq61m762SGPm3z+2KYc1KAGuYCCLOhqM/s32LZiUiVDyOa6GOnplgMgIoYs8p26gVhpipCyxC+iiO6jaXNtFu0+fF62HLjJGOpSxjv13qHXbKPig6UjCtRyG7uCIfF0pC3eAOakQrXcpGSxDO0Z00A6vffzZPhXxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562169158; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=z+ylwmqb4CNAFKhTasGusVL0V+2PDM+TuHmapqKhEEw=; b=BUfoZiYynDmQTj4NLh3lpWGbu/xrc8CK2CjCPka9a89D8mo0gP4F0NpbKgtvzfjY/P/l70YfsyNAArFTOWaDvzzcLrlY/zqiKZK+ms8qgfvRovixYRsQ2zSxZmqNFQOwun0j6Js6fDFv+fFmGb4Dtyo8TUZF18M+SIr0IEi5/MU= ARC-Authentication-Results: i=1; mx.zoho.com; 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 1562169158331940.9313579599484; Wed, 3 Jul 2019 08:52:38 -0700 (PDT) Received: from localhost ([::1]:37042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hihYj-00027R-Dt for importer@patchew.org; Wed, 03 Jul 2019 11:52:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52313) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hihWH-0000R4-Gc for qemu-devel@nongnu.org; Wed, 03 Jul 2019 11:50:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hihWG-00054W-Eb for qemu-devel@nongnu.org; Wed, 03 Jul 2019 11:50:05 -0400 Received: from mga01.intel.com ([192.55.52.88]:58204) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hihWG-00051k-6c for qemu-devel@nongnu.org; Wed, 03 Jul 2019 11:50:04 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2019 08:49:59 -0700 Received: from juliomon-mobl1.zpn.intel.com (HELO fedora.zpn.intel.com.) ([10.219.4.39]) by fmsmga001.fm.intel.com with ESMTP; 03 Jul 2019 08:49:59 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,446,1557212400"; d="scan'208";a="184790038" From: Julio Montes To: qemu-devel@nongnu.org Date: Wed, 3 Jul 2019 15:49:58 +0000 Message-Id: <20190703154958.29004-1-julio.montes@intel.com> X-Mailer: git-send-email 2.17.2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Subject: [Qemu-devel] [PATCH] hw/i386: Fix linker error when ISAPC is disabled 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: Julio Montes , pbonzini@redhat.com, sgarzare@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In pc_init1(), ISA IDE is initialized without checking if ISAPC or IDE_ISA configs are enabled. This results in a link error when CONFIG_ISAPC is set to 'n' in the file default-configs/i386-softmmu.mak: hw/i386/pc_piix.o: In function `pc_init1': hw/i386/pc_piix.c:261: undefined reference to `isa_ide_init' hw/i386/pc_piix.c:261: undefined reference to `isa_ide_init' Place ide_isa code under #ifdef CONFIG_IDE_ISA to fix linker errors Signed-off-by: Julio Montes --- hw/i386/pc_piix.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index c07c4a5b38..b93f9327be 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -61,9 +61,11 @@ =20 #define MAX_IDE_BUS 2 =20 +#ifdef CONFIG_IDE_ISA static const int ide_iobase[MAX_IDE_BUS] =3D { 0x1f0, 0x170 }; static const int ide_iobase2[MAX_IDE_BUS] =3D { 0x3f6, 0x376 }; static const int ide_irq[MAX_IDE_BUS] =3D { 14, 15 }; +#endif =20 /* PC hardware initialisation */ static void pc_init1(MachineState *machine, @@ -254,7 +256,10 @@ static void pc_init1(MachineState *machine, } idebus[0] =3D qdev_get_child_bus(&dev->qdev, "ide.0"); idebus[1] =3D 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 =3D 0; i < MAX_IDE_BUS; i++) { ISADevice *dev; char busname[] =3D "ide.0"; @@ -268,9 +273,9 @@ static void pc_init1(MachineState *machine, busname[4] =3D '0' + i; idebus[i] =3D qdev_get_child_bus(DEVICE(dev), busname); } + pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state); } - - pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state); +#endif =20 if (pcmc->pci_enabled && machine_usb(machine)) { pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci"); --=20 2.17.2