From nobody Tue Apr 30 12:48:02 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=1562359797; cv=none; d=zoho.com; s=zohoarc; b=hhmdm7+/4vClA37VMKIuSx/29JgDMzU8hL+PmYuyK6GJcVkgVWlPD2PPLiHE0xaawY5rvAvByy+fgpx/sXjCenqlbVQLun8h668y0v9RcC67pGKbVAMMDP0dH++qF/p8borETRXZ0DS6JJymwCa8IHG62QtuvYIpKhaBaqdZwjc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562359797; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1Q2/Kno8eBtSRnDs1aukgO8GHqqzId6Tt8OoZfKY3WI=; b=nRsZiEajy7zzfeFX39nq1mku2Cj9DeZOaddwJkhlxI92ueh2gTldJYP5KUKX7gmSIRwUxMNwiRTzQbFQaUQJQ3qjXupMJfuGI0LxkkMh3esH01wJ9yyE9h4V3mxoNSlbXaU01U7q4WGs9B167iqteOasjhQQdCiZ5RIU1DIYdAM= 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 1562359797987390.53331868038765; Fri, 5 Jul 2019 13:49:57 -0700 (PDT) Received: from localhost ([::1]:56042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjV9Y-0003tx-UY for importer@patchew.org; Fri, 05 Jul 2019 16:49:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33802) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUiH-0002QM-JI for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:21:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUiG-0001ck-KM for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:21:45 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:36495) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUiG-0001bh-Dp for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:21:44 -0400 Received: by mail-wr1-x444.google.com with SMTP id n4so11049419wrs.3 for ; Fri, 05 Jul 2019 13:21:44 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id l9sm5582926wmh.36.2019.07.05.13.21.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:21:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=1Q2/Kno8eBtSRnDs1aukgO8GHqqzId6Tt8OoZfKY3WI=; b=aRICEbgUlenPNq03o1RTqWe1mKxm+raDhHJlmoxHE8wBYhlnCtsg2ANxxnGctl+yS3 mofc0FY7YL1JLwR1dKBVXojjC3BgQujgbu4dEm/MOl1K/j2VdToNdQy3lX/7AiAfMEYE 1W9q4IqYRRTGysMaHtPigxnABrs5DJVkL4omA0cx+ydi1yqYEoH1QNrC9Dk8w8VJ7Qru XdI2YluuWGY8NhIhHCgyeTcjLJCzFULdHVUQSQEtzohR4BNmIY9EZg97mzisHvdi/Put eZyX2OedrFrU1P3wbMLeqIlPKe1rxd9Zm+OnBu6SOmFzkbJdnM5KYq7zO/vrj7EIqrX0 SoLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=1Q2/Kno8eBtSRnDs1aukgO8GHqqzId6Tt8OoZfKY3WI=; b=Ekh5aeTFacomAoZirfDVUM9WZNqGknUWBjKgmryAbLIm1W7dixvmqLcUL99CGwEniR RxlQWSK6nOAk3fgYREF6WmgbsOvQWfev0Jt6vRqL/bmHOA0fmt9eYLtDCvVdYvejVy3o ntydLKJH1TUSQcFcvc2leO/JdNSykwon7aM2qpVENkJUtDJ4yG+OSsUZwg8s3r0W+Pso kP9OxSyph2egT18O2Hc6/Dz+LjK0oo/PdbVF8MQP2Fl3dWNP3QdlLPOABlSBWz7PgVmI v1WMf1YfeqT7HnITPX4dGhElOMAYIeSW8/XTsK/mhSIj8vhcpCQX73bS9m6MrcsiQdRd 5Vkw== X-Gm-Message-State: APjAAAWG40ZyEtNjFwx2t6iSpjlbxDiwsxxOesJtNcaWj7aRoyVthiqI mjyc+yvRMHIp5eTS0T6g7bqEt2pdOo8= X-Google-Smtp-Source: APXvYqxMIHhSaWL2xz/FwhURU4L/+LoNQILntLn8Ja33W+VgMpvfu+6h8OKKDCNYFx3EGkLxolN4PA== X-Received: by 2002:a5d:4c86:: with SMTP id z6mr5531462wrs.330.1562358102956; Fri, 05 Jul 2019 13:21:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:21:39 +0200 Message-Id: <1562358100-27171-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358100-27171-1-git-send-email-pbonzini@redhat.com> References: <1562358100-27171-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v3 1/2] Makefile: generate header file with the list of devices enabled 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julio Montes v2: generate config-devices.h which contains the list of devices enabled Message-Id: <20190705143554.10295-1-julio.montes@intel.com> Signed-off-by: Paolo Bonzini Signed-off-by: Julio Montes --- Makefile.target | 4 ++++ scripts/create_config | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Makefile.target b/Makefile.target index 72c267f..7154e99 100644 --- a/Makefile.target +++ b/Makefile.target @@ -45,6 +45,9 @@ include $(SRC_PATH)/tests/tcg/Makefile.include config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak =20 +config-devices.h: config-devices.h-timestamp +config-devices.h-timestamp: config-devices.mak + ifdef CONFIG_TRACE_SYSTEMTAP stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace= .stp $(QEMU_PROG)-log.stp =20 @@ -168,6 +171,7 @@ obj-y +=3D hw/$(TARGET_BASE_ARCH)/ endif =20 generated-files-y +=3D hmp-commands.h hmp-commands-info.h +generated-files-y +=3D config-devices.h =20 endif # CONFIG_SOFTMMU =20 diff --git a/scripts/create_config b/scripts/create_config index d727e5e..00e86c8 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -58,6 +58,8 @@ case $line in name=3D${line%=3D*} echo "#define $name 1" ;; + CONFIG_*=3Dn) # configuration + ;; CONFIG_*=3D*) # configuration name=3D${line%=3D*} value=3D${line#*=3D} --=20 1.8.3.1 From nobody Tue Apr 30 12:48:02 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=1562359618; cv=none; d=zoho.com; s=zohoarc; b=RmjPI0q+ePl194aexYptOQsUWC+7+gMpWefiziy5miSaFGjCbDCUotUHrTKrrKaW93b5/9zTy+R5671bTdGEUVPFNN5pUcf3xgJs4qxhzRAlxHIpSsXKyja9NASYfM9gZSnVYPU+1nXeBtKE//e80db7bIUUM6anKP6WpuuBRCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562359618; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=UHc1AWBOadewTEukk6xNWZCM4+ZLGS/wJxEaP2onOLs=; b=Jnt4ccUCY88e1pQeHVkysNQc71shx0d9+AuNuOiRKj3QhvIkyLsTHDL9QPIWbfogvHmmAunz+QfMSUGoyd9KCfemM778o7ziFxBudtA3ynHxp1QA6JJzwsC2XUVFbAZKjWP54MpZxNs1TlMEE6L9wE15/J7apPsuAzd8/+QW8sk= 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 1562359618261152.24726945114742; Fri, 5 Jul 2019 13:46:58 -0700 (PDT) Received: from localhost ([::1]:56008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjV6d-0000cj-5g for importer@patchew.org; Fri, 05 Jul 2019 16:46:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33816) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUiI-0002Sv-KT for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:21:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUiH-0001dh-Mn for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:21:46 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:35567) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUiH-0001cx-Gb for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:21:45 -0400 Received: by mail-wm1-x332.google.com with SMTP id l2so3528396wmg.0 for ; Fri, 05 Jul 2019 13:21:45 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id l9sm5582926wmh.36.2019.07.05.13.21.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:21:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=UHc1AWBOadewTEukk6xNWZCM4+ZLGS/wJxEaP2onOLs=; b=LjsCK22pv1uN8WBKKJS6KgnvSnHCbMUyPFro9GaDWH02FTncOGU7xExugoOqd6Fwx1 sPQ1Vtqgc9tTpmuQyHzWKw6LfAa289EYaAm4f3jLkr2GWguK7Uvm1gA5ZQWVg9mBllNz m5xscpZzrmTxytxFZ6q2sJa9SsINM//GYrDrEI6o2hGT93yYno+iAIeS8OmWdM0yV6a8 neTe7j1WK74fu2OQjOJliXeYZtlrrysfXL64k+Xzmc0bxv9g5c5ilpqfy0v5Br1B8pii nNYbsBi0pRzQ5VKJFLuAT8q37iv4afHFgpvB9yoyqQKo/hTw4AM57e0z7SUIKBXVLAKX MFzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=UHc1AWBOadewTEukk6xNWZCM4+ZLGS/wJxEaP2onOLs=; b=RBdlraDCSzGJjiW4zkydcGv+uHK8H7AlxLEQJgsm7LpmNYa51ZBb9vmAmwoiQCrJPD Sm11U9pEUFd80xuj/EjQ9QrVnuEDAJ2FpwQyTawuMkpfTwDonOL21SmqvM12XTApNBhc kUQdvyzsf870lTh92qfrwGE11dkzXCMRjaqKnW1qY0VvcZH9AHcSzVVoZu83ewHCuEVL qo66TiMkDrBeYHVjK/B6IF6Vg5r5OB/2J49gccQtWEioRjySvmOVhTvyyckqPrRwZ8Hq MszFrXiaFVRUwgIxqrm4g6JsbTZwTBDTZKV4DylEYTTe/YNbD5+a7q29bsWrfNpH7Z35 Bnlg== X-Gm-Message-State: APjAAAUh68uWQKWMjI0vTmZfILnpu1kl12E9Pu4D2l0bmx52L+GkqxX/ fu+KKFKY1iUzOsudxWu2R/M+2sXcLOY= X-Google-Smtp-Source: APXvYqyGGrqnfPd3w8Ws2E50Y53uMNgFZGfw9O3Afeg6yhbXkSGoe9xHl298x7EnftUciR3Q3tHLRQ== X-Received: by 2002:a1c:f918:: with SMTP id x24mr4373665wmh.132.1562358104236; Fri, 05 Jul 2019 13:21:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:21:40 +0200 Message-Id: <1562358100-27171-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358100-27171-1-git-send-email-pbonzini@redhat.com> References: <1562358100-27171-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 Subject: [Qemu-devel] [PATCH v3 2/2] 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julio Montes v2: include config-devices.h to use CONFIG_IDE_ISA Message-Id: <20190705143554.10295-2-julio.montes@intel.com> Signed-off-by: Paolo Bonzini Signed-off-by: Julio Montes --- hw/i386/pc_piix.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index c07c4a5..cc04c01 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "config-devices.h" =20 #include "qemu/units.h" #include "hw/hw.h" @@ -61,9 +62,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 +257,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 +274,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 1.8.3.1