From nobody Wed May 8 18:04:58 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=1562947401; cv=none; d=zoho.com; s=zohoarc; b=BrIQlJg7Cl90gzKZBdj8ZbD3kNmRSdIbjmPHIl3KOf5fbQvS6DsnPVVlqKUTzxytAKVaihQ7WVM5n9X/wPXW4GYTxhW1qIh7IQrOaCdDefzFHD3dMo67u6uOLCrphAS0yebIwnP53OyMG2LvBf4yJEcJImD84i+b7DdOZ+8Y9wM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562947401; 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=4VR2ca9FQi3dtrryRUrYX2Vu61qpx5Smv8FhaK1agh8=; b=Cvd0EL5/OOSSF/7Ak1jN4kosDnrXPQDzB/0JxIN+QdWeZJhn55henLoGQ2tSUKPQyfM4LzgILFfIDbh7TGEfKvbHx9qmLzGIPDv9VpYLFHAlF9PbEj70oxFQKjpiHg9Ttl7NID1Zi/XLP10z7c9YUyDfQhN9yGYnL4ilI9U1qfw= 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 1562947401477693.7583770947851; Fri, 12 Jul 2019 09:03:21 -0700 (PDT) Received: from localhost ([::1]:50998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hly11-00073f-Na for importer@patchew.org; Fri, 12 Jul 2019 12:03:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42433) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hly0l-0006fA-Gz for qemu-devel@nongnu.org; Fri, 12 Jul 2019 12:03:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hly0k-0000M4-F0 for qemu-devel@nongnu.org; Fri, 12 Jul 2019 12:03:03 -0400 Received: from mga05.intel.com ([192.55.52.43]:18090) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hly0k-00009U-64 for qemu-devel@nongnu.org; Fri, 12 Jul 2019 12:03:02 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Jul 2019 09:02:57 -0700 Received: from unknown (HELO fedora.zpn.intel.com.) ([10.219.4.39]) by fmsmga001.fm.intel.com with ESMTP; 12 Jul 2019 09:02:57 -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,483,1557212400"; d="scan'208";a="186626293" From: Julio Montes To: qemu-devel@nongnu.org Date: Fri, 12 Jul 2019 16:02:57 +0000 Message-Id: <20190712160257.18270-1-julio.montes@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190712145017.17879-1-julio.montes@intel.com> References: <20190712145017.17879-1-julio.montes@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH v2] hw/i386: turn off vmport if CONFIG_VMPORT 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, philmd@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" vmport device is not included when CONFIG_VMPORT is disabled, hence QEMU fails with the following error: `Unknown device 'vmport' for bus 'ISA': unknown.` v2: imply VMPORT (Paolo Bonzini ) Signed-off-by: Julio Montes --- hw/i386/Kconfig | 4 ++-- hw/i386/pc.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 4ddf2a9c55..b9c96ac361 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -51,6 +51,7 @@ config PC_ACPI config I440FX bool imply E1000_PCI + imply VMPORT select PC_PCI select PC_ACPI select ACPI_SMBUS @@ -58,7 +59,6 @@ config I440FX select IDE_PIIX select DIMM select SMBIOS - select VMPORT select VMMOUSE select FW_CFG_DMA @@ -77,6 +77,7 @@ config Q35 imply VTD imply AMD_IOMMU imply E1000E_PCI_EXPRESS + imply VMPORT select PC_PCI select PC_ACPI select PCI_EXPRESS_Q35 @@ -84,7 +85,6 @@ config Q35 select AHCI_ICH9 select DIMM select SMBIOS - select VMPORT select VMMOUSE select FW_CFG_DMA diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c33ce47578..549c437050 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -83,6 +83,7 @@ #include "hw/mem/memory-device.h" #include "sysemu/replay.h" #include "qapi/qmp/qerror.h" +#include "config-devices.h" /* debug PC/ISA interrupts */ //#define DEBUG_IRQ @@ -2793,7 +2794,11 @@ static void pc_machine_initfn(Object *obj) pcms->max_ram_below_4g =3D 0; /* use default */ pcms->smm =3D ON_OFF_AUTO_AUTO; +#ifdef CONFIG_VMPORT pcms->vmport =3D ON_OFF_AUTO_AUTO; +#else + pcms->vmport =3D ON_OFF_AUTO_OFF; +#endif /* CONFIG_VMPORT */ /* acpi build is enabled by default if machine supports it */ pcms->acpi_build_enabled =3D PC_MACHINE_GET_CLASS(pcms)->has_acpi_buil= d; pcms->smbus_enabled =3D true; -- 2.17.2