From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548410951294799.6490701215176; Fri, 25 Jan 2019 02:09:11 -0800 (PST) Received: from localhost ([127.0.0.1]:41261 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyQ8-0008SG-Az for importer@patchew.org; Fri, 25 Jan 2019 05:09:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOK-0007Fj-DB for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOJ-0001Rl-Qp for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:16 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35781) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOJ-0001Qs-Ky for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:15 -0500 Received: by mail-wr1-x442.google.com with SMTP id 96so9655909wrb.2 for ; Fri, 25 Jan 2019 02:07:15 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:13 -0800 (PST) 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=PZHr31WBhsqtAlZ0dSvlOp8lFAO4ocuRzEBtONsg1A4=; b=hY6mmp+9C2yaB2Ul7yE5MwX2kXKUzTLt9Lt4IozMlVO+MT0QG94t2T+5udOpQfX+hf kBEaTWTVq3x+DoFs4GpWjIM9K+Yy9eOgN26mqYBXxWTqnMWI5sKU1ULxbrqRfiAXyGL1 1OP9G4DJsjs3oOZ959MuQ6vd7i93KYnzaenGZNqS/PP6PE+fUpHZR6Wu0lL6XOuCDB1q u6SacCQQ42TbJUb3Qwd4t3eazigRQU+LMYXtwj9QsYIpW1s1xS2IHi+gaO62nqNIauS7 LJWJSjTvdfz9W8WxxApq3jVqxTVSV7HiH8BZ2yHS4wx9gVZ47DFjgJmxLnG8WroBYihG 5x0Q== 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=PZHr31WBhsqtAlZ0dSvlOp8lFAO4ocuRzEBtONsg1A4=; b=GlY13iFF2fH9oDbZhz2R7C/l1k3wJc9h8R+4X1nHX0RQLYC824QaqhQMl3kEgG1c6N kdCApqWB9GsorJlPskGcpHdtONO9j0B9y9VnAEAdlLY8Oz++7WaqkOgsIx09VlixbUJG nYtf5EVBmjhpkdXmRmoD9lMvpfsEhdGmDR+kac+jEI8tm7NhIKAVJyH1bPXh3Odfyd9D /UNiExT0zP0qNOfz7FWdldjNnPupO06DKW4LDEEWEr5GKFWmyPG7hyiVUOgz4nzW3qXV ADEDV/YwFuPJXl3UsnMQcyICySnRqOm1xxKbUPznpbqUPrkbAjj3G53nkPhuS5MsEmvO deKw== X-Gm-Message-State: AJcUukf6oNqqeCFk6wb7ILoaQoZEeoDyBeoLypjg8p1DHPBIA3X5tgdP 2YFTN4e0sStmM+qOhNNi1nNMixeQ X-Google-Smtp-Source: ALg8bN6E6xshRPG2iwSSsc5JAI9JC0s2pIw5PwsUYIrdMziGs9cOQvLLdaAcVKxLf33K5tg0I7PBow== X-Received: by 2002:adf:c042:: with SMTP id c2mr11096409wrf.158.1548410834087; Fri, 25 Jan 2019 02:07:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:20 +0100 Message-Id: <1548410831-19553-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::442 Subject: [Qemu-devel] [PATCH 01/52] arm: disable CONFIG_SERIAL_ISA X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" ARM does not have an ISA bus, this device should not be enabled. Kconfig catches the contradiction because ARM does not define CONFIG_ISA_BUS. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/arm-softmmu.mak | 1 - 1 file changed, 1 deletion(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 2420491..3c9351f 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,7 +6,6 @@ CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_PTIMER=3Dy CONFIG_SD=3Dy CONFIG_MAX7310=3Dy --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548410967129614.0356461080022; Fri, 25 Jan 2019 02:09:27 -0800 (PST) Received: from localhost ([127.0.0.1]:41263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyQO-0000Bi-0t for importer@patchew.org; Fri, 25 Jan 2019 05:09:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyON-0007Ha-Jl for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOK-0001Sj-RL for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:19 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:45949) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOK-0001Rw-LQ for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:16 -0500 Received: by mail-wr1-x443.google.com with SMTP id t6so9580637wrr.12 for ; Fri, 25 Jan 2019 02:07:16 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:14 -0800 (PST) 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=te0Qn1sKyuDZsGiMx7vmH1Bk/nEeESZg2oUjRNlDJQ0=; b=gXpAyUiOVHWoJ2SWnR/9PgdBOOAMOGqWgTzqSTxlhM1ADt5Ah9uyapGfdtD08Sx47W JXjkZRodtDKZvpSzpJ+zcFP7d1BsIHJDmN1yoVPxOMaMGMmjCsRbZybAjJkWEOQxC3Mw vzfPxWEOMYhyhlrz97gSe9RW7cxxTzJUi+/rBn0+KN310HxGZwh3JcceQTwea8nobIbE BHVIS4+MLw3UJVv/GAsi+hX8TAL52RKv78ucPoGL+zvA9uRXCQwAtzh1eYcJzP4cDUxT 24N0VxankFTMuwraB3mQpl6ex/osPg+u+qJzfZcdG3x0jKM5KXLSGap4ISq8FSl3R6y9 hHlQ== 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=te0Qn1sKyuDZsGiMx7vmH1Bk/nEeESZg2oUjRNlDJQ0=; b=M0/NLITMlwBXy6kaKKww1yXXZT3264Iehw7H2MOQwdO5YUI0m4MHPXHkoROdNViqVW c1r15bwYq6vHyBmCLd1qYZ5QT4tME340l487s2ybTeO6IRSzC2g3+zo+h/2ri/LR7xHo OCPkhPfrMZi9LeLccIwImtIa6AGWWMPzygmOHM+ps7j9xA8M5tkt815yH0zzOH7bqupr F4US+SrqZbmuJCk/UkV7s8Xgk/My8yindQahK/87uy/aLOi4ov4x96eBvIaFKq3lENQX r5NLp1WNGUKXVUu2k9Yrbtan7+f7rS7Eh0AkLuhjYg8xihMfcHThTM13FWxC9buSycgM y+Yg== X-Gm-Message-State: AJcUukfae7/U1kbwWJ2bDFvNLecisDXJ160O8to3DECzWcfbq0Dtc8/R g0ct3n2eqXt+VNaFAiZ0sWLcFp/k X-Google-Smtp-Source: ALg8bN6/qb1tu4abuplBPY3Sv/M5cV6LJhUm+lWgLq0SDwDg2LSsLw+x07VbBEz27xMnnv5cgBeevw== X-Received: by 2002:a5d:480d:: with SMTP id l13mr11419697wrq.175.1548410835320; Fri, 25 Jan 2019 02:07:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:21 +0100 Message-Id: <1548410831-19553-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::443 Subject: [Qemu-devel] [PATCH 02/52] ide: split ioport registration to a separate file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" This is not needed on ARM, and brings in ISA bus code which is otherwise not necessary. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- hw/ide/Makefile.objs | 6 ++--- hw/ide/core.c | 25 -------------------- hw/ide/ioport.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 3 files changed, 70 insertions(+), 28 deletions(-) create mode 100644 hw/ide/ioport.c diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs index fc328ff..3f3edd10 100644 --- a/hw/ide/Makefile.objs +++ b/hw/ide/Makefile.objs @@ -1,12 +1,12 @@ common-obj-$(CONFIG_IDE_CORE) +=3D core.o atapi.o common-obj-$(CONFIG_IDE_QDEV) +=3D qdev.o -common-obj-$(CONFIG_IDE_PCI) +=3D pci.o -common-obj-$(CONFIG_IDE_ISA) +=3D isa.o +common-obj-$(CONFIG_IDE_PCI) +=3D pci.o ioport.o +common-obj-$(CONFIG_IDE_ISA) +=3D isa.o ioport.o common-obj-$(CONFIG_IDE_PIIX) +=3D piix.o common-obj-$(CONFIG_IDE_CMD646) +=3D cmd646.o common-obj-$(CONFIG_IDE_MACIO) +=3D macio.o common-obj-$(CONFIG_IDE_MMIO) +=3D mmio.o -common-obj-$(CONFIG_IDE_VIA) +=3D via.o +common-obj-$(CONFIG_IDE_VIA) +=3D via.o ioport.o common-obj-$(CONFIG_MICRODRIVE) +=3D microdrive.o common-obj-$(CONFIG_AHCI) +=3D ahci.o common-obj-$(CONFIG_AHCI) +=3D ich.o diff --git a/hw/ide/core.c b/hw/ide/core.c index c3d779d..8483200 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2686,31 +2686,6 @@ void ide_exit(IDEState *s) qemu_vfree(s->io_buffer); } =20 -static const MemoryRegionPortio ide_portio_list[] =3D { - { 0, 8, 1, .read =3D ide_ioport_read, .write =3D ide_ioport_write }, - { 0, 1, 2, .read =3D ide_data_readw, .write =3D ide_data_writew }, - { 0, 1, 4, .read =3D ide_data_readl, .write =3D ide_data_writel }, - PORTIO_END_OF_LIST(), -}; - -static const MemoryRegionPortio ide_portio2_list[] =3D { - { 0, 1, 1, .read =3D ide_status_read, .write =3D ide_cmd_write }, - PORTIO_END_OF_LIST(), -}; - -void ide_init_ioport(IDEBus *bus, ISADevice *dev, int iobase, int iobase2) -{ - /* ??? Assume only ISA and PCI configurations, and that the PCI-ISA - bridge has been setup properly to always register with ISA. */ - isa_register_portio_list(dev, &bus->portio_list, - iobase, ide_portio_list, bus, "ide"); - - if (iobase2) { - isa_register_portio_list(dev, &bus->portio2_list, - iobase2, ide_portio2_list, bus, "ide"); - } -} - static bool is_identify_set(void *opaque, int version_id) { IDEState *s =3D opaque; diff --git a/hw/ide/ioport.c b/hw/ide/ioport.c new file mode 100644 index 0000000..b8f1b3f --- /dev/null +++ b/hw/ide/ioport.c @@ -0,0 +1,67 @@ +/* + * QEMU IDE disk and CD/DVD-ROM Emulator + * + * Copyright (c) 2003 Fabrice Bellard + * Copyright (c) 2006 Openedhand Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "hw/hw.h" +#include "hw/isa/isa.h" +#include "qemu/error-report.h" +#include "qemu/timer.h" +#include "sysemu/sysemu.h" +#include "sysemu/blockdev.h" +#include "sysemu/dma.h" +#include "hw/block/block.h" +#include "sysemu/block-backend.h" +#include "qapi/error.h" +#include "qemu/cutils.h" +#include "sysemu/replay.h" + +#include "hw/ide/internal.h" +#include "trace.h" + +static const MemoryRegionPortio ide_portio_list[] =3D { + { 0, 8, 1, .read =3D ide_ioport_read, .write =3D ide_ioport_write }, + { 0, 1, 2, .read =3D ide_data_readw, .write =3D ide_data_writew }, + { 0, 1, 4, .read =3D ide_data_readl, .write =3D ide_data_writel }, + PORTIO_END_OF_LIST(), +}; + +static const MemoryRegionPortio ide_portio2_list[] =3D { + { 0, 1, 1, .read =3D ide_status_read, .write =3D ide_cmd_write }, + PORTIO_END_OF_LIST(), +}; + +void ide_init_ioport(IDEBus *bus, ISADevice *dev, int iobase, int iobase2) +{ + /* ??? Assume only ISA and PCI configurations, and that the PCI-ISA + bridge has been setup properly to always register with ISA. */ + isa_register_portio_list(dev, &bus->portio_list, + iobase, ide_portio_list, bus, "ide"); + + if (iobase2) { + isa_register_portio_list(dev, &bus->portio2_list, + iobase2, ide_portio2_list, bus, "ide"); + } +} + --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548410975038199.77411786214293; Fri, 25 Jan 2019 02:09:35 -0800 (PST) Received: from localhost ([127.0.0.1]:41267 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyQW-0000Kp-I2 for importer@patchew.org; Fri, 25 Jan 2019 05:09:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOT-0007L0-6O for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOQ-0001YU-Rq for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:24 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:40453) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOP-0001TM-14 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:21 -0500 Received: by mail-wr1-x433.google.com with SMTP id p4so9622539wrt.7 for ; Fri, 25 Jan 2019 02:07:17 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:15 -0800 (PST) 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=MKCdIJCJz0Ak+UMtyZXITHQ2T/NJAtO4Jg3jma+yEdc=; b=faLutp7v4J6k9J/NkErWEP4a2jE+RHUG31iYLdIVx/ICL7I15vTKMlZmBDFfqV9NC1 4oZyZj1hy5M6XAB2U6FPD5SVz3FxN4pwsvqCfCjVh+U6th/ocmpmIrqw0jL5DxaWGd+c KXcOzsynUyFqa15ss+/TER7//JVU4F8JUWIp9HvEGbR+9szgJDpNeIzW11qtiHYFuM2B R0OaejzN+WkfNyEDiUw8EdS8o1JmFrl8NeoY+VAj/YEeM6AUgS0Vf9+JaCxcbzPEuWJn M5qdqFYOpQaoAg7UuUlGoumNiQyJm0qoJQkbosxt5LoZffqSIPKAFR0UXa9osyBAMZ0t SWew== 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=MKCdIJCJz0Ak+UMtyZXITHQ2T/NJAtO4Jg3jma+yEdc=; b=orP8SXvdCWlcXOkdSISfWM09RZz7dJVWfvNVlZa4XAFZKzC9/qcBPYaHmrdGZd4qgl QfEi9CyzfU5riSpYhx6PPF8LBYhFNbsyWQFO1QMPQtKToJNhRMAM9/rUIAYZhMn/T7vm mks5JY76wSBIhi7UOFaLUpzJU47diEJcAGLmBFmdSZbD+Dk95fsWZFgO7pFD9QNR1Azn sCixgJydJ1ADgiJUqPJuLCApbcDBhXhaUeT8s4SRfMMKNmWPi0xdB0IEWB7tFuwO+Tzj LEY6cSYEqPVtPglAAuo4d6hLaYXaE1XctO+5t6J6ZpfnILj/NHvM5eFHp0lU0McaiVih hcYQ== X-Gm-Message-State: AJcUukdhiOJ7dKYoGEE/Ft3uOwln+GDJuSNoGcDQGWenXZYVv0Nh3RbK kq6490vPKXxLTCQzjc/bWb8RvZDr X-Google-Smtp-Source: ALg8bN5PQGMKuj2kMTDwMyiIR6E6b8HxHkM3gKn2WvbDdS54bgKLCjnd6FYo7yhSB5Bg77pknay3pg== X-Received: by 2002:a5d:410e:: with SMTP id l14mr10773559wrp.61.1548410836395; Fri, 25 Jan 2019 02:07:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:22 +0100 Message-Id: <1548410831-19553-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::433 Subject: [Qemu-devel] [PATCH 03/52] vfio: move conditional up to hw/Makefile.objs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Instead of wrapping the entire Makefile.objs with an ifeq/endif, just include the directory only for Linux. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- hw/Makefile.objs | 2 +- hw/vfio/Makefile.objs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 39d882a..22dd211 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -30,7 +30,7 @@ devices-dirs-$(CONFIG_SOFTMMU) +=3D ssi/ devices-dirs-$(CONFIG_SOFTMMU) +=3D timer/ devices-dirs-$(CONFIG_TPM) +=3D tpm/ devices-dirs-$(CONFIG_SOFTMMU) +=3D usb/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D vfio/ +devices-dirs-$(CONFIG_LINUX) +=3D vfio/ devices-dirs-$(CONFIG_SOFTMMU) +=3D virtio/ devices-dirs-$(CONFIG_SOFTMMU) +=3D watchdog/ devices-dirs-$(CONFIG_SOFTMMU) +=3D xen/ diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs index 8b3f664..9180589 100644 --- a/hw/vfio/Makefile.objs +++ b/hw/vfio/Makefile.objs @@ -1,4 +1,3 @@ -ifeq ($(CONFIG_LINUX), y) obj-$(CONFIG_SOFTMMU) +=3D common.o obj-$(CONFIG_PCI) +=3D pci.o pci-quirks.o display.o obj-$(CONFIG_VFIO_CCW) +=3D ccw.o @@ -7,4 +6,3 @@ obj-$(CONFIG_VFIO_XGMAC) +=3D calxeda-xgmac.o obj-$(CONFIG_VFIO_AMD_XGBE) +=3D amd-xgbe.o obj-$(CONFIG_SOFTMMU) +=3D spapr.o obj-$(CONFIG_VFIO_AP) +=3D ap.o -endif --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411292036939.9254248979033; Fri, 25 Jan 2019 02:14:52 -0800 (PST) Received: from localhost ([127.0.0.1]:41344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyVc-0005EJ-Ra for importer@patchew.org; Fri, 25 Jan 2019 05:14:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOT-0007Ky-6D for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOQ-0001YL-Pj for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:24 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36644) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOO-0001UQ-UP for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:21 -0500 Received: by mail-wr1-x441.google.com with SMTP id u4so9639519wrp.3 for ; Fri, 25 Jan 2019 02:07:18 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:16 -0800 (PST) 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=5AJrg63YSNg5YAyACAhVTzV/teajywyIQzTIy8u98tc=; b=RNgiV2MsjsgU115jCzt1OSfLuatWoQf+KYgpuGMZCnz9YZxY07b8y04AOh1CaLCkJo RC24n+ojGpvV0TEilFT7nyBqHcjc5O2XpXBC6ggmW+upHplVMEuahGU8X7h4f3kKxqZG cfN+KsCRbIvylIkmd31SApbiwzgjERPwZK7PKQP/2O0QwUuO73fDgMkps2/tpIZZBN0r 6ra/QD1JCZlMSSXIBPArke0TyAY4m3QNqn7Gr9d8Kldx2BBjDeIbzWeTipIv6ua6zGoa Wvzpn8A4c1HdNO30hSdwHv4nDZiAGk1WCzeK+uIhdKKQeQRcoLffylLdDfY/FkJ9OZ5X L1Ug== 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=5AJrg63YSNg5YAyACAhVTzV/teajywyIQzTIy8u98tc=; b=saReiS986r2kzs/FS0FwuKMlDXMFC93INkTQQ8Uc/xDfybF1MJUIOtQTh+/UznBg3H H5AqsLjCqa1pJOJUf8u+tHpQPbCXQrMjJt9/zWaniBr8iy8wsdOVMxw5ZBPFbaJaWNSw QNmaa+NDP+D97Vp/OD0xJGWo6TQnNS7UWdTysj7YziR4pmomYGOnFTHKaBGKpORFvOAV +ieIoDWe949hP6oJ0dDoWPJzo6TW4uC3ELH4Rj8An9sZZojhL/CSQ/+qVZZ8KsZE81Px ur9MHmj/COkuRgAVw4dfSJ4tm2BE4/1oqTSe73pGAzxKXlcOG1H+/AG600fX2ZBIn29C aQWw== X-Gm-Message-State: AJcUukfN7WL8WDrCFQAqGtl4k0nRSzVvE15XTEm5QFtQMua3I9eAkEIj QcTmESA2RMFsjco3jEmQEVPOsyyQ X-Google-Smtp-Source: ALg8bN44kTaSRMI31wKtkpb+BdhEGZc2ZnWE7mqat2IjpNmhViEfr+QFAheDi2qxqluoum1rOMDPTQ== X-Received: by 2002:adf:f649:: with SMTP id x9mr10561692wrp.247.1548410837613; Fri, 25 Jan 2019 02:07:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:23 +0100 Message-Id: <1548410831-19553-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::441 Subject: [Qemu-devel] [PATCH 04/52] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, "Michael S. Tsirkin" 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: Yang Zhong Change the CONFIGs for PCI EXPRESS and make module name more clear for code files. Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin Message-Id: <20190123065618.3520-2-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 4 ++-- default-configs/i386-softmmu.mak | 2 +- default-configs/mips64el-softmmu.mak | 2 +- default-configs/pci.mak | 2 +- default-configs/riscv32-softmmu.mak | 2 +- default-configs/riscv64-softmmu.mak | 2 +- hw/net/Makefile.objs | 4 ++-- hw/pci-host/Makefile.objs | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 3c9351f..107f801 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -122,7 +122,7 @@ CONFIG_VERSATILE=3Dy CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 -CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy CONFIG_VFIO_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy =20 @@ -153,7 +153,7 @@ CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_XILINX_AXI=3Dy -CONFIG_PCI_DESIGNWARE=3Dy +CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy =20 CONFIG_STRONGARM=3Dy CONFIG_HIGHBANK=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 64c998c..2f919df 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -47,7 +47,7 @@ CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy CONFIG_SGA=3Dy CONFIG_LPC_ICH9=3Dy -CONFIG_PCI_Q35=3Dy +CONFIG_PCI_EXPRESS_Q35=3Dy CONFIG_APIC=3Dy CONFIG_IOAPIC=3Dy CONFIG_PVPANIC=3Dy diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-softmmu.mak index c2ae313..9eb1208 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -12,4 +12,4 @@ CONFIG_JAZZ_LED=3Dy CONFIG_VT82C686=3Dy CONFIG_MIPS_BOSTON=3Dy CONFIG_FITLOADER=3Dy -CONFIG_PCI_XILINX=3Dy +CONFIG_PCI_EXPRESS_XILINX=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 6c7be12..83738cb 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -22,7 +22,7 @@ CONFIG_MEGASAS_SCSI_PCI=3Dy CONFIG_MPTSAS_SCSI_PCI=3Dy CONFIG_RTL8139_PCI=3Dy CONFIG_E1000_PCI=3Dy -CONFIG_E1000E_PCI=3Dy +CONFIG_E1000E_PCI_EXPRESS=3Dy CONFIG_IDE_CORE=3Dy CONFIG_IDE_QDEV=3Dy CONFIG_IDE_PCI=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index c9c5971..fbfd1d4 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,7 +8,7 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_CADENCE=3Dy =20 -CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index c9c5971..fbfd1d4 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,7 +8,7 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_CADENCE=3Dy =20 -CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs index fa461d4..a43351a 100644 --- a/hw/net/Makefile.objs +++ b/hw/net/Makefile.objs @@ -7,8 +7,8 @@ common-obj-$(CONFIG_EEPRO100_PCI) +=3D eepro100.o common-obj-$(CONFIG_PCNET_PCI) +=3D pcnet-pci.o common-obj-$(CONFIG_PCNET_COMMON) +=3D pcnet.o common-obj-$(CONFIG_E1000_PCI) +=3D e1000.o e1000x_common.o -common-obj-$(CONFIG_E1000E_PCI) +=3D net_tx_pkt.o net_rx_pkt.o -common-obj-$(CONFIG_E1000E_PCI) +=3D e1000e.o e1000e_core.o e1000x_common.o +common-obj-$(CONFIG_E1000E_PCI_EXPRESS) +=3D net_tx_pkt.o net_rx_pkt.o +common-obj-$(CONFIG_E1000E_PCI_EXPRESS) +=3D e1000e.o e1000e_core.o e1000x= _common.o common-obj-$(CONFIG_RTL8139_PCI) +=3D rtl8139.o common-obj-$(CONFIG_VMXNET3_PCI) +=3D net_tx_pkt.o net_rx_pkt.o common-obj-$(CONFIG_VMXNET3_PCI) +=3D vmxnet3.o diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs index 6d6597c..073d512 100644 --- a/hw/pci-host/Makefile.objs +++ b/hw/pci-host/Makefile.objs @@ -14,8 +14,8 @@ common-obj-$(CONFIG_VERSATILE_PCI) +=3D versatile.o common-obj-$(CONFIG_PCI_SABRE) +=3D sabre.o common-obj-$(CONFIG_FULONG) +=3D bonito.o common-obj-$(CONFIG_PCI_PIIX) +=3D piix.o -common-obj-$(CONFIG_PCI_Q35) +=3D q35.o -common-obj-$(CONFIG_PCI_GENERIC) +=3D gpex.o -common-obj-$(CONFIG_PCI_XILINX) +=3D xilinx-pcie.o +common-obj-$(CONFIG_PCI_EXPRESS_Q35) +=3D q35.o +common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) +=3D gpex.o +common-obj-$(CONFIG_PCI_EXPRESS_XILINX) +=3D xilinx-pcie.o =20 -common-obj-$(CONFIG_PCI_DESIGNWARE) +=3D designware.o +common-obj-$(CONFIG_PCI_EXPRESS_DESIGNWARE) +=3D designware.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548410970495752.2678693148355; Fri, 25 Jan 2019 02:09:30 -0800 (PST) Received: from localhost ([127.0.0.1]:41265 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyQR-0000GQ-CG for importer@patchew.org; Fri, 25 Jan 2019 05:09:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOT-0007Kz-6L for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOQ-0001Yn-UZ for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:24 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:35783) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOP-0001VH-6H for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:22 -0500 Received: by mail-wr1-x444.google.com with SMTP id 96so9656144wrb.2 for ; Fri, 25 Jan 2019 02:07:20 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:18 -0800 (PST) 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=8yUggRzfLCGMchW5NabpNTXA1WfKt+zj5FuTWqvFsj4=; b=iDYcsmQiQQnwewQX/FYvEQZbbUvFwTm9Qb3X1WEM63Pm0PXuuv+Vhi0yK4YPsIR3BR 4rY30HIdozCean9Twtsx+lSJLkyHZimYSAV4i7LWbbTjVluU/zePyEMRMuuHMB6nooio 8B08j5m4D8Tzuh2s32JVopAi6Ba9zfj31TG2DCbcEpI0dl6xl7+zUqUulqXnus3UlZBu uj77TJboboEv7DwMcYvwQ+YCH2zv4786kwZjhmJyDOFiuZpgHB8qv+bUT18Po6MCaNby yDMLy5pgO1g9L1ACnSD3XN9+8lsp06f7oQFBqRzhurFhQJIi+8If75zj3ij7IqeaRs/z nEMw== 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=8yUggRzfLCGMchW5NabpNTXA1WfKt+zj5FuTWqvFsj4=; b=r63zh1pRz+8MseyjNrHBVp/jTy+nE2MQk+3ODr0Lb62B5Y+4CbUc7CglOn2GfSYVYi nL+QN0u7zt2XNSxVnsS6mg/PmVWnOrKxvmjJD3JyFZoHq3LwmsD/9ydLpp8QxnMxSYxA H53CzBeg7Sg6JnMDF3HcHKBdKd1ubYkryrcW9RlR8QWyk0iK4/6Za2xY8T8hWZcesAnj CorEh31GVKAenZ/n2ifPOqS7yMRuA7K8R7SyoZRg64BlSv5stY7+78TElw38p/a0ezVe rFDwj2M5mnsXBuNObarIo5HdMQmrOvElNAGsCcEk7QGRAtrU8DAU64h5ElcZd8+/WQ38 Z5hQ== X-Gm-Message-State: AJcUukdYScdLZupEz8k75QYQGl+eACD8m19ujGoLO6eN4H4NT/1o540n jTs9XsHGdvBUdjPQvTflQs+FnjpL X-Google-Smtp-Source: ALg8bN5DVq6fZJzv64qeDe+TgMLDQfE4QLCjP4H25VSCuufo1zIc91X2vcQ945oi5kjBgPlw+pkBvQ== X-Received: by 2002:adf:c888:: with SMTP id k8mr11349163wrh.6.1548410838743; Fri, 25 Jan 2019 02:07:18 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:24 +0100 Message-Id: <1548410831-19553-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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 05/52] build: actually use CONFIG_PAM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Do not link it unconditionally into all binaries. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-3-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/i386-softmmu.mak | 1 + hw/pci-host/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 2f919df..48da996 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -67,3 +67,4 @@ CONFIG_I2C=3Dy CONFIG_SEV=3D$(CONFIG_KVM) CONFIG_VTD=3Dy CONFIG_AMD_IOMMU=3Dy +CONFIG_PAM=3Dy diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs index 073d512..a9cd3e0 100644 --- a/hw/pci-host/Makefile.objs +++ b/hw/pci-host/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-y +=3D pam.o +common-obj-$(CONFIG_PAM) +=3D pam.o =20 # PPC devices common-obj-$(CONFIG_PREP_PCI) +=3D prep.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411148426754.5195644327118; Fri, 25 Jan 2019 02:12:28 -0800 (PST) Received: from localhost ([127.0.0.1]:41320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyT7-0002m9-44 for importer@patchew.org; Fri, 25 Jan 2019 05:12:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOT-0007L4-9s for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOR-0001Yv-0q for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:24 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33146) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOQ-0001WS-P2 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:22 -0500 Received: by mail-wm1-x342.google.com with SMTP id r24so4413450wmh.0 for ; Fri, 25 Jan 2019 02:07:21 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:19 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=DC02qC2Mru24wleJ8SeN1kZ8/hFRmey9FjtW14weYug=; b=lIRacQxRdqc0P6I4H6t9oyL1zbJMaLMUgXDlhjmtWDH3OfOQYw34kUvWjW8S0CLoDZ /SppfPwnIkDoz3RtenogaVanDiAfz2k4ivxxBjBP7g2+5BedeYvHPkAMoqQhEF8WCTHC 3sDrkBYKJF+D0bFiHdJAX0HIhxRkkSBJ+p/5YqGSr0ee7KiRyqrlr3LwC/cqZ8pJMs0k AmXrk+Ts5OcW4+bto1V3P2xZ7MMEyq6luoztD5aoxNzeEnBLkXV0bKPg8K3/WpWMJXMk KpOzy/IxLi5CS1ELBD7ZvZHNi+9i/k78VXgYUwiDS4Jo8NWo00ydt2WNNvcmQFVsBqJc SxVA== 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:mime-version:content-transfer-encoding; bh=DC02qC2Mru24wleJ8SeN1kZ8/hFRmey9FjtW14weYug=; b=fYpnohrJjEBklgHLaYWrmgMYZOGysHPYmItfT6Dzid5Mt0bXyXCm5jFStP2QusWf6d oBVMj1Il6eBlf4zYVNAY6sVRvdIvF/d8c/WHrSJ8m2+IiVzFY1TpGRwj7ve1gYZAdEbM hvMjJNwzTiaGfcPMlkKif5XTR/6XkMBe+8bE7ODwmlULvPLxKSrl0QPzyxIeO6l2ovsM UsBjr/aJfiJ7iu+E2w6Nxuan9ZiGAyW1i1hzSQVb5fwcR4zxU0BxHbBgjNofE/P53hF9 vDcbRmthyoUYh8fMBESNKmheRR0eHjQ+CaVW6uceTpHLi9xlmDti7MipcYxVFnSOqg0u cFeg== X-Gm-Message-State: AJcUukc47k+sxooflqdhkk+ntI/UiNawWwqkpzvqmbqwBq9Y2Cgbt3Sq VVIFA0inWujEvo8Wpw6x94Cf+ZjC X-Google-Smtp-Source: ALg8bN4SIQfQOtG61B6kfG68OmzKwMGPssBsaNmNMHI6yGac8bbORUay/mr0qSqksZAIG1FdKX0TxA== X-Received: by 2002:a1c:2e43:: with SMTP id u64mr6368759wmu.52.1548410839930; Fri, 25 Jan 2019 02:07:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:25 +0100 Message-Id: <1548410831-19553-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 06/52] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, =?UTF-8?q?=C3=81kos=20Kov=C3=A1cs?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) CONFIG_PIIX and CONFIG_Q35 created for the pc board object files. These are enabled automatically at default-configs/i386-softmmu.mak and default-configs/x86_64-softmmu.mak Signed-off-by: =C3=81kos Kov=C3=A1cs Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-4-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 2 ++ hw/i386/Makefile.objs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 48da996..71c9f6f 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -68,3 +68,5 @@ CONFIG_SEV=3D$(CONFIG_KVM) CONFIG_VTD=3Dy CONFIG_AMD_IOMMU=3Dy CONFIG_PAM=3Dy +CONFIG_I440FX=3Dy +CONFIG_Q35=3Dy diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index fa87a14..3de7ca2 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -1,6 +1,8 @@ obj-$(CONFIG_KVM) +=3D kvm/ obj-y +=3D multiboot.o -obj-y +=3D pc.o pc_piix.o pc_q35.o +obj-y +=3D pc.o +obj-$(CONFIG_I440FX) +=3D pc_piix.o +obj-$(CONFIG_Q35) +=3D pc_q35.o obj-y +=3D pc_sysfw.o obj-$(CONFIG_VTD) +=3D x86-iommu.o intel_iommu.o obj-$(CONFIG_AMD_IOMMU) +=3D x86-iommu.o amd_iommu.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411489338911.4748322241571; Fri, 25 Jan 2019 02:18:09 -0800 (PST) Received: from localhost ([127.0.0.1]:41403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyYm-0007iU-Tc for importer@patchew.org; Fri, 25 Jan 2019 05:18:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOb-0007Qe-Tm for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOT-0001Zp-1p for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:29 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:38327) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOQ-0001Xh-Sy for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:23 -0500 Received: by mail-wr1-x42e.google.com with SMTP id v13so9615057wrw.5 for ; Fri, 25 Jan 2019 02:07:22 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:20 -0800 (PST) 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=oqzkbXIYoUM2r9N69Yr06Q3JKQjBD19tfzB7paYpi9I=; b=ESuFwlm7E2zE5cxpXhkYsKCckXBZiap/uy7a7/jXWiWZ5FNrmuH41t5LFPLmdIX+Oh BsHur2W1pxHg6Y33uBg/0Yyjyh30Tib8v7/jO6D2TxWAXyZTxnzLwqISNzLFU+4mLfvN 52VvuUrY/2iT0Fbq4v+Kj7hdOhlzBiE6hiq0CutuV6bqeF0BYZiQxiFmtV45EzirHUrI hMAQfJdMPcu4X3sPjLd5spi8pO5u8UYwJexNrJaHKN/4T6LqqdaYelpnPFwkgcUN6l1+ Jklyl3kQaWMc6AE/vbh8TPSFQYS4ip068JVdSCW+lMoT0nLR0m9x+pHuZY/fa2Jryq8F 4KFA== 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=oqzkbXIYoUM2r9N69Yr06Q3JKQjBD19tfzB7paYpi9I=; b=uFFgI2SLe8gHboZcLgSWzrniggFGXYkeSC155n9R24n4OQWgCq+9tZG2CqDlLk8Wel 2flAx49Fqd0kjdW5Yn2jCZLEKM0yptIbJKpQ6Psyfx3+dfQAKHRchbB6c1bkC/N6mQRs LXvdH5+kjD4A0rH3SEDuCidmihImadU18Q0Ywh4Kt5RhVzL8qLff61VN1yaSF8DYQab0 kL6qPIejdqtlxrY4dd+Mw1ApnMBIs39SUPLVx02ltGFrypPkomyMJ0VeJEKuf5k6yKjI CyiHW1nTgn8rQez3qG3xZWjQhTRSaTSE2jYKOXZsWkbv/vKRk7qpaoX7HWIxwkPfGytL iARA== X-Gm-Message-State: AJcUukelJEj1X1nhRHfTza1uetxzDvVPWPPG305uZRpRatstzGpzJ8nh pnqEllp1Qwe0qlhBjOsYjTolGGFg X-Google-Smtp-Source: ALg8bN4gRQUy6iEvj+2dU3xupwP6czXuTtlK30ZUgonpvDgUAgquEGw4srO7lmwSDW1E35efhdGCFQ== X-Received: by 2002:a5d:6b09:: with SMTP id v9mr11302296wrw.304.1548410841101; Fri, 25 Jan 2019 02:07:21 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:26 +0100 Message-Id: <1548410831-19553-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::42e Subject: [Qemu-devel] [PATCH 07/52] hw/arm/Makefile.objs: CONFIG_VIRT created for virt board X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong make virt code configurable and the new CONFIG_VIRT definitions added to the default-configs/arm-softmmu.mak to replace CONFIG_ACPI in arm board. Signed-off-by: Yang Zhong Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-5-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 + hw/arm/Makefile.objs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 107f801..68deb1c 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -147,6 +147,7 @@ CONFIG_XIO3130=3Dy CONFIG_IOH3420=3Dy CONFIG_I82801B11=3Dy CONFIG_ACPI=3Dy +CONFIG_VIRT=3Dy CONFIG_SMBIOS=3Dy CONFIG_ASPEED_SOC=3Dy CONFIG_GPIO_KEY=3Dy diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 50c7b4a..41dab8a 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,4 +1,5 @@ -obj-y +=3D boot.o virt.o sysbus-fdt.o +obj-y +=3D boot.o sysbus-fdt.o +obj-$(CONFIG_VIRT) +=3D virt.o obj-$(CONFIG_ACPI) +=3D virt-acpi-build.o obj-$(CONFIG_DIGIC) +=3D digic_boards.o obj-$(CONFIG_EXYNOS4) +=3D exynos4_boards.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 154841171181671.59883211892907; Fri, 25 Jan 2019 02:21:51 -0800 (PST) Received: from localhost ([127.0.0.1]:41462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyc7-00021b-8Q for importer@patchew.org; Fri, 25 Jan 2019 05:21:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOb-0007Qf-Tt for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOU-0001bC-Jx for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:29 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:46149) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOS-0001YG-Vs for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:25 -0500 Received: by mail-wr1-x429.google.com with SMTP id l9so9578158wrt.13 for ; Fri, 25 Jan 2019 02:07:23 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:21 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=3uubmAIGX+Ajp2kn59DME+dlaNV0pz/IISAHLpVVcz0=; b=EG12uywLwYuN5xEbhDhk4lTL9h2sE1vW5OgnehLEFkhV15DXELLLheeJ1EajQzBOL4 3uR2vosOM0la4OfdwaHQRD02Hhu2Pu+Kl7ybgD6tZOeuPz9vR6N759oL3mn6uX2dahNc gmVMhOynj0PFqimioIWNfQMXZ0ytfagJdmjVzwHYFTzNMPt7wRSUgApmHfNc5whlHGC3 lcVmlVXXO6++HuceJ7pBQ9E1ISE/7wfu38Mw04mB8EVcODkyYCyWioSxZFwRUK5yafXK Gc3YqLQAHUaoiEg7J+ocIBxkL/LQtbYAz2jFd740v5oVwjun23t7+rPBMzjKmoUinVAm OYrw== 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:mime-version:content-transfer-encoding; bh=3uubmAIGX+Ajp2kn59DME+dlaNV0pz/IISAHLpVVcz0=; b=kzjAzkDbLQWFtXMblBAJR/x/OHI+64h/xEvSvCdv1vK2C6PtwIkNOFtSFWEx/DLBOM 8QpqMd5qRGOFeuprmHRKKey1YD8477ZpzA6csY9VheS5t1RTxoXdIqNENpxdcv+kaxlD g0HcjOaRANjWSHvJo0h6JyxFzp+ce/1G1LKTQ4syc9Xpqg/0zruqfOyNCMhIhcZG6tcR F67VYyzsj182NUgv+r00U3RXD1WI1lhHO4hhJNH42NQkA9EpTfvfwl/assgnf10WNlyu 662+h/B1M0WwGBDCfCSV1OKsK3VI9Au8z1afae0H3Y+mcOS+e6VhA9KWMaFQzv/3QYkj u3LQ== X-Gm-Message-State: AJcUukcSjDkwYNkwl+58+IwzXUjdztK5KqQt+kM4kGwer8EIrRQNu65a uuwz9VgSykSsshXI845UQBfzPSCg X-Google-Smtp-Source: ALg8bN55+yeFRnoOJm17QTNR/4VlnAnCsi63L6uYnLxW2OkH5P8JlZB3ErUDSjucgovHbSzF2cWWrA== X-Received: by 2002:adf:fc09:: with SMTP id i9mr10366683wrr.299.1548410842085; Fri, 25 Jan 2019 02:07:22 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:27 +0100 Message-Id: <1548410831-19553-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PATCH 08/52] hw/m68k/Makefile.objs: Conditionally build boards X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, =?UTF-8?q?=C3=81kos=20Kov=C3=A1cs?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: =C3=81kos Kov=C3=A1cs CONFIG_AN5206, CONFIG_MCF5206 and CONFIG_MCF5208 make variables created for m68k boards, and added to default-configs/m86k-softmmu.mak. Signed-off-by: =C3=81kos Kov=C3=A1cs Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-6-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/m68k-softmmu.mak | 2 ++ hw/m68k/Makefile.objs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmm= u.mak index 60f7cdf..27f5274 100644 --- a/default-configs/m68k-softmmu.mak +++ b/default-configs/m68k-softmmu.mak @@ -2,3 +2,5 @@ =20 CONFIG_COLDFIRE=3Dy CONFIG_PTIMER=3Dy +CONFIG_AN5206=3Dy +CONFIG_MCF5208=3Dy diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs index d1f089c..482f847 100644 --- a/hw/m68k/Makefile.objs +++ b/hw/m68k/Makefile.objs @@ -1,2 +1,2 @@ -obj-y +=3D an5206.o mcf5208.o -obj-y +=3D mcf5206.o mcf_intc.o +obj-$(CONFIG_AN5206) +=3D an5206.o mcf5206.o +obj-$(CONFIG_MCF5208) +=3D mcf5208.o mcf_intc.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411910669645.7977337946749; Fri, 25 Jan 2019 02:25:10 -0800 (PST) Received: from localhost ([127.0.0.1]:41489 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyfY-0004TW-Iq for importer@patchew.org; Fri, 25 Jan 2019 05:25:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57877) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOe-0007TP-Li for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOZ-0001eM-00 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:34 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:37370) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOT-0001ZH-Dt for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:26 -0500 Received: by mail-wr1-x434.google.com with SMTP id s12so9630998wrt.4 for ; Fri, 25 Jan 2019 02:07:24 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:22 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=016r6nBxtrx31SuxGJ7Z6zZUEedY7Asa2sTIo0cnPGI=; b=RobrqGlmPU6oJ0Lot+/ftmOP7HGxhTmzTqOVXJjRsjIr4nICXFyj5Q9seGJY0qoYDg /8N81RFj+mxYMADQH9tmH0nI2G1cLP1Y0pI4IedLinuXiqh85YKtEUpgr3V6Np6ytGJD FaEG/dpM0nPEVu6cmYc21cehGPgOo4Z9VsAlztG97pYUkunQ0PgPxV1L8yj4gsGuAo64 ndGvUGcBv8BjMEhzYzkhH5h353p44DlZah5FTTeM6ZpfTnhgYDkvp0nOEmHxvVzlVSbm p0XccA7cnjMiTRM+rUaJZUQQz6XP12H7P4TY6LGQIeJevLToUxAHwTD5Babg2ZmXPLaY L/TA== 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:mime-version:content-transfer-encoding; bh=016r6nBxtrx31SuxGJ7Z6zZUEedY7Asa2sTIo0cnPGI=; b=L1vdSSpXnoyjjocM2Vv9uOdOYLb1BC2AYvw2ywVxVfEFeU24kHUoDgcCkPyK+a4jdk ZUXt99K+Cqe6hfYpJv2NLvv7UbPbtAltfk9e7HH7HO5PM+hHt/MQsOrZJF9TuUWVR5OY +rlK2+llrrZzSXvJFbaDM5O0zYjEl516ByrNNrnufwl5t32K3FPIC+lrWwueWJc/BlGV 8b/mVnWgzVydMYyYa7dPbBKAynk//1an6S7jnOBeh+CR5lGXN8gkLO/GBc0fpLjaPDLL Z2D5yDa8LsOru3PG164ClCV7AN9iXOG8RAy1wvc79J5uN9OKzIsdy8/rZrzoQ1Dy77r+ nUBQ== X-Gm-Message-State: AJcUukf3KqkrKopocIHc/TEy0rSmEaA5Obu9cqYMyL4dFfB52Kn5S8Pb AiUs7UDScIYGi4toiXNrcMnqzXe9 X-Google-Smtp-Source: ALg8bN79E/sddib/09/6w6lUGH/nDj/hDMWYGGQxJ+tfioUsOUBuoOpX5UojPQ8msKiIqcyMx6zJEQ== X-Received: by 2002:adf:e608:: with SMTP id p8mr10890473wrm.166.1548410843177; Fri, 25 Jan 2019 02:07:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:28 +0100 Message-Id: <1548410831-19553-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PATCH 09/52] hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx boards X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, =?UTF-8?q?=C3=81kos=20Kov=C3=A1cs?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: =C3=81kos Kov=C3=A1cs CONFIG_PETALOGIX_* and CONFIG_XLNX_* configs added to default-configs/microblaze-softmmu.mak and default-configs/microblazeel-softmmu.mak. Signed-off-by: =C3=81kos Kov=C3=A1cs Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-7-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/microblaze-softmmu.mak | 3 +++ hw/microblaze/Makefile.objs | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/micro= blaze-softmmu.mak index 7fca8e4..14837cf 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -10,3 +10,6 @@ CONFIG_XILINX_ETHLITE=3Dy CONFIG_SSI=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_XLNX_ZYNQMP=3Dy +CONFIG_PETALOGIX_S3ADSP1800=3Dy +CONFIG_PETALOGIX_ML605=3Dy +CONFIG_XLNX_ZYNQMP_PMU=3Dy diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs index ae9fd40..8595a62 100644 --- a/hw/microblaze/Makefile.objs +++ b/hw/microblaze/Makefile.objs @@ -1,4 +1,4 @@ -obj-y +=3D petalogix_s3adsp1800_mmu.o -obj-y +=3D petalogix_ml605_mmu.o -obj-y +=3D xlnx-zynqmp-pmu.o +obj-$(CONFIG_PETALOGIX_S3ADSP1800) +=3D petalogix_s3adsp1800_mmu.o +obj-$(CONFIG_PETALOGIX_ML605) +=3D petalogix_ml605_mmu.o +obj-$(CONFIG_XLNX_ZYNQMP_PMU) +=3D xlnx-zynqmp-pmu.o obj-y +=3D boot.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411303744106.75917051945089; Fri, 25 Jan 2019 02:15:03 -0800 (PST) Received: from localhost ([127.0.0.1]:41352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyVq-0005Q4-Hz for importer@patchew.org; Fri, 25 Jan 2019 05:15:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOh-0007WO-Jb for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOe-0001jd-Rp for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:38 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:43843) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOc-0001ZY-RJ for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:36 -0500 Received: by mail-wr1-x442.google.com with SMTP id r10so9601913wrs.10 for ; Fri, 25 Jan 2019 02:07:25 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:23 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=Rghd0ld4SFfIoLscESenMNv95fMC+8s6tMaicfaH4a4=; b=RGyrMhiiq92OhlpblcuSJvZUahomloPv2j3EzPur++g2U0t5xwRJrkdLy+kOdWoD0n XnyNqOwIUYaXbYwy/Az+etFgn75VGtBcm4VwdellFVfO9jPx0tKkoIY6Z6n2zOnz+tWi zSj52KErGmRollE2AQ8f0k+b/Fl1T0qE/oZ3IWlyl/p20Ao1UTjq9FANHhRY+vAyLE9a 5sKx1tpDXv+s5aXM0dkH8KgxWn9lnoSKQFbNb4E24jcvQs8FcpU0kTtuWOPvoIMMmB3m rBfl4r1ofTkDk7e4c67UUHi9XiCKkT1+seKSkGsf7jyLR4h1YOVFGiUBNH5FVbL8tbA/ VpJQ== 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:mime-version:content-transfer-encoding; bh=Rghd0ld4SFfIoLscESenMNv95fMC+8s6tMaicfaH4a4=; b=DAwR1WK6wzjrx0s69O8qdfqIF7pUCK8IkjxtW9XuYXRVMyRiGxOeiHlMKa9geW+odH aQ8mUQsef0AQLcmhQw54bQtZvInRZfq33EeZeQXXy/2Q70+T0x0wAm2NXyF6LPxjwcw2 9P/DhSwn5qG7NF8yM/+aH+WSjAtlSci3m4QPgA/Jt3Ac0yQv1Pt3FAilJ4ZRuRReSJ3M Iiu8VNwLsm74C+xMcXTt04AMW7BAsSkdQPTjVb4dNIpKrUy/nJLFArphkWalb5yjEnhw n1IOGnukOnIAM31qJ28FebNWsxMU23beF8ZjTS0qT6D2yUS5gaHCdtP/AIvdM04kSRUN 39vg== X-Gm-Message-State: AJcUukfgIprrMXkcSeFAHSuUdDyFDG3wKM2NV29W8Jd8xngMYxT8TUzi XxSA0yMlLdrqwA0gwqUMA+qJiFhR X-Google-Smtp-Source: ALg8bN5W1Tasyf2dunWGmhEbaMgbUQTs5v5MwuerrLsk/llDsAlL4mPm1TUkLkCZpkhRVUHIzLkG/Q== X-Received: by 2002:a5d:488f:: with SMTP id g15mr10720315wrq.15.1548410844224; Fri, 25 Jan 2019 02:07:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:29 +0100 Message-Id: <1548410831-19553-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH 10/52] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, =?UTF-8?q?=C3=81kos=20Kov=C3=A1cs?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: =C3=81kos Kov=C3=A1cs Add the new configs to default-configs/mips*-sofmmu.mak. Signed-off-by: =C3=81kos Kov=C3=A1cs Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-8-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/mips-softmmu-common.mak | 3 +++ hw/mips/Makefile.objs | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index fae2347..479fb4d 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -36,3 +36,6 @@ CONFIG_EMPTY_SLOT=3Dy CONFIG_MIPS_CPS=3Dy CONFIG_MIPS_ITU=3Dy CONFIG_I2C=3Dy +CONFIG_R4K=3Dy +CONFIG_MALTA=3Dy +CONFIG_MIPSSIM=3Dy diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 17a311a..525809a 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,7 +1,8 @@ -obj-y +=3D mips_r4k.o mips_malta.o mips_mipssim.o obj-y +=3D addr.o mips_int.o +obj-$(CONFIG_R4K) +=3D mips_r4k.o +obj-$(CONFIG_MALTA) +=3D gt64xxx_pci.o mips_malta.o +obj-$(CONFIG_MIPSSIM) +=3D mips_mipssim.o obj-$(CONFIG_JAZZ) +=3D mips_jazz.o obj-$(CONFIG_FULONG) +=3D mips_fulong2e.o -obj-y +=3D gt64xxx_pci.o obj-$(CONFIG_MIPS_CPS) +=3D cps.o obj-$(CONFIG_MIPS_BOSTON) +=3D boston.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412315059290.5145560423357; Fri, 25 Jan 2019 02:31:55 -0800 (PST) Received: from localhost ([127.0.0.1]:41605 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmym0-0001Cd-0a for importer@patchew.org; Fri, 25 Jan 2019 05:31:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOo-0007dT-3x for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOm-0001sC-0c for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:46 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:54480) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOl-0001aq-GY for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wm1-x341.google.com with SMTP id a62so6153018wmh.4 for ; Fri, 25 Jan 2019 02:07:26 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:24 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=VHcBl9IVYAw9f8zH46cDgxlintukMYHtqdtg5pBS2bM=; b=ncJUzjB8EaD2eSIwh6Wj9SfhWmS64w19qC0JtQaXgROp8OVtIhtIbyPgRUvrnGJHJD IrwWh0sYrCvJNCWGaTOGE0txpVLPw7K4ZGLz46jkltVsSpR7JahzCpxo1IjFFFkblp6y 0tjghSM2Z0J3zJXJMtK74oTmdVrSevN5v+5fPWVWjWu9gtgHTCiaoXGrt0GfRwVebWXz 9w9uNjjMm01ViDUeq0qy369Vjf4rcjPNgScsIXdbS92YWcfjqCV0s0swpXjqTyG5xieV vlxfa4ygeFF3T8JAIKK/cVnlBf9ygPdokfzI+nBLzaKNR1avwWuNs+nRbOEXeeE2S2lH BLfw== 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:mime-version:content-transfer-encoding; bh=VHcBl9IVYAw9f8zH46cDgxlintukMYHtqdtg5pBS2bM=; b=QVrrhvwEQotSTAWQs5mx8qxC1rRWGWmhYZCsr2xwiFrivz2E2V1SsCXSHEkSmwhxKV 2Yn9eNhAd3GLQrfUcKEtWOfDzxJNtrystiLo3Ka+T/0JD2KOJE8i+Zr4B8inonPJxloX UHU32TnqrdE5TtqBHhh3CD9MJGVouy1hrUJgATWGFrCK2QyEAUgS16OLfu3Fvb845cMB QqtAHpBTWU7qGu3SfDF5LgONY4bMe2RemxhX0DaZ0whIRuZBEXkKFk99gF/JLl7m5W7S kM6RptUtPgwvPs42XrwNtd+m7NM/yYYe30SXPqClwW3nicXELa5hjj735eBnru3SUgV3 Mv/Q== X-Gm-Message-State: AJcUukcCboVoDw380uJNSALPEZFkbi/t7tRZsZXS2HZVmInKxKffX1tX ewSwc9E6xuYvDojBHjbQlfpXF22O X-Google-Smtp-Source: ALg8bN7kAMyXgrLHorxFcKYIfR/tKlfDWv/UGFu4BTuwf9CC0uFita8BIi6YRwJJQTUl5dVzBLMP4Q== X-Received: by 2002:a1c:3282:: with SMTP id y124mr6457769wmy.134.1548410845256; Fri, 25 Jan 2019 02:07:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:30 +0100 Message-Id: <1548410831-19553-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH 11/52] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_* X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, =?UTF-8?q?=C3=81kos=20Kov=C3=A1cs?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: =C3=81kos Kov=C3=A1cs CONFIG_PPC405, CONFIG_PPC440, CONFIG_MAC_OLDWORLD, CONFIG_MAX_NEWWORLD and CONFIG_VIRTEX configuration options created for default-configs/ppc*-softmmu.mak. Signed-off-by: =C3=81kos Kov=C3=A1cs Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-9-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 7 ++++++- hw/ppc/Makefile.objs | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 23d871f..7f80f0c 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -21,6 +21,10 @@ CONFIG_E500=3Dy CONFIG_OPENPIC_KVM=3D$(call land,$(CONFIG_E500),$(CONFIG_KVM)) CONFIG_PLATFORM_BUS=3Dy CONFIG_ETSEC=3Dy +CONFIG_PPC405=3Dy +CONFIG_PPC440=3Dy +CONFIG_VIRTEX=3Dy + # For Sam460ex CONFIG_SAM460EX=3Dy CONFIG_USB_EHCI_SYSBUS=3Dy @@ -34,7 +38,6 @@ CONFIG_M41T80=3Dy CONFIG_VGA_CIRRUS=3Dy =20 # For Macs -CONFIG_MAC=3Dy CONFIG_ESCC=3Dy CONFIG_MACIO=3Dy CONFIG_MACIO_GPIO=3Dy @@ -50,6 +53,8 @@ CONFIG_GRACKLE_PCI=3Dy CONFIG_UNIN_PCI=3Dy CONFIG_DEC_PCI=3Dy CONFIG_IDE_MACIO=3Dy +CONFIG_MAC_OLDWORLD=3Dy +CONFIG_MAC_NEWWORLD=3Dy =20 # For PReP CONFIG_PREP=3Dy diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 4e0c1c0..7d815b7 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -14,19 +14,20 @@ endif obj-$(CONFIG_PSERIES) +=3D spapr_rtas_ddw.o # PowerPC 4xx boards obj-y +=3D ppc4xx_devs.o ppc405_uc.o -obj-$(CONFIG_PPC4XX) +=3D ppc4xx_pci.o ppc405_boards.o -obj-$(CONFIG_PPC4XX) +=3D ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o +obj-$(CONFIG_PPC405) +=3D ppc405_boards.o +obj-$(CONFIG_PPC440) +=3D ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o +obj-$(CONFIG_PPC4XX) +=3D ppc4xx_pci.o obj-$(CONFIG_SAM460EX) +=3D sam460ex.o # PReP obj-$(CONFIG_PREP) +=3D prep.o obj-$(CONFIG_PREP) +=3D prep_systemio.o obj-${CONFIG_RS6000_MC} +=3D rs6000_mc.o # OldWorld PowerMac -obj-$(CONFIG_MAC) +=3D mac_oldworld.o +obj-$(CONFIG_MAC_OLDWORLD) +=3D mac_oldworld.o # NewWorld PowerMac -obj-$(CONFIG_MAC) +=3D mac_newworld.o +obj-$(CONFIG_MAC_NEWWORLD) +=3D mac_newworld.o # e500 obj-$(CONFIG_E500) +=3D e500.o mpc8544ds.o e500plat.o obj-$(CONFIG_E500) +=3D mpc8544_guts.o ppce500_spin.o # PowerPC 440 Xilinx ML507 reference board. -obj-$(CONFIG_XILINX) +=3D virtex_ml507.o +obj-$(CONFIG_VIRTEX) +=3D virtex_ml507.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412601902997.2372492238218; Fri, 25 Jan 2019 02:36:41 -0800 (PST) Received: from localhost ([127.0.0.1]:41667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyqa-0005B4-6a for importer@patchew.org; Fri, 25 Jan 2019 05:36:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOs-0007hw-2P for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOl-0001qx-LL for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:49 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:50228) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOl-0001bT-5f for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wm1-x341.google.com with SMTP id n190so6175820wmd.0 for ; Fri, 25 Jan 2019 02:07:27 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:25 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=0HoYMIG8MQ8Tedold4z40URH8CRVbx3F/JxuEH7XwIY=; b=Cx3U/fVZMPVRJmK5vJSiwOv4/yBkfa0J536PPUHyGARscizW0OiskDpk8W5dxww5F6 3XyV41bXU/ewVm7qFZ4y0DmOkY3IO404ThYTQa0/RYMWRiC6MODVP6f5psQ3nmwE2+MS vxMPHZu/oDxa/E9E7FpTGghD3ZAlVDQxvoPmuh85sAA7Yrn+X/vpVeyKIJwamExfpEpT Vgby9kYgUrtBGzANbxmVNdRzpXeYxWhLbVKjKTbO3DNOHdPJOS4kIkx2Kjvu75+e1U76 4BOOgQf+imWiGS/2CXuilKbbEEdZxN8CF1UGru8gP2JnxhJWeVx4UvkueJAkhAnW81Js bAZQ== 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:mime-version:content-transfer-encoding; bh=0HoYMIG8MQ8Tedold4z40URH8CRVbx3F/JxuEH7XwIY=; b=tIQTlA6EvDC7jl0LraVH63uhujpfC8WkzH9DiPaO3UIEu8N+uIsGPGj1u8NY1PcXo1 ZcthENxdhlC3k4gtkTiaxnbzO+/5ZgY0bvbIwL93Gtv1Zj2+28omFhNkyQn6XXonWYpC dWnQ8EvwQCMkIxCVNC6krKS1Bvf7EXNObgnuszoqjXwtR8hJ2hVl5ayDb9NQDzY1h0fH tUAn48veDy3w2XmuGhwv9gg2qhucfl4QyDEcimVmihwlIXBt9Bn1ymcahBR0g+0bPfrj SlwRFIkLwS9LjOLZcUJehMA+XWGWr16fZyrEMtwNmZn6odxZgmy8mVHlI1YJYXGotaVq iwHw== X-Gm-Message-State: AJcUukdBJ8b92YWiq5FLIyd62fP05We/A/PKitGktXHILWQ7sfty4Y06 YDCqxcIQtHlOoRC2Xy+L/V7JMoCz X-Google-Smtp-Source: ALg8bN6dAuUYRO0vRIrt1irZ9sxbcsqZYEUCfo71E/INjZmvJaPDEXiV+bRwScatSzNiO2El+0KESA== X-Received: by 2002:a1c:7ec4:: with SMTP id z187mr6077026wmc.43.1548410846317; Fri, 25 Jan 2019 02:07:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:31 +0100 Message-Id: <1548410831-19553-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH 12/52] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, =?UTF-8?q?=C3=81kos=20Kov=C3=A1cs?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: =C3=81kos Kov=C3=A1cs Make hw/sh4 configurable and add new CONFIG_* to the default-configs/sh4*-s= oftmmu.mak. Signed-off-by: =C3=81kos Kov=C3=A1cs Message-Id: <20190123065618.3520-10-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/sh4-softmmu.mak | 2 ++ default-configs/sh4eb-softmmu.mak | 2 ++ hw/sh4/Makefile.objs | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index caeccd5..1fdb009 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -19,3 +19,5 @@ CONFIG_PCSPK=3Dy CONFIG_I82374=3Dy CONFIG_I8257=3Dy CONFIG_MC146818RTC=3Dy +CONFIG_R2D=3Dy +CONFIG_SHIX=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 53b9cd7..3b550a5 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -19,3 +19,5 @@ CONFIG_PCSPK=3Dy CONFIG_I82374=3Dy CONFIG_I8257=3Dy CONFIG_MC146818RTC=3Dy +CONFIG_R2D=3Dy +CONFIG_SHIX=3Dy diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs index 2393702..2a707f9 100644 --- a/hw/sh4/Makefile.objs +++ b/hw/sh4/Makefile.objs @@ -1,4 +1,4 @@ -obj-y +=3D shix.o r2d.o - obj-y +=3D sh7750.o sh7750_regnames.o obj-y +=3D sh_pci.o +obj-$(CONFIG_R2D) +=3D r2d.o +obj-$(CONFIG_SHIX) +=3D shix.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411515521557.2352294395437; Fri, 25 Jan 2019 02:18:35 -0800 (PST) Received: from localhost ([127.0.0.1]:41407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyZ1-0007u8-17 for importer@patchew.org; Fri, 25 Jan 2019 05:18:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOn-0007dH-VI for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOl-0001s5-Vi for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50231) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOl-0001bx-GX for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wm1-x344.google.com with SMTP id n190so6175861wmd.0 for ; Fri, 25 Jan 2019 02:07:28 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:26 -0800 (PST) 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=8iv08lAlQqwfHsTyX4A6h1IpuHS/tNcKPZyAwzZUtIg=; b=elRsXZeesprPaBvT3PUVXHUFIyWrz4kiDn8wa+t/K6Y+1rqGV2Pf6WSlrh9l4FonAU ITlAEYfsgoQFW2loolIEfZzrD1qF3kIDXOO9kZESN0k73dwHsS37B0lu7xQkFzkwQZ+b HpSBqg9pi3+jatgmSA+1EfZV7/4Ix/jTpFpgvKyNBsZxQPb3nq+fY/oe9bwcaHTUmvCR AhjuSGCrAkongxytn8NfEK6m3xR6P+qIADjCTJ7iLfRuLZXlskEAmmck+xN2ExR18tNr Vut+3ATB9yOP0QYKM4sixmsoPIk/jjB2o1GuWIXD0/+AfHbxbCfrtobyPcTaMUHXbRGu D4rQ== 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=8iv08lAlQqwfHsTyX4A6h1IpuHS/tNcKPZyAwzZUtIg=; b=MNvZXI1ZOt82XITSOxfLWO9E3WRF/OrLhL2GVS221m3qLACKdXHT6Sx5y6ff+4Thxh l+z+iqK1cvRJX+MCYmLUnpv4YDINjINZwPMQhxkVrVu2YVOWm3NxZNXdJpZZY13scio4 FK224FmawlgKV5bg/YKo+XRSEvveOPfUMwVnIODePCeaKMvw3sSh78PyWHoLfpnXYe5N iwxs+bBXeRiFRTwhifajSB0Jm18v1xBoQr3rxXFqfnREYYEnvv42dv5JQINaT7rhTF2M LxPCZlCb44UOBJy0OXHKAzrPbV2Eya288t/QH2/UYuoJBYy9Uv9lVVpOccT0daNRcinZ BcRg== X-Gm-Message-State: AJcUukd5Fm3HRiSrPFTfHkAkI7GsOQFlBUhsAzDCQTAYr8IXKczibqMe +w7VdFspQflNfGvs4HaZkuWL1CGk X-Google-Smtp-Source: ALg8bN4VUHIOPydyOQGvDHaWgK2eXQm/6mXwyFxEmLij/mKQQUKWqj7npCfxoOGoMWzI8R4XETWzmg== X-Received: by 2002:a1c:b1d5:: with SMTP id a204mr6540441wmf.32.1548410847257; Fri, 25 Jan 2019 02:07:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:32 +0100 Message-Id: <1548410831-19553-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::344 Subject: [Qemu-devel] [PATCH 13/52] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Make hw/s390x configurable and add new CONFIG_* to the default-configs/s390= x*-softmmu.mak. This will be used to enable/disable vfio-ccw. Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-10-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/s390x-softmmu.mak | 1 + hw/s390x/Makefile.objs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 5eef375..8bb7e43 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -8,3 +8,4 @@ CONFIG_S390_FLIC_KVM=3D$(CONFIG_KVM) CONFIG_VFIO_CCW=3D$(CONFIG_LINUX) CONFIG_WDT_DIAG288=3Dy CONFIG_VFIO_AP=3D$(CONFIG_LINUX) +CONFIG_S390_CCW_VIRTIO=3Dy diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index ca68806..a884aae 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -1,3 +1,4 @@ +ifeq ($(CONFIG_S390_CCW_VIRTIO),y) obj-y +=3D s390-virtio-hcall.o obj-y +=3D sclp.o obj-y +=3D event-facility.o @@ -33,3 +34,4 @@ obj-$(CONFIG_KVM) +=3D s390-stattrib-kvm.o obj-y +=3D s390-ccw.o obj-y +=3D ap-device.o obj-y +=3D ap-bridge.o +endif --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411513407554.9493926881842; Fri, 25 Jan 2019 02:18:33 -0800 (PST) Received: from localhost ([127.0.0.1]:41405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyZ1-0007tx-Eb for importer@patchew.org; Fri, 25 Jan 2019 05:18:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOi-0007XP-IW for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOg-0001lc-U2 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:40 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:52261) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOe-0001cp-QT for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:38 -0500 Received: by mail-wm1-x32e.google.com with SMTP id m1so6162519wml.2 for ; Fri, 25 Jan 2019 02:07:29 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:27 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=qlaHyTXepShzl56sX5YPKwcTCpSoUm8RvbB3gL07M3I=; b=EK8hvpEEUntJdgCOP5SRSnpGgn8ewaACGeBfSExBhvPwGml1tvvuC0ZFHyyetqeNoR 9eC2fC54UGVUNxSoul2fBV0/PkhgZPt+QMF0ZYplC5TvfZ9bIC0lCbTKIISSWswvaAWE Q+hYvNPtbEPcmui2XE9YG5qv4mLRvoPcmOoC9w1bpq8+2xcfKEr5hlcweBiYv+d9A8i/ bbqvncNGhcA8qS5U79e2AsaBb2yac5fVPkO2A4xfRIgThdYXfYl7kFBiDIWvMkW4OMiz 4xtuynjYuKISwQtbw8+QIyR4q4NXP7x9eH3Y9av+vs9K9GfPk9rm4WM9rxgXIm/IXDLw WjHA== 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:mime-version:content-transfer-encoding; bh=qlaHyTXepShzl56sX5YPKwcTCpSoUm8RvbB3gL07M3I=; b=MmE9IZ5O6pDp3AQw1ZMmy44VZHuDCkNq59APasXFcwUpQwx+k7doNNUDTN+cbCXde2 pmV6PakwG+JUm/znFD1N07oK7Ieyr14XGurZFoQM55RHlPG7PlZ3lNNitnTMLVdcTOrh 7lYbX/yoUGNedj2GVxqOIXKippyIFTqFYv2rcaufYTKerRQMMPL6RYXfsQtFOWAggdoL DsX4aua65DJGCqoJJiLhM2ZgSJuZuKKvEXOg4zGBlhGm//NcEtQEiQmX4zqH5+ApkiQq yI1k/W0+ZJ7rKTLlo5paiFzGHxTRnMS/8NjT2XWa9UFxVN9te3i3qhToL4uzI5eN4Rkz Hsow== X-Gm-Message-State: AJcUuke+oNBHyzF83rad54vEzZQ1TdyUQAK7Rogri7x6sDcPDL59BvkB AiMJHoC8IGFqGPbfvjPfy7lw1kXB X-Google-Smtp-Source: ALg8bN6rJSgrcAwlr+q+7MHXPlf9EbXtniT8iS9Xz3aFe8qNpaOLoksMx3VhiAy7Gz2q/a2/l4ixCQ== X-Received: by 2002:a1c:2501:: with SMTP id l1mr6509133wml.102.1548410848151; Fri, 25 Jan 2019 02:07:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:33 +0100 Message-Id: <1548410831-19553-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e Subject: [Qemu-devel] [PATCH 14/52] hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, =?UTF-8?q?=C3=81kos=20Kov=C3=A1cs?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: =C3=81kos Kov=C3=A1cs CONFIG_LEON3 added to default-configs/sparc-softmmu.mak. Signed-off-by: =C3=81kos Kov=C3=A1cs Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-11-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/sparc-softmmu.mak | 2 ++ hw/sparc/Makefile.objs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-soft= mmu.mak index 12f97ee..59a4a3d 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -18,4 +18,6 @@ CONFIG_CS4231=3Dy CONFIG_GRLIB=3Dy CONFIG_STP2000=3Dy CONFIG_ECCMEMCTL=3Dy + CONFIG_SUN4M=3Dy +CONFIG_LEON3=3Dy diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs index e2d0828..d57e33f 100644 --- a/hw/sparc/Makefile.objs +++ b/hw/sparc/Makefile.objs @@ -1 +1,3 @@ -obj-y +=3D sun4m_iommu.o sun4m.o leon3.o +obj-$(CONFIG_SUN4M) +=3D sun4m_iommu.o +obj-$(CONFIG_SUN4M) +=3D sun4m.o +obj-$(CONFIG_LEON3) +=3D leon3.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 15484121120891013.6090775319918; Fri, 25 Jan 2019 02:28:32 -0800 (PST) Received: from localhost ([127.0.0.1]:41548 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyip-00073C-LG for importer@patchew.org; Fri, 25 Jan 2019 05:28:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOn-0007cb-Ar for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOl-0001ph-5s for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:39524) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOk-0001dK-UZ for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wm1-x342.google.com with SMTP id y8so6008620wmi.4 for ; Fri, 25 Jan 2019 02:07:30 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:28 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=1qCU/4kUh651elEmaN7RBjDkTSEyi5Sq251KJ8Ma21U=; b=TlimO5oLXBbtPQKysvnOrtP/G/Rh+u/Y1qK4hWAKY+EyfIXtCfNGOfA/12a6EaHtvr q9dbwD0hyZ1IhWQngGGevBAAldnOokICcTuI3lY2FOibeKnjppun/k5Bpds6nPHG8rik vaeWkNlP848NbUGvlUBLquF7ijaKCaE8XdppgqdLyBd6KFbfhiIFvdfIV9QQpqzfXRPt UIok8NZbUPOr3Qhd0YdzXDAsU8Bhyunm6V70ocV2PYOSYMU8966XjDWMFTl5d5Ao9ksu 13cLf9Up8Ao7/UJ/6ht2+SFu4Us+nvncLdlMy5uGrT2EwLFv17pilZ78h2Qm64q+nGH5 eEEg== 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:mime-version:content-transfer-encoding; bh=1qCU/4kUh651elEmaN7RBjDkTSEyi5Sq251KJ8Ma21U=; b=Xr5zplQaFwL7ZfQ/vRv58G3bJqbiXeoQ8uk7XLzuihoVGgeYF1SmQx1CW3QGa3JKdF Lt8hDaiNJETF1QoXuVlpLcs23OqbcohtuxT4RCpOx7DRprkr7ddtPV5bEa+zW8bXMdYQ dqbcBoo6rwzbcsy4U0PjIA2NJTQ7km1WyvYzYuOA3TUq1loGcDDGNKEuikpJaWELVC/7 ZNFTZ05pSGeghlkREnBcgATxc0dGLfbd/ogSf+eEhnKuP1IFvyXp+lwRvY5hAbydeLlL W1DngCiaVNI0AbUY+rTkw6ARrwYA5BpK8AEkr+vPHHKx1KVJUvYEBvKdDwaTUSLJRUnX w9mg== X-Gm-Message-State: AJcUukfDcl3iCbBMVv98xZJcqvE+y0D7O9h9PulFwd9UBIGQ4TFy4AnZ iDTGf/OvIzy69aIGkvVzVFAVbLP7 X-Google-Smtp-Source: ALg8bN6CWUI6Cousp0ff8qJfuxkA0BQLDGQ7p1u3F3ewCxX6cBJ1snrY+EfEXQ1vnY3FOtRaMbonAw== X-Received: by 2002:a1c:b10a:: with SMTP id a10mr6092727wmf.148.1548410849094; Fri, 25 Jan 2019 02:07:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:34 +0100 Message-Id: <1548410831-19553-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 15/52] hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, =?UTF-8?q?=C3=81kos=20Kov=C3=A1cs?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: =C3=81kos Kov=C3=A1cs CONFIG_LM32 and CONFIG_MILKYMIST added for lm32 and milkmyst build. Signed-off-by: =C3=81kos Kov=C3=A1cs Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-12-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- hw/lm32/Makefile.objs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs index ea6418a..c394186 100644 --- a/hw/lm32/Makefile.objs +++ b/hw/lm32/Makefile.objs @@ -1,3 +1,3 @@ # LM32 boards -obj-y +=3D lm32_boards.o -obj-y +=3D milkymist.o +obj-$(CONFIG_LM32) +=3D lm32_boards.o +obj-$(CONFIG_MILKYMIST) +=3D milkymist.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 154841180570233.1316062607566; Fri, 25 Jan 2019 02:23:25 -0800 (PST) Received: from localhost ([127.0.0.1]:41469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmydp-0003Dx-2I for importer@patchew.org; Fri, 25 Jan 2019 05:23:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOo-0007dQ-1P for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOl-0001qq-Km for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:37802) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOl-0001dq-6n for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wr1-x442.google.com with SMTP id s12so9631359wrt.4 for ; Fri, 25 Jan 2019 02:07:31 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:29 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=zuZ1yZzmGxgltmCqgJ1MZ5kW5IoeNLQ/WUbUvBlvtCs=; b=UBWhBFXQ2cduZf2RVvKaRULN3egUyicoGGaqp4i88co/OfRIp6RRWuo/VfYM7P05Lg wE+pQKn3Wjirbcc7er839T/g/34WpSamnutZp/shvtAbc/iK0mr/e+ueJC9BJp2nDNj2 1pQ67aodSYnSqQoP4CfRHWIojytBeC4+sAmK2x6ZHlF09uIbSwsiEwxtH/G2TQ0tWutE lpLRkgq/wwhmuU1kYbButK1kk0NMFYdRdPeX7Dj7i6e4C5fsd5XfpHST2PLF79tQioy0 l3cj89AxwN1Rj1IRuyQBrvC8MKzow6kGbjNOoH2+pmk2T7YY5KuwVtHyJaAaoQBMv7rq 4pWg== 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:mime-version:content-transfer-encoding; bh=zuZ1yZzmGxgltmCqgJ1MZ5kW5IoeNLQ/WUbUvBlvtCs=; b=CKiw652Ja/1VF85Qc1BcSg5U6j9LqPKMP2tKzPPgV7AKPrNwkKhfJaXJXEmKiIo+6t /8HgJc07Dz2wUnfNAUbsWkXn9sdrvKZg3EJliP0fHDGOFdNKhEbVKgfuTkA92RrLoUVq t8vZKmDYontPgzd3geY12DFxIlKo0EOedEe6wBKXr1q3fD6pJBPV5QkQqNtJ0qHXtMpg nGuK8bx8GwkLDMquBbOqioORzGaPr8qlQ9Ah9AAGAIND9/dOEKf91VkMpYMwPs2uHC+F L/jgh9WrkerNteATLMdEiAB1QxJdGHvajfQizNN4rsjOiYsnPvLrf1fRy7tx4JSqpCZ6 7JWA== X-Gm-Message-State: AJcUukdj6y1Djc1/088+affhXuus8RrihkoVuEbHGXX/on0kHC9W9mKC TXfuN1wsNvnrphU7TrWvXL1k729f X-Google-Smtp-Source: AHgI3Ib6R9a8Fqwe9U6qsP+N3AcuM4NnvSoYeuRShoj0xluC4GyN8dfsVWTqBAaj5A8V9YSrfq0Iug== X-Received: by 2002:adf:f3c6:: with SMTP id g6mr6533289wrp.111.1548410850042; Fri, 25 Jan 2019 02:07:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:35 +0100 Message-Id: <1548410831-19553-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH 16/52] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, =?UTF-8?q?=C3=81kos=20Kov=C3=A1cs?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: =C3=81kos Kov=C3=A1cs Add the new CONFIG_* values to default-config/xtensa*-softmmu.mak. Signed-off-by: =C3=81kos Kov=C3=A1cs Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Acked-by: Max Filippov Message-Id: <20190123065618.3520-13-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/xtensa-softmmu.mak | 3 +++ default-configs/xtensaeb-softmmu.mak | 3 +++ hw/xtensa/Makefile.objs | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-so= ftmmu.mak index 9d8899c..baf90ca 100644 --- a/default-configs/xtensa-softmmu.mak +++ b/default-configs/xtensa-softmmu.mak @@ -3,3 +3,6 @@ CONFIG_SERIAL=3Dy CONFIG_OPENCORES_ETH=3Dy CONFIG_PFLASH_CFI01=3Dy + +CONFIG_XTENSA_SIM=3Dy +CONFIG_XTENSA_FPGA=3Dy diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensae= b-softmmu.mak index 9d8899c..baf90ca 100644 --- a/default-configs/xtensaeb-softmmu.mak +++ b/default-configs/xtensaeb-softmmu.mak @@ -3,3 +3,6 @@ CONFIG_SERIAL=3Dy CONFIG_OPENCORES_ETH=3Dy CONFIG_PFLASH_CFI01=3Dy + +CONFIG_XTENSA_SIM=3Dy +CONFIG_XTENSA_FPGA=3Dy diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs index cb4998d..62e244f 100644 --- a/hw/xtensa/Makefile.objs +++ b/hw/xtensa/Makefile.objs @@ -1,4 +1,4 @@ obj-y +=3D pic_cpu.o -obj-y +=3D sim.o obj-y +=3D xtensa_memory.o -obj-y +=3D xtfpga.o +obj-$(CONFIG_XTENSA_SIM) +=3D sim.o +obj-$(CONFIG_XTENSA_FPGA) +=3D xtfpga.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411384458191.91478674797963; Fri, 25 Jan 2019 02:16:24 -0800 (PST) Received: from localhost ([127.0.0.1]:41385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyX4-0006RX-CH for importer@patchew.org; Fri, 25 Jan 2019 05:16:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOl-0007ax-SL for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOk-0001pF-TV for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:54677) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOk-0001ep-Jj for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:42 -0500 Received: by mail-wm1-x32b.google.com with SMTP id a62so6153288wmh.4 for ; Fri, 25 Jan 2019 02:07:32 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:30 -0800 (PST) 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=JropNDr2wvNvjJozinMSpYTJHyA1vfDQUd35RqjIrNA=; b=ENqqBDt7Az1fjMSTyFESF23PlTjTqCZ3dAXgkksOByCvqvnrNQt2U7pxPlT6Z9SHYH f9cU0OOG6gpJbiqjku3IGMyVNS1eK5BIe+oVD0WBY7RPNFRLXOCQTextdXyynhl+Qadh Hvuuf4c0COXlne1jYME6FCH/zx/X62nt3nbBPD6ysSI1W5A92pbhLhLR5pK2nh+kKjHW Lo4a3DXGBPbz8PuF1spJF0qC/o4Ph1UrysbF/pDyj+TScc1cIKateCBJS3m6CE7d9YC1 8Lz0pms/YtfzQWH6sreSU584LiBg9rJ7PRdFoAJSjmF58fhmJsBL9Y9/N9HGJ6fPD9ks EvTA== 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=JropNDr2wvNvjJozinMSpYTJHyA1vfDQUd35RqjIrNA=; b=tThrqDJ5PP4JnLQqF0N6GnqY03J/ZHs30o6KWTKf711n69Ni9esb4jTnV3A5A2duRu L9aFrIz/bgor4V7F2iWa2hka/c2UdoJNaM9cNDm5rpUsBOcw7T7EZ0GprPitN/MFhHjU dsIWVQYhbiOFp+Q8KKVnUK5zVXR2sVcHi+fxWpsy5ADMmofExVGlgZe1caobwBu4nSis fc8MrmKEo1cBxTF/iMTBGOg4GC5rBmoqoReOZOT/zrqCE5HOwd+yv3BAd/NTul5jpil2 JKwKEMwKg5vS4j2KTss/G3aHSMwD6bbCtEwW2GVgf+z0c7pFgp61ZHg/m2i52lmLCYhj MMIQ== X-Gm-Message-State: AJcUukcITL9pVPA9OEPwYNPEQWSjrS3mk0+93yQdGSIruxlhK+vNC7KW j6oSNcYRnp2r2KsVCbw7b6m6Y/pg X-Google-Smtp-Source: ALg8bN6Q6oBHxPwTvOPNcNu3upDBfnbSjNocfjhpj58LJGAl/iauNFLSd8tvj7xcL3Xh6ZV7eFrCbg== X-Received: by 2002:a1c:1383:: with SMTP id 125mr6460636wmt.71.1548410850932; Fri, 25 Jan 2019 02:07:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:36 +0100 Message-Id: <1548410831-19553-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::32b Subject: [Qemu-devel] [PATCH 17/52] hw/nios2/Makefile.objs: Conditionally build nios2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong CONFIG_NIOS2_10M50 added for 10m50 dev board. Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-14-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/nios2-softmmu.mak | 1 + hw/nios2/Makefile.objs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-soft= mmu.mak index 74dc70c..ab42d0f 100644 --- a/default-configs/nios2-softmmu.mak +++ b/default-configs/nios2-softmmu.mak @@ -4,3 +4,4 @@ CONFIG_NIOS2=3Dy CONFIG_SERIAL=3Dy CONFIG_PTIMER=3Dy CONFIG_ALTERA_TIMER=3Dy +CONFIG_NIOS2_10M50=3Dy diff --git a/hw/nios2/Makefile.objs b/hw/nios2/Makefile.objs index 6b5c421..89a419a 100644 --- a/hw/nios2/Makefile.objs +++ b/hw/nios2/Makefile.objs @@ -1 +1,2 @@ -obj-y =3D boot.o cpu_pic.o 10m50_devboard.o +obj-y =3D boot.o cpu_pic.o +obj-$(CONFIG_NIOS2_10M50) +=3D 10m50_devboard.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411207115726.479222621707; Fri, 25 Jan 2019 02:13:27 -0800 (PST) Received: from localhost ([127.0.0.1]:41326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyUE-0003tE-2u for importer@patchew.org; Fri, 25 Jan 2019 05:13:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOl-0007aT-Ai for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOk-0001oP-GR for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:53890) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOh-0001fT-Kz for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:40 -0500 Received: by mail-wm1-x332.google.com with SMTP id d15so6162883wmb.3 for ; Fri, 25 Jan 2019 02:07:32 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:31 -0800 (PST) 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=6aas3VWTQQEemhBM/G5pPkaS0OIs3ZlIU2r2p4fCjtI=; b=Gjo7I3VOpOgeBWZ9hDiPSYicFppvfPvoexpuWuY+1tPw/liH5KJ7ImMMG2XUpnD+Qx 8jbWqZk/5bDHXuueYPBKjPcAjamVFZoWSZwOhSWzfwEiRPtQJQTrufjZGSAWD8EPcZ30 QW10RhcB5AaSnyDk4CETf/hePINmmojpfYUmRm5+fnPkTvSSHI8Ey5IhCCZru/SOWtiO 2CTLRDcU5gwb6gRNmzlYbcL6ceclZHFbYbNRiiLx/YCp6vVu5WAGaWdt9QyKx2lSCY4n lnB7xMWcscVKUa9OQAp1+1CUYOZUmPwmdPLSZNgD5aM0PUzou1anjLPrtJwbwL6qERB6 +Iqw== 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=6aas3VWTQQEemhBM/G5pPkaS0OIs3ZlIU2r2p4fCjtI=; b=NdoPDccfiHQ7dkx+2Cfp1giQxXlulrVoGR6X8Uqut2KdrXlIeOfOnc7SyekKXHbfT1 +NbTln9mC902dxfRES2ADTvm4IVj+9To29QSCovMEX5wW7ZVtOEYlZPaYY/YkY0a4uvx s7reb4XHWiyzwQEAGtAq0WrERtNH3s2FIwXC/R4q26qx8gHuIA6tLKs3fQ9ST63Sv881 HRN2MPQekvlgmkSnWPi6TvXtfjZG1TnWDCvxaY2CROzqZART2g9/fqOOgkQXeLm/Xrhs jK5MSKxiAC3KO/GGlsoCzdES4hFNtCme8J7PHpiG+UPoB8d6GHlvEk2IwCqEv/9lM1MV 2LAA== X-Gm-Message-State: AJcUukdtewgaaM248xSpikmHwze6XDbXN6Cv1YvrLXQXDg0jUKaP7Thp jBHxvkQhlBFDBmJbwsZtMe9POt4+ X-Google-Smtp-Source: ALg8bN7twjIaW0WkEet689WiQaf83/3CiDyu6rZtrf7FTditCBBcLp625bFy5qWYWJgYOsrfmuSYOg== X-Received: by 2002:a1c:f605:: with SMTP id w5mr6518457wmc.116.1548410851775; Fri, 25 Jan 2019 02:07:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:37 +0100 Message-Id: <1548410831-19553-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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 18/52] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong Add the new configs to default-configs/riscv*-sofmmu.mak. Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-15-yang.zhong@intel.com> Reviewed-by: Alistair Francis Signed-off-by: Paolo Bonzini --- default-configs/riscv32-softmmu.mak | 7 +++++++ default-configs/riscv64-softmmu.mak | 7 +++++++ hw/riscv/Makefile.objs | 22 +++++++++++----------- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index fbfd1d4..6533716 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -12,3 +12,10 @@ CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy + +CONFIG_SPIKE=3Dy +CONFIG_HART=3Dy +CONFIG_SIFIVE_E=3Dy +CONFIG_SIFIVE=3Dy +CONFIG_SIFIVE_U=3Dy +CONFIG_RISCV_VIRT=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index fbfd1d4..6533716 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -12,3 +12,10 @@ CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy + +CONFIG_SPIKE=3Dy +CONFIG_HART=3Dy +CONFIG_SIFIVE_E=3Dy +CONFIG_SIFIVE=3Dy +CONFIG_SIFIVE_U=3Dy +CONFIG_RISCV_VIRT=3Dy diff --git a/hw/riscv/Makefile.objs b/hw/riscv/Makefile.objs index 1dde01d..79bfb3a 100644 --- a/hw/riscv/Makefile.objs +++ b/hw/riscv/Makefile.objs @@ -1,11 +1,11 @@ -obj-y +=3D riscv_htif.o -obj-y +=3D riscv_hart.o -obj-y +=3D sifive_e.o -obj-y +=3D sifive_clint.o -obj-y +=3D sifive_prci.o -obj-y +=3D sifive_plic.o -obj-y +=3D sifive_test.o -obj-y +=3D sifive_u.o -obj-y +=3D sifive_uart.o -obj-y +=3D spike.o -obj-y +=3D virt.o +obj-$(CONFIG_SPIKE) +=3D riscv_htif.o +obj-$(CONFIG_HART) +=3D riscv_hart.o +obj-$(CONFIG_SIFIVE_E) +=3D sifive_e.o +obj-$(CONFIG_SIFIVE) +=3D sifive_clint.o +obj-$(CONFIG_SIFIVE) +=3D sifive_prci.o +obj-$(CONFIG_SIFIVE) +=3D sifive_plic.o +obj-$(CONFIG_SIFIVE) +=3D sifive_test.o +obj-$(CONFIG_SIFIVE_U) +=3D sifive_u.o +obj-$(CONFIG_SIFIVE) +=3D sifive_uart.o +obj-$(CONFIG_SPIKE) +=3D spike.o +obj-$(CONFIG_RISCV_VIRT) +=3D virt.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412104092248.5241527001076; Fri, 25 Jan 2019 02:28:24 -0800 (PST) Received: from localhost ([127.0.0.1]:41546 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyig-0006wu-2g for importer@patchew.org; Fri, 25 Jan 2019 05:28:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOi-0007XO-I6 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOe-0001jt-TU for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:39 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:33541) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOe-0001g4-CE for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:36 -0500 Received: by mail-wr1-x443.google.com with SMTP id p7so9671438wru.0 for ; Fri, 25 Jan 2019 02:07:33 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:32 -0800 (PST) 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=80wWbwWOUNd2pCZG+wyW5PvaP5SAvt4QP7I/6nYyPkQ=; b=OA90fQ/d1GVXipTVKImDUNxPgGexwZsqxsHPHTZaUPJSWwMXGE2zgY3lKmv5p9cJ0j ykmQbuW2yGA6JI++waBBnXUpEjoRwDqoJ4kkbj5VVsY8j0tCn1wFQlrRg6/6d60dGt9F rv5B3t0liAix/otCXwri1OJKM9Nw5Oqrzn8aFD2SzdcJv7BjlHblPFHFOLEbGUDrAnYN 1oxw1xUB6ZUYARv/DIWA5qVuAiTz5tD5ZwR61pjn+rP/9PWt7gba0x67ydGkHoNTRg5f g+knGiPpskTK2BHq5UTpm6ZmLlX8MYFF/xAMCBAKiZNwfbQonKWMvyjx+qhhAhZOsR6F gNCg== 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=80wWbwWOUNd2pCZG+wyW5PvaP5SAvt4QP7I/6nYyPkQ=; b=O+roajLhgC62PzopMFNgAbDp5CIDqxhEn/wLdGQveFiOVityL+Z7flqccS1Q1K7je+ NrVy3YaTS7/tiIgCfBl+lzf9gJpMwPN3rAKoCK8Av3AXCbWxNuwqY97VFk2SdXtihTVO bj2/F67oi6XlEgxhwxmAdx1F2hTYk9tTTuhcvokfbDjHIsJNA3aErkLlTjOmqb2yrOLI RyyUYYkf/poUoLGGUW5UZGqUYriq/gu3W3Tk/Vfit5xD+Cfp/qsQIHxhZ0p/fmQUQ4b5 l18fFSPl9xsed5pYdRHcO9WHNS6yIIfGJMoIywwfq/7sZAD6aB4eT8uJREQsJiObVy3Y 2Puw== X-Gm-Message-State: AJcUukeRyWJSSgOkAizjrbC4afN4rQFZJ555lN6YcqwAiBS+NmFU76aE H2e/xAPLTcGKm8mjSg4ie1WdNP0i X-Google-Smtp-Source: ALg8bN7CKYFi080MLqNQr0D8Fs/uWP3hLN3dUoM4lmsL+yTodYpNhJS4J6SMNzvYOEpmee/a3v5CeQ== X-Received: by 2002:a5d:664a:: with SMTP id f10mr10625116wrw.311.1548410852484; Fri, 25 Jan 2019 02:07:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:38 +0100 Message-Id: <1548410831-19553-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::443 Subject: [Qemu-devel] [PATCH 19/52] hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong Add the new configs to default-configs/sparc64-sofmmu.mak. Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-16-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/sparc64-softmmu.mak | 2 ++ hw/sparc64/Makefile.objs | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index ce63d47..1fae488 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -17,3 +17,5 @@ CONFIG_SUNHME=3Dy CONFIG_MC146818RTC=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_SUN4V_RTC=3Dy +CONFIG_SUN4U=3Dy +CONFIG_NIAGARA=3Dy diff --git a/hw/sparc64/Makefile.objs b/hw/sparc64/Makefile.objs index 117e0ff..af0525c 100644 --- a/hw/sparc64/Makefile.objs +++ b/hw/sparc64/Makefile.objs @@ -1,4 +1,4 @@ obj-y +=3D sparc64.o -obj-y +=3D sun4u_iommu.o -obj-y +=3D sun4u.o -obj-y +=3D niagara.o \ No newline at end of file +obj-$(CONFIG_SUN4U) +=3D sun4u_iommu.o +obj-$(CONFIG_SUN4U) +=3D sun4u.o +obj-$(CONFIG_NIAGARA) +=3D niagara.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411319613553.7834703586936; Fri, 25 Jan 2019 02:15:19 -0800 (PST) Received: from localhost ([127.0.0.1]:41350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyVr-0005Pf-At for importer@patchew.org; Fri, 25 Jan 2019 05:15:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOn-0007cv-Gl for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOl-0001qe-Jn for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:53982) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOl-0001gc-3c for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wm1-x343.google.com with SMTP id d15so6162940wmb.3 for ; Fri, 25 Jan 2019 02:07:34 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:32 -0800 (PST) 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=M337nU1nW2Bg3JnFYsvXA9p4+FuBo3uR/JronY5wUCs=; b=G50t1xTUmj0dxnTizeDkeT4eh0uVDCXKz1QU5eyNr6ROqp62QjomwcfqSAjgAiozoM hCO+9ekCKEK9l7kQKjzy383Ru+Lm/h416oQAz78XcUvIRqXPhqO7S7XN+9/DLT7PoG0+ ysAEuxVJSfYP2a/QYocINvwVWRV38EbuuXfo/tbLc6xP8X31Uppstxd3CBiE7O3R/Yxg 7dTsSrajRIktw2FwLnG1JrXcUmHSo1rxw39+7omwdKIizecQlc+jsN8d8KJd8jgX24we 6HGGVFuof4WVBfdimCgj3itkK4MxDc9/s20sqiXneY5hsfdikpUPtQZQHUbG2qlG7Wta nshA== 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=M337nU1nW2Bg3JnFYsvXA9p4+FuBo3uR/JronY5wUCs=; b=rcm0OJFt5S6p6zng2Or3Mf55wvLT2bquiL4jd/0d7VZmvQbUvnD/aGkvfhcL2RZGCo MsQIc1aT08igJVbmND8uXKVfk1vQDmZ2mysHp2pSbWBokk82EIPfq0QNOng++Tv/zlFL GVZxjvHxOHDwAaiNbpXYF2cellAST8Pd7cIAZ4bL1MsAQIacPOVYFhdB6BXrMks440jl yh/OZXrdZJR5KI9t53W3+nephYYLIjEloLSr3/4xEd/V/1jMo+B0Se/c/2QHV51gKfrz g4Bn4LkvGBUQu9d2+tj5A8yFeiPQX/1Vv06rwAPBeEjG52xsKpf2xkN1i1JeGkVb1W31 s68A== X-Gm-Message-State: AJcUukdwvUktoTGl7TzA42hr+FF6WyoXZWzUC/QpXa6qX7Z+pLaVzxGX exiYx0wU9yNcSnjlja8oXNfO3V2w X-Google-Smtp-Source: ALg8bN7S+dgPLoLphhQXnR56n1lUXmyzfoJK1m0XYHkBzp+IoxpqW34yc/Trf4IJ6aXdy6VGY3gy2w== X-Received: by 2002:a1c:b1d5:: with SMTP id a204mr6540862wmf.32.1548410853341; Fri, 25 Jan 2019 02:07:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:39 +0100 Message-Id: <1548410831-19553-21-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::343 Subject: [Qemu-devel] [PATCH 20/52] hw/alpha/Makefile.objs: Create CONFIG_* for alpha X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong Add the new configs to default-configs/alpha-sofmmu.mak. Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-17-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- default-configs/alpha-softmmu.mak | 1 + hw/alpha/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 4d654ea..49cb7ce 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -19,3 +19,4 @@ CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_SMC37C669=3Dy +CONFIG_DP264=3Dy diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs index 5c74275..62fdf3e 100644 --- a/hw/alpha/Makefile.objs +++ b/hw/alpha/Makefile.objs @@ -1 +1 @@ -obj-y +=3D dp264.o pci.o typhoon.o +obj-$(CONFIG_DP264) +=3D dp264.o pci.o typhoon.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411148352491.4295586343825; Fri, 25 Jan 2019 02:12:28 -0800 (PST) Received: from localhost ([127.0.0.1]:41322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyT9-0002oO-V9 for importer@patchew.org; Fri, 25 Jan 2019 05:12:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOj-0007YX-Jz for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOg-0001lW-U1 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:40 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40511) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOe-0001hD-OD for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:38 -0500 Received: by mail-wm1-x343.google.com with SMTP id f188so5996952wmf.5 for ; Fri, 25 Jan 2019 02:07:35 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:33 -0800 (PST) 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=U4TpGXuUnSBMYkOVwAoj6I5ADQB9oomT4ufgtRPfJWc=; b=TodtyW3dluYiAkX7kSwPXMZYYZwQNfsyBigS8iSp3eIjuBdJBAaKuDckIRB1xJZzX5 1I0koUAyYBaGVC873ediHHRkhZJHNICNzlPfvWR9doaoi9nzoIlagBmZEa+u//kYhLA8 GKCECDrpJqx00KSyfK9rczuEGfwesh1A6yjGqKW3kIp3PRCl5znq/6WqjJd1ah6Ptulg M3JqGyAcI9qU+y7cEhuqKFU8szbIJZze/utAbSXWfm+VkL+1pFWIfL1iqGZs7aTXnA4n T2Fe2aLsDLQnN76xatfbhzx86FNSegtK5H7ekxUJJuRLbwJxeV7duvGVRSTo88Blwwm+ tViQ== 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=U4TpGXuUnSBMYkOVwAoj6I5ADQB9oomT4ufgtRPfJWc=; b=WcUfHS8tVi5/RMm+qZp4qEyiDuUn1yt3ZA8DYSVauPuoki+fCaUEk4RF11VdBsKxPI g7Gj9qkxSed5A6JUit9g7h2BQEkN7eZEqO/lpNbWS06MzDrOQx6cqWS6I5xeuMjgHpAw n8nQZs9Pbg/motD1qF+51oZ9vznI8xoNMpIaChDZ3IJXt54UedEeVoMfaWDzclTFwm1z UkQSiESoua+hiNDIDmjsOs4V0TixrEcJdCd8ZPJKqkHsacqxrvo36rSXpoDrfdq6QKTI fBeudqChkordTEbi4J6Di1rsy48+2kkLeSsB9bjWv44UMwNmdebDRYYkXmnB47VyGz7j w1CA== X-Gm-Message-State: AJcUukf5DV7WkyTYesE6r8kO+DIPM1qQEB9bncoWnf7IgCGBlzoIVELs HavarRfMpFNi22Lye28xMuZosU6f X-Google-Smtp-Source: ALg8bN5uf859G8nKR7SMUvvPx3bfmjMJGN3T/vdZLFbdJlr9ULeoo3npdUFkECnOFkmKHB/oEkeP3g== X-Received: by 2002:a1c:2501:: with SMTP id l1mr6509567wml.102.1548410854175; Fri, 25 Jan 2019 02:07:34 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:40 +0100 Message-Id: <1548410831-19553-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::343 Subject: [Qemu-devel] [PATCH 21/52] hw/cris/Makefile.objs: Create CONFIG_* for cris X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong Add the new configs to default-configs/cris-sofmmu.mak. Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-18-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/cris-softmmu.mak | 1 + hw/cris/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmm= u.mak index d970d50..a637c4b 100644 --- a/default-configs/cris-softmmu.mak +++ b/default-configs/cris-softmmu.mak @@ -4,3 +4,4 @@ CONFIG_ETRAXFS=3Dy CONFIG_NAND=3Dy CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI02=3Dy +CONFIG_AXIS=3Dy diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs index 7624173..a4a27b3 100644 --- a/hw/cris/Makefile.objs +++ b/hw/cris/Makefile.objs @@ -1,2 +1,2 @@ obj-y +=3D boot.o -obj-y +=3D axis_dev88.o +obj-$(CONFIG_AXIS) +=3D axis_dev88.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411727246460.9683335872778; Fri, 25 Jan 2019 02:22:07 -0800 (PST) Received: from localhost ([127.0.0.1]:41465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmycQ-0002DX-Tc for importer@patchew.org; Fri, 25 Jan 2019 05:21:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOn-0007cs-Fj for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOl-0001qt-Kx for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:41251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOl-0001i2-3t for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wr1-x441.google.com with SMTP id x10so9613639wrs.8 for ; Fri, 25 Jan 2019 02:07:36 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:34 -0800 (PST) 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=5NWeDPmpJNKWz+LbNDWYIe6bRfkhArIRLH1KPJKtI0U=; b=lZgpZcBs3PwdpJCmwYxdUIehWD4o1g50TRK8mRbaSmJpP1yTgc/nxs1xZwqyMegxeX Q5gBq5h6fLku7uhfcIDwQWwxTmUhMRNLbX1IlaRH7ZoqeX1EcZBqpmuneAzH+U0YHIr/ 2JoAf8X8AtHFWaB5YwLQrLR8wJOfZmAmVvNpHbJGEZlVfg/WEHLtkscDeGIOqn5EdaRq heMzEJvD+tfSJePeE3z3B+PfuMYKPANNO5RiEjnRitp2TG9X3y4jBz8WuYi4wRf1zDRW F/LVCZGkZCy0dPcivQOCp30hkAotV0ZAiAQsIEKpERTHy+Lfw8Q8YZ+vQdAHjxW3gCjn GLVw== 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=5NWeDPmpJNKWz+LbNDWYIe6bRfkhArIRLH1KPJKtI0U=; b=SGivpK6nnfW3/iuQOrceu/ECSKSGBgEryiXKI2g9mX/YGdra1dl7RD4DUiyBG8L4ZS L287Y6s8C2XBVXxRa+E8+5iwiM4hItYiy3i44eKQ6JePu2KzzV2Nr7AtQ2wFNdf3bC6O ZX7krLZK90bCYq/NcG7nEuth0onaFx9o1Xm34Wx35iG6jQtjk/Qilw05cwPf/6XUgksp IyxPAMCxlPB3j3dpi1BCcA6KbJYKpRoqGfjV/D+ATpnIJ2g+v2e6EquMEMY3F9ItRiXT QERozB2wP9W+OU+iV458eZK2DMF+iGTMhNatkzYb0chsADQsCrwhs/TyjSjV1wQ09WF+ 4i9w== X-Gm-Message-State: AJcUukfjiIL75cfjKvE6b3YCYVTiTpMOFPiafaFBOfHO3KA/C4pqdPPL tc2VWspg5ltCHC9eEpin6xmXWLsQ X-Google-Smtp-Source: ALg8bN647+T5SuP8zZgMxoIujZfDPJii6+P5C+mcMW+ZOgOQed7Ze9Bl6tb2iGMnXUPKIouL7T2syg== X-Received: by 2002:adf:c042:: with SMTP id c2mr11097923wrf.158.1548410855187; Fri, 25 Jan 2019 02:07:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:41 +0100 Message-Id: <1548410831-19553-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::441 Subject: [Qemu-devel] [PATCH 22/52] hw/hppa/Makefile.objs: Create CONFIG_* for hppa X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong Add the new configs to default-configs/hppa-sofmmu.mak. Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-19-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- default-configs/hppa-softmmu.mak | 1 + hw/hppa/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index 4badc05..b594a6d 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -10,3 +10,4 @@ CONFIG_IDE_CMD646=3Dy # CONFIG_IDE_MMIO=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_MC146818RTC=3Dy +CONFIG_DINO=3Dy diff --git a/hw/hppa/Makefile.objs b/hw/hppa/Makefile.objs index bef241e..67838f5 100644 --- a/hw/hppa/Makefile.objs +++ b/hw/hppa/Makefile.objs @@ -1 +1 @@ -obj-y +=3D machine.o pci.o dino.o +obj-$(CONFIG_DINO) +=3D pci.o machine.o dino.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411601566963.5340146075282; Fri, 25 Jan 2019 02:20:01 -0800 (PST) Received: from localhost ([127.0.0.1]:41409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyaN-0000VA-3u for importer@patchew.org; Fri, 25 Jan 2019 05:19:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOn-0007cy-Ip for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOl-0001ry-TK for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:50411) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOl-0001iV-D6 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wm1-x32a.google.com with SMTP id n190so6176256wmd.0 for ; Fri, 25 Jan 2019 02:07:37 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:35 -0800 (PST) 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=fy1/wER6ku7eEcJ171Vr6S/Hop1fTi4PKKKm+Vxt5cM=; b=MIb06MnM4+UblA5V/IHG+fbUz7baPP1vKiOYgtrMKbp21m6JaiBeWIxE8z2gu4DJHI uYFOGtJN/AgiRKJ979xgL7FiCP6NBbbXQPPQbpMVogTS41kZqcSjgRItVm5vFGGdUyAm 5qaTCv2FXmAAageeBuy14aGyohiziVcN/y02kMVnBHVlKkK1V5SoyYEgXUvVnipna5rF AGDrk+bVNYac/Gjehi/kJo2iDjBTmKhdWSn3VdAl4xdKBD8Kn6jyv5se/VFEM72npNF/ iXlIaNPVZpFsDQn/A7pDl7VGhHBgebel/5izHIqjn0d2uQoYnVXfAWFF3/N2Bvkjgz77 s4pg== 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=fy1/wER6ku7eEcJ171Vr6S/Hop1fTi4PKKKm+Vxt5cM=; b=npUygnDRr3gq3YrtxUr4jEAgULNT7oK0rykWQDU1MI5MFlAdo8pT9dAUuIktEsJ/I4 0ZpzqKmi0LIaSJimxXFhbSyRPa/eytsDWKMaJf7vH2AwE/RfCnZFO9TVAJmoxCCv5x4W CdjxYVBR8a4uGhqL16RZlz83/Lj2mCS8nZWnGhvGW6k/q91kvei+Yw1kXMUCGpJ9COiT 8iNPF/qScRINIgSkMqKXsdar8Bvn2MnsgP40JVyge+kApsXnzfYDlmFZQU86hu/a40E9 CzZQcoVm2njK054xO+zCrczR2/1/J/veYnFKEu0KwU3o+DsVcJMXfO4Sd2mMP5JmQ4CZ TecQ== X-Gm-Message-State: AJcUukfGkiqWfjp9lumpKfEs9b06GXrKDZPvInAldn6DTLnSOwzZTRG8 ds89/G3ek0TxLdjb0NI2gZIVWpFh X-Google-Smtp-Source: ALg8bN5e/kkeao3rp31kJxm4sg6VCP0UofgzuqukAf661uytm6j9Xv0UoxmIhYqh18n2RPacIzkKLw== X-Received: by 2002:a1c:b10a:: with SMTP id a10mr6093173wmf.148.1548410855958; Fri, 25 Jan 2019 02:07:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:42 +0100 Message-Id: <1548410831-19553-24-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::32a Subject: [Qemu-devel] [PATCH 23/52] hw/moxie/Makefile.objs: Conditionally build moxie X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong CONFIG_MOXIE added for moxiesim board. Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-20-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/moxie-softmmu.mak | 1 + hw/moxie/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/moxie-softmmu.mak b/default-configs/moxie-soft= mmu.mak index e00d099..b176563 100644 --- a/default-configs/moxie-softmmu.mak +++ b/default-configs/moxie-softmmu.mak @@ -5,3 +5,4 @@ CONFIG_MC146818RTC=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_VGA=3Dy +CONFIG_MOXIE=3Dy diff --git a/hw/moxie/Makefile.objs b/hw/moxie/Makefile.objs index bfc9001..cb575ef 100644 --- a/hw/moxie/Makefile.objs +++ b/hw/moxie/Makefile.objs @@ -1,2 +1,2 @@ # moxie boards -obj-y +=3D moxiesim.o +obj-$(CONFIG_MOXIE) +=3D moxiesim.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411923467928.4210861357593; Fri, 25 Jan 2019 02:25:23 -0800 (PST) Received: from localhost ([127.0.0.1]:41491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyfg-0004ag-3r for importer@patchew.org; Fri, 25 Jan 2019 05:25:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOm-0007b9-2Y for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOk-0001pQ-Vy for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:35655) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOk-0001kT-O9 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:42 -0500 Received: by mail-wm1-x343.google.com with SMTP id t200so6103865wmt.0 for ; Fri, 25 Jan 2019 02:07:37 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:36 -0800 (PST) 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=d61h8QJL3rr5P/zdstIZEqrU01Om7Ih0g2x0p5k1hrM=; b=UkPROg+8CFakpN17fVwAULO4wGfPMGpMHS2NGI0c2GR45vYDWTgd35yrKuSivlo1Ik 5OrNLQu/AefbY/QmkatEQ8KR/yoPpWmOn0lC7l/+F6emJ13BK/+Vsph5KxWUFfvnpRsz gCHb68u76+mLnXnN1DSzcp7NeegpFveSRLrsYjJqIdzMx/e6pmZh9JsU87qa2psV+UdA Rqr89R6K3XAy6fwWeLLOQTiX2lg5NClQcRR7l9OOAbH6rhSb2Gs8rSMe0zbY/+MLuFGc NGa4RMjfEa3eiUj2s+evdK3LMXWL3j6ZT9J5ta3DDG31UIXNZYADjzy60JxfUBiCRZCe dkRg== 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=d61h8QJL3rr5P/zdstIZEqrU01Om7Ih0g2x0p5k1hrM=; b=Asn0QQKcohi5nYvb0T8Q2o8Uox8kpmPTdwzQjPrrHI6OE5Yqb4rW5ahlC/5C0XJzO3 SAXXQQpWzZeQZg1s+2gUMdHtdtY8oo8r3r3Gaf69TW+i57T8I4I+XTvNyvB3kcHqwrdO raxoDaeTVm4hP8zH85Rk2tBxpbxSllWmo9jg12Fv9rcMPNwaOqlBLtk4dZt14MoMxeyA W2ekMZRIBL2raqBsAf3Q/sdBVvn6QtY162l0ikogsF7Wi7vLDTkQA6tQQE6c4wI5xmgE mY2y8CHuQqW97dLD5h8fvE2dHXGDzqH8kb6iwG42wB3BosTkeYtzvlrVMHLtrE6a1Xtp KREQ== X-Gm-Message-State: AJcUukehT9xcg2RJCOPUaSqnPD5O3YVEZZ/47HfIRxrbbADpBL0qGcS8 iyFy/M5T8CvbCwX4HqMTmB8nX4TT X-Google-Smtp-Source: ALg8bN59B8tbkrA/5YT4jTTAEIgFk6QxcKOPBI1MJxft43pHwQqVrDACVEPl1vjAhpZvK/LCYSb7ug== X-Received: by 2002:a1c:282:: with SMTP id 124mr6131231wmc.113.1548410856826; Fri, 25 Jan 2019 02:07:36 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:43 +0100 Message-Id: <1548410831-19553-25-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::343 Subject: [Qemu-devel] [PATCH 24/52] hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong Add the new configs to default-configs/or1k-sofmmu.mak. Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-21-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/or1k-softmmu.mak | 1 + hw/openrisc/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/or1k-softmmu.mak b/default-configs/or1k-softmm= u.mak index 6f5824f..85a7e69 100644 --- a/default-configs/or1k-softmmu.mak +++ b/default-configs/or1k-softmmu.mak @@ -3,3 +3,4 @@ CONFIG_SERIAL=3Dy CONFIG_OPENCORES_ETH=3Dy CONFIG_OMPIC=3Dy +CONFIG_OPENRISC=3Dy diff --git a/hw/openrisc/Makefile.objs b/hw/openrisc/Makefile.objs index 61246b1..8dc413c 100644 --- a/hw/openrisc/Makefile.objs +++ b/hw/openrisc/Makefile.objs @@ -1,2 +1,2 @@ obj-y =3D pic_cpu.o cputimer.o -obj-y +=3D openrisc_sim.o=20 +obj-$(CONFIG_OPENRISC) +=3D openrisc_sim.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412004987921.6348488887996; Fri, 25 Jan 2019 02:26:44 -0800 (PST) Received: from localhost ([127.0.0.1]:41528 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyh4-0005kM-Vp for importer@patchew.org; Fri, 25 Jan 2019 05:26:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOo-0007dg-8t for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOl-0001q3-Bf for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:46 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:40510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOl-0001lK-1e for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wm1-x341.google.com with SMTP id f188so5997171wmf.5 for ; Fri, 25 Jan 2019 02:07:39 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:37 -0800 (PST) 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=rrcFLSttOj9nHjc9zalf9yo/3J1q+WH+0pNEzIgPtEs=; b=HXNhiOoRQfL0aNMEuM3/SHStNZUR55yQ5LuiYorr4OYxqBBaJS1FtC/lRL25KDDgcu vdWI3Jj0CEczbRXSvXWneGEjcC/PSE4pgK8GsZ4iAteU+cFvLK2jvhd0dsVzLPDR8xcF jDRam58CUAQYRLaR7ttZhwgO0OxNxNp6jaAD3ZA1LJ7ecYqCyb6LVbNVvy06Umd7YQvy H06aP7vP3nqgGDtBFQnCrtNwZoLDtBUT+7rYkUFN4xyVhLxSkxPoh5Y/yhP8mVabRXbX 1b897r5Rqg/2TqqQ3VvFAe96JSg9RR7ErDUhZX64Fzxs4pYXVi6r1YhT747eL7dy3mHz kAQw== 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=rrcFLSttOj9nHjc9zalf9yo/3J1q+WH+0pNEzIgPtEs=; b=UWlrPioB0GAem68sIf5Z/Ie3wFrIxc96vZqjviXdE1N2LZ4jvYh0+aIzDuDXlIpIbX 7frSaO/LBRX2+MXrmvjVdikt81AhEgZhZnHDWrRYXm2DPEGU1w7Q7kZaBak5F1x8O7+w gZTCj5Y9q/twvHnasA3eMB0CeFgS15J6XZXT/x8BngPZCRChHxVIn23d4R/PS4C/Bftt dK4hQqIGk8DmDs316l+4HRHaRi0fKx/o7iUjMrZF8shrm2Nus+stHRSL0Ls3YZmFt1ZJ ActzQoU027VuU8EPbqUp3kPWC5rZfK4yOdCnppIk2kVdu6ZxRLewcBGBwsrOpA3qF3P7 UcDw== X-Gm-Message-State: AJcUukcW0k5/qEFemZXUFLK/oK5nDoB0WrWDzRlgJp70PDHK2XZtI7ID fj3cUp3646Cpg84eD7zwxwvRHMxd X-Google-Smtp-Source: ALg8bN6yAwc/TGvv5Scnvnja5vZN2wnSpuJNoDl7uj7Si0cR3GYvDXTzFdaxykQBIc7L6uI4cKu8+g== X-Received: by 2002:a1c:7c3:: with SMTP id 186mr6463415wmh.41.1548410857814; Fri, 25 Jan 2019 02:07:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:44 +0100 Message-Id: <1548410831-19553-26-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::341 Subject: [Qemu-devel] [PATCH 25/52] hw/tricore/Makefile.objs: Create CONFIG_* for tricore X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong Add the new configs to default-configs/tricore-sofmmu.mak. Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-22-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/tricore-softmmu.mak | 1 + hw/tricore/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/tricore-softmmu.mak b/default-configs/tricore-= softmmu.mak index e69de29..c397cff 100644 --- a/default-configs/tricore-softmmu.mak +++ b/default-configs/tricore-softmmu.mak @@ -0,0 +1 @@ +CONFIG_TRICORE=3Dy diff --git a/hw/tricore/Makefile.objs b/hw/tricore/Makefile.objs index 435e095..5501f6c 100644 --- a/hw/tricore/Makefile.objs +++ b/hw/tricore/Makefile.objs @@ -1 +1 @@ -obj-y +=3D tricore_testboard.o +obj-$(CONFIG_TRICORE) +=3D tricore_testboard.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412203430830.8673982762809; Fri, 25 Jan 2019 02:30:03 -0800 (PST) Received: from localhost ([127.0.0.1]:41553 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmykA-00087d-Ce for importer@patchew.org; Fri, 25 Jan 2019 05:29:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOn-0007d0-Ix for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOl-0001ql-LH for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:37806) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOl-0001mb-4p for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wr1-x443.google.com with SMTP id s12so9631879wrt.4 for ; Fri, 25 Jan 2019 02:07:40 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:38 -0800 (PST) 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=jKUZs6Ca1/MMr5I6z6KHdtPYZ6foryp5+IUnA7nVKZk=; b=Fktsn8DRxLJ7sYnrKDWvX72BnXSnaoaEjSz31HOHqNXM3Nr5Hy1e3m55V/kyMnmteq KXukHxf6vwKjAytSH19Vf7er8MY2es+tla1nfLOri+pM9dnycG5WdudhNq4kIP3F0Vw4 PyVfMOleNIPtRX2jhLrUdG1iXsdOQMrrYaNOJxnKv9wHWdeTKBkLj8btLxxF6vzIKbJ1 T/pOmYf1wg8d4Bc4twzj3CYlU1PabqEmD3C6brMSe4R1sr9Mel2Iwrdq6XtYHvrX0j+q IuNe6gRhHR1AY1Y3YkcFy19biJXOqIJXWdCpM1K9tPWcMclvhn1ZsrWdlp3q1PuY3gjH 540g== 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=jKUZs6Ca1/MMr5I6z6KHdtPYZ6foryp5+IUnA7nVKZk=; b=TC/zPWcm0kBq5gcHgSFx1qeGr77IOYKurLRQtvgDQ4rePy6TRGaRjG19K2G6n8xsmF LpkVz5gSWcexYZruHHJrF0teovZELK7L7K2k16x5TSULaevM0LF5+4OH2pjJlbx0ED0V jv+KBKERsPJb8tLiN3Oli6r0G8XTZiba3eKeVaGZIjQQOdv/OL7f2Ae0DqFOg53twawH 0Pk/DmjQGqQwEDe0nL1GoyUgZYmhFcg7Z2FV8QHPWcmEgWK0PSQpOmG34hd4yo6OdfoX XmaN9g6/vzTKj74SSUuF4SL8K7pIPItvYGHo+ymdmrNqWGudnOHWTdWz61XkXdc0dPsj mqwg== X-Gm-Message-State: AJcUukex/aWsUMSY2x3M/6Be1u7YeSwMSoHywsIZgDUJkt6JsRyVUAEt h6q2yLIIa0jksY4gqqrYCBldPp3+ X-Google-Smtp-Source: ALg8bN4mrOEntq9Efb06MipQM+TgVCulcwAoyCO7d5JsmMyKs/DvzaGLTcf2yK4rzY6KRHoOy54oaQ== X-Received: by 2002:a5d:410e:: with SMTP id l14mr10775139wrp.61.1548410859234; Fri, 25 Jan 2019 02:07:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:45 +0100 Message-Id: <1548410831-19553-27-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::443 Subject: [Qemu-devel] [PATCH 26/52] hw/i2c/Makefile.objs: Create new CONFIG_* variables for EEPROM and ACPI controller X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Create separate variables for these components, they are used in many boards but not all. This allows finer-grain selection of the included code with default-configs/*.mak. Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-10-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 2 ++ default-configs/mips-softmmu-common.mak | 2 ++ default-configs/ppc-softmmu.mak | 1 + hw/i2c/Makefile.objs | 5 +++-- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 68deb1c..caf7d7e 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -150,6 +150,7 @@ CONFIG_ACPI=3Dy CONFIG_VIRT=3Dy CONFIG_SMBIOS=3Dy CONFIG_ASPEED_SOC=3Dy +CONFIG_SMBUS_EEPROM=3Dy CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy CONFIG_FW_CFG_DMA=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 71c9f6f..15b6287 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -62,6 +62,8 @@ CONFIG_I82801B11=3Dy CONFIG_SMBIOS=3Dy CONFIG_PXB=3Dy CONFIG_ACPI_VMGENID=3Dy +CONFIG_ACPI_SMBUS=3Dy +CONFIG_SMBUS_EEPROM=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_I2C=3Dy CONFIG_SEV=3D$(CONFIG_KVM) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 479fb4d..ded7498 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -39,3 +39,5 @@ CONFIG_I2C=3Dy CONFIG_R4K=3Dy CONFIG_MALTA=3Dy CONFIG_MIPSSIM=3Dy +CONFIG_ACPI_SMBUS=3Dy +CONFIG_SMBUS_EEPROM=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 7f80f0c..52acb7c 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -36,6 +36,7 @@ CONFIG_AT24C=3Dy CONFIG_BITBANG_I2C=3Dy CONFIG_M41T80=3Dy CONFIG_VGA_CIRRUS=3Dy +CONFIG_SMBUS_EEPROM=3Dy =20 # For Macs CONFIG_ESCC=3Dy diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs index 37cacde..61ac50a 100644 --- a/hw/i2c/Makefile.objs +++ b/hw/i2c/Makefile.objs @@ -1,8 +1,9 @@ -common-obj-$(CONFIG_I2C) +=3D core.o smbus.o smbus_eeprom.o +common-obj-$(CONFIG_I2C) +=3D core.o smbus.o +common-obj-$(CONFIG_SMBUS_EEPROM) +=3D smbus_eeprom.o common-obj-$(CONFIG_DDC) +=3D i2c-ddc.o common-obj-$(CONFIG_VERSATILE_I2C) +=3D versatile_i2c.o common-obj-$(CONFIG_ACPI_X86) +=3D smbus_ich9.o -common-obj-$(CONFIG_APM) +=3D pm_smbus.o +common-obj-$(CONFIG_ACPI_SMBUS) +=3D pm_smbus.o common-obj-$(CONFIG_BITBANG_I2C) +=3D bitbang_i2c.o common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_i2c.o common-obj-$(CONFIG_IMX_I2C) +=3D imx_i2c.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412300225555.4270759317802; Fri, 25 Jan 2019 02:31:40 -0800 (PST) Received: from localhost ([127.0.0.1]:41603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmylp-00013v-Ti for importer@patchew.org; Fri, 25 Jan 2019 05:31:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOn-0007dJ-Vv for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOl-0001r8-MK for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50233) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOl-0001nf-AH for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wm1-x344.google.com with SMTP id n190so6176459wmd.0 for ; Fri, 25 Jan 2019 02:07:41 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:39 -0800 (PST) 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=4V0NZkdJf0K7ARIk4OH+z7tTxzzfBdLAD5lC8BqqjSc=; b=g5OMPy1UnJ0PzRMB8FOgHL60wguHm1EN0NkmOJG6xAgWSgUaMt++Bid+6lqHcw1ggB +da3l1OA4litiC+vXJ2bemAY2o9//5CalDD/UxqHaiNruaCHZKnM9h0DmOtCehv+zVAs GgoDx/I5xORehCiEpDhbt/mMNvEmuQS8SQJX5rpe/+bsjqMfu1WlBJADZiJg2gnZ/24I 5SMYYhrPjnuN3gCKIx+QCRUK6YY1qwIZCgzpBdzMp760nJCZS33GRAh85lBfL8IGOMan KrBST7EmM2Yuh9SEE7iJNKLMikDc/gQgWRbekh62YZ3Oo4Ndl1wGQdGROi7Sx8ka/688 RhoA== 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=4V0NZkdJf0K7ARIk4OH+z7tTxzzfBdLAD5lC8BqqjSc=; b=KmxTcqCX9iIHuD+sNqTHGOSxXoKgfBFTj88l9JdNabWuLnIGTUeKCbzTER6qQxi9tS rj9rHZsk2yeDbAOnOCilQaugx5r+wF1QXU9rrhzEKLnJ/UKXeBFx6s46MoDSGe7XHqaM zCRdZAV05E2ow68Zj5lMUfK6wAvw3PGe8OOnJbYKPI0rLLqi9pewx0YADQk2wd8zS+vC BOryFqncHSegnop+YF6N/7lDg83cGYlmuCgxp3BnuWjnsFWo/+3sNCm1iJ8z3T37bOBq /33agh2l9MNKIWQ5skgNg4/O9JMKzcAzTQU7Ap8hxKnkHVPcGdlpmQWh+SU16YjU2KsR GvEw== X-Gm-Message-State: AJcUukdjPi5/h0qlwFABj7dL1CcKphToo/TMbB4iYt2cl+B4qnxzQfKH TaM2Qpl50HtmSZh1tpyLlkf41eHl X-Google-Smtp-Source: ALg8bN5ESYU9y2lvvNLoK7I3feKJEJIVKLdeyi1aktVpT5OqD7157D3KSi5/1GCPLuKsuhEmri6JwQ== X-Received: by 2002:a1c:4c0c:: with SMTP id z12mr5886951wmf.17.1548410860262; Fri, 25 Jan 2019 02:07:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:46 +0100 Message-Id: <1548410831-19553-28-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::344 Subject: [Qemu-devel] [PATCH 27/52] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Make hw/vfio configurable and add new CONFIG_VFIO_* to the default-configs/s390x*-softmmu.mak. This allow a finer-grain selection of the various VFIO backends. Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-10-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 2 ++ default-configs/pci.mak | 2 ++ default-configs/ppc64-softmmu.mak | 1 + default-configs/s390x-softmmu.mak | 5 +++-- hw/Makefile.objs | 2 +- hw/vfio/Makefile.objs | 7 +++---- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index caf7d7e..4f0ecba 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -123,6 +123,8 @@ CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy +CONFIG_VFIO=3D$(CONFIG_LINUX) +CONFIG_VFIO_PLATFORM=3Dy CONFIG_VFIO_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy =20 diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 83738cb..037636f 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -47,3 +47,5 @@ CONFIG_VGA_PCI=3Dy CONFIG_BOCHS_DISPLAY=3Dy CONFIG_IVSHMEM_DEVICE=3D$(CONFIG_IVSHMEM) CONFIG_ROCKER=3Dy +CONFIG_VFIO=3D$(CONFIG_LINUX) +CONFIG_VFIO_PCI=3Dy diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index 7f34ad0..ccd7b17 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -18,6 +18,7 @@ CONFIG_XICS_SPAPR=3D$(CONFIG_PSERIES) CONFIG_XICS_KVM=3D$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM)) CONFIG_XIVE=3D$(CONFIG_PSERIES) CONFIG_XIVE_SPAPR=3D$(CONFIG_PSERIES) +CONFIG_VFIO_SPAPR=3D$(CONFIG_PSERIES) CONFIG_MEM_DEVICE=3Dy CONFIG_DIMM=3Dy CONFIG_SPAPR_RNG=3Dy diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 8bb7e43..6f2c6ce 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -5,7 +5,8 @@ CONFIG_SCLPCONSOLE=3Dy CONFIG_TERMINAL3270=3Dy CONFIG_S390_FLIC=3Dy CONFIG_S390_FLIC_KVM=3D$(CONFIG_KVM) -CONFIG_VFIO_CCW=3D$(CONFIG_LINUX) CONFIG_WDT_DIAG288=3Dy -CONFIG_VFIO_AP=3D$(CONFIG_LINUX) CONFIG_S390_CCW_VIRTIO=3Dy +CONFIG_VFIO=3D$(CONFIG_LINUX) +CONFIG_VFIO_CCW=3Dy +CONFIG_VFIO_AP=3Dy diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 22dd211..e2fcd6a 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -30,7 +30,7 @@ devices-dirs-$(CONFIG_SOFTMMU) +=3D ssi/ devices-dirs-$(CONFIG_SOFTMMU) +=3D timer/ devices-dirs-$(CONFIG_TPM) +=3D tpm/ devices-dirs-$(CONFIG_SOFTMMU) +=3D usb/ -devices-dirs-$(CONFIG_LINUX) +=3D vfio/ +devices-dirs-$(CONFIG_VFIO) +=3D vfio/ devices-dirs-$(CONFIG_SOFTMMU) +=3D virtio/ devices-dirs-$(CONFIG_SOFTMMU) +=3D watchdog/ devices-dirs-$(CONFIG_SOFTMMU) +=3D xen/ diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs index 9180589..abad8b8 100644 --- a/hw/vfio/Makefile.objs +++ b/hw/vfio/Makefile.objs @@ -1,8 +1,7 @@ -obj-$(CONFIG_SOFTMMU) +=3D common.o -obj-$(CONFIG_PCI) +=3D pci.o pci-quirks.o display.o +obj-y +=3D common.o spapr.o +obj-$(CONFIG_VFIO_PCI) +=3D pci.o pci-quirks.o display.o obj-$(CONFIG_VFIO_CCW) +=3D ccw.o -obj-$(CONFIG_SOFTMMU) +=3D platform.o +obj-$(CONFIG_VFIO_PLATFORM) +=3D platform.o obj-$(CONFIG_VFIO_XGMAC) +=3D calxeda-xgmac.o obj-$(CONFIG_VFIO_AMD_XGBE) +=3D amd-xgbe.o -obj-$(CONFIG_SOFTMMU) +=3D spapr.o obj-$(CONFIG_VFIO_AP) +=3D ap.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412519200161.3293828999466; Fri, 25 Jan 2019 02:35:19 -0800 (PST) Received: from localhost ([127.0.0.1]:41630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmypK-0003mo-LI for importer@patchew.org; Fri, 25 Jan 2019 05:35:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOr-0007gz-Ac for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOl-0001pb-4V for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:49 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:41647) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOk-0001o1-Oh for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wr1-x42c.google.com with SMTP id x10so9614012wrs.8 for ; Fri, 25 Jan 2019 02:07:42 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:40 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=mIJ+bq6IFo3ZNbjqJqHjSWauX1uWJ26DO2ATlrtNv3w=; b=AC3QFVzpgBTOUu4yHM/uILolBUYdW+hbZCJ64ussWV0o8kwCtSdkn+SVTbeoSkCwsj P4NzOUIHXo6EgSi+I1wvXk3EnU1NnlX9loAk3VWZneMIxjN5LtMoIv6HNx6fJ9jmuC6Z SXAKwAErvVgITz4qtAZUcfzLr9P6bJNHhPE2EWQSXpKNu8H9EgZwNzPfCymWTN/QefMb CureGpgeoXg2IMd9J3FTCLG9RbkRcywZdj/hq8EwNzmUQzgRb2FyFD9MRyoWRM6Eil2X 50SaHStK525wELFFaK3sQkucrXwNH0tOPDkia+3QI1lSlCQJdmLXl/FlR+caLAsAj0t0 p2Bg== 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:mime-version:content-transfer-encoding; bh=mIJ+bq6IFo3ZNbjqJqHjSWauX1uWJ26DO2ATlrtNv3w=; b=s3vTkeYh0fgwj3fj6Vhtn/BRMJ93Mgc5nxy2zLWde/NLSeM6qKRSx66uqGDRezj/wQ vfW+2wEx4RA1bosT94+MLi2V6x3WpM1VnkZ0MMFUqX/3vAxcsmZDaEjiOpRJxI71/MPy FBJOGPZ6NT/2Rci4tRr8UBRFs9xgXTgHEijF9NbalnUUiKodqfcMs2Go+qQPjFHs5Zo0 kZqyScA2NuNs5KWlUwGRkO0vZfn9g5QeTiISqmalxGSRqHqYxCD86q9SNkBhPuXdCpcN yblKz2JdsHveZwlDjgL3jcykrMyEyj9vdh4mFatr2hYEZPIoOodqzKs1r1FLUhRRlL2p o3yw== X-Gm-Message-State: AHQUAubo3kjIKLiN667Kjd7EUdHJmnsoLfhaVow0BxzSib1Q8aAS5f4b lP1fGDPt83ACXZWapDkvmkonTUGv X-Google-Smtp-Source: AHgI3Iaj6ihdz9ANJlUCukOofyNpz3dgiBDyjGA5U6O8RWAwHhyqTz7xeqYtVlG9eT/tyOypyBPG2Q== X-Received: by 2002:adf:ef88:: with SMTP id d8mr1769571wro.163.1548410861144; Fri, 25 Jan 2019 02:07:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:47 +0100 Message-Id: <1548410831-19553-29-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c Subject: [Qemu-devel] [PATCH 28/52] minikconfig: add parser skeleton X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This implements a scanner and recursive descent parser for Kconfig-like configuration files. The only "action" of the parser is for now to detect undefined variables and process include files. The main differences between Kconfig and this are: * only the "bool" type is supported * variables can only be defined once * choices are not supported (but they could be added as syntactic sugar for multiple Boolean values) * menus and other graphical concepts (prompts, help text) are not supported * assignments ("CONFIG_FOO=3Dy", "CONFIG_FOO=3Dn") are parsed as part of the Kconfig language, not as a separate file. The idea was originally by =C3=81kos Kov=C3=A1cs, but I could not find his implementation so I had to redo it. Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-23-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- scripts/minikconf.py | 425 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 425 insertions(+) create mode 100644 scripts/minikconf.py diff --git a/scripts/minikconf.py b/scripts/minikconf.py new file mode 100644 index 0000000..4a1fe09 --- /dev/null +++ b/scripts/minikconf.py @@ -0,0 +1,425 @@ +# +# Mini-Kconfig parser +# +# Copyright (c) 2015 Red Hat Inc. +# +# Authors: +# Paolo Bonzini +# +# This work is licensed under the terms of the GNU GPL, version 2 +# or, at your option, any later version. See the COPYING file in +# the top-level directory. + +from __future__ import print_function +import os +import sys + +__all__ =3D [ 'KconfigParserError', 'KconfigData', 'KconfigParser' ] + +# ------------------------------------------- +# KconfigData implements the Kconfig semantics. For now it can only +# detect undefined symbols, i.e. symbols that were referenced in +# assignments or dependencies but were not declared with "config FOO". +# +# Semantic actions are represented by methods called do_*. The do_var +# method return the semantic value of a variable (which right now is +# just its name). +# ------------------------------------------- + +class KconfigData: + def __init__(self): + self.previously_included =3D [] + self.incl_info =3D None + self.defined_vars =3D set() + self.referenced_vars =3D set() + + # semantic analysis ------------- + + def check_undefined(self): + undef =3D False + for i in self.referenced_vars: + if not (i in self.defined_vars): + print("undefined symbol %s" % (i), file=3Dsys.stderr) + undef =3D True + return undef + + # semantic actions ------------- + + def do_declaration(self, var): + if (var in self.defined_vars): + raise Exception('variable "' + var + '" defined twice') + + self.defined_vars.add(var) + + # var is a string with the variable's name. + # + # For now this just returns the variable's name itself. + def do_var(self, var): + self.referenced_vars.add(var) + return var + + def do_assignment(self, var, val): + pass + + def do_default(self, var, val, cond=3DNone): + pass + + def do_depends_on(self, var, expr): + pass + + def do_select(self, var, symbol, cond=3DNone): + pass + +# ------------------------------------------- +# KconfigParser implements a recursive descent parser for (simplified) +# Kconfig syntax. +# ------------------------------------------- + +# tokens table +TOKENS =3D {} +TOK_NONE =3D -1 +TOK_LPAREN =3D 0; TOKENS[TOK_LPAREN] =3D '"("'; +TOK_RPAREN =3D 1; TOKENS[TOK_RPAREN] =3D '")"'; +TOK_EQUAL =3D 2; TOKENS[TOK_EQUAL] =3D '"=3D"'; +TOK_AND =3D 3; TOKENS[TOK_AND] =3D '"&&"'; +TOK_OR =3D 4; TOKENS[TOK_OR] =3D '"||"'; +TOK_NOT =3D 5; TOKENS[TOK_NOT] =3D '"!"'; +TOK_DEPENDS =3D 6; TOKENS[TOK_DEPENDS] =3D '"depends"'; +TOK_ON =3D 7; TOKENS[TOK_ON] =3D '"on"'; +TOK_SELECT =3D 8; TOKENS[TOK_SELECT] =3D '"select"'; +TOK_CONFIG =3D 9; TOKENS[TOK_CONFIG] =3D '"config"'; +TOK_DEFAULT =3D 10; TOKENS[TOK_DEFAULT] =3D '"default"'; +TOK_Y =3D 11; TOKENS[TOK_Y] =3D '"y"'; +TOK_N =3D 12; TOKENS[TOK_N] =3D '"n"'; +TOK_SOURCE =3D 13; TOKENS[TOK_SOURCE] =3D '"source"'; +TOK_BOOL =3D 14; TOKENS[TOK_BOOL] =3D '"bool"'; +TOK_IF =3D 15; TOKENS[TOK_IF] =3D '"if"'; +TOK_ID =3D 16; TOKENS[TOK_ID] =3D 'identifier'; +TOK_EOF =3D 17; TOKENS[TOK_EOF] =3D 'end of file'; + +class KconfigParserError(Exception): + def __init__(self, parser, msg, tok=3DNone): + self.loc =3D parser.location() + tok =3D tok or parser.tok + if tok !=3D TOK_NONE: + location =3D TOKENS.get(tok, None) or ('"%s"' % tok) + msg =3D '%s before %s' % (msg, location) + self.msg =3D msg + + def __str__(self): + return "%s: %s" % (self.loc, self.msg) + +class KconfigParser: + @classmethod + def parse(self, fp): + data =3D KconfigData() + parser =3D KconfigParser(data) + parser.parse_file(fp) + if data.check_undefined(): + raise KconfigParserError(parser, "there were undefined symbols= ") + + return data + + def __init__(self, data): + self.data =3D data + + def parse_file(self, fp): + self.abs_fname =3D os.path.abspath(fp.name) + self.fname =3D fp.name + self.data.previously_included.append(self.abs_fname) + self.src =3D fp.read() + if self.src =3D=3D '' or self.src[-1] !=3D '\n': + self.src +=3D '\n' + self.cursor =3D 0 + self.line =3D 1 + self.line_pos =3D 0 + self.get_token() + self.parse_config() + + # file management ----- + + def error_path(self): + inf =3D self.data.incl_info + res =3D "" + while inf: + res =3D ("In file included from %s:%d:\n" % (inf['file'], + inf['line'])) + res + inf =3D inf['parent'] + return res + + def location(self): + col =3D 1 + for ch in self.src[self.line_pos:self.pos]: + if ch =3D=3D '\t': + col +=3D 8 - ((col - 1) % 8) + else: + col +=3D 1 + return '%s%s:%d:%d' %(self.error_path(), self.fname, self.line, co= l) + + def do_include(self, include): + incl_abs_fname =3D os.path.join(os.path.dirname(self.abs_fname), + include) + # catch inclusion cycle + inf =3D self.data.incl_info + while inf: + if incl_abs_fname =3D=3D os.path.abspath(inf['file']): + raise KconfigParserError(self, "Inclusion loop for %s" + % include) + inf =3D inf['parent'] + + # skip multiple include of the same file + if incl_abs_fname in self.data.previously_included: + return + try: + fp =3D open(incl_abs_fname, 'r') + except IOError as e: + raise KconfigParserError(self, + '%s: %s' % (e.strerror, include)) + + inf =3D self.data.incl_info + self.data.incl_info =3D { 'file': self.fname, 'line': self.line, + 'parent': inf } + KconfigParser(self.data).parse_file(fp) + self.data.incl_info =3D inf + + # recursive descent parser ----- + + # y_or_n: Y | N + def parse_y_or_n(self): + if self.tok =3D=3D TOK_Y: + self.get_token() + return True + if self.tok =3D=3D TOK_N: + self.get_token() + return False + raise KconfigParserError(self, 'Expected "y" or "n"') + + # var: ID + def parse_var(self): + if self.tok =3D=3D TOK_ID: + val =3D self.val + self.get_token() + return self.data.do_var(val) + else: + raise KconfigParserError(self, 'Expected identifier') + + # assignment_var: ID (starting with "CONFIG_") + def parse_assignment_var(self): + if self.tok =3D=3D TOK_ID: + val =3D self.val + if not val.startswith("CONFIG_"): + raise KconfigParserError(self, + 'Expected identifier starting with "CONFIG_"', = TOK_NONE) + self.get_token() + return self.data.do_var(val[7:]) + else: + raise KconfigParserError(self, 'Expected identifier') + + # assignment: var EQUAL y_or_n + def parse_assignment(self): + var =3D self.parse_assignment_var() + if self.tok !=3D TOK_EQUAL: + raise KconfigParserError(self, 'Expected "=3D"') + self.get_token() + self.data.do_assignment(var, self.parse_y_or_n()) + + # primary: NOT primary + # | LPAREN expr RPAREN + # | var + def parse_primary(self): + if self.tok =3D=3D TOK_NOT: + self.get_token() + self.parse_primary() + elif self.tok =3D=3D TOK_LPAREN: + self.get_token() + self.parse_expr() + if self.tok !=3D TOK_RPAREN: + raise KconfigParserError(self, 'Expected ")"') + self.get_token() + elif self.tok =3D=3D TOK_ID: + self.parse_var() + else: + raise KconfigParserError(self, 'Expected "!" or "(" or identif= ier') + + # disj: primary (OR primary)* + def parse_disj(self): + self.parse_primary() + while self.tok =3D=3D TOK_OR: + self.get_token() + self.parse_primary() + + # expr: disj (AND disj)* + def parse_expr(self): + self.parse_disj() + while self.tok =3D=3D TOK_AND: + self.get_token() + self.parse_disj() + + # condition: IF expr + # | empty + def parse_condition(self): + if self.tok =3D=3D TOK_IF: + self.get_token() + return self.parse_expr() + else: + return None + + # property: DEFAULT y_or_n condition + # | DEPENDS ON expr + # | SELECT var condition + # | BOOL + def parse_property(self, var): + if self.tok =3D=3D TOK_DEFAULT: + self.get_token() + val =3D self.parse_y_or_n() + cond =3D self.parse_condition() + self.data.do_default(var, val, cond) + elif self.tok =3D=3D TOK_DEPENDS: + self.get_token() + if self.tok !=3D TOK_ON: + raise KconfigParserError(self, 'Expected "on"') + self.get_token() + self.data.do_depends_on(var, self.parse_expr()) + elif self.tok =3D=3D TOK_SELECT: + self.get_token() + symbol =3D self.parse_var() + cond =3D self.parse_condition() + self.data.do_select(var, symbol, cond) + elif self.tok =3D=3D TOK_BOOL: + self.get_token() + else: + raise KconfigParserError(self, 'Error in recursive descent?') + + # properties: properties property + # | /* empty */ + def parse_properties(self, var): + had_default =3D False + while self.tok =3D=3D TOK_DEFAULT or self.tok =3D=3D TOK_DEPENDS o= r \ + self.tok =3D=3D TOK_SELECT or self.tok =3D=3D TOK_BOOL: + self.parse_property(var) + self.data.do_default(var, False) + + # for nicer error message + if self.tok !=3D TOK_SOURCE and self.tok !=3D TOK_CONFIG and \ + self.tok !=3D TOK_ID and self.tok !=3D TOK_EOF: + raise KconfigParserError(self, 'expected "source", "config", i= dentifier, ' + + '"default", "depends on" or "select"') + + # declaration: config var properties + def parse_declaration(self): + if self.tok =3D=3D TOK_CONFIG: + self.get_token() + var =3D self.parse_var() + self.data.do_declaration(var) + self.parse_properties(var) + else: + raise KconfigParserError(self, 'Error in recursive descent?') + + # clause: SOURCE + # | declaration + # | assignment + def parse_clause(self): + if self.tok =3D=3D TOK_SOURCE: + val =3D self.val + self.get_token() + self.do_include(val) + elif self.tok =3D=3D TOK_CONFIG: + self.parse_declaration() + elif self.tok =3D=3D TOK_ID: + self.parse_assignment() + else: + raise KconfigParserError(self, 'expected "source", "config" or= identifier') + + # config: clause+ EOF + def parse_config(self): + while self.tok !=3D TOK_EOF: + self.parse_clause() + return self.data + + # scanner ----- + + def get_token(self): + while True: + self.tok =3D self.src[self.cursor] + self.pos =3D self.cursor + self.cursor +=3D 1 + + self.val =3D None + self.tok =3D self.scan_token() + if self.tok is not None: + return + + def check_keyword(self, rest): + if not self.src.startswith(rest, self.cursor): + return False + length =3D len(rest) + if self.src[self.cursor + length].isalnum() or self.src[self.curso= r + length] =3D=3D '|': + return False + self.cursor +=3D length + return True + + def scan_token(self): + if self.tok =3D=3D '#': + self.cursor =3D self.src.find('\n', self.cursor) + return None + elif self.tok =3D=3D '=3D': + return TOK_EQUAL + elif self.tok =3D=3D '(': + return TOK_LPAREN + elif self.tok =3D=3D ')': + return TOK_RPAREN + elif self.tok =3D=3D '&' and self.src[self.pos+1] =3D=3D '&': + self.cursor +=3D 1 + return TOK_AND + elif self.tok =3D=3D '|' and self.src[self.pos+1] =3D=3D '|': + self.cursor +=3D 1 + return TOK_OR + elif self.tok =3D=3D '!': + return TOK_NOT + elif self.tok =3D=3D 'd' and self.check_keyword("epends"): + return TOK_DEPENDS + elif self.tok =3D=3D 'o' and self.check_keyword("n"): + return TOK_ON + elif self.tok =3D=3D 's' and self.check_keyword("elect"): + return TOK_SELECT + elif self.tok =3D=3D 'c' and self.check_keyword("onfig"): + return TOK_CONFIG + elif self.tok =3D=3D 'd' and self.check_keyword("efault"): + return TOK_DEFAULT + elif self.tok =3D=3D 'b' and self.check_keyword("ool"): + return TOK_BOOL + elif self.tok =3D=3D 'i' and self.check_keyword("f"): + return TOK_IF + elif self.tok =3D=3D 'y' and self.check_keyword(""): + return TOK_Y + elif self.tok =3D=3D 'n' and self.check_keyword(""): + return TOK_N + elif (self.tok =3D=3D 's' and self.check_keyword("ource")) or \ + self.tok =3D=3D 'i' and self.check_keyword("nclude"): + # source FILENAME + # include FILENAME + while self.src[self.cursor].isspace(): + self.cursor +=3D 1 + start =3D self.cursor + self.cursor =3D self.src.find('\n', self.cursor) + self.val =3D self.src[start:self.cursor] + return TOK_SOURCE + elif self.tok.isalpha(): + # identifier + while self.src[self.cursor].isalnum() or self.src[self.cursor]= =3D=3D '_': + self.cursor +=3D 1 + self.val =3D self.src[self.pos:self.cursor] + return TOK_ID + elif self.tok =3D=3D '\n': + if self.cursor =3D=3D len(self.src): + return TOK_EOF + self.line +=3D 1 + self.line_pos =3D self.cursor + elif not self.tok.isspace(): + raise KconfigParserError(self, 'invalid input') + + return None + +if __name__ =3D=3D '__main__': + fname =3D len(sys.argv) > 1 and sys.argv[1] or 'Kconfig.test' + KconfigParser.parse(open(fname, 'r')) --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412519125700.0306555641589; Fri, 25 Jan 2019 02:35:19 -0800 (PST) Received: from localhost ([127.0.0.1]:41628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyp8-0003e6-2E for importer@patchew.org; Fri, 25 Jan 2019 05:34:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOr-0007gs-7I for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOm-0001sw-5U for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:49 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:46161) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOl-0001pX-Qm for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:43 -0500 Received: by mail-wr1-x433.google.com with SMTP id l9so9579392wrt.13 for ; Fri, 25 Jan 2019 02:07:43 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:41 -0800 (PST) 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=oDql9niKUpXpXD428wkAUaYAXEC0/5RltfODN/kNrIA=; b=CoBkc8s80/vSutJG/LCyoAJ8RRynlbGSHPcC7FPokoSgwjDNiD90zX40sF8wGKGiFi 9EfSbcUXhLgXHQizH2LVUzWqW2uk+9PQWozjZyYM7BxTtDSDFOvQEV+sctcGq1D1Mw9D EXNMVEbKd4pe/dZVMLZpSurodCFn5PP2YNb+30NxmBM4phP652TWjYfgQBwKKNffe72w 03tN3k7Vi5mLJyLQFTbbfuw7fDjGXSpfPfeQZQaRJLXGFMIIi6OIeN/hy878YWNmb1uL OCH1c4H+PRCGyX5V5gvoxPVTmEWj1TAvrX8xxYlBXhyRrQ2eidyfMpyvlHPafDJ1uRmp 9QbQ== 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=oDql9niKUpXpXD428wkAUaYAXEC0/5RltfODN/kNrIA=; b=WD3Oyc8MktXfrAewQ2AC96sN9MOXemh+xH4yMRywCMehgbBUL3+ZeVEQ1zHz2k2wNG PmVl56gPTbc+mRAZRD2tqLHZeyc9k+x7RHcvZDmL+CRv93MD4SVaPsnNxbFTePsc55yf byJAR2TsqKuSGxSNyTV6fOT/TeNkSnFXrX0wnvHXOrAP2rlcJLnxy4ROHiH+C3zhcp2u YSmj7wSZwrkTVpKHfUbg1WeP81xn4xy4Cq/FJxJ3qM8ZLN9nykREwrHDh7NBQXquA/d6 tn3OoRe+SWqKKH4DGT07F/ohxmL3Lsz6y6wny21wEfkxnrkBLfzey6d5P8Wn02iFoF9/ wBHQ== X-Gm-Message-State: AJcUukfGeB5zBoB65k6ZU9wCM1o349Fxx83kyR/HR9cXZEPIO2eGNKdt l9jHGdtBibokF1UGTgNscU1WKyW7 X-Google-Smtp-Source: ALg8bN6qYW1eJ642bQMyyjWJgdbRVFnL0/ANrkq7eWjlJztbufYyZHFaOs0Ch3+29R4sounsZ4EnEQ== X-Received: by 2002:adf:81c4:: with SMTP id 62mr10157020wra.266.1548410862390; Fri, 25 Jan 2019 02:07:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:48 +0100 Message-Id: <1548410831-19553-30-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::433 Subject: [Qemu-devel] [PATCH 29/52] minikconfig: add AST X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Add Python classes that represent the Kconfig abstract syntax tree. The abstract syntax tree is stored as a list of clauses. For example: config FOO depends on BAR select BAZ is represented as three clauses: FOO depends on BAR FOO default n select BAZ if FOO Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-24-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- scripts/minikconf.py | 116 +++++++++++++++++++++++++++++++++++++++++++----= ---- 1 file changed, 98 insertions(+), 18 deletions(-) diff --git a/scripts/minikconf.py b/scripts/minikconf.py index 4a1fe09..eeecac1 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -27,11 +27,84 @@ __all__ =3D [ 'KconfigParserError', 'KconfigData', 'Kco= nfigParser' ] # ------------------------------------------- =20 class KconfigData: + class Expr: + def __and__(self, rhs): + return KconfigData.AND(self, rhs) + def __or__(self, rhs): + return KconfigData.OR(self, rhs) + def __invert__(self): + return KconfigData.NOT(self) + + class AND(Expr): + def __init__(self, lhs, rhs): + self.lhs =3D lhs + self.rhs =3D rhs + def __str__(self): + return "(%s && %s)" % (self.lhs, self.rhs) + + class OR(Expr): + def __init__(self, lhs, rhs): + self.lhs =3D lhs + self.rhs =3D rhs + def __str__(self): + return "(%s || %s)" % (self.lhs, self.rhs) + + class NOT(Expr): + def __init__(self, lhs): + self.lhs =3D lhs + def __str__(self): + return "!%s" % (self.lhs) + + class Var(Expr): + def __init__(self, name): + self.name =3D name + self.value =3D None + def __str__(self): + return self.name + + class Clause: + def __init__(self, dest): + self.dest =3D dest + + class AssignmentClause(Clause): + def __init__(self, dest, value): + KconfigData.Clause.__init__(self, dest) + self.value =3D value + def __str__(self): + return "%s=3D%s" % (self.dest, 'y' if self.value else 'n') + + class DefaultClause(Clause): + def __init__(self, dest, value, cond=3DNone): + KconfigData.Clause.__init__(self, dest) + self.value =3D value + self.cond =3D cond + def __str__(self): + value =3D 'y' if self.value else 'n' + if self.cond is None: + return "config %s default %s" % (self.dest, value) + else: + return "config %s default %s if %s" % (self.dest, value, s= elf.cond) + + class DependsOnClause(Clause): + def __init__(self, dest, expr): + KconfigData.Clause.__init__(self, dest) + self.expr =3D expr + def __str__(self): + return "config %s depends on %s" % (self.dest, self.expr) + + class SelectClause(Clause): + def __init__(self, dest, cond): + KconfigData.Clause.__init__(self, dest) + self.cond =3D cond + def __str__(self): + return "select %s if %s" % (self.dest, self.cond) + def __init__(self): self.previously_included =3D [] self.incl_info =3D None self.defined_vars =3D set() - self.referenced_vars =3D set() + self.referenced_vars =3D dict() + self.clauses =3D list() =20 # semantic analysis ------------- =20 @@ -49,26 +122,28 @@ class KconfigData: if (var in self.defined_vars): raise Exception('variable "' + var + '" defined twice') =20 - self.defined_vars.add(var) + self.defined_vars.add(var.name) =20 # var is a string with the variable's name. - # - # For now this just returns the variable's name itself. def do_var(self, var): - self.referenced_vars.add(var) - return var + if (var in self.referenced_vars): + return self.referenced_vars[var] + + var_obj =3D self.referenced_vars[var] =3D KconfigData.Var(var) + return var_obj =20 def do_assignment(self, var, val): - pass + self.clauses.append(KconfigData.AssignmentClause(var, val)) =20 def do_default(self, var, val, cond=3DNone): - pass + self.clauses.append(KconfigData.DefaultClause(var, val, cond)) =20 def do_depends_on(self, var, expr): - pass + self.clauses.append(KconfigData.DependsOnClause(var, expr)) =20 def do_select(self, var, symbol, cond=3DNone): - pass + cond =3D (cond & var) if cond is not None else var + self.clauses.append(KconfigData.SelectClause(symbol, cond)) =20 # ------------------------------------------- # KconfigParser implements a recursive descent parser for (simplified) @@ -229,31 +304,34 @@ class KconfigParser: def parse_primary(self): if self.tok =3D=3D TOK_NOT: self.get_token() - self.parse_primary() + val =3D ~self.parse_primary() elif self.tok =3D=3D TOK_LPAREN: self.get_token() - self.parse_expr() + val =3D self.parse_expr() if self.tok !=3D TOK_RPAREN: raise KconfigParserError(self, 'Expected ")"') self.get_token() elif self.tok =3D=3D TOK_ID: - self.parse_var() + val =3D self.parse_var() else: raise KconfigParserError(self, 'Expected "!" or "(" or identif= ier') + return val =20 # disj: primary (OR primary)* def parse_disj(self): - self.parse_primary() + lhs =3D self.parse_primary() while self.tok =3D=3D TOK_OR: self.get_token() - self.parse_primary() + lhs =3D lhs | self.parse_primary() + return lhs =20 # expr: disj (AND disj)* def parse_expr(self): - self.parse_disj() + lhs =3D self.parse_disj() while self.tok =3D=3D TOK_AND: self.get_token() - self.parse_disj() + lhs =3D lhs & self.parse_disj() + return lhs =20 # condition: IF expr # | empty @@ -422,4 +500,6 @@ class KconfigParser: =20 if __name__ =3D=3D '__main__': fname =3D len(sys.argv) > 1 and sys.argv[1] or 'Kconfig.test' - KconfigParser.parse(open(fname, 'r')) + data =3D KconfigParser.parse(open(fname, 'r')) + for i in data.clauses: + print i --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412704263479.9262292712714; Fri, 25 Jan 2019 02:38:24 -0800 (PST) Received: from localhost ([127.0.0.1]:41685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmysF-0006Ql-4Z for importer@patchew.org; Fri, 25 Jan 2019 05:38:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOr-0007hc-P7 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOn-0001u7-64 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:49 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:36406) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOm-0001sc-Rv for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: by mail-wm1-x32d.google.com with SMTP id p6so6035689wmc.1 for ; Fri, 25 Jan 2019 02:07:44 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:42 -0800 (PST) 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=P7EUL1dtqlvCawn9iblER8oQehVwWW5sdULoxFBNhiQ=; b=HddvZnxaBv9W/v9wpP9TlQLlaYyb94869i77Q5leJDA5dBBJL/XQLJljv5581whxmI 56dYfjxjE7EkFiMTs/Xmy3VFBjv6JilxxzAk9fQjw/NPV6GfeWn1DgtCqxYGTTR3Z5tt QAxydRCv4/tG+/fexLd+gv4uDyg0GGOUzXloekY1Wj9lzFWL1vWeqIAkaWR3aJbnE8/V JX3+sbtyizlBRqx54mltZI/kB0eZXoiGTNICToswIAwwHlTJcdfgb5dQ1zk76zLsc8ob gTJaEmYc1A8foXrA4fhdc6hwko4xijbpmzvQsvhYoJ3SeSGqypsZRw8+Rhm5Dso56J3m 9zFg== 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=P7EUL1dtqlvCawn9iblER8oQehVwWW5sdULoxFBNhiQ=; b=QaVGLbLh3OOmmkM/WsEbzwT7wH2ClD2BSthJfs7X/2BhyxWz0yhFitvuzY7EwNN+Jv RUrqO1Xf6CoNZY1SRCsP4GxxUFmqTZyTSM4u7cgV02VhHcyQ7Woyo8/eTRI8nEsAw1eu 2hDNAbtnIjqVyrD5eaLj0prQmVG/GRi/orov0ONp+3ygZNxxk0VEh95VCnjVnjnhhpSg TLyTJi5xLkvdGd0y1L/8jJTtdD064tec6iYgW5P+Rqkcitxhs974YxPyHcRhtLjxiBnB N7+Bn8v4g2Nag0JndgTcaDK3QsxWSo9lHjFerbuocWx9Nw5e8b0gHWvLx9E64mJPV08Q EEoQ== X-Gm-Message-State: AJcUukc8cb4QVdw0A7HGHKW0BlUc+XHVCUGLqtS/xWPNi43s1aUX8/aD ZPMzp83xFp+oKfFLwIFcaEq3YejR X-Google-Smtp-Source: ALg8bN671bBTZzv0JbdePsGcnSy2j62C+Me9lgff/eHPWgXZyyuB7v+VKJ0OmL6r8B70Lsjzq13big== X-Received: by 2002:a1c:7dd7:: with SMTP id y206mr6239853wmc.50.1548410863341; Fri, 25 Jan 2019 02:07:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:49 +0100 Message-Id: <1548410831-19553-31-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::32d Subject: [Qemu-devel] [PATCH 30/52] minikconfig: add semantic analysis X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" There are three parts in the semantic analysis: 1) evaluating expressions. This is done as a simple visit of the Expr nodes. 2) ordering clauses. This is done by constructing a graph of variables. There is an edge from X to Y if Y depends on X, if X selects Y, or if X appears in a conditional selection of Y; in other words, if the value of X can affect the value of Y. Each clause has a "destination" variable whose value can be affected by the clause, and clauses will be processed according to a topological sorting of their destination variables. Defaults are processed after all other clauses with the same destination. 3) deriving the value of the variables. This is done by processing the clauses in the topological order provided by the previous step. A "depends on" clause will force a variable to False, a "select" clause will force a variable to True, an assignment will force a variable to its RHS. A default will set a variable to its RHS if it has not been set before. Because all variables have a default, after visiting all clauses all variables will have been set. Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-25-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- scripts/minikconf.py | 136 +++++++++++++++++++++++++++++++++++++++++++++++= +--- 1 file changed, 130 insertions(+), 6 deletions(-) diff --git a/scripts/minikconf.py b/scripts/minikconf.py index eeecac1..7fd1438 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -16,6 +16,10 @@ import sys =20 __all__ =3D [ 'KconfigParserError', 'KconfigData', 'KconfigParser' ] =20 +def debug_print(*args): + #print ' '.join(str(x) for x in args) + pass + # ------------------------------------------- # KconfigData implements the Kconfig semantics. For now it can only # detect undefined symbols, i.e. symbols that were referenced in @@ -35,6 +39,12 @@ class KconfigData: def __invert__(self): return KconfigData.NOT(self) =20 + # Abstract methods + def add_edges_to(self, var): + pass + def evaluate(self): + assert False + class AND(Expr): def __init__(self, lhs, rhs): self.lhs =3D lhs @@ -42,6 +52,12 @@ class KconfigData: def __str__(self): return "(%s && %s)" % (self.lhs, self.rhs) =20 + def add_edges_to(self, var): + self.lhs.add_edges_to(var) + self.rhs.add_edges_to(var) + def evaluate(self): + return self.lhs.evaluate() and self.rhs.evaluate() + class OR(Expr): def __init__(self, lhs, rhs): self.lhs =3D lhs @@ -49,35 +65,85 @@ class KconfigData: def __str__(self): return "(%s || %s)" % (self.lhs, self.rhs) =20 + def add_edges_to(self, var): + self.lhs.add_edges_to(var) + self.rhs.add_edges_to(var) + def evaluate(self): + return self.lhs.evaluate() or self.rhs.evaluate() + class NOT(Expr): def __init__(self, lhs): self.lhs =3D lhs def __str__(self): return "!%s" % (self.lhs) =20 + def add_edges_to(self, var): + self.lhs.add_edges_to(var) + def evaluate(self): + return not self.lhs.evaluate() + class Var(Expr): def __init__(self, name): self.name =3D name self.value =3D None + self.outgoing =3D set() + self.clauses_for_var =3D list() def __str__(self): return self.name =20 + def has_value(self): + return not (self.value is None) + def set_value(self, val, clause): + self.clauses_for_var.append(clause) + if self.has_value() and self.value !=3D val: + print("The following clauses were found for " + self.name) + for i in self.clauses_for_var: + print(" " + str(i), file=3Dsys.stderr) + raise Exception('contradiction between clauses when settin= g %s' % self) + debug_print("=3D> %s is now %s" % (self.name, val)) + self.value =3D val + + # depth first search of the dependency graph + def dfs(self, visited, f): + if self in visited: + return + visited.add(self) + for v in self.outgoing: + v.dfs(visited, f) + f(self) + + def add_edges_to(self, var): + self.outgoing.add(var) + def evaluate(self): + if not self.has_value(): + raise Exception('cycle found including %s' % self) + return self.value + class Clause: def __init__(self, dest): self.dest =3D dest + def priority(self): + return 0 + def process(self): + pass =20 class AssignmentClause(Clause): def __init__(self, dest, value): KconfigData.Clause.__init__(self, dest) self.value =3D value def __str__(self): - return "%s=3D%s" % (self.dest, 'y' if self.value else 'n') + return "CONFIG_%s=3D%s" % (self.dest, 'y' if self.value else '= n') + + def process(self): + self.dest.set_value(self.value, self) =20 class DefaultClause(Clause): def __init__(self, dest, value, cond=3DNone): KconfigData.Clause.__init__(self, dest) self.value =3D value self.cond =3D cond + if not (self.cond is None): + self.cond.add_edges_to(self.dest) def __str__(self): value =3D 'y' if self.value else 'n' if self.cond is None: @@ -85,20 +151,38 @@ class KconfigData: else: return "config %s default %s if %s" % (self.dest, value, s= elf.cond) =20 + def priority(self): + # Defaults are processed just before leaving the variable + return -1 + def process(self): + if not self.dest.has_value() and \ + (self.cond is None or self.cond.evaluate()): + self.dest.set_value(self.value, self) + class DependsOnClause(Clause): def __init__(self, dest, expr): KconfigData.Clause.__init__(self, dest) self.expr =3D expr + self.expr.add_edges_to(self.dest) def __str__(self): return "config %s depends on %s" % (self.dest, self.expr) =20 + def process(self): + if not self.expr.evaluate(): + self.dest.set_value(False, self) + class SelectClause(Clause): def __init__(self, dest, cond): KconfigData.Clause.__init__(self, dest) self.cond =3D cond + self.cond.add_edges_to(self.dest) def __str__(self): return "select %s if %s" % (self.dest, self.cond) =20 + def process(self): + if self.cond.evaluate(): + self.dest.set_value(True, self) + def __init__(self): self.previously_included =3D [] self.incl_info =3D None @@ -116,6 +200,50 @@ class KconfigData: undef =3D True return undef =20 + def compute_config(self): + if self.check_undefined(): + raise Exception(parser, "there were undefined symbols") + return None + + debug_print("Input:") + for clause in self.clauses: + debug_print(clause) + + debug_print("\nDependency graph:") + for i in self.referenced_vars: + debug_print(i, "->", [str(x) for x in self.referenced_vars[i].= outgoing]) + + # The reverse of the depth-first order is the topological sort + dfo =3D dict() + visited =3D set() + debug_print("\n") + def visit_fn(var): + debug_print(var, "has DFS number", len(dfo)) + dfo[var] =3D len(dfo) + + for name in self.referenced_vars: + v =3D self.referenced_vars[name] + v.dfs(visited, visit_fn) + + # Put higher DFS numbers and higher priorities first. This + # places the clauses in topological order and places defaults + # after assignments and dependencies. + self.clauses.sort(key=3Dlambda x: (-dfo[x.dest], -x.priority())) + + debug_print("\nSorted clauses:") + for clause in self.clauses: + debug_print(clause) + clause.process() + + debug_print("") + values =3D dict() + for name in self.referenced_vars: + debug_print("Evaluating", name) + v =3D self.referenced_vars[name] + values[name] =3D v.evaluate() + + return values + # semantic actions ------------- =20 def do_declaration(self, var): @@ -190,9 +318,6 @@ class KconfigParser: data =3D KconfigData() parser =3D KconfigParser(data) parser.parse_file(fp) - if data.check_undefined(): - raise KconfigParserError(parser, "there were undefined symbols= ") - return data =20 def __init__(self, data): @@ -501,5 +626,4 @@ class KconfigParser: if __name__ =3D=3D '__main__': fname =3D len(sys.argv) > 1 and sys.argv[1] or 'Kconfig.test' data =3D KconfigParser.parse(open(fname, 'r')) - for i in data.clauses: - print i + print data.compute_config() --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412398999339.0298740300848; Fri, 25 Jan 2019 02:33:18 -0800 (PST) Received: from localhost ([127.0.0.1]:41609 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmynO-0002H1-El for importer@patchew.org; Fri, 25 Jan 2019 05:33:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOr-0007ge-35 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOo-0001vc-2p for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:49 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36651) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOn-0001tw-Oc for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:45 -0500 Received: by mail-wr1-x441.google.com with SMTP id u4so9641034wrp.3 for ; Fri, 25 Jan 2019 02:07:45 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:43 -0800 (PST) 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=QlzUi6HeA7fQMzgzYsJgUsnclE2te9tho+w8c1Pxu4k=; b=Pi8WDg6A/huBT7+RDuoiziPnvoluHSUlh2i17Ann34haK3TNxgze1oLhsT9lQbPLtZ FPXyB37OHzx0ItN26BtHTH/+JOWkT0WP15Yr4Aeltat1268UsVfexPgT2iog4YJY5cPE 3oervxOebaKJLGgnzM6hOMrQn4XIDD9sUx60TescLEBnCqV6MAUNNgMcC+XENAJ/NExG OY5Bdjniw4xDwSbeh4JP4tvrKouEoc/ypKdiDh0KCir/gZKeNsKKiW+NHMl7IhvwC7oz 99do50y6ifx5O5Nw4lfJk1jUa9FCorlRRq25R6tDsjVVyogFFDwfSfNNjNpUFOxW80+S yO9A== 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=QlzUi6HeA7fQMzgzYsJgUsnclE2te9tho+w8c1Pxu4k=; b=RpqhTSHt2bgBZ40+btah/14HlI6rZHJuU92GoyyL/TtYpWFMWPcC45a9qSGwJmS9Im avWuhQ/cMbAMOj2d/NJiKa1ih1Qv1goC3BMQGkOW78gVQYupzFwPtHtYkijISWhnkbjG FIzawS/m1VnJktcI494bjmQlfSBt6QDVHJSLyTsgPwODGrRLVNNP5L2q44bM4fDhccWk 9ofRuFC59DkEE6gLAvVQjuyZfV7G1vUJljaYYlVXDM9i3bQX2SIbIsOnuX1xR4EtALir JwRZqquttM5NUfUmn6rM0D+PGCxjYk5wHX7dAZXlKDKrPfUOdhaYiZlfDuqC0ZbksFug WgfQ== X-Gm-Message-State: AHQUAuY0CWSlGEMSxJ13P/7PMpVe+VpHWBv7Isgc3Zza9KRRKDbN7GD8 yHKyp0Tn4PZQgxnpBQ1AkUvAyVkU X-Google-Smtp-Source: AHgI3IaVZJfmUw5m5SXzLQvY6uvMtqMxZ6ZH6/fmrs3BERSZwaThdoPvCZsk3epmTejsgqMIpCCinQ== X-Received: by 2002:adf:ed92:: with SMTP id c18mr2792533wro.194.1548410864416; Fri, 25 Jan 2019 02:07:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:50 +0100 Message-Id: <1548410831-19553-32-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::441 Subject: [Qemu-devel] [PATCH 31/52] hw/display: make edid configurable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong Use CONFIG_EDID to make edid-generate.c and edid-region.c configurable. Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-26-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/pci.mak | 1 + hw/display/Makefile.objs | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 037636f..0552190 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -49,3 +49,4 @@ CONFIG_IVSHMEM_DEVICE=3D$(CONFIG_IVSHMEM) CONFIG_ROCKER=3Dy CONFIG_VFIO=3D$(CONFIG_LINUX) CONFIG_VFIO_PCI=3Dy +CONFIG_EDID=3Dy diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 97acd5b..a8e23c8 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-y +=3D edid-generate.o +common-obj-$(CONFIG_EDID) +=3D edid-generate.o edid-region.o =20 common-obj-$(CONFIG_FW_CFG_DMA) +=3D ramfb.o common-obj-$(CONFIG_FW_CFG_DMA) +=3D ramfb-standalone.o @@ -15,12 +15,10 @@ common-obj-$(CONFIG_SSD0323) +=3D ssd0323.o common-obj-$(CONFIG_XEN) +=3D xenfb.o =20 common-obj-$(CONFIG_VGA_PCI) +=3D vga-pci.o -common-obj-$(CONFIG_VGA_PCI) +=3D edid-region.o common-obj-$(CONFIG_VGA_ISA) +=3D vga-isa.o common-obj-$(CONFIG_VGA_ISA_MM) +=3D vga-isa-mm.o common-obj-$(CONFIG_VMWARE_VGA) +=3D vmware_vga.o common-obj-$(CONFIG_BOCHS_DISPLAY) +=3D bochs-display.o -common-obj-$(CONFIG_BOCHS_DISPLAY) +=3D edid-region.o =20 common-obj-$(CONFIG_BLIZZARD) +=3D blizzard.o common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_fimd.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413436231708.8612553473524; Fri, 25 Jan 2019 02:50:36 -0800 (PST) Received: from localhost ([127.0.0.1]:41875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmz4B-0008HG-Vh for importer@patchew.org; Fri, 25 Jan 2019 05:50:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP0-0007q7-KL for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOr-0001z8-1l for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:54 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:38913) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOq-0001wT-Hp for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:48 -0500 Received: by mail-wm1-x333.google.com with SMTP id y8so6009536wmi.4 for ; Fri, 25 Jan 2019 02:07:47 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:44 -0800 (PST) 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=asp9WnYzYdbmElZnFPqIFB9rtXxm3UIT8YYqup7TLas=; b=CC0H0bf0UHpKBCaybxriEWkxvABs9FbbhTHQLDk29/zNBXoH81+BgXwRSNwKtqJwRD Ax9beQvgfFo2Zhp4xxkP21GUG8xTm/WsaYURCoixPQVRbwwubEsJ69G2ikC4nOHYzvmg LiKbmODUdtZPASqzHr7fNcu564Gg1aVjYLzrFOb+xuLePItqzlLyHIu/A+EiMogFInk5 exqWkwPHY3fBVhCeUx+OiMLnNAeO8iwbXrlN1cO5VYpxs2+9twtH3ubGWdWg+aLksJHo o+JV9ks/qEBiysq/R8n07coW2ItTv5AphlrCD6WkLZJQHRbIgA93NGOq0sNLaq4Q6Qs8 /Ltg== 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=asp9WnYzYdbmElZnFPqIFB9rtXxm3UIT8YYqup7TLas=; b=Xz3q1zCqZbtUxc3lRj8KaTOduJe0PgV42AyPyQByb/Y4TUrY8lu03XIpoit63lCjJ4 wMDyf9Nn6AWPRK5qe6C7zsQkxXBzxFyJwXE32jlKz4uLsWkD+8MSg7/q0h5DUfsGq435 l7gKb7AHrTfXJk1+gA4ANth+BDTLHywE6K4T64r5+ExqRy0jW1ML8xv4XFXSxxKPfMNI L+yyG/6ZYiNZubp1mYxpTkXeewl7QuAnqK4ie6ENVtRwIwG46nCD0YhIl5ARhffw7WSv wsgO2lsx8OhVkT07EnWPnHaPJPOBk/kaYBy55if2oncFG9/STIrk0nM1G86bpuIxfc5b 4MFQ== X-Gm-Message-State: AJcUukeMi+kRuAztM5O9+i09FSIbUAgAC5bfEXnUPU2YioglM+7AawiJ rJI0cy+KgeJ8x0RCT1TsNN6knYea X-Google-Smtp-Source: ALg8bN4UMEUtsWUp9rpkkrCjtImw6ZkG59fBwnJs0mWwEkdRAlOcPPpzm6niBv/QtvTun3nS5MK8QQ== X-Received: by 2002:a1c:b10a:: with SMTP id a10mr6093755wmf.148.1548410865341; Fri, 25 Jan 2019 02:07:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:51 +0100 Message-Id: <1548410831-19553-33-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::333 Subject: [Qemu-devel] [PATCH 32/52] kconfig: introduce kconfig files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" The Kconfig files were generated mostly with this script: for i in `grep -ho CONFIG_[A-Z0-9_]* default-configs/* | sort -u`; do set fnord `git grep -lw $i -- 'hw/*/Makefile.objs' ` shift if test $# =3D 1; then cat >> $(dirname $1)/Kconfig << EOF config ${i#CONFIG_} bool EOF git add $(dirname $1)/Kconfig else echo $i $* fi done sed -i '$d' hw/*/Kconfig for i in hw/*; do if test -d $i && ! test -f $i/Kconfig; then touch $i/Kconfig git add $i/Kconfig fi done Whenever a symbol is referenced from multiple subdirectories, the script prints the list of directories that reference the symbol. These symbols have to be added manually to the Kconfig files. Kconfig.host and hw/Kconfig were created manually. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-27-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- Kconfig.host | 23 ++++++++++ hw/9pfs/Kconfig | 4 ++ hw/Kconfig | 68 ++++++++++++++++++++++++++++++ hw/acpi/Kconfig | 20 +++++++++ hw/adc/Kconfig | 2 + hw/alpha/Kconfig | 2 + hw/arm/Kconfig | 113 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ hw/audio/Kconfig | 35 ++++++++++++++++ hw/block/Kconfig | 29 +++++++++++++ hw/bt/Kconfig | 2 + hw/char/Kconfig | 32 ++++++++++++++ hw/core/Kconfig | 11 +++++ hw/cpu/Kconfig | 8 ++++ hw/cris/Kconfig | 5 +++ hw/display/Kconfig | 77 ++++++++++++++++++++++++++++++++++ hw/dma/Kconfig | 20 +++++++++ hw/gpio/Kconfig | 8 ++++ hw/hppa/Kconfig | 5 +++ hw/hyperv/Kconfig | 5 +++ hw/i2c/Kconfig | 20 +++++++++ hw/i386/Kconfig | 23 ++++++++++ hw/ide/Kconfig | 35 ++++++++++++++++ hw/input/Kconfig | 23 ++++++++++ hw/intc/Kconfig | 47 +++++++++++++++++++++ hw/ipack/Kconfig | 2 + hw/ipmi/Kconfig | 14 +++++++ hw/isa/Kconfig | 23 ++++++++++ hw/lm32/Kconfig | 5 +++ hw/m68k/Kconfig | 8 ++++ hw/mem/Kconfig | 8 ++++ hw/microblaze/Kconfig | 8 ++++ hw/mips/Kconfig | 20 +++++++++ hw/misc/Kconfig | 92 ++++++++++++++++++++++++++++++++++++++++ hw/misc/macio/Kconfig | 11 +++++ hw/moxie/Kconfig | 2 + hw/net/Kconfig | 92 ++++++++++++++++++++++++++++++++++++++++ hw/nios2/Kconfig | 5 +++ hw/nvram/Kconfig | 8 ++++ hw/openrisc/Kconfig | 2 + hw/pci-bridge/Kconfig | 20 +++++++++ hw/pci-host/Kconfig | 35 ++++++++++++++++ hw/pci/Kconfig | 2 + hw/pcmcia/Kconfig | 2 + hw/ppc/Kconfig | 56 +++++++++++++++++++++++++ hw/riscv/Kconfig | 19 +++++++++ hw/s390x/Kconfig | 2 + hw/scsi/Kconfig | 26 ++++++++++++ hw/sd/Kconfig | 11 +++++ hw/sh4/Kconfig | 11 +++++ hw/smbios/Kconfig | 2 + hw/sparc/Kconfig | 11 +++++ hw/sparc64/Kconfig | 5 +++ hw/ssi/Kconfig | 14 +++++++ hw/timer/Kconfig | 53 +++++++++++++++++++++++ hw/tpm/Kconfig | 14 +++++++ hw/tricore/Kconfig | 2 + hw/unicore32/Kconfig | 2 + hw/usb/Kconfig | 53 +++++++++++++++++++++++ hw/vfio/Kconfig | 23 ++++++++++ hw/virtio/Kconfig | 17 ++++++++ hw/watchdog/Kconfig | 11 +++++ hw/xtensa/Kconfig | 5 +++ scripts/minikconf.py | 35 ++++++++++++++-- 63 files changed, 1345 insertions(+), 3 deletions(-) create mode 100644 Kconfig.host create mode 100644 hw/9pfs/Kconfig create mode 100644 hw/Kconfig create mode 100644 hw/acpi/Kconfig create mode 100644 hw/adc/Kconfig create mode 100644 hw/alpha/Kconfig create mode 100644 hw/arm/Kconfig create mode 100644 hw/audio/Kconfig create mode 100644 hw/block/Kconfig create mode 100644 hw/bt/Kconfig create mode 100644 hw/char/Kconfig create mode 100644 hw/core/Kconfig create mode 100644 hw/cpu/Kconfig create mode 100644 hw/cris/Kconfig create mode 100644 hw/display/Kconfig create mode 100644 hw/dma/Kconfig create mode 100644 hw/gpio/Kconfig create mode 100644 hw/hppa/Kconfig create mode 100644 hw/hyperv/Kconfig create mode 100644 hw/i2c/Kconfig create mode 100644 hw/i386/Kconfig create mode 100644 hw/ide/Kconfig create mode 100644 hw/input/Kconfig create mode 100644 hw/intc/Kconfig create mode 100644 hw/ipack/Kconfig create mode 100644 hw/ipmi/Kconfig create mode 100644 hw/isa/Kconfig create mode 100644 hw/lm32/Kconfig create mode 100644 hw/m68k/Kconfig create mode 100644 hw/mem/Kconfig create mode 100644 hw/microblaze/Kconfig create mode 100644 hw/mips/Kconfig create mode 100644 hw/misc/Kconfig create mode 100644 hw/misc/macio/Kconfig create mode 100644 hw/moxie/Kconfig create mode 100644 hw/net/Kconfig create mode 100644 hw/nios2/Kconfig create mode 100644 hw/nvram/Kconfig create mode 100644 hw/openrisc/Kconfig create mode 100644 hw/pci-bridge/Kconfig create mode 100644 hw/pci-host/Kconfig create mode 100644 hw/pci/Kconfig create mode 100644 hw/pcmcia/Kconfig create mode 100644 hw/ppc/Kconfig create mode 100644 hw/riscv/Kconfig create mode 100644 hw/s390x/Kconfig create mode 100644 hw/scsi/Kconfig create mode 100644 hw/sd/Kconfig create mode 100644 hw/sh4/Kconfig create mode 100644 hw/smbios/Kconfig create mode 100644 hw/sparc/Kconfig create mode 100644 hw/sparc64/Kconfig create mode 100644 hw/ssi/Kconfig create mode 100644 hw/timer/Kconfig create mode 100644 hw/tpm/Kconfig create mode 100644 hw/tricore/Kconfig create mode 100644 hw/unicore32/Kconfig create mode 100644 hw/usb/Kconfig create mode 100644 hw/vfio/Kconfig create mode 100644 hw/virtio/Kconfig create mode 100644 hw/watchdog/Kconfig create mode 100644 hw/xtensa/Kconfig diff --git a/Kconfig.host b/Kconfig.host new file mode 100644 index 0000000..f43f418 --- /dev/null +++ b/Kconfig.host @@ -0,0 +1,23 @@ +# These are "proxy" symbols used to pass config-host.mak values +# down to Kconfig. + +config KVM + bool + +config OPENGL + bool + +config SPICE + bool + +config TPM + bool + +config XEN + bool + +config VHOST_USER + bool + +config LINUX + bool diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig new file mode 100644 index 0000000..be8e5b3 --- /dev/null +++ b/hw/9pfs/Kconfig @@ -0,0 +1,4 @@ +config VIRTFS + +config VIRTIO_9P + bool diff --git a/hw/Kconfig b/hw/Kconfig new file mode 100644 index 0000000..c4f1547 --- /dev/null +++ b/hw/Kconfig @@ -0,0 +1,68 @@ +# devices Kconfig +source 9pfs/Kconfig +source acpi/Kconfig +source adc/Kconfig +source audio/Kconfig +source block/Kconfig +source bt/Kconfig +source char/Kconfig +source core/Kconfig +source display/Kconfig +source dma/Kconfig +source gpio/Kconfig +source hyperv/Kconfig +source i2c/Kconfig +source ide/Kconfig +source input/Kconfig +source intc/Kconfig +source ipack/Kconfig +source ipmi/Kconfig +source isa/Kconfig +source mem/Kconfig +source misc/Kconfig +source net/Kconfig +source nvram/Kconfig +source pci-bridge/Kconfig +source pci-host/Kconfig +source pcmcia/Kconfig +source pci/Kconfig +source scsi/Kconfig +source sd/Kconfig +source smbios/Kconfig +source ssi/Kconfig +source timer/Kconfig +source tpm/Kconfig +source usb/Kconfig +source virtio/Kconfig +source vfio/Kconfig +source watchdog/Kconfig + +# arch Kconfig +source arm/Kconfig +source alpha/Kconfig +source cris/Kconfig +source hppa/Kconfig +source i386/Kconfig +source lm32/Kconfig +source m68k/Kconfig +source microblaze/Kconfig +source mips/Kconfig +source moxie/Kconfig +source nios2/Kconfig +source openrisc/Kconfig +source ppc/Kconfig +source riscv/Kconfig +source s390x/Kconfig +source sh4/Kconfig +source sparc/Kconfig +source sparc64/Kconfig +source tricore/Kconfig +source unicore32/Kconfig +source xtensa/Kconfig + +# Symbols used by multiple targets +config XILINX + bool + +config XILINX_AXI + bool diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig new file mode 100644 index 0000000..c485a34 --- /dev/null +++ b/hw/acpi/Kconfig @@ -0,0 +1,20 @@ +config ACPI + bool + +config ACPI_X86 + bool + +config ACPI_X86_ICH + bool + +config ACPI_CPU_HOTPLUG + bool + +config ACPI_MEMORY_HOTPLUG + bool + +config ACPI_NVDIMM + bool + +config ACPI_VMGENID + bool diff --git a/hw/adc/Kconfig b/hw/adc/Kconfig new file mode 100644 index 0000000..25d2229 --- /dev/null +++ b/hw/adc/Kconfig @@ -0,0 +1,2 @@ +config STM32F2XX_ADC + bool diff --git a/hw/alpha/Kconfig b/hw/alpha/Kconfig new file mode 100644 index 0000000..c5d0438 --- /dev/null +++ b/hw/alpha/Kconfig @@ -0,0 +1,2 @@ +config DP264 + bool diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig new file mode 100644 index 0000000..1a0a5c9 --- /dev/null +++ b/hw/arm/Kconfig @@ -0,0 +1,113 @@ +config VIRT + bool + +config DIGIC + bool + +config EXYNOS4 + bool + +config HIGHBANK + bool + +config INTEGRATOR + bool + +config MAINSTONE + bool + +config MUSICPAL + bool + +config NETDUINO2 + bool + +config NSERIES + bool + +config OMAP + bool + +config PXA2XX + bool + +config REALVIEW + bool + +config STELLARIS + bool + +config STRONGARM + bool + +config VERSATILE + bool + +config ZYNQ + bool + +config ARM_V7M + bool + +config EXYNOS4 + bool + +config ALLWINNER_A10 + bool + +config RASPI + bool + +config STM32F205_SOC + bool + +config XLNX_ZYNQMP_ARM + bool + +config XLNX_VERSAL + bool + +config FSL_IMX25 + bool + +config FSL_IMX31 + bool + +config FSL_IMX6 + bool + +config ASPEED_SOC + bool + +config MPS2 + bool + +config IOTKIT + bool + +config FSL_IMX7 + bool + +config ARM_SMMUV3 + bool + +config FSL_IMX6UL + bool + +config NRF51_SOC + bool + +config MSF2 + bool + +config ZAURUS + bool + +config A9MPCORE + bool + +config A15MPCORE + bool + +config ARM11MPCORE + bool diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig new file mode 100644 index 0000000..207baee --- /dev/null +++ b/hw/audio/Kconfig @@ -0,0 +1,35 @@ +config SB16 + bool + +config ES1370 + bool + +config AC97 + bool + +config ADLIB + bool + +config GUS + bool + +config CS4231A + bool + +config HDA + bool + +config PCSPK + bool + +config WM8750 + bool + +config PL041 + bool + +config CS4231 + bool + +config MARVELL_88W8618 + bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig new file mode 100644 index 0000000..9d418bc --- /dev/null +++ b/hw/block/Kconfig @@ -0,0 +1,29 @@ +config FDC + bool + +config SSI_M25P80 + bool + +config NAND + bool + +config PFLASH_CFI01 + bool + +config PFLASH_CFI02 + bool + +config ECC + bool + +config ONENAND + bool + +config NVME_PCI + bool + +config VIRTIO_BLK + bool + +config VHOST_USER_BLK + bool diff --git a/hw/bt/Kconfig b/hw/bt/Kconfig new file mode 100644 index 0000000..554a9ee --- /dev/null +++ b/hw/bt/Kconfig @@ -0,0 +1,2 @@ +config BLUETOOTH + bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig new file mode 100644 index 0000000..26c1324 --- /dev/null +++ b/hw/char/Kconfig @@ -0,0 +1,32 @@ +config ESCC + bool + +config PARALLEL + bool + +config PL011 + bool + +config SERIAL + bool + +config SERIAL_ISA + bool + +config SERIAL_PCI + bool + +config VIRTIO_SERIAL + bool + +config STM32F2XX_USART + bool + +config CMSDK_APB_UART + bool + +config SCLPCONSOLE + bool + +config TERMINAL3270 + bool diff --git a/hw/core/Kconfig b/hw/core/Kconfig new file mode 100644 index 0000000..c2a1ae8 --- /dev/null +++ b/hw/core/Kconfig @@ -0,0 +1,11 @@ +config EMPTY_SLOT + bool + +config PTIMER + bool + +config FITLOADER + bool + +config PLATFORM_BUS + bool diff --git a/hw/cpu/Kconfig b/hw/cpu/Kconfig new file mode 100644 index 0000000..1767d02 --- /dev/null +++ b/hw/cpu/Kconfig @@ -0,0 +1,8 @@ +config ARM11MPCORE + bool + +config A9MPCORE + bool + +config A15MPCORE + bool diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig new file mode 100644 index 0000000..86954ab --- /dev/null +++ b/hw/cris/Kconfig @@ -0,0 +1,5 @@ +config AXIS + bool + +config ETRAXFS + bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig new file mode 100644 index 0000000..d5c022c --- /dev/null +++ b/hw/display/Kconfig @@ -0,0 +1,77 @@ +config EDID + bool + +config FW_CFG_DMA + bool + +config ADS7846 + bool + +config VGA_CIRRUS + bool + +config G364FB + bool + +config JAZZ_LED + bool + +config PL110 + bool + +config SII9022 + bool + +config SSD0303 + bool + +config SSD0323 + bool + +config VGA_PCI + bool + +config VGA_ISA + bool + +config VGA_ISA_MM + bool + +config VMWARE_VGA + bool + +config BOCHS_DISPLAY + bool + +config BLIZZARD + bool + +config FRAMEBUFFER + bool + +config MILKYMIST_TMU2 + bool + +config SM501 + bool + +config TCX + bool + +config CG3 + bool + +config VGA + bool + +config QXL + bool + +config VIRTIO_GPU + bool + +config VIRTIO_VGA + bool + +config DPCD + bool diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig new file mode 100644 index 0000000..b9ce1c5 --- /dev/null +++ b/hw/dma/Kconfig @@ -0,0 +1,20 @@ +config RC4030 + bool + +config PL080 + bool + +config PL330 + bool + +config I82374 + bool + +config I8257 + bool + +config ZYNQ_DEVCFG + bool + +config STP2000 + bool diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig new file mode 100644 index 0000000..d0a4abf --- /dev/null +++ b/hw/gpio/Kconfig @@ -0,0 +1,8 @@ +config MAX7310 + bool + +config PL061 + bool + +config GPIO_KEY + bool diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig new file mode 100644 index 0000000..1be5915 --- /dev/null +++ b/hw/hppa/Kconfig @@ -0,0 +1,5 @@ +config HPPA + bool + +config DINO + bool diff --git a/hw/hyperv/Kconfig b/hw/hyperv/Kconfig new file mode 100644 index 0000000..be724b7 --- /dev/null +++ b/hw/hyperv/Kconfig @@ -0,0 +1,5 @@ +config HYPERV + bool + +config HYPERV_TESTDEV + bool diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig new file mode 100644 index 0000000..d6d4402 --- /dev/null +++ b/hw/i2c/Kconfig @@ -0,0 +1,20 @@ +config I2C + bool + +config SMBUS_EEPROM + bool + +config DDC + bool + +config VERSATILE_I2C + bool + +config ACPI_SMBUS + bool + +config BITBANG_I2C + bool + +config IMX_I2C + bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig new file mode 100644 index 0000000..2dbe2b5 --- /dev/null +++ b/hw/i386/Kconfig @@ -0,0 +1,23 @@ +config KVM + bool + +config I440FX + bool + +config ISAPC + bool + +config Q35 + bool + +config VTD + bool + +config AMD_IOMMU + bool + +config VMPORT + bool + +config VMMOUSE + bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig new file mode 100644 index 0000000..5ec4495 --- /dev/null +++ b/hw/ide/Kconfig @@ -0,0 +1,35 @@ +config IDE_CORE + bool + +config IDE_QDEV + bool + +config IDE_PCI + bool + +config IDE_ISA + bool + +config IDE_PIIX + bool + +config IDE_CMD646 + bool + +config IDE_MACIO + bool + +config IDE_MMIO + bool + +config IDE_VIA + bool + +config MICRODRIVE + bool + +config AHCI + bool + +config IDE_SII3112 + bool diff --git a/hw/input/Kconfig b/hw/input/Kconfig new file mode 100644 index 0000000..91bae47 --- /dev/null +++ b/hw/input/Kconfig @@ -0,0 +1,23 @@ +config ADB + bool + +config LM832X + bool + +config PCKBD + bool + +config PL050 + bool + +config STELLARIS_INPUT + bool + +config TSC2005 + bool + +config VIRTIO_INPUT + bool + +config TSC210X + bool diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig new file mode 100644 index 0000000..69adbd1 --- /dev/null +++ b/hw/intc/Kconfig @@ -0,0 +1,47 @@ +config HEATHROW_PIC + bool + +config I8259 + bool + +config PL190 + bool + +config IOAPIC + bool + +config ARM_GIC + bool + +config OPENPIC + bool + +config APIC + bool + +config ARM_GIC_KVM + bool + +config OPENPIC_KVM + bool + +config XICS + bool + +config XICS_SPAPR + bool + +config XICS_KVM + bool + +config ALLWINNER_A10_PIC + bool + +config S390_FLIC + bool + +config S390_FLIC_KVM + bool + +config OMPIC + bool diff --git a/hw/ipack/Kconfig b/hw/ipack/Kconfig new file mode 100644 index 0000000..481e0d2 --- /dev/null +++ b/hw/ipack/Kconfig @@ -0,0 +1,2 @@ +config IPACK + bool diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig new file mode 100644 index 0000000..68f8ba1 --- /dev/null +++ b/hw/ipmi/Kconfig @@ -0,0 +1,14 @@ +config IPMI + bool + +config IPMI_LOCAL + bool + +config IPMI_EXTERN + bool + +config ISA_IPMI_KCS + bool + +config ISA_IPMI_BT + bool diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig new file mode 100644 index 0000000..b59d074 --- /dev/null +++ b/hw/isa/Kconfig @@ -0,0 +1,23 @@ +config ISA_BUS + bool + +config APM + bool + +config I82378 + bool + +config PC87312 + bool + +config PIIX4 + bool + +config VT82C686 + bool + +config SMC37C669 + bool + +config LPC_ICH9 + bool diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig new file mode 100644 index 0000000..84c530e --- /dev/null +++ b/hw/lm32/Kconfig @@ -0,0 +1,5 @@ +config LM32 + bool + +config MILKYMIST + bool diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig new file mode 100644 index 0000000..cd66ada --- /dev/null +++ b/hw/m68k/Kconfig @@ -0,0 +1,8 @@ +config AN5206 + bool + +config MCF5206 + bool + +config MCF5208 + bool diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig new file mode 100644 index 0000000..a3a4372 --- /dev/null +++ b/hw/mem/Kconfig @@ -0,0 +1,8 @@ +config DIMM + bool + +config MEM_DEVICE + bool + +config NVDIMM + bool diff --git a/hw/microblaze/Kconfig b/hw/microblaze/Kconfig new file mode 100644 index 0000000..44683b2 --- /dev/null +++ b/hw/microblaze/Kconfig @@ -0,0 +1,8 @@ +config PETALOGIX_S3ADSP1800 + bool + +config PETALOGIX_ML605 + bool + +config XLNX_ZYNQMP_PMU + bool diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig new file mode 100644 index 0000000..348c9bf --- /dev/null +++ b/hw/mips/Kconfig @@ -0,0 +1,20 @@ +config R4K + bool + +config MALTA + bool + +config MIPSSIM + bool + +config JAZZ + bool + +config FULONG + bool + +config MIPS_CPS + bool + +config MIPS_BOSTON + bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig new file mode 100644 index 0000000..c006b04 --- /dev/null +++ b/hw/misc/Kconfig @@ -0,0 +1,92 @@ +config APPLESMC + bool + +config MAX111X + bool + +config TMP105 + bool + +config TMP421 + bool + +config ISA_DEBUG + bool + +config SGA + bool + +config ISA_TESTDEV + bool + +config PCI_TESTDEV + bool + +config EDU + bool + +config PCA9552 + bool + +config PL310 + bool + +config INTEGRATOR_DEBUG + bool + +config A9SCU + bool + +config ARM11SCU + bool + +config MOS6522 + bool + +config MACIO + bool + +config IVSHMEM_DEVICE + bool + +config ECCMEMCTL + bool + +config IMX + bool + +config STM32F2XX_SYSCFG + bool + +config MIPS_ITU + bool + +config MPS2_FPGAIO + bool + +config MPS2_SCC + bool + +config TZ_MPC + bool + +config TZ_MSC + bool + +config TZ_PPC + bool + +config IOTKIT_SECCTL + bool + +config IOTKIT_SYSCTL + bool + +config IOTKIT_SYSINFO + bool + +config PVPANIC + bool + +config AUX + bool diff --git a/hw/misc/macio/Kconfig b/hw/misc/macio/Kconfig new file mode 100644 index 0000000..c6caeb6 --- /dev/null +++ b/hw/misc/macio/Kconfig @@ -0,0 +1,11 @@ +config CUDA + bool + +config MAC_PMU + bool + +config MAC_DBDMA + bool + +config MACIO_GPIO + bool diff --git a/hw/moxie/Kconfig b/hw/moxie/Kconfig new file mode 100644 index 0000000..52391bb --- /dev/null +++ b/hw/moxie/Kconfig @@ -0,0 +1,2 @@ +config MOXIE + bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig new file mode 100644 index 0000000..d358b2c --- /dev/null +++ b/hw/net/Kconfig @@ -0,0 +1,92 @@ +config DP8393X + bool + +config NE2000_PCI + bool + +config EEPRO100_PCI + bool + +config PCNET_PCI + bool + +config PCNET_COMMON + bool + +config E1000_PCI + bool + +config E1000E_PCI_EXPRESS + bool + +config RTL8139_PCI + bool + +config VMXNET3_PCI + bool + +config SMC91C111 + bool + +config LAN9118 + bool + +config NE2000_ISA + bool + +config OPENCORES_ETH + bool + +config XGMAC + bool + +config MIPSNET + bool + +config ALLWINNER_EMAC + bool + +config IMX_FEC + bool + +config CADENCE + bool + +config STELLARIS_ENET + bool + +config LANCE + bool + +config SUNHME + bool + +config FTGMAC100 + bool + +config SUNGEM + bool + +config COLDFIRE + bool + +config XILINX_ETHLITE + bool + +config VIRTIO_NET + bool + +config ETSEC + bool + +config ROCKER + bool + +config CAN_BUS + bool + +config CAN_PCI + bool + +config CAN_SJA1000 + bool diff --git a/hw/nios2/Kconfig b/hw/nios2/Kconfig new file mode 100644 index 0000000..22817e4 --- /dev/null +++ b/hw/nios2/Kconfig @@ -0,0 +1,5 @@ +config NIOS2_10M50 + bool + +config NIOS2 + bool diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig new file mode 100644 index 0000000..1f5ec95 --- /dev/null +++ b/hw/nvram/Kconfig @@ -0,0 +1,8 @@ +config DS1225Y + bool + +config AT24C + bool + +config MAC_NVRAM + bool diff --git a/hw/openrisc/Kconfig b/hw/openrisc/Kconfig new file mode 100644 index 0000000..e0da4ac --- /dev/null +++ b/hw/openrisc/Kconfig @@ -0,0 +1,2 @@ +config OPENRISC + bool diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig new file mode 100644 index 0000000..bb19b7a --- /dev/null +++ b/hw/pci-bridge/Kconfig @@ -0,0 +1,20 @@ +config PCIE_PORT + bool + +config PXB + bool + +config XIO3130 + bool + +config IOH3420 + bool + +config I82801B11 + bool + +config DEC_PCI + bool + +config SIMBA + bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig new file mode 100644 index 0000000..2edc5bb --- /dev/null +++ b/hw/pci-host/Kconfig @@ -0,0 +1,35 @@ +config PAM + bool + +config PREP_PCI + bool + +config GRACKLE_PCI + bool + +config UNIN_PCI + bool + +config PPCE500_PCI + bool + +config VERSATILE_PCI + bool + +config PCI_SABRE + bool + +config PCI_PIIX + bool + +config PCI_EXPRESS_Q35 + bool + +config PCI_EXPRESS_GENERIC_BRIDGE + bool + +config PCI_EXPRESS_XILINX + bool + +config PCI_EXPRESS_DESIGNWARE + bool diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig new file mode 100644 index 0000000..d3d2205 --- /dev/null +++ b/hw/pci/Kconfig @@ -0,0 +1,2 @@ +config PCI + bool diff --git a/hw/pcmcia/Kconfig b/hw/pcmcia/Kconfig new file mode 100644 index 0000000..41f2df9 --- /dev/null +++ b/hw/pcmcia/Kconfig @@ -0,0 +1,2 @@ +config PCMCIA + bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig new file mode 100644 index 0000000..9da9d7d --- /dev/null +++ b/hw/ppc/Kconfig @@ -0,0 +1,56 @@ +config PSERIES + bool + +config SPAPR_RNG + bool + +config POWERNV + bool + +config PPC405 + bool + +config PPC440 + bool + +config PPC4XX + bool + +config SAM460EX + bool + +config PREP + bool + +config RS6000_MC + bool + +config MAC_OLDWORLD + bool + +config MAC_NEWWORLD + bool + +config E500 + bool + +config VIRTEX + bool + +config MAC_DBDMA + bool + +config MAC_PMU + bool + +config XIVE + bool + +config MACIO_GPIO + bool + +config XIVE_SPAPR + bool + +config CUDA + bool diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig new file mode 100644 index 0000000..7603729 --- /dev/null +++ b/hw/riscv/Kconfig @@ -0,0 +1,19 @@ +config HTIF + bool + +config HART + bool + +config SIFIVE + bool + +config SIFIVE_E + bool + +config SIFIVE_U + +config SPIKE + bool + +config RISCV_VIRT + bool diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig new file mode 100644 index 0000000..303db7f --- /dev/null +++ b/hw/s390x/Kconfig @@ -0,0 +1,2 @@ +config S390_CCW_VIRTIO + bool diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig new file mode 100644 index 0000000..eb78478 --- /dev/null +++ b/hw/scsi/Kconfig @@ -0,0 +1,26 @@ +config SCSI + bool + +config LSI_SCSI_PCI + bool + +config MPTSAS_SCSI_PCI + bool + +config MEGASAS_SCSI_PCI + bool + +config VMW_PVSCSI_SCSI_PCI + bool + +config ESP + bool + +config ESP_PCI + bool + +config VIRTIO_SCSI + bool + +config VHOST_USER_SCSI + bool diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig new file mode 100644 index 0000000..4f43bbb --- /dev/null +++ b/hw/sd/Kconfig @@ -0,0 +1,11 @@ +config PL181 + bool + +config SSI_SD + bool + +config SD + bool + +config SDHCI + bool diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig new file mode 100644 index 0000000..417a72f --- /dev/null +++ b/hw/sh4/Kconfig @@ -0,0 +1,11 @@ +config R2D + bool + +config SHIX + bool + +config SH7750 + bool + +config SH4 + bool diff --git a/hw/smbios/Kconfig b/hw/smbios/Kconfig new file mode 100644 index 0000000..553adf4 --- /dev/null +++ b/hw/smbios/Kconfig @@ -0,0 +1,2 @@ +config SMBIOS + bool diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig new file mode 100644 index 0000000..3795754 --- /dev/null +++ b/hw/sparc/Kconfig @@ -0,0 +1,11 @@ +config SUN4M + bool + +config LEON3 + bool + +config GRLIB + bool + +config SLAVIO + bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig new file mode 100644 index 0000000..8c13345 --- /dev/null +++ b/hw/sparc64/Kconfig @@ -0,0 +1,5 @@ +config SUN4U + bool + +config NIAGARA + bool diff --git a/hw/ssi/Kconfig b/hw/ssi/Kconfig new file mode 100644 index 0000000..5a03110 --- /dev/null +++ b/hw/ssi/Kconfig @@ -0,0 +1,14 @@ +config PL022 + bool + +config SSI + bool + +config XILINX_SPI + bool + +config XILINX_SPIPS + bool + +config STM32F2XX_SPI + bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig new file mode 100644 index 0000000..7dbc121 --- /dev/null +++ b/hw/timer/Kconfig @@ -0,0 +1,53 @@ +config ARM_TIMER + bool + +config ARM_MPTIMER + bool + +config A9_GTIMER + bool + +config DS1338 + bool + +config HPET + bool + +config I8254 + bool + +config M41T80 + bool + +config M48T59 + bool + +config PL031 + bool + +config TWL92230 + bool + +config XLNX_ZYNQMP + bool + +config ALTERA_TIMER + bool + +config MC146818RTC + bool + +config ALLWINNER_A10_PIT + bool + +config STM32F2XX_TIMER + bool + +config SUN4V_RTC + bool + +config CMSDK_APB_TIMER + bool + +config CMSDK_APB_DUALTIMER + bool diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig new file mode 100644 index 0000000..2eee8eb --- /dev/null +++ b/hw/tpm/Kconfig @@ -0,0 +1,14 @@ +config TPM + bool + +config TPM_TIS + bool + +config TPM_CRB + bool + +config TPM_PASSTHROUGH + bool + +config TPM_EMULATOR + bool diff --git a/hw/tricore/Kconfig b/hw/tricore/Kconfig new file mode 100644 index 0000000..9313409 --- /dev/null +++ b/hw/tricore/Kconfig @@ -0,0 +1,2 @@ +config TRICORE + bool diff --git a/hw/unicore32/Kconfig b/hw/unicore32/Kconfig new file mode 100644 index 0000000..b3cf294 --- /dev/null +++ b/hw/unicore32/Kconfig @@ -0,0 +1,2 @@ +config PUV3 + bool diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig new file mode 100644 index 0000000..cbf5c5d --- /dev/null +++ b/hw/usb/Kconfig @@ -0,0 +1,53 @@ +config USB + bool + +config USB_UHCI + bool + +config USB_OHCI + bool + +config USB_EHCI + bool + +config USB_EHCI_SYSBUS + bool + +config USB_XHCI + bool + +config USB_XHCI_NEC + bool + +config USB_MUSB + bool + +config TUSB6010 + bool + +config USB_TABLET_WACOM + bool + +config USB_STORAGE_BOT + bool + +config USB_STORAGE_UAS + bool + +config USB_AUDIO + bool + +config USB_SERIAL + bool + +config USB_NETWORK + bool + +config USB_BLUETOOTH + bool + +config USB_SMARTCARD + bool + +config USB_STORAGE_MTP + bool diff --git a/hw/vfio/Kconfig b/hw/vfio/Kconfig new file mode 100644 index 0000000..31d8dfc --- /dev/null +++ b/hw/vfio/Kconfig @@ -0,0 +1,23 @@ +config VFIO + bool + +config VFIO_PCI + bool + +config VFIO_SPAPR + bool + +config VFIO_CCW + bool + +config VFIO_PLATFORM + bool + +config VFIO_XGMAC + bool + +config VFIO_AMD_XGBE + bool + +config VFIO_AP + bool diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig new file mode 100644 index 0000000..ebf1812 --- /dev/null +++ b/hw/virtio/Kconfig @@ -0,0 +1,17 @@ +config VIRTIO + bool + +config VIRTIO_RNG + bool + +config VIRTIO_PCI + bool + +config VIRTIO_MMIO + bool + +config VIRTIO_BALLOON + bool + +config VIRTIO_CRYPTO + bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig new file mode 100644 index 0000000..cd0244f --- /dev/null +++ b/hw/watchdog/Kconfig @@ -0,0 +1,11 @@ +config CMSDK_APB_WATCHDOG + bool + +config WDT_IB6300ESB + bool + +config WDT_IB700 + bool + +config WDT_DIAG288 + bool diff --git a/hw/xtensa/Kconfig b/hw/xtensa/Kconfig new file mode 100644 index 0000000..97543a9 --- /dev/null +++ b/hw/xtensa/Kconfig @@ -0,0 +1,5 @@ +config XTENSA_SIM + bool + +config XTENSA_FPGA + bool diff --git a/scripts/minikconf.py b/scripts/minikconf.py index 7fd1438..e26a0e4 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -13,6 +13,7 @@ from __future__ import print_function import os import sys +import re =20 __all__ =3D [ 'KconfigParserError', 'KconfigData', 'KconfigParser' ] =20 @@ -336,6 +337,12 @@ class KconfigParser: self.get_token() self.parse_config() =20 + def do_assignment(self, var, val): + if not var.startswith("CONFIG_"): + raise Error('assigned variable should start with CONFIG_') + var =3D self.data.do_var(var[7:]) + self.data.do_assignment(var, val) + # file management ----- =20 def error_path(self): @@ -624,6 +631,28 @@ class KconfigParser: return None =20 if __name__ =3D=3D '__main__': - fname =3D len(sys.argv) > 1 and sys.argv[1] or 'Kconfig.test' - data =3D KconfigParser.parse(open(fname, 'r')) - print data.compute_config() + argv =3D sys.argv + if len(argv) =3D=3D 1: + print ("%s: at least one argument is required" % argv[0], file=3Ds= ys.stderr) + sys.exit(1) + + data =3D KconfigData() + parser =3D KconfigParser(data) + for arg in argv[3:]: + m =3D re.match(r'^(CONFIG_[A-Z0-9_]+)=3D([yn]?)$', arg) + if m is not None: + name, value =3D m.groups() + parser.do_assignment(name, value =3D=3D 'y') + else: + fp =3D open(arg, 'r') + parser.parse_file(fp) + fp.close() + + config =3D data.compute_config() + for key in sorted(config.keys()): + print ('CONFIG_%s=3D%s' % (key, ('y' if config[key] else 'n'))) + + deps =3D open(argv[2], 'w') + for fname in data.previously_included: + print ('%s: %s' % (argv[1], fname), file=3Ddeps) + deps.close() --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412909647424.1046935933631; Fri, 25 Jan 2019 02:41:49 -0800 (PST) Received: from localhost ([127.0.0.1]:41743 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyva-0000ru-FJ for importer@patchew.org; Fri, 25 Jan 2019 05:41:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOu-0007fY-RR for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOq-0001xt-5e for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:52 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:52901) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOp-0001wx-P6 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:48 -0500 Received: by mail-wm1-x343.google.com with SMTP id m1so6163325wml.2 for ; Fri, 25 Jan 2019 02:07:47 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:45 -0800 (PST) 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=bLU1DOUsNobL3y4z8L2R2CU0JzPJE/ZvRuHJBwqQ6Ro=; b=ubYn4jhC5/gmA9hUb0ZxeA8pe3fjncZFB1Bq0Ekz4FDrRo0AnYwrBeQJGpAWycGo07 9b44RMBWeHA6HDjgsiIV3LNvdoaMJXbhCwhr4whHPuRmSCbW8im0ccHuehtEzjpik2UA pvby6QrYGJGYzTKRtiKohkpIZRv+527h27VgY1CkrsmrNX/cYXT+5vT349W/rE+F1ozF 2uc0XK5Viys2lPPPip0rOXoDLYp1Pb2fc4BJjK9A2jC8GeSvI1iQzIt7qGITEO5cxhvR 5FMRALqp8u30//4ZB3Mq3s5cyRFolOqI6AAgJBDgNQnI8DOHZdu/0k/Q/6lfmT9vsErq QLqQ== 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=bLU1DOUsNobL3y4z8L2R2CU0JzPJE/ZvRuHJBwqQ6Ro=; b=NaW1eJQPYo4qCGWfNVGAX5r7r+trhHUtqVp5KgLxpJ6emI6u6m+5Sz8UZCjf45UaKS +v0wsQSGKPz6JPjCbq+bJS2A+ZOky8g0Y/3lkaLOzwSaqiLfFV6F5tc+qWzU0ymXArVe DBtkcFUf8vzBqNbDG+xcuYYLf/ypO6wZP3k7vNoJnGAdUdEXwKO+uDTjVH/exOdYi0WI QJOCOBEP4jOKe4bxGvlvtRSpp8FjXMLRKJlMuyHewx4+L8tL/eh3UCVPWt7MrqwL1gKX LGng9Af2uDMnKlG01cHeY+38+3442Bdl5Pp67oEV/SoyVF68MQNx2Bd5O3/HUiirlHw0 dvhQ== X-Gm-Message-State: AJcUukdhmR27p+T/fk5dGe8pjG6ta6bDTJNdowXLOTpEqSUepDKlhxyh QCbyIsrwPwqiCEuiPIVoO3i68NZ9 X-Google-Smtp-Source: ALg8bN5uOI3M1M4aI86mjYR/WwwKMfuOU3b0u29mtNHyoJQfYCDv6A7+Vah0vODKgsQ21gZdBzOg/Q== X-Received: by 2002:a1c:7c3:: with SMTP id 186mr6463976wmh.41.1548410866179; Fri, 25 Jan 2019 02:07:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:52 +0100 Message-Id: <1548410831-19553-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::343 Subject: [Qemu-devel] [PATCH 33/52] build: switch to Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" The make_device_config.sh script is replaced by minikconf, which is modified to support the same command line as its predecessor. The roots of the parsing are default-configs/*.mak, Kconfig.host and hw/Kconfig. One difference with make_device_config.sh is that all symbols have to be defined in a Kconfig file, including those coming from the configure script. This is the reason for the Kconfig.host file introduced in the previous patch. Whenever a file in default-configs/*.mak used $(...) to refer to a config-host.mak symbol, this is replaced by a Kconfig dependency; this part must be done already in this patch for bisectability. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Acked-by: Thomas Huth Message-Id: <20190123065618.3520-28-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- Kconfig.host | 3 ++- Makefile | 19 ++++++++++++++++--- Makefile.target | 7 ++++++- configure | 3 +++ default-configs/arm-softmmu.mak | 2 -- default-configs/i386-softmmu.mak | 5 +---- default-configs/lm32-softmmu.mak | 1 - default-configs/pci.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/ppc64-softmmu.mak | 6 ------ default-configs/s390x-softmmu.mak | 4 +--- default-configs/virtio.mak | 3 --- hw/9pfs/Kconfig | 1 + hw/block/Kconfig | 1 + hw/display/Kconfig | 4 ++++ hw/i386/Kconfig | 6 +++++- hw/input/Kconfig | 5 +++++ hw/intc/Kconfig | 12 ++++++++++++ hw/misc/Kconfig | 2 ++ hw/ppc/Kconfig | 4 ++++ hw/scsi/Kconfig | 6 ++++++ hw/tpm/Kconfig | 2 ++ hw/vfio/Kconfig | 11 +++++++++++ rules.mak | 2 +- scripts/make_device_config.sh | 30 ------------------------------ 25 files changed, 83 insertions(+), 58 deletions(-) delete mode 100644 scripts/make_device_config.sh diff --git a/Kconfig.host b/Kconfig.host index f43f418..3772627 100644 --- a/Kconfig.host +++ b/Kconfig.host @@ -1,5 +1,6 @@ # These are "proxy" symbols used to pass config-host.mak values -# down to Kconfig. +# down to Kconfig. See also MINIKCONF_ARGS in the Makefile: +# these two need to be kept in sync. =20 config KVM bool diff --git a/Makefile b/Makefile index de898ea..70b9aec 100644 --- a/Makefile +++ b/Makefile @@ -326,9 +326,22 @@ endif =20 -include $(SUBDIR_DEVICES_MAK_DEP) =20 -%/config-devices.mak: default-configs/%.mak $(SRC_PATH)/scripts/make_devic= e_config.sh - $(call quiet-command, \ - $(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $< $*-confi= g-devices.mak.d $@ > $@.tmp,"GEN","$@.tmp") +# This has to be kept in sync with Kconfig.host. +MINIKCONF_ARGS =3D \ + $@ $*-config.devices.mak.d $< $(MINIKCONF_INPUTS) \ + CONFIG_KVM=3D$(CONFIG_KVM) \ + CONFIG_SPICE=3D$(CONFIG_SPICE) \ + CONFIG_TPM=3D$(CONFIG_TPM) \ + CONFIG_XEN=3D$(CONFIG_XEN) \ + CONFIG_OPENGL=3D$(CONFIG_OPENGL) \ + CONFIG_VHOST_USER=3D$(CONFIG_VHOST_USER) \ + CONFIG_LINUX=3D$(CONFIG_LINUX) + +MINIKCONF_INPUTS =3D $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig +MINIKCONF =3D $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \ + +%/config-devices.mak: default-configs/%.mak $(MINIKCONF_INPUTS) + $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp, "GEN", "$@= .tmp") $(call quiet-command, if test -f $@; then \ if cmp -s $@.old $@; then \ mv $@.tmp $@; \ diff --git a/Makefile.target b/Makefile.target index 39f72e8..f31692c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -4,9 +4,12 @@ BUILD_DIR?=3D$(CURDIR)/.. =20 include ../config-host.mak include config-target.mak -include config-devices.mak include $(SRC_PATH)/rules.mak =20 +ifdef CONFIG_SOFTMMU +include config-devices.mak +endif + $(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) ifdef CONFIG_LINUX QEMU_CFLAGS +=3D -I../linux-headers @@ -190,7 +193,9 @@ all-obj-$(CONFIG_SOFTMMU) +=3D $(crypto-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(io-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(slirp-obj-y) =20 +ifdef CONFIG_SOFTMMU $(QEMU_PROG_BUILD): config-devices.mak +endif =20 COMMON_LDADDS =3D ../libqemuutil.a =20 diff --git a/configure b/configure index 8f312ac..dae1b67 100755 --- a/configure +++ b/configure @@ -7377,12 +7377,15 @@ if supported_xen_target $target; then fi if supported_kvm_target $target; then echo "CONFIG_KVM=3Dy" >> $config_target_mak + echo "$target/config-devices.mak: CONFIG_KVM=3Dy" >> $config_host_mak if test "$vhost_net" =3D "yes" ; then echo "CONFIG_VHOST_NET=3Dy" >> $config_target_mak if test "$vhost_user" =3D "yes" ; then echo "CONFIG_VHOST_USER_NET_TEST_$target_name=3Dy" >> $config_= host_mak fi fi +else + echo "$target/config-devices.mak: CONFIG_KVM=3Dn" >> $config_host_mak fi if supported_hax_target $target; then echo "CONFIG_HAX=3Dy" >> $config_target_mak diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 4f0ecba..b0995a0 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -51,7 +51,6 @@ CONFIG_ARM_V7M=3Dy CONFIG_NETDUINO2=3Dy =20 CONFIG_ARM_GIC=3Dy -CONFIG_ARM_GIC_KVM=3D$(CONFIG_KVM) CONFIG_ARM_TIMER=3Dy CONFIG_ARM_MPTIMER=3Dy CONFIG_A9_GTIMER=3Dy @@ -123,7 +122,6 @@ CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy -CONFIG_VFIO=3D$(CONFIG_LINUX) CONFIG_VFIO_PLATFORM=3Dy CONFIG_VFIO_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 15b6287..412c8c5 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -4,7 +4,6 @@ include pci.mak include sound.mak include usb.mak include hyperv.mak -CONFIG_QXL=3D$(CONFIG_SPICE) CONFIG_VGA_ISA=3Dy CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy @@ -37,8 +36,6 @@ CONFIG_HPET=3Dy CONFIG_APPLESMC=3Dy CONFIG_I8259=3Dy CONFIG_PFLASH_CFI01=3Dy -CONFIG_TPM_TIS=3D$(CONFIG_TPM) -CONFIG_TPM_CRB=3D$(CONFIG_TPM) CONFIG_MC146818RTC=3Dy CONFIG_PCI_PIIX=3Dy CONFIG_WDT_IB700=3Dy @@ -66,9 +63,9 @@ CONFIG_ACPI_SMBUS=3Dy CONFIG_SMBUS_EEPROM=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_I2C=3Dy -CONFIG_SEV=3D$(CONFIG_KVM) CONFIG_VTD=3Dy CONFIG_AMD_IOMMU=3Dy CONFIG_PAM=3Dy +CONFIG_PC=3Dy CONFIG_I440FX=3Dy CONFIG_Q35=3Dy diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmm= u.mak index 4889348..ef0f4ba 100644 --- a/default-configs/lm32-softmmu.mak +++ b/default-configs/lm32-softmmu.mak @@ -2,7 +2,6 @@ =20 CONFIG_LM32=3Dy CONFIG_MILKYMIST=3Dy -CONFIG_MILKYMIST_TMU2=3D$(CONFIG_OPENGL) CONFIG_FRAMEBUFFER=3Dy CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI01=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 0552190..3d4c71d 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -47,6 +47,5 @@ CONFIG_VGA_PCI=3Dy CONFIG_BOCHS_DISPLAY=3Dy CONFIG_IVSHMEM_DEVICE=3D$(CONFIG_IVSHMEM) CONFIG_ROCKER=3Dy -CONFIG_VFIO=3D$(CONFIG_LINUX) CONFIG_VFIO_PCI=3Dy CONFIG_EDID=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 52acb7c..90118cb 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -18,7 +18,6 @@ CONFIG_I8259=3Dy CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_E500=3Dy -CONFIG_OPENPIC_KVM=3D$(call land,$(CONFIG_E500),$(CONFIG_KVM)) CONFIG_PLATFORM_BUS=3Dy CONFIG_ETSEC=3Dy CONFIG_PPC405=3Dy diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index ccd7b17..a0a9151 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -13,12 +13,6 @@ CONFIG_ISA_IPMI_BT=3Dy # For pSeries CONFIG_PSERIES=3Dy CONFIG_VIRTIO_VGA=3Dy -CONFIG_XICS=3D$(CONFIG_PSERIES) -CONFIG_XICS_SPAPR=3D$(CONFIG_PSERIES) -CONFIG_XICS_KVM=3D$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM)) -CONFIG_XIVE=3D$(CONFIG_PSERIES) -CONFIG_XIVE_SPAPR=3D$(CONFIG_PSERIES) -CONFIG_VFIO_SPAPR=3D$(CONFIG_PSERIES) CONFIG_MEM_DEVICE=3Dy CONFIG_DIMM=3Dy CONFIG_SPAPR_RNG=3Dy diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 6f2c6ce..2794ffb 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,12 +1,10 @@ CONFIG_PCI=3Dy -CONFIG_VIRTIO_PCI=3D$(CONFIG_PCI) +CONFIG_VIRTIO_PCI=3Dy include virtio.mak CONFIG_SCLPCONSOLE=3Dy CONFIG_TERMINAL3270=3Dy CONFIG_S390_FLIC=3Dy -CONFIG_S390_FLIC_KVM=3D$(CONFIG_KVM) CONFIG_WDT_DIAG288=3Dy CONFIG_S390_CCW_VIRTIO=3Dy -CONFIG_VFIO=3D$(CONFIG_LINUX) CONFIG_VFIO_CCW=3Dy CONFIG_VFIO_AP=3Dy diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak index ecb4420..51599ed 100644 --- a/default-configs/virtio.mak +++ b/default-configs/virtio.mak @@ -1,5 +1,3 @@ -CONFIG_VHOST_USER_SCSI=3D$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) -CONFIG_VHOST_USER_BLK=3D$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) CONFIG_VIRTIO=3Dy CONFIG_VIRTIO_9P=3D$(CONFIG_VIRTFS) CONFIG_VIRTIO_BALLOON=3Dy @@ -12,4 +10,3 @@ CONFIG_VIRTIO_RNG=3Dy CONFIG_SCSI=3Dy CONFIG_VIRTIO_SCSI=3Dy CONFIG_VIRTIO_SERIAL=3Dy -CONFIG_VIRTIO_INPUT_HOST=3D$(CONFIG_LINUX) diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index be8e5b3..84d2366 100644 --- a/hw/9pfs/Kconfig +++ b/hw/9pfs/Kconfig @@ -2,3 +2,4 @@ config VIRTFS =20 config VIRTIO_9P bool + default y if VIRTFS diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 9d418bc..1780569 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -27,3 +27,4 @@ config VIRTIO_BLK =20 config VHOST_USER_BLK bool + default y if VHOST_USER && LINUX diff --git a/hw/display/Kconfig b/hw/display/Kconfig index d5c022c..429056b 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -51,6 +51,8 @@ config FRAMEBUFFER =20 config MILKYMIST_TMU2 bool + default y + depends on OPENGL =20 config SM501 bool @@ -66,6 +68,8 @@ config VGA =20 config QXL bool + default y if PC + depends on SPICE && PCI =20 config VIRTIO_GPU bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 2dbe2b5..9a0e559 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -1,4 +1,8 @@ -config KVM +config SEV + bool + default y if PC && KVM + +config PC bool =20 config I440FX diff --git a/hw/input/Kconfig b/hw/input/Kconfig index 91bae47..98a18a1 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -19,5 +19,10 @@ config TSC2005 config VIRTIO_INPUT bool =20 +config VIRTIO_INPUT_HOST + bool + default y if LINUX + depends on LINUX + config TSC210X bool diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 69adbd1..6eea14e 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -21,18 +21,28 @@ config APIC =20 config ARM_GIC_KVM bool + default y + depends on ARM_GIC && KVM =20 config OPENPIC_KVM bool + default y + depends on OPENPIC && KVM =20 config XICS bool + default y + depends on PSERIES =20 config XICS_SPAPR bool + default y + depends on PSERIES =20 config XICS_KVM bool + default y + depends on XICS && KVM =20 config ALLWINNER_A10_PIC bool @@ -42,6 +52,8 @@ config S390_FLIC =20 config S390_FLIC_KVM bool + default y + depends on S390_FLIC && KVM =20 config OMPIC bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index c006b04..cc8dbed 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -48,6 +48,8 @@ config MACIO =20 config IVSHMEM_DEVICE bool + default y + depends on PCI =20 config ECCMEMCTL bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 9da9d7d..b0095e1 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -45,12 +45,16 @@ config MAC_PMU =20 config XIVE bool + default y + depends on PSERIES =20 config MACIO_GPIO bool =20 config XIVE_SPAPR bool + default y + depends on PSERIES =20 config CUDA bool diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index eb78478..834413b 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -19,8 +19,14 @@ config ESP config ESP_PCI bool =20 +config SPAPR_VSCSI + bool + default y + depends on PSERIES + config VIRTIO_SCSI bool =20 config VHOST_USER_SCSI bool + default y if VHOST_USER && LINUX diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index 2eee8eb..db57388 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -3,6 +3,8 @@ config TPM =20 config TPM_TIS bool + default y if PC + depends on TPM =20 config TPM_CRB bool diff --git a/hw/vfio/Kconfig b/hw/vfio/Kconfig index 31d8dfc..f896779 100644 --- a/hw/vfio/Kconfig +++ b/hw/vfio/Kconfig @@ -1,17 +1,26 @@ config VFIO bool + depends on LINUX =20 config VFIO_PCI bool + select VFIO + depends on LINUX =20 config VFIO_SPAPR bool + default y + depends on VFIO && LINUX && PSERIES =20 config VFIO_CCW bool + select VFIO + depends on LINUX =20 config VFIO_PLATFORM bool + select VFIO + depends on LINUX =20 config VFIO_XGMAC bool @@ -21,3 +30,5 @@ config VFIO_AMD_XGBE =20 config VFIO_AP bool + select VFIO + depends on LINUX diff --git a/rules.mak b/rules.mak index 86e033d..62cf02e 100644 --- a/rules.mak +++ b/rules.mak @@ -144,7 +144,7 @@ cc-option =3D $(if $(shell $(CC) $1 $2 -S -o /dev/null = -xc /dev/null \ cc-c-option =3D $(if $(shell $(CC) $1 $2 -c -o /dev/null -xc /dev/null \ >/dev/null 2>&1 && echo OK), $2, $3) =20 -VPATH_SUFFIXES =3D %.c %.h %.S %.cc %.cpp %.m %.mak %.texi %.sh %.rc +VPATH_SUFFIXES =3D %.c %.h %.S %.cc %.cpp %.m %.mak %.texi %.sh %.rc Kconf= ig% set-vpath =3D $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(P= ATTERN) $1))) =20 # install-prog list, dir diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh deleted file mode 100644 index 354af31..0000000 --- a/scripts/make_device_config.sh +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/sh -# Writes a target device config file to stdout, from a default and from -# include directives therein. Also emits Makefile dependencies. -# -# Usage: make_device_config.sh SRC DEPFILE-NAME DEPFILE-TARGET > DEST - -src=3D$1 -dep=3D$2 -target=3D$3 -src_dir=3D$(dirname $src) -all_includes=3D - -process_includes () { - cat $1 | grep '^include' | \ - while read include file ; do - all_includes=3D"$all_includes $src_dir/$file" - process_includes $src_dir/$file - done -} - -f=3D$src -while [ -n "$f" ] ; do - f=3D$(cat $f | tr -d '\r' | awk '/^include / {printf "'$src_dir'/%s ", $= 2}') - [ $? =3D 0 ] || exit 1 - all_includes=3D"$all_includes $f" -done -process_includes $src - -cat $src $all_includes | grep -v '^include' -echo "$target: $all_includes" > $dep --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 15484127109091005.5521324734881; Fri, 25 Jan 2019 02:38:30 -0800 (PST) Received: from localhost ([127.0.0.1]:41687 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmysS-0006bq-QB for importer@patchew.org; Fri, 25 Jan 2019 05:38:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOt-0007jN-7k for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOq-0001yP-Kk for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:51 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:53892) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOq-0001xf-9s for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:48 -0500 Received: by mail-wm1-x332.google.com with SMTP id d15so6163583wmb.3 for ; Fri, 25 Jan 2019 02:07:48 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:46 -0800 (PST) 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=zD3+THhDL3hGn04Q3WK3oVAJtDiJY5KFcgTMlsXIhc4=; b=GRtvDPxIplaCPY2GXLHdmbLLbMSgw5RU9CpJ0HA08MqVVE+KvSNh0+pI4JD30n9eKQ bMpcfDysnxNjV/odmMdEhrZNaYQcO6TdacfbsGIe9w6Ofkfj3WJpZJKs5I8cGaJbLRYK 5nMTd5hpLW7V8PR5dvNYiV5MsMOF7YrpOxESaE3VOE1RCxnqCoKuhkewzVwc31ujnnbN 4OpLD9e7iM4G1as8JdRrl3ZW83KsKwNIs2I9OGY8TfED+MIuPABbl/3rWtVaT+c+CafY kkAn9fTl6/XoRKuHxCyhBSFODOe2N1xGlW9Z26BEy1IMs3Pz2ajBqfAxs73MSOtb0/m6 yOFQ== 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=zD3+THhDL3hGn04Q3WK3oVAJtDiJY5KFcgTMlsXIhc4=; b=SabQC045WisEsk1kq3mOnB+yAIv8aYpJ4P9K85fvfsnB+1osiMpB3HEG+QzmrUj9jO m0cBfluOqGsj0U07IwkQOYm5QRnLcMmftfVovWv8NQKkX/uvo5pFUfGUnnGHY67BghaW 8GmDnoJFiZJqzTddI73Fo4E2C7o4eOS46aImtrxE5+Gf23cZID6RfFQqL65ZzhnQ85YZ i2rFjFfNm5rSTxh/Zht9GoI5rRuY6sjvhCHVmybAvMJW7yLBdzoh1kags4MH4Mbx4ELR Pl3QUywZf1PXVZ5YHwBb4nRPGF4Lu0WE5IIieaCXto69HLTJFTGgKTthPPEMYMMluH+G Tmmg== X-Gm-Message-State: AJcUukdpX5qD3H3GsvOH4loaekZNrWhFXbuIErFGBPeiHnJrPLXBtCJp LjOjzrXRof/pIlchrYq0Gv0jtBmo X-Google-Smtp-Source: ALg8bN6J2rtcQgE9XQ8ziPLxHbo6JJQVN3ef66Rz+YoyxszLwRDVrjFGerZeCAsELyO5eKt+mMHIGg== X-Received: by 2002:a1c:ba89:: with SMTP id k131mr6121254wmf.85.1548410866992; Fri, 25 Jan 2019 02:07:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:53 +0100 Message-Id: <1548410831-19553-35-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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 34/52] minikconf: implement allnoconfig and defconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Apart from defconfig (which is a no-op), allyesconfig/allnoconfig/randcondfig can be implemented simply by ignoring the RHS of assignments and "default" statements. The RHS is replaced respectively by "true", "false" or a random value. However, allyesconfig and randconfig do not quite work, because all the files for hw/ARCH/Kconfig are sourced and therefore you could end up enabling some ARM boards in x86 or things like that. This is left for future work. Signed-off-by: Paolo Bonzini --- Makefile | 8 +++++--- scripts/minikconf.py | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 70b9aec..f3b0dc8 100644 --- a/Makefile +++ b/Makefile @@ -340,6 +340,11 @@ MINIKCONF_ARGS =3D \ MINIKCONF_INPUTS =3D $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig MINIKCONF =3D $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \ =20 +.PHONY: allnoconfig defconfig +allnoconfig defconfig: + rm */config-devices.mak config-all-devices.mak + $(MAKE) MINIKCONF=3D"$(MINIKCONF) --$<" config-all-devices.mak + %/config-devices.mak: default-configs/%.mak $(MINIKCONF_INPUTS) $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp, "GEN", "$@= .tmp") $(call quiet-command, if test -f $@; then \ @@ -360,9 +365,6 @@ MINIKCONF =3D $(PYTHON) $(SRC_PATH)/scripts/minikconf.p= y \ cp -p $@ $@.old; \ fi,"GEN","$@"); =20 -defconfig: - rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK) - ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/Makefile.objs endif diff --git a/scripts/minikconf.py b/scripts/minikconf.py index e26a0e4..dde22ef 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -14,8 +14,10 @@ from __future__ import print_function import os import sys import re +import random =20 -__all__ =3D [ 'KconfigParserError', 'KconfigData', 'KconfigParser' ] +__all__ =3D [ 'KconfigParserError', 'KconfigData', 'KconfigParser', + 'defconfig', 'allyesconfig', 'allnoconfig', 'randconfig' ] =20 def debug_print(*args): #print ' '.join(str(x) for x in args) @@ -31,6 +33,11 @@ def debug_print(*args): # just its name). # ------------------------------------------- =20 +allyesconfig =3D lambda x: True +allnoconfig =3D lambda x: False +defconfig =3D lambda x: x +randconfig =3D lambda x: random.randint(0, 1) =3D=3D 1 + class KconfigData: class Expr: def __and__(self, rhs): @@ -184,7 +191,8 @@ class KconfigData: if self.cond.evaluate(): self.dest.set_value(True, self) =20 - def __init__(self): + def __init__(self, value_mangler=3Ddefconfig): + self.value_mangler =3D value_mangler self.previously_included =3D [] self.incl_info =3D None self.defined_vars =3D set() @@ -265,6 +273,7 @@ class KconfigData: self.clauses.append(KconfigData.AssignmentClause(var, val)) =20 def do_default(self, var, val, cond=3DNone): + val =3D self.value_mangler(val) self.clauses.append(KconfigData.DefaultClause(var, val, cond)) =20 def do_depends_on(self, var, expr): @@ -314,9 +323,10 @@ class KconfigParserError(Exception): return "%s: %s" % (self.loc, self.msg) =20 class KconfigParser: + @classmethod - def parse(self, fp): - data =3D KconfigData() + def parse(self, fp, mode=3DNone): + data =3D KconfigData(mode or KconfigParser.defconfig) parser =3D KconfigParser(data) parser.parse_file(fp) return data @@ -632,11 +642,30 @@ class KconfigParser: =20 if __name__ =3D=3D '__main__': argv =3D sys.argv + mode =3D defconfig + if len(sys.argv) > 1: + if argv[1] =3D=3D '--defconfig': + del argv[1] + elif argv[1] =3D=3D '--randconfig': + random.seed() + mode =3D randconfig + del argv[1] + elif argv[1] =3D=3D '--allyesconfig': + mode =3D allyesconfig + del argv[1] + elif argv[1] =3D=3D '--allnoconfig': + mode =3D allnoconfig + del argv[1] + if len(argv) =3D=3D 1: print ("%s: at least one argument is required" % argv[0], file=3Ds= ys.stderr) sys.exit(1) =20 - data =3D KconfigData() + if argv[1].startswith('-'): + print ("%s: invalid option %s" % (argv[0], argv[1]), file=3Dsys.st= derr) + sys.exit(1) + + data =3D KconfigData(mode) parser =3D KconfigParser(data) for arg in argv[3:]: m =3D re.match(r'^(CONFIG_[A-Z0-9_]+)=3D([yn]?)$', arg) --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412900518299.4497208016073; Fri, 25 Jan 2019 02:41:40 -0800 (PST) Received: from localhost ([127.0.0.1]:41741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyvI-0000cc-Cn for importer@patchew.org; Fri, 25 Jan 2019 05:41:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOu-0007kS-1f for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOs-00020Y-4T for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:52 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:36653) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOr-0001zK-Q3 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:49 -0500 Received: by mail-wr1-x443.google.com with SMTP id u4so9641258wrp.3 for ; Fri, 25 Jan 2019 02:07:49 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:47 -0800 (PST) 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=MYBKwWnivcjhMDsbyFu+0zS44LAW9DHhMoRXORp/MsU=; b=pMcvUWwvxINoXSNF0bgDuDIzVm0D5AIVubU8zsjw4pHvKDoy8cS+KkLVAu0ZqVAxRD TB55Ky4/ZHnjn3jEJ9bAIOEzEbnRsUOVDJKnm2FbKu4Kz8KjVdV4e2p3LHySEQMGFq3Q V5K7eW7n6Z6W08lJYvMNw5NgVe++ZLKf0HQ20Qq1S6oAdHri1jwQW0euX91UpnYp185O KRXo2ph1OxPREfKUxw/w3sLX8asKrzTF5z2jQNSuHYUcdn4RrcBuD8tXiliuDqQIKMq9 K6Ekgu5xL2sJvUeqoCkMsvSa7HykEhR9/nPhtTED+i06VhLaFBL/wfbJUXu9Vb3j4wbh Kb4Q== 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=MYBKwWnivcjhMDsbyFu+0zS44LAW9DHhMoRXORp/MsU=; b=cMq+RY8G29qEP1sP6F3MFqoIPsTVtIDtU8FuWrvgHx+ExmFeWA+f7n2j7NZpkyXJRq McJ8yeaRgJQKD+3xw4TxzhZVy/k5MIZxvD48LM/hYAuggsqAziX8eEqZTd7x5fbQM2T0 VldiB9js11FgO0eonFIpW3ZiaJUSd3jkj9x//eEvmujtlAT/ChrbJT65TO9ldJmK9tlA gqJDbfLDbmpEXou7ISiKVCOhn3F89HK+GddcgAHuLyNwPBhueQDc8h76HQ16pTEWrb2z 5sGDg09j+rW7ucEaeX1A0qvywfFyCB8pxTN/vOzMy5iXtRKUlqj5MRASRuzSQBXlcVCr uybw== X-Gm-Message-State: AJcUukfyddkcXLY2HLU2jY5/4cHkf4Wi4FSFIaII9XILK5BHKVaLM/8N q80CYeAUx2oarrc1khNVJqliNxJ/ X-Google-Smtp-Source: ALg8bN7osFwM4FlLollcTr0YJJZhVOR/ej4bWvB4qWIVW74kkQkDN+OxjrM7DUG42WqzrKDCtZwtcQ== X-Received: by 2002:a5d:6988:: with SMTP id g8mr10316493wru.33.1548410868470; Fri, 25 Jan 2019 02:07:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:54 +0100 Message-Id: <1548410831-19553-36-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::443 Subject: [Qemu-devel] [PATCH 35/52] ide: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-29-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 2 -- default-configs/pci.mak | 3 --- hw/ide/Kconfig | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 49cb7ce..fc4afeb 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -11,8 +11,6 @@ CONFIG_PARALLEL=3Dy CONFIG_FDC=3Dy CONFIG_PCKBD=3Dy CONFIG_VGA_CIRRUS=3Dy -CONFIG_IDE_CORE=3Dy -CONFIG_IDE_QDEV=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_IDE_CMD646=3Dy CONFIG_I8259=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 3d4c71d..41af5e7 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -23,9 +23,6 @@ CONFIG_MPTSAS_SCSI_PCI=3Dy CONFIG_RTL8139_PCI=3Dy CONFIG_E1000_PCI=3Dy CONFIG_E1000E_PCI_EXPRESS=3Dy -CONFIG_IDE_CORE=3Dy -CONFIG_IDE_QDEV=3Dy -CONFIG_IDE_PCI=3Dy CONFIG_AHCI=3Dy CONFIG_ESP=3Dy CONFIG_ESP_PCI=3Dy diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index 5ec4495..fe27705 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -3,33 +3,48 @@ config IDE_CORE =20 config IDE_QDEV bool + select IDE_CORE =20 config IDE_PCI bool + select IDE_CORE =20 config IDE_ISA bool + select IDE_QDEV =20 config IDE_PIIX bool + select IDE_PCI + select IDE_QDEV =20 config IDE_CMD646 bool + select IDE_PCI + select IDE_QDEV =20 config IDE_MACIO bool + select IDE_QDEV =20 config IDE_MMIO bool + select IDE_QDEV =20 config IDE_VIA bool + select IDE_PCI + select IDE_QDEV =20 config MICRODRIVE bool + select IDE_QDEV =20 config AHCI bool + select IDE_QDEV =20 config IDE_SII3112 bool + select IDE_PCI + select IDE_QDEV --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413111266122.45315722072814; Fri, 25 Jan 2019 02:45:11 -0800 (PST) Received: from localhost ([127.0.0.1]:41750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmywg-0001jq-T5 for importer@patchew.org; Fri, 25 Jan 2019 05:42:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP2-0007rB-K4 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOt-00021T-2V for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:53 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:53983) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOs-00020b-PC for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:50 -0500 Received: by mail-wm1-x341.google.com with SMTP id d15so6163696wmb.3 for ; Fri, 25 Jan 2019 02:07:50 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:48 -0800 (PST) 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=4YwvvJzgwJ6cEYMwbmdT17ztBEesueuxLWzPB5SSmJ8=; b=nPzf51hcPdPtVI5dirpgoG6zMh0vCLuBM2wxK+fb7mhxGhhikLsLH+vI4/Re+NpgCB 6L6wKtiR84plZ0WLTfqYR+p7lotu612IuAQOEsvSofwskMzUVTwYdL9C/IRdv3W75M5v o59qHdg1HN59zZxx0Z3Q1d5lP339khUiDQ7oS90n89O4sXadsiesCa/2pya3wi5qfjfn 8vZiIJZndQYb/QFN3vY7sLtVzO30bbPPb5q6jgo2P3yK3dVDt2vKaoMuClZY3eQV+ta8 erxcsJrorogdYMQw0e+F4IAb+7YnE55X3HPoj86iBW1MPdZyT+sck8+OHpwbxGJSX3mI uuJA== 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=4YwvvJzgwJ6cEYMwbmdT17ztBEesueuxLWzPB5SSmJ8=; b=ucpy3nRIsp3+F3pjp1vwKyBst1TB6vjEDsoO7/yEsV2StpYxkKHj07HTzPAnSDwHct yrzUnTXzj/Az8heJ0DLNX6gUXfp2Gq9StoxpWnDeRn87aLyhuJaSbMRibY7u1/tHgsRg 40/cV6rtCuxNB/DWO//LYaKC6pR5k1wraYNFIOc/Aj4S7MUdwwksHTdPGvwmF7o+Gjt0 VFDc8GWXqR23u+29JP+KHzHT8jtGapmdOmfMqdxo8ANVGLzugqUIS1YiPQlc16S++AgR xe+zcNuEiwIDEIc4ZIkKlev0wxWoaf4Vhb10ml4xRmM7AL/divmyETIhLAcrM4l8DrHF mCHw== X-Gm-Message-State: AJcUukcoxjCwGygyLcOVwpcFHZTTf2rKRebLpDIjZ81KhLv/YSSSDvuh FK3/qLMhnwK/3xv351otOn0JEbWV X-Google-Smtp-Source: ALg8bN4Nj0STg1yVP6JspBpqSQ/rdDBIys8dXoX0LKYriohMT1zUD+inz9KzxGDGjJZeqtpnDW/q9Q== X-Received: by 2002:a1c:a00f:: with SMTP id j15mr5980241wme.84.1548410869431; Fri, 25 Jan 2019 02:07:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:55 +0100 Message-Id: <1548410831-19553-37-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::341 Subject: [Qemu-devel] [PATCH 36/52] hw/pci/Makefile.objs: make pcie configurable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, "Michael S. Tsirkin" 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: Yang Zhong Make pcie splited from pci and make it configurable. Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-30-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + default-configs/mips64el-softmmu.mak | 1 + default-configs/ppc-softmmu.mak | 1 + default-configs/riscv32-softmmu.mak | 1 + default-configs/riscv64-softmmu.mak | 1 + hw/pci/Kconfig | 4 ++++ hw/pci/Makefile.objs | 9 +++++++-- 8 files changed, 17 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index b0995a0..59cf3d2 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -121,6 +121,7 @@ CONFIG_VERSATILE=3Dy CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy CONFIG_VFIO_PLATFORM=3Dy CONFIG_VFIO_XGMAC=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 412c8c5..b5281d3 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -44,6 +44,7 @@ CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy CONFIG_SGA=3Dy CONFIG_LPC_ICH9=3Dy +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_Q35=3Dy CONFIG_APIC=3Dy CONFIG_IOAPIC=3Dy diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-softmmu.mak index 9eb1208..c6ad4da 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -12,4 +12,5 @@ CONFIG_JAZZ_LED=3Dy CONFIG_VT82C686=3Dy CONFIG_MIPS_BOSTON=3Dy CONFIG_FITLOADER=3Dy +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_XILINX=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 90118cb..47e4177 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -23,6 +23,7 @@ CONFIG_ETSEC=3Dy CONFIG_PPC405=3Dy CONFIG_PPC440=3Dy CONFIG_VIRTEX=3Dy +CONFIG_PCI_EXPRESS=3Dy =20 # For Sam460ex CONFIG_SAM460EX=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 6533716..8c3a91a 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_CADENCE=3Dy =20 +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 6533716..8c3a91a 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_CADENCE=3Dy =20 +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig index d3d2205..4ca2537 100644 --- a/hw/pci/Kconfig +++ b/hw/pci/Kconfig @@ -1,2 +1,6 @@ config PCI bool + +config PCI_EXPRESS + bool + select PCI diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index 9f905e6..c78f2fb 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -2,8 +2,13 @@ common-obj-$(CONFIG_PCI) +=3D pci.o pci_bridge.o common-obj-$(CONFIG_PCI) +=3D msix.o msi.o common-obj-$(CONFIG_PCI) +=3D shpc.o common-obj-$(CONFIG_PCI) +=3D slotid_cap.o -common-obj-$(CONFIG_PCI) +=3D pci_host.o pcie_host.o -common-obj-$(CONFIG_PCI) +=3D pcie.o pcie_aer.o pcie_port.o +common-obj-$(CONFIG_PCI) +=3D pci_host.o + +# The functions in these modules can be used by devices too. Since we +# allow plugging PCIe devices into PCI buses, include them even if +# CONFIG_PCI_EXPRESS=3Dn. +common-obj-$(CONFIG_PCI) +=3D pcie.o pcie_aer.o +common-obj-$(CONFIG_PCI_EXPRESS) +=3D pcie_port.o pcie_host.o =20 common-obj-$(call lnot,$(CONFIG_PCI)) +=3D pci-stub.o common-obj-$(CONFIG_ALL) +=3D pci-stub.o --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413455309930.1338082696998; Fri, 25 Jan 2019 02:50:55 -0800 (PST) Received: from localhost ([127.0.0.1]:41919 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmz4V-0000Bz-4j for importer@patchew.org; Fri, 25 Jan 2019 05:50:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOz-0007fY-Rw for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOu-000238-8k for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:55 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:46826) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOt-00021c-TF for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:52 -0500 Received: by mail-wr1-x442.google.com with SMTP id l9so9579902wrt.13 for ; Fri, 25 Jan 2019 02:07:51 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:49 -0800 (PST) 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=yBfCPmzVV9rPdrMEJwegKcVci8EcS1VJ+uvTzzDkiH8=; b=Ps3blJr77AdYTUbNftDsMCkqdZQHrqwbCY2rEePXmrkfyfgT4dFVvucnm2B9NHDtwC iwvqdDTdRY4GCQ6e0k9WFrDXFyp+sJFwMRw4gpZyXryy9/+zJBn/3f0YyIqKsu/uM/PC Bx4SOFSs1m7gQOBjtJIlLgfcaJenHl1iEM2A5KdhzdcuF03h00hvZOqU855NCvyFyngf Myy0lQ6/5MPgvrJaFSqeA/zMsy5qddXKdzwxolmH2aMEwwNnJK5wBnip+AjQBlysVZ1H 8ZgaNnUelwdtRFYzqQ72HkxiPbf/6juUDRt2MGsEgz7e2tRURB+VZX2gmg3nfwTgRl9r +hIQ== 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=yBfCPmzVV9rPdrMEJwegKcVci8EcS1VJ+uvTzzDkiH8=; b=DFEKEqVKNtepWKIJu2Jplg49bQswn9Qr331pOY6B7fG09NuPiIV5eLoSkmpGZiRiVx wWP5UrgRcNzr+poP/RTuyRoBqwTZr71OKSQTcoRn15pUDfpTHiZwFl5whTiQ301F8Lwk hXdn+KNDn55/Xpguk9JZiSGeBWeUIUWTkwXio537xAkHFDFmEZeTckX9odlIHJTBLjcC N2w1ThEGVVob/vvjdpkWGU+4E00Shsgsd4KgIRsqvGUlZHzgJb5Ivs0OuUELpIGEw1pK O0BE7IL6VntlS63i7l0nEMhfPjpsnTyilBjzCYVdjnKDPeifKGHiPfUPDPy3JQC2H5w9 2jvw== X-Gm-Message-State: AJcUukf4R4//D9rCFwg+59ueysjjh8Plq53MDEjmxQGNlii5Qcr/Jqfh M2r+m+mUIdmYTPkBxiVSbYzvE3Xm X-Google-Smtp-Source: ALg8bN7f4FZpZdpMxiRJUiqJERerXvslSNGVyIlliMwiV80I9MexjmBg4zyzgmIWud8t/q7oMpiszQ== X-Received: by 2002:adf:e891:: with SMTP id d17mr11579339wrm.140.1548410870303; Fri, 25 Jan 2019 02:07:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:56 +0100 Message-Id: <1548410831-19553-38-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::442 Subject: [Qemu-devel] [PATCH 37/52] build: convert pci.mak to Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, "Michael S. Tsirkin" 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" Instead of including the same list of devices for each target, set CONFIG_PCI to true, and make the devices default to present whenever PCI is available. However, s390x does not want all the PCI devices, so there is a separate symbol to enable them. Done mostly with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y if PCI_DEVICES\' -e' depends on PCI'= \ `grep -lw $i hw/*/Kconfig` done < default-configs/pci.mak followed by replacing a few "depends on" clauses with "select" whenever the symbol is not really related to PCI. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-31-yang.zhong@intel.com> Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 3 ++- default-configs/arm-softmmu.mak | 3 ++- default-configs/hppa-softmmu.mak | 4 +-- default-configs/i386-softmmu.mak | 5 ++-- default-configs/mips-softmmu-common.mak | 3 ++- default-configs/pci.mak | 48 -----------------------------= ---- default-configs/ppc-softmmu.mak | 3 ++- default-configs/riscv32-softmmu.mak | 4 +-- default-configs/riscv64-softmmu.mak | 4 +-- default-configs/sh4-softmmu.mak | 3 ++- default-configs/sh4eb-softmmu.mak | 3 ++- default-configs/sparc64-softmmu.mak | 3 ++- docs/devel/build-system.txt | 1 - hw/audio/Kconfig | 6 +++++ hw/block/Kconfig | 2 ++ hw/char/Kconfig | 2 ++ hw/display/Kconfig | 16 +++++++++++ hw/ide/Kconfig | 3 +++ hw/ipack/Kconfig | 2 ++ hw/misc/Kconfig | 6 ++++- hw/net/Kconfig | 23 ++++++++++++++++ hw/pci-bridge/Kconfig | 8 ++++++ hw/pci-host/Kconfig | 10 +++++++ hw/pci/Kconfig | 3 +++ hw/scsi/Kconfig | 11 ++++++++ hw/sd/Kconfig | 3 +++ hw/usb/Kconfig | 10 +++++++ hw/virtio/Kconfig | 3 +++ hw/watchdog/Kconfig | 2 ++ 29 files changed, 131 insertions(+), 66 deletions(-) delete mode 100644 default-configs/pci.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index fc4afeb..a7b4a87 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for alpha-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_I82374=3Dy diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 59cf3d2..0109e68 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for arm-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index b594a6d..1594760 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,10 +1,10 @@ -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_ISA_BUS=3Dy CONFIG_I8259=3Dy -CONFIG_E1000_PCI=3Dy CONFIG_IDE_ISA=3Dy CONFIG_IDE_CMD646=3Dy # CONFIG_IDE_MMIO=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index b5281d3..a139bd5 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,11 +1,11 @@ # Default configuration for i386-softmmu =20 -include pci.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy include sound.mak include usb.mak include hyperv.mak CONFIG_VGA_ISA=3Dy -CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy @@ -53,7 +53,6 @@ CONFIG_MEM_DEVICE=3Dy CONFIG_DIMM=3Dy CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy -CONFIG_PCIE_PORT=3Dy CONFIG_XIO3130=3Dy CONFIG_IOH3420=3Dy CONFIG_I82801B11=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index ded7498..246af88 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,8 +1,9 @@ # Common mips*-softmmu CONFIG defines =20 -include pci.mak include sound.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_ESP=3Dy CONFIG_SCSI=3Dy CONFIG_VGA_ISA=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak deleted file mode 100644 index 41af5e7..0000000 --- a/default-configs/pci.mak +++ /dev/null @@ -1,48 +0,0 @@ -CONFIG_PCI=3Dy -# For now, CONFIG_IDE_CORE requires ISA, so we enable it here -CONFIG_ISA_BUS=3Dy -CONFIG_VIRTIO_PCI=3Dy -include virtio.mak -CONFIG_USB_UHCI=3Dy -CONFIG_USB_OHCI=3Dy -CONFIG_USB_EHCI=3Dy -CONFIG_USB_XHCI=3Dy -CONFIG_USB_XHCI_NEC=3Dy -CONFIG_NE2000_PCI=3Dy -CONFIG_EEPRO100_PCI=3Dy -CONFIG_PCNET_PCI=3Dy -CONFIG_PCNET_COMMON=3Dy -CONFIG_AC97=3Dy -CONFIG_HDA=3Dy -CONFIG_ES1370=3Dy -CONFIG_SCSI=3Dy -CONFIG_LSI_SCSI_PCI=3Dy -CONFIG_VMW_PVSCSI_SCSI_PCI=3Dy -CONFIG_MEGASAS_SCSI_PCI=3Dy -CONFIG_MPTSAS_SCSI_PCI=3Dy -CONFIG_RTL8139_PCI=3Dy -CONFIG_E1000_PCI=3Dy -CONFIG_E1000E_PCI_EXPRESS=3Dy -CONFIG_AHCI=3Dy -CONFIG_ESP=3Dy -CONFIG_ESP_PCI=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_SERIAL_PCI=3Dy -CONFIG_CAN_BUS=3Dy -CONFIG_CAN_SJA1000=3Dy -CONFIG_CAN_PCI=3Dy -CONFIG_IPACK=3Dy -CONFIG_WDT_IB6300ESB=3Dy -CONFIG_PCI_TESTDEV=3Dy -CONFIG_NVME_PCI=3Dy -CONFIG_SD=3Dy -CONFIG_SDHCI=3Dy -CONFIG_EDU=3Dy -CONFIG_VGA=3Dy -CONFIG_VGA_PCI=3Dy -CONFIG_BOCHS_DISPLAY=3Dy -CONFIG_IVSHMEM_DEVICE=3D$(CONFIG_IVSHMEM) -CONFIG_ROCKER=3Dy -CONFIG_VFIO_PCI=3Dy -CONFIG_EDID=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 47e4177..763184f 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,8 +1,9 @@ # Default configuration for ppc-softmmu =20 -include pci.mak include sound.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy =20 # For embedded PPCs: CONFIG_PPC4XX=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 8c3a91a..5501c1b 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,8 +1,8 @@ # Default configuration for riscv-softmmu =20 -include pci.mak include usb.mak - +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 8c3a91a..5501c1b 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,8 +1,8 @@ # Default configuration for riscv-softmmu =20 -include pci.mak include usb.mak - +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 1fdb009..0459d43 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for sh4-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PTIMER=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 3b550a5..09a5b5e 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for sh4eb-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PTIMER=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 1fae488..d5e4a73 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for sparc64-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_M48T59=3Dy CONFIG_PTIMER=3Dy CONFIG_SERIAL=3Dy diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.txt index f9fd27f..addd274 100644 --- a/docs/devel/build-system.txt +++ b/docs/devel/build-system.txt @@ -417,7 +417,6 @@ into each QEMU system and userspace emulator targets. T= hey merely contain a long list of config variable definitions. For example, default-configs/x86_64-softmmu.mak has: =20 - include pci.mak include sound.mak include usb.mak CONFIG_QXL=3D$(CONFIG_SPICE) diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index 207baee..aa5c82b 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -3,9 +3,13 @@ config SB16 =20 config ES1370 bool + default y if PCI_DEVICES + depends on PCI =20 config AC97 bool + default y if PCI_DEVICES + depends on PCI =20 config ADLIB bool @@ -18,6 +22,8 @@ config CS4231A =20 config HDA bool + default y if PCI_DEVICES + depends on PCI =20 config PCSPK bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 1780569..f7b9d3a 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -21,6 +21,8 @@ config ONENAND =20 config NVME_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VIRTIO_BLK bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 26c1324..6eba69a 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -15,6 +15,8 @@ config SERIAL_ISA =20 config SERIAL_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VIRTIO_SERIAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 429056b..f8d63c6 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -9,6 +9,9 @@ config ADS7846 =20 config VGA_CIRRUS bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config G364FB bool @@ -30,6 +33,9 @@ config SSD0323 =20 config VGA_PCI bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config VGA_ISA bool @@ -39,9 +45,15 @@ config VGA_ISA_MM =20 config VMWARE_VGA bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config BOCHS_DISPLAY bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config BLIZZARD bool @@ -70,12 +82,16 @@ config QXL bool default y if PC depends on SPICE && PCI + select VGA =20 config VIRTIO_GPU bool =20 config VIRTIO_VGA bool + default y if PCI_DEVICES && VIRTIO + depends on PCI + select VGA =20 config DPCD bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index fe27705..246e27b 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -7,6 +7,7 @@ config IDE_QDEV =20 config IDE_PCI bool + depends on PCI select IDE_CORE =20 config IDE_ISA @@ -42,6 +43,8 @@ config MICRODRIVE =20 config AHCI bool + default y if PCI_DEVICES + depends on PCI select IDE_QDEV =20 config IDE_SII3112 diff --git a/hw/ipack/Kconfig b/hw/ipack/Kconfig index 481e0d2..f8da24a 100644 --- a/hw/ipack/Kconfig +++ b/hw/ipack/Kconfig @@ -1,2 +1,4 @@ config IPACK bool + default y if PCI_DEVICES + depends on PCI diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index cc8dbed..c85c085 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -21,9 +21,13 @@ config ISA_TESTDEV =20 config PCI_TESTDEV bool + default y if PCI_DEVICES + depends on PCI =20 config EDU bool + default y if PCI_DEVICES + depends on PCI =20 config PCA9552 bool @@ -48,7 +52,7 @@ config MACIO =20 config IVSHMEM_DEVICE bool - default y + default y if PCI_DEVICES depends on PCI =20 config ECCMEMCTL diff --git a/hw/net/Kconfig b/hw/net/Kconfig index d358b2c..d50e301 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -3,27 +3,42 @@ config DP8393X =20 config NE2000_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config EEPRO100_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config PCNET_PCI bool + default y if PCI_DEVICES + depends on PCI + select PCNET_COMMON =20 config PCNET_COMMON bool =20 config E1000_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config E1000E_PCI_EXPRESS bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config RTL8139_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VMXNET3_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config SMC91C111 bool @@ -81,12 +96,20 @@ config ETSEC =20 config ROCKER bool + default y if PCI_DEVICES + depends on PCI =20 config CAN_BUS bool =20 config CAN_PCI bool + default y if PCI_DEVICES + depends on PCI + select CAN_BUS =20 config CAN_SJA1000 bool + default y if PCI_DEVICES + depends on PCI + select CAN_BUS diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index bb19b7a..0519eb1 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -1,17 +1,25 @@ config PCIE_PORT bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config PXB bool =20 config XIO3130 bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config IOH3420 bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config I82801B11 bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config DEC_PCI bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 2edc5bb..c01812a 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -2,21 +2,27 @@ config PAM bool =20 config PREP_PCI + select PCI bool =20 config GRACKLE_PCI + select PCI bool =20 config UNIN_PCI + select PCI bool =20 config PPCE500_PCI + select PCI bool =20 config VERSATILE_PCI + select PCI bool =20 config PCI_SABRE + select PCI bool =20 config PCI_PIIX @@ -24,12 +30,16 @@ config PCI_PIIX =20 config PCI_EXPRESS_Q35 bool + select PCI_EXPRESS =20 config PCI_EXPRESS_GENERIC_BRIDGE bool + select PCI_EXPRESS =20 config PCI_EXPRESS_XILINX bool + select PCI_EXPRESS =20 config PCI_EXPRESS_DESIGNWARE bool + select PCI_EXPRESS diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig index 4ca2537..3b8638b 100644 --- a/hw/pci/Kconfig +++ b/hw/pci/Kconfig @@ -4,3 +4,6 @@ config PCI config PCI_EXPRESS bool select PCI + +config PCI_DEVICES + bool diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index 834413b..c02d880 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -3,21 +3,32 @@ config SCSI =20 config LSI_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config MPTSAS_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config MEGASAS_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VMW_PVSCSI_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config ESP bool =20 config ESP_PCI bool + default y if PCI_DEVICES + depends on PCI + select ESP =20 config SPAPR_VSCSI bool diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig index 4f43bbb..c6c5dfb 100644 --- a/hw/sd/Kconfig +++ b/hw/sd/Kconfig @@ -9,3 +9,6 @@ config SD =20 config SDHCI bool + default y if PCI_DEVICES + depends on PCI + select SD diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index cbf5c5d..86ee615 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -3,21 +3,31 @@ config USB =20 config USB_UHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_OHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_EHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_EHCI_SYSBUS bool =20 config USB_XHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_XHCI_NEC bool + default y if PCI_DEVICES + depends on PCI =20 config USB_MUSB bool diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index ebf1812..5dafbe3 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -6,6 +6,9 @@ config VIRTIO_RNG =20 config VIRTIO_PCI bool + default y if PCI_DEVICES + depends on PCI + select VIRTIO =20 config VIRTIO_MMIO bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index cd0244f..edb3d42 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -3,6 +3,8 @@ config CMSDK_APB_WATCHDOG =20 config WDT_IB6300ESB bool + default y if PCI_DEVICES + depends on PCI =20 config WDT_IB700 bool --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412787267357.82504403364214; Fri, 25 Jan 2019 02:39:47 -0800 (PST) Received: from localhost ([127.0.0.1]:41692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyth-0007ic-6M for importer@patchew.org; Fri, 25 Jan 2019 05:39:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP2-0007sQ-GW for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOu-00023c-OJ for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:54 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40513) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOu-00022Z-HA for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:52 -0500 Received: by mail-wm1-x343.google.com with SMTP id f188so5997750wmf.5 for ; Fri, 25 Jan 2019 02:07:52 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:50 -0800 (PST) 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=ttiRuZxRTdDEgorCA3qjfY7LKpLs/nJntQ6NlZIXLhs=; b=gpDxanHEENdbuq/uXLCktvDnNyOnYaskctMX5QdbyMusW9tWrvWR1n6VI9TrtjUPYI umAq9LsciOcsw1h81+7sWQnSA2o4XYhGCumlDVvMO1uiPIUtrxaJOQ8Fd1G/VITuFgwQ hPYqtt3B+7jLqIgBQCnq77RLF+hPy3GG0N77XnupDBGbyaqYflwkl9+wbFsAaaZf8DTo a7fHYWLA3pIMlaIl5cy1pj87Xx9ZQPZaV6VcS/hFOf7CDE0Y/PriB2ZOr1ZNXCo+Bxoa gvMQDPZGSY80Ge1tfd+JaWyLiC/5R/EOWfxrla4T16W416MIysdVbJtStc6/43iYo603 6kjQ== 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=ttiRuZxRTdDEgorCA3qjfY7LKpLs/nJntQ6NlZIXLhs=; b=mzjdlNSLiOm88PHGdgf52qzoeQV6jWz+4odRAC6XrVcwcfOeZnd9fxnwNZs4P6dP7O KN0rRoBuSR243EwH5TI1QbSZGyJD5CZwhm+MzqLkaapW0nDrZoNDgvJmYcGzgNi6EQxX fpsTQFgbGgERz7cUNLQnTkmYWvf+sISznjdXeLteSdpSJWkKsyQ9voyNhLJOKB5JimnC jfWtMdYIdVnAKF+b/Gt8PpSHlgx1QrMJZjPd1mskVYhLqvcgQ2Sipq6LJX+0SV+k0Mur Tmon/leRo1M98nj+pHusDCj8diGZ1JGRLdllL4yqg43Cdjb4AymvY6cQTzPG+36TzLvt gVwg== X-Gm-Message-State: AJcUukffPmJx6S32+OjItQGlvXmCtEhIS7bTX4sK33Egc7sySuy87eFG uvRwVE4XPoKS6lfn7t47I0GJau0N X-Google-Smtp-Source: ALg8bN7mJF5vlE/mEAnBYRepygptPC9w7/pxEC40recM3lIOsXPsW/qSLnyCZCtSYBTUomiXwTEHNw== X-Received: by 2002:a1c:5984:: with SMTP id n126mr6020109wmb.62.1548410871119; Fri, 25 Jan 2019 02:07:51 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:57 +0100 Message-Id: <1548410831-19553-39-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::343 Subject: [Qemu-devel] [PATCH 38/52] build: convert sound.mak to Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" There is really nothing special in these devices; they are just ISA devices. Instead of including them for each target, set CONFIG_ISA_BUS to true, and make the devices default to present whenever ISA is available. More conversion of ISA devices will follow. Done with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y\' -e' depends on ISA_BUS' \ `grep -lw $i hw/*/Kconfig` done < default-configs/sound.mak Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-32-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 2 +- default-configs/mips-softmmu-common.mak | 2 +- default-configs/ppc-softmmu.mak | 2 +- default-configs/sound.mak | 4 ---- hw/audio/Kconfig | 8 ++++++++ 5 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 default-configs/sound.mak diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index a139bd5..9eb9351 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -2,7 +2,7 @@ =20 CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy -include sound.mak +CONFIG_ISA_BUS=3Dy include usb.mak include hyperv.mak CONFIG_VGA_ISA=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 246af88..981ea2c 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,7 +1,7 @@ # Common mips*-softmmu CONFIG defines =20 -include sound.mak include usb.mak +CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ESP=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 763184f..dba071a 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,9 +1,9 @@ # Default configuration for ppc-softmmu =20 -include sound.mak include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy +CONFIG_ISA_BUS=3Dy =20 # For embedded PPCs: CONFIG_PPC4XX=3Dy diff --git a/default-configs/sound.mak b/default-configs/sound.mak deleted file mode 100644 index 4f22c34..0000000 --- a/default-configs/sound.mak +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_SB16=3Dy -CONFIG_ADLIB=3Dy -CONFIG_GUS=3Dy -CONFIG_CS4231A=3Dy diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index aa5c82b..dedb513 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -1,5 +1,7 @@ config SB16 bool + default y + depends on ISA_BUS =20 config ES1370 bool @@ -13,12 +15,18 @@ config AC97 =20 config ADLIB bool + default y + depends on ISA_BUS =20 config GUS bool + default y + depends on ISA_BUS =20 config CS4231A bool + default y + depends on ISA_BUS =20 config HDA bool --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411805703541.042063901766; Fri, 25 Jan 2019 02:23:25 -0800 (PST) Received: from localhost ([127.0.0.1]:41467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmydh-00039U-In for importer@patchew.org; Fri, 25 Jan 2019 05:23:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP0-0007rB-0M for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOw-000254-73 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:57 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:34605) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOv-000245-ST for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:54 -0500 Received: by mail-wr1-x441.google.com with SMTP id f7so9672681wrp.1 for ; Fri, 25 Jan 2019 02:07:53 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:51 -0800 (PST) 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=9caWpS0esp4P7Bw71XiGE+lryaZFUg00jlBeTlZJ+CI=; b=Ba0soBF1wQtwsd/bpr9stKQm5LmLDpRekMFhHF7GvWPmu1MS+LiRR0yUaGqJLJQja0 KmUqjzJDSLyMTqY5SheeBW+1XpTIw+caDWj8FqCuwUKW/htAWDwEMhHA6NT6QKpnKbz+ vH+8LV8siqMbejxK+NjPzaPM3fWfq8ulFOm7f7VRxUeG/o5/Whtzcd66rN5NsmCT2Fx8 cQxlyHGJfe9ivF071lIaQZZd8E6ILH/qFaiids76hpvzFbzIU80F5ySJ388jLWk1eAv+ 4zyqHCCJzgqSjHDQgTuCk6QWFrovzd2wIXGFtywsZiFETz7kaY2FDedzCkGbNxfjRt+L V8xA== 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=9caWpS0esp4P7Bw71XiGE+lryaZFUg00jlBeTlZJ+CI=; b=VEcfYBlkWS4lyMQd5cwal9+FRkYysokClm9atqCjYq9Ro4xCnmzB4niFSQ9S3sBgy8 2RAle48xgPovaa2WLRccMhaz2P5ku+JGL64IgBEitV9bZ4q8yq+wwLXJGw1/Re+LfV29 HJ/sCJR389y43qtnXI+xiiLtjoQzwozfKYgsoy+7Rnn/gmeuoTyLqegmA/nNWA/DLmLJ hfOGpFphtY0e5h4HLq57EAxr2TmY98lszhfZ7iBpFuLNv6wg1atSGpZCC8K5B4QjLbBK 8TdjsNq5+jrHhf5a5RMdhfHs3NSuSu8IMP7N1bpGUpBXWhzt0fQMtaozKXGF/PdzPuyT efwg== X-Gm-Message-State: AJcUukciYkXxMm13AUdJQ48WBtlf4Bm4mCGSHdUuQgg2FPqRs2T8Fh9r pjj40tjOaZJyK6vYCmeJGlUEHOrb X-Google-Smtp-Source: ALg8bN6Cw2wW2fg6o8Zwp9sr3GhD01LbHDnHB8VfzC+CPFQJ4lxSbr3HOsSerjiP667kTyc874U+Wg== X-Received: by 2002:adf:c452:: with SMTP id a18mr10964988wrg.145.1548410872528; Fri, 25 Jan 2019 02:07:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:58 +0100 Message-Id: <1548410831-19553-40-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::441 Subject: [Qemu-devel] [PATCH 39/52] build: convert usb.mak to Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Instead of including the same list of devices for each target, let the host controllers select CONFIG_USB and make the devices default to present whenever USB is available. Done with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y\' -e' depends on USB' \ `grep -lw $i hw/*/Kconfig` done < default-configs/usb.mak followed by adding "select USB" on the host controllers. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-33-yang.zhong@intel.com> Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 1 - default-configs/arm-softmmu.mak | 2 -- default-configs/hppa-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 1 - default-configs/mips-softmmu-common.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/riscv32-softmmu.mak | 1 - default-configs/riscv64-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - default-configs/usb.mak | 11 ----------- hw/usb/Kconfig | 26 ++++++++++++++++++++++++++ 13 files changed, 26 insertions(+), 23 deletions(-) delete mode 100644 default-configs/usb.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index a7b4a87..f44c5bc 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for alpha-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 0109e68..07d0a62 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for arm-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_VGA=3Dy @@ -38,7 +37,6 @@ CONFIG_DS1338=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_MICRODRIVE=3Dy -CONFIG_USB=3Dy CONFIG_USB_MUSB=3Dy CONFIG_USB_EHCI_SYSBUS=3Dy CONFIG_PLATFORM_BUS=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index 1594760..d30b12a 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,4 +1,3 @@ -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 9eb9351..4073c62 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -3,7 +3,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ISA_BUS=3Dy -include usb.mak include hyperv.mak CONFIG_VGA_ISA=3Dy CONFIG_VMWARE_VGA=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 981ea2c..e5f0841 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,6 +1,5 @@ # Common mips*-softmmu CONFIG defines =20 -include usb.mak CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index dba071a..c60a483 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for ppc-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ISA_BUS=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 5501c1b..fd91efb 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for riscv-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 5501c1b..fd91efb 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for riscv-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 0459d43..7446fc8 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sh4-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 09a5b5e..e37a532 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sh4eb-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index d5e4a73..4a6e997 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sparc64-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_M48T59=3Dy diff --git a/default-configs/usb.mak b/default-configs/usb.mak deleted file mode 100644 index e42cfea..0000000 --- a/default-configs/usb.mak +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_USB=3Dy -CONFIG_USB_TABLET_WACOM=3Dy -CONFIG_USB_STORAGE_BOT=3Dy -CONFIG_USB_STORAGE_UAS=3Dy -CONFIG_USB_STORAGE_MTP=3Dy -CONFIG_SCSI=3Dy -CONFIG_USB_SMARTCARD=3Dy -CONFIG_USB_AUDIO=3Dy -CONFIG_USB_SERIAL=3Dy -CONFIG_USB_NETWORK=3Dy -CONFIG_USB_BLUETOOTH=3Dy diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 86ee615..e20670a 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -5,59 +5,85 @@ config USB_UHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_OHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_EHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_EHCI_SYSBUS bool + select USB =20 config USB_XHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_XHCI_NEC bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_MUSB bool + select USB =20 config TUSB6010 bool + select USB_MUSB =20 config USB_TABLET_WACOM bool + default y + depends on USB =20 config USB_STORAGE_BOT bool + default y + depends on USB =20 config USB_STORAGE_UAS bool + default y + depends on USB =20 config USB_AUDIO bool + default y + depends on USB =20 config USB_SERIAL bool + default y + depends on USB =20 config USB_NETWORK bool + default y + depends on USB =20 config USB_BLUETOOTH bool + default y + depends on USB =20 config USB_SMARTCARD bool + default y + depends on USB =20 config USB_STORAGE_MTP bool + default y + depends on USB --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413082934881.6224176755601; Fri, 25 Jan 2019 02:44:42 -0800 (PST) Received: from localhost ([127.0.0.1]:41789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyyU-0003TY-VA for importer@patchew.org; Fri, 25 Jan 2019 05:44:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOy-0007fY-GS for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOw-00026G-Ty for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:55 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:39528) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOw-00024v-MK for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:54 -0500 Received: by mail-wm1-x344.google.com with SMTP id y8so6009857wmi.4 for ; Fri, 25 Jan 2019 02:07:54 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:52 -0800 (PST) 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=Tk646+qeFZF8k4MBXmfwyBZ0VvZEL7sRX7BXvPcxO3U=; b=sqIg2V7VNQxcmLCe8DaaIrdIA8OejTy+yoiGk6Po06mnDQkP5GUzlux/wMMwkTJnaW 7JaabqqUdhyUazxrfCAmfr1Jyg4j0LQ0ThDsfFmKeo+MgzbXNQEUf0tp/AzD3FpofBeQ uXhjLKwlAA1UCFzXb9wDec/1C0BVsG5wWdlaqm98otfvoBA+xslbWwhRDZbjRk2C8rAd m06qElAFvsgwCgc70LsG3u+4G139U9ZY7ubJHlMspLRiS29Zo0eiHSEsgcJ36ryueYdo dTsoDEPtkTt+CV8n0nFmfMCUIp5Ho7tDPJPzK1ZNMSsvzwUk/gTPyjyKp2ZX7LIl6Wx/ p1tg== 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=Tk646+qeFZF8k4MBXmfwyBZ0VvZEL7sRX7BXvPcxO3U=; b=B4/6lgKMkIrPHC/5uTbc9SygvGReR6zPjcw1FckgZ0i+DdE0cX/KrTjVK+d698xtBJ DVs9EOIzkJJO2LhROqTgMMOozPpPIgNO4Wk9War5Xv3m2LQjuTYcxjF3SchyTOEoGA+Y yj0tK08LveO3DetbumxMLQLpt/FpcIbA/FGERfqsndCtaJca3+MlLYNi4SqICGfIgPEq FUZZ3d0fj+j1xNGIddn9niIlBajYFhv/EViEPTx5YL2XCws9BZ2/sGprFVv3GK0BOJrC yrLn2wBuv4Jhe75CbfmJpnR8Y806uRLfHJRExp/lcptHZYfSNAbvdxpbyZCw24zxdlJ9 yusA== X-Gm-Message-State: AJcUukdKvUeJ8TXitH3s1I+O2hUBV7NmmN3H79tAfiMF1nJ2Bkz1wJqF I6BrLaKROCnHeMwDZkIT/JnVaUJF X-Google-Smtp-Source: ALg8bN5fzWjb0VcxSp2//QksHPSdruYs/4E+0TzfHrKI29RsaDkPsdgMq/4RgRuHM5scqteAKFGIQQ== X-Received: by 2002:a1c:6707:: with SMTP id b7mr6223430wmc.138.1548410873448; Fri, 25 Jan 2019 02:07:53 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:59 +0100 Message-Id: <1548410831-19553-41-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::344 Subject: [Qemu-devel] [PATCH 40/52] scsi: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" This automatically removes the SCSI subsystem from the binary altogether if no controllers are selected. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-34-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- hw/scsi/Kconfig | 11 ++++++++++- hw/scsi/Makefile.objs | 2 +- hw/usb/Kconfig | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index c02d880..b9cf269 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -5,24 +5,29 @@ config LSI_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config MPTSAS_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config MEGASAS_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config VMW_PVSCSI_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config ESP bool + select SCSI =20 config ESP_PCI bool @@ -34,10 +39,14 @@ config SPAPR_VSCSI bool default y depends on PSERIES + select SCSI =20 config VIRTIO_SCSI bool + select SCSI =20 config VHOST_USER_SCSI bool - default y if VHOST_USER && LINUX + # Only PCI devices are provided for now + default y if VIRTIO_PCI + depends on VHOST_USER && LINUX diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs index 45167ba..54b36ed 100644 --- a/hw/scsi/Makefile.objs +++ b/hw/scsi/Makefile.objs @@ -6,7 +6,7 @@ common-obj-$(CONFIG_MEGASAS_SCSI_PCI) +=3D megasas.o common-obj-$(CONFIG_VMW_PVSCSI_SCSI_PCI) +=3D vmw_pvscsi.o common-obj-$(CONFIG_ESP) +=3D esp.o common-obj-$(CONFIG_ESP_PCI) +=3D esp-pci.o -obj-$(CONFIG_PSERIES) +=3D spapr_vscsi.o +obj-$(CONFIG_SPAPR_VSCSI) +=3D spapr_vscsi.o =20 ifeq ($(CONFIG_VIRTIO_SCSI),y) obj-y +=3D virtio-scsi.o virtio-scsi-dataplane.o diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index e20670a..a1b7acb 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -52,11 +52,13 @@ config USB_STORAGE_BOT bool default y depends on USB + select SCSI =20 config USB_STORAGE_UAS bool default y depends on USB + select SCSI =20 config USB_AUDIO bool --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413243099820.2767131919658; Fri, 25 Jan 2019 02:47:23 -0800 (PST) Received: from localhost ([127.0.0.1]:41843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmz15-0005eN-Rv for importer@patchew.org; Fri, 25 Jan 2019 05:47:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOz-0007qf-M5 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOy-00027c-0w for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:57 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:36410) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOx-00026b-Oq for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:55 -0500 Received: by mail-wm1-x330.google.com with SMTP id p6so6036198wmc.1 for ; Fri, 25 Jan 2019 02:07:55 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:53 -0800 (PST) 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=5GJmCa46c9v2SV5H7VSyMVADrPZaPYSSVu88NthNycc=; b=hgsgsfICTcDZlhzeK9VqK+WtCuqY79DsKqRqaETio0cSTlCvGuy9BvO2NuTWBbgN6p oJ1FpJJWR2c2rlB+oMCDjX5qmXI5QoLs4MFdnPhrB5XmatzzAwFbiyIZVT9VzA3Yrjb4 xWMxnsE+l4Bw7m5fXNylv5NzUp7sfr0ysw6i8nVzNGbWYhhMpBhHA3mXTNRD6RlpnzR6 CFgB+DWI4xqvRU1NdSFP2yUgQHsE6cSSMR2X033s3otlDiPvklbqpU0TL1X73cg2aJro eRmJxOZ4mWFv94izO+1s4WQpmYYqkj4gaqPAQIsLS/EyrYa/M+ODs8m1sp1c8iWdpqO+ EAKw== 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=5GJmCa46c9v2SV5H7VSyMVADrPZaPYSSVu88NthNycc=; b=fSPF/8YHcUeA566sTjd9CYrEByqjf0MvEzBcbGXMM2BRL1OpH9kjxHrjig2+coXeLi HBEqw2AYjaVsa3zk4QtVTHTm0iFdcl5MjA7Iri+jxHIaoVU7zSiNpftkA7gWIkIS4ncg a11kBnlT73TMWr3IBIEKfzFg8Mw6x8u/ao4CMSWYJTzjOL4quLGKr6D5FSQJWnt7zv7x JWltT4ZRK6PYH2RgU1icyAe5/Nk4PkrgjL0pKy3sOqBSPOTV1+wQ8zAHlwe8AWbQ+u+F 4bEZph1S3q2nM5DHoZXEsvspQBaUE4yFgITmwqhsi8//cGuvjmRWFpXQ7YEd9UzeYxy1 YVvA== X-Gm-Message-State: AJcUukcuu5cJtSI7sW7AdDvcdg5LNftHqm2V82FU7nIdLZ1ZWxzHzHhA QhapytDVM222akpUNIEM6w/Aj4by X-Google-Smtp-Source: ALg8bN6E4aSCy9c6Nm9vo5ISIspjwZVSht+w5+B9KeLzOAiknw276BHJLfCVsntpbKswuA/FaT6ssw== X-Received: by 2002:a1c:b10a:: with SMTP id a10mr6094329wmf.148.1548410874370; Fri, 25 Jan 2019 02:07:54 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:00 +0100 Message-Id: <1548410831-19553-42-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::330 Subject: [Qemu-devel] [PATCH 41/52] isa: express dependencies with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-36-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 9 --------- hw/audio/Kconfig | 2 ++ hw/block/Kconfig | 2 ++ hw/char/Kconfig | 6 ++++++ hw/display/Kconfig | 3 +++ hw/dma/Kconfig | 1 + hw/i386/Kconfig | 1 + hw/ide/Kconfig | 1 + hw/input/Kconfig | 2 ++ hw/isa/Kconfig | 7 +++++++ hw/misc/Kconfig | 4 ++++ hw/net/Kconfig | 3 +++ hw/sparc64/Kconfig | 1 + hw/watchdog/Kconfig | 2 ++ 14 files changed, 35 insertions(+), 9 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 4073c62..8e6a810 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -8,19 +8,12 @@ CONFIG_VGA_ISA=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy -CONFIG_VMMOUSE=3Dy CONFIG_IPMI=3Dy CONFIG_IPMI_LOCAL=3Dy CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_KCS=3Dy CONFIG_ISA_IPMI_BT=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_PARALLEL=3Dy CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy -CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy CONFIG_ACPI=3Dy CONFIG_ACPI_X86=3Dy CONFIG_ACPI_X86_ICH=3Dy @@ -30,14 +23,12 @@ CONFIG_APM=3Dy CONFIG_I8257=3Dy CONFIG_IDE_ISA=3Dy CONFIG_IDE_PIIX=3Dy -CONFIG_NE2000_ISA=3Dy CONFIG_HPET=3Dy CONFIG_APPLESMC=3Dy CONFIG_I8259=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_MC146818RTC=3Dy CONFIG_PCI_PIIX=3Dy -CONFIG_WDT_IB700=3Dy CONFIG_ISA_DEBUG=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index dedb513..01aea55 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -35,6 +35,8 @@ config HDA =20 config PCSPK bool + default y + depends on I8254 =20 config WM8750 bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index f7b9d3a..dc91e67 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -1,5 +1,7 @@ config FDC bool + default y + depends on ISA_BUS =20 config SSI_M25P80 bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 6eba69a..fc18481 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -3,6 +3,8 @@ config ESCC =20 config PARALLEL bool + default y + depends on ISA_BUS =20 config PL011 bool @@ -12,11 +14,15 @@ config SERIAL =20 config SERIAL_ISA bool + default y + depends on ISA_BUS + select SERIAL =20 config SERIAL_PCI bool default y if PCI_DEVICES depends on PCI + select SERIAL =20 config VIRTIO_SERIAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index f8d63c6..64a5764 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -39,9 +39,12 @@ config VGA_PCI =20 config VGA_ISA bool + depends on ISA_BUS + select VGA =20 config VGA_ISA_MM bool + select VGA =20 config VMWARE_VGA bool diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig index b9ce1c5..751dec5 100644 --- a/hw/dma/Kconfig +++ b/hw/dma/Kconfig @@ -9,6 +9,7 @@ config PL330 =20 config I82374 bool + select I8257 =20 config I8257 bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 9a0e559..ff41be3 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -10,6 +10,7 @@ config I440FX =20 config ISAPC bool + select ISA_BUS =20 config Q35 bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index 246e27b..ab47b6a 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -12,6 +12,7 @@ config IDE_PCI =20 config IDE_ISA bool + depends on ISA_BUS select IDE_QDEV =20 config IDE_PIIX diff --git a/hw/input/Kconfig b/hw/input/Kconfig index 98a18a1..bdb4237 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -6,6 +6,8 @@ config LM832X =20 config PCKBD bool + default y + depends on ISA_BUS =20 config PL050 bool diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index b59d074..af68af9 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -6,18 +6,25 @@ config APM =20 config I82378 bool + select ISA_BUS =20 config PC87312 bool + select ISA_BUS =20 config PIIX4 bool + select ISA_BUS =20 config VT82C686 bool + select ISA_BUS =20 config SMC37C669 bool + select ISA_BUS =20 config LPC_ICH9 bool + select ISA_BUS + select ACPI_X86_ICH diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index c85c085..ca051fb 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -1,5 +1,6 @@ config APPLESMC bool + depends on ISA_BUS =20 config MAX111X bool @@ -12,9 +13,11 @@ config TMP421 =20 config ISA_DEBUG bool + depends on ISA_BUS =20 config SGA bool + depends on ISA_BUS =20 config ISA_TESTDEV bool @@ -93,6 +96,7 @@ config IOTKIT_SYSINFO =20 config PVPANIC bool + depends on ISA_BUS =20 config AUX bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index d50e301..6d15720 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -48,6 +48,9 @@ config LAN9118 =20 config NE2000_ISA bool + default y + depends on ISA_BUS + depends on PCI # for NE2000State =20 config OPENCORES_ETH bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index 8c13345..41f7295 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -1,5 +1,6 @@ config SUN4U bool + select ISA_BUS =20 config NIAGARA bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index edb3d42..35ccb72 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -8,6 +8,8 @@ config WDT_IB6300ESB =20 config WDT_IB700 bool + default y + depends on ISA_BUS =20 config WDT_DIAG288 bool --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413058575799.0566401053794; Fri, 25 Jan 2019 02:44:18 -0800 (PST) Received: from localhost ([127.0.0.1]:41787 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyy8-0002vC-FW for importer@patchew.org; Fri, 25 Jan 2019 05:44:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP0-0007sQ-Jm for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOy-00028k-Rh for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:58 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:46827) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOy-00027U-Iw for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:56 -0500 Received: by mail-wr1-x442.google.com with SMTP id l9so9580210wrt.13 for ; Fri, 25 Jan 2019 02:07:56 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:54 -0800 (PST) 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=Y8U6caDdbVDJvSI3qgA827lzhO7T3M66gJFLSF1lByk=; b=Ke2zCY2dkXgiYz1JfsJPz0BfsJR69zT7prcNh3f1cGt5QrT9vOccVb08uOPrDmjuTC rEZOwuer2ZJP5iludmDvLIhM6hTqhiKEhF32BwkdiuqJ6LSjAg5tnC7o4zeOBN1C7S38 PDSGEaFTjdeTSqBzOTfogkLpOmc6C7jLI3+RFYB/hvOGcgCX07YZAPwNtCcGzmrBZv06 z5iKpCa1CVYrM/ULGzGizBeIvuaEdyQlN3J/A22GKdZXaP0ULZl6Lj+oh3js1BLKWOfU ZEFYONtbA0PyIj7O9mCJSfPR8zg/XDpLywDE0/XN1IMRTU+1DplQqjY30aCrJORAPkAE YBJQ== 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=Y8U6caDdbVDJvSI3qgA827lzhO7T3M66gJFLSF1lByk=; b=b98y8VIhN0L0LjFDbgntiWEOe7gXq6at5bkm5rmrS+r3oharGCqlpGFRlUWOv/YOyK VdnKm/q2QCdjJeSli2oKHH6CP/Buk35oCAAdSCtFd2i4TezfVyDBQzsiR3onPCRO+hGj iwMczeS8xNEviI6iv2DC5KAHSg/7y/qkYXgXGauw3c3TPEr77PdPyM6oeECKZ7A8H2wA nPdC+jvDemCxwbQGe7/bWA2Dt4EnaFVlB+VWOx8nt33t6lJladXHjQev4j7WBR2LviOp D9WMrh8tL5O7jfpQjXvLbuFT85it0s3aSeYfAPs8ZYTqZDkimiFGz/n2rEVBprMR7UxK 45AQ== X-Gm-Message-State: AJcUukfDhAcAg3QbwBgw3GB1O+wN4fJ0xgeLjSG7S3k+wm8ls6njvSro ATMNvFZ6TllehZI0lcoP3WOEEDAZ X-Google-Smtp-Source: AHgI3IbMG837xHA7WZKq+jSjfbaXvPB8n8/rIQ3vQPM3JLoAcT2EIrc7jH204nNG9zdB9wdLOFc5tQ== X-Received: by 2002:adf:f3c6:: with SMTP id g6mr6534988wrp.111.1548410875253; Fri, 25 Jan 2019 02:07:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:01 +0100 Message-Id: <1548410831-19553-43-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::442 Subject: [Qemu-devel] [PATCH 42/52] i386: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" This way, the default-configs file only need to specify the boards and any optional devices. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-37-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 44 ++++++-------------------------- hw/acpi/Kconfig | 3 +++ hw/i2c/Makefile.objs | 2 +- hw/i386/Kconfig | 54 ++++++++++++++++++++++++++++++++++++= ++++ hw/isa/Kconfig | 1 + hw/pci-host/Kconfig | 4 +++ hw/tpm/Kconfig | 2 ++ 7 files changed, 73 insertions(+), 37 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 8e6a810..9eb9a5e 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,11 +1,6 @@ # Default configuration for i386-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_ISA_BUS=3Dy include hyperv.mak -CONFIG_VGA_ISA=3Dy -CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_IPMI=3Dy @@ -13,49 +8,26 @@ CONFIG_IPMI_LOCAL=3Dy CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_KCS=3Dy CONFIG_ISA_IPMI_BT=3Dy -CONFIG_I8254=3Dy -CONFIG_ACPI=3Dy -CONFIG_ACPI_X86=3Dy -CONFIG_ACPI_X86_ICH=3Dy -CONFIG_ACPI_MEMORY_HOTPLUG=3Dy -CONFIG_ACPI_CPU_HOTPLUG=3Dy -CONFIG_APM=3Dy -CONFIG_I8257=3Dy -CONFIG_IDE_ISA=3Dy -CONFIG_IDE_PIIX=3Dy + +# Optional devices: +# CONFIG_HPET=3Dy CONFIG_APPLESMC=3Dy -CONFIG_I8259=3Dy CONFIG_PFLASH_CFI01=3Dy -CONFIG_MC146818RTC=3Dy -CONFIG_PCI_PIIX=3Dy -CONFIG_ISA_DEBUG=3Dy CONFIG_ISA_TESTDEV=3Dy -CONFIG_VMPORT=3Dy CONFIG_SGA=3Dy -CONFIG_LPC_ICH9=3Dy -CONFIG_PCI_EXPRESS=3Dy -CONFIG_PCI_EXPRESS_Q35=3Dy -CONFIG_APIC=3Dy -CONFIG_IOAPIC=3Dy CONFIG_PVPANIC=3Dy CONFIG_MEM_DEVICE=3Dy -CONFIG_DIMM=3Dy CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy -CONFIG_XIO3130=3Dy -CONFIG_IOH3420=3Dy -CONFIG_I82801B11=3Dy -CONFIG_SMBIOS=3Dy CONFIG_PXB=3Dy CONFIG_ACPI_VMGENID=3Dy -CONFIG_ACPI_SMBUS=3Dy CONFIG_SMBUS_EEPROM=3Dy -CONFIG_FW_CFG_DMA=3Dy CONFIG_I2C=3Dy -CONFIG_VTD=3Dy -CONFIG_AMD_IOMMU=3Dy -CONFIG_PAM=3Dy -CONFIG_PC=3Dy +CONFIG_PCI_DEVICES=3Dy + +# Boards: +# +CONFIG_ISAPC=3Dy CONFIG_I440FX=3Dy CONFIG_Q35=3Dy diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index c485a34..035a28f 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -3,15 +3,18 @@ config ACPI =20 config ACPI_X86 bool + select ACPI =20 config ACPI_X86_ICH bool + select ACPI_X86 =20 config ACPI_CPU_HOTPLUG bool =20 config ACPI_MEMORY_HOTPLUG bool + select MEM_DEVICE =20 config ACPI_NVDIMM bool diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs index 61ac50a..ff22aa6 100644 --- a/hw/i2c/Makefile.objs +++ b/hw/i2c/Makefile.objs @@ -2,7 +2,7 @@ common-obj-$(CONFIG_I2C) +=3D core.o smbus.o common-obj-$(CONFIG_SMBUS_EEPROM) +=3D smbus_eeprom.o common-obj-$(CONFIG_DDC) +=3D i2c-ddc.o common-obj-$(CONFIG_VERSATILE_I2C) +=3D versatile_i2c.o -common-obj-$(CONFIG_ACPI_X86) +=3D smbus_ich9.o +common-obj-$(CONFIG_ACPI_X86_ICH) +=3D smbus_ich9.o common-obj-$(CONFIG_ACPI_SMBUS) +=3D pm_smbus.o common-obj-$(CONFIG_BITBANG_I2C) +=3D bitbang_i2c.o common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_i2c.o diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index ff41be3..8814b7c 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -5,20 +5,73 @@ config SEV config PC bool =20 +config PC + bool + select ISA_DEBUG + select I8259 + select I8254 + select PCSPK + select I82374 + select I8257 + select MC146818RTC + +config PC_PCI + bool + select APIC + select IOAPIC + select APM + select PC + +config PC_ACPI + bool + select ACPI_X86 + select ACPI_CPU_HOTPLUG + select ACPI_MEMORY_HOTPLUG + depends on ACPI_SMBUS + config I440FX bool + select PC_PCI + select PC_ACPI + select ACPI_SMBUS + select PCI_PIIX + select FDC + select IDE_PIIX + select DIMM + select SMBIOS + select VMPORT + select VMMOUSE + select FW_CFG_DMA =20 config ISAPC bool select ISA_BUS + select PC + select IDE_ISA + select VGA_ISA + # FIXME: it is in the same file as i440fx, and does not compile + # if separated + depends on I440FX =20 config Q35 bool + select PC_PCI + select PC_ACPI + select PCI_EXPRESS_Q35 + select LPC_ICH9 + select AHCI + select DIMM + select SMBIOS + select VMPORT + select VMMOUSE + select FW_CFG_DMA =20 config VTD + default y if Q35 bool =20 config AMD_IOMMU + default y if Q35 bool =20 config VMPORT @@ -26,3 +79,4 @@ config VMPORT =20 config VMMOUSE bool + depends on VMPORT diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index af68af9..6f0812d 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -27,4 +27,5 @@ config SMC37C669 config LPC_ICH9 bool select ISA_BUS + select ACPI_SMBUS select ACPI_X86_ICH diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index c01812a..ff4080c 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -27,10 +27,14 @@ config PCI_SABRE =20 config PCI_PIIX bool + select PCI + select PAM + select ISA_BUS =20 config PCI_EXPRESS_Q35 bool select PCI_EXPRESS + select PAM =20 config PCI_EXPRESS_GENERIC_BRIDGE bool diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index db57388..8a63597 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -8,6 +8,8 @@ config TPM_TIS =20 config TPM_CRB bool + default y + depends on TPM && PC =20 config TPM_PASSTHROUGH bool --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411998850970.0713003754212; Fri, 25 Jan 2019 02:26:38 -0800 (PST) Received: from localhost ([127.0.0.1]:41526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyh0-0005f3-CU for importer@patchew.org; Fri, 25 Jan 2019 05:26:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP1-0007ut-Ij for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOz-00029S-NZ for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:59 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:42342) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOz-00028e-ER for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:57 -0500 Received: by mail-wr1-x444.google.com with SMTP id q18so9614330wrx.9 for ; Fri, 25 Jan 2019 02:07:57 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:55 -0800 (PST) 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=UP9pG+nHxCFHhoRbraLGW3eb/J52jh1wQSz7vwEDZmc=; b=P0jYxeaYXGYOa5MHVnmiXJIoYT1bpd3A7sr83weXdJVAejooS8B+2yOCT0QDexPJoV 2vqUXCYZDn3ut21KHJhPFPkMrulAmc083fUqC3RdYXON4GrJX1hao5Q5srHC9qEpHZv8 Dn0UY+MgbF5L4f2AvtaeGdiXLPyLiIuCo7WlIjD4ti1ZzAf2RajeALSIVeHGcIsvYekR UPaPlschtPXc0TCyPIesE3I0TIcJaUrLHcMcVonDthvVughohzpf3NdE8mAzEB0vdoKf zeKjDCdynuj1gIDfFL6kvgdTCOB9udDMO9MEhxmxyJsi4tyGr4x622A5TySVhV1fbDLR lyjw== 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=UP9pG+nHxCFHhoRbraLGW3eb/J52jh1wQSz7vwEDZmc=; b=t1BYPOXkylSyjSA/98rnfgbBeDZh9Yy+XGNO1r3XSU26GT84VZeRygAyW68zis8/LK dSjTJCR4OCrZfOvLGyl/mjzKubaz7V+1u1wtlrrKpj8vr3e+7gXop+elQQWJkC+oOdPu /oOcO81zQe4W2goJGgrjUpYl5CeWjnnNYOHS5TT2yMjV8ZOPUAoNgnvuS3VhAxGmI2BO ODXqoVR+zILWKPXJyVmv4fOCi3/JROg0bfiK7krm8ZgstWFjA3k+h+7TQpV4BfKgifyc xjkuAgxBYv3wzNlXbknGcXaqF9yjcdixOyI32W3M7gKhnlWi21J0Fv/oZqmKpd72VxtF dHTw== X-Gm-Message-State: AJcUukcMvTNYIN/OJYIJMDVVKZs1KEV2oQri3eOKSALjrNIOsHNZnWwR XrKkGGA8ne2/3ZZA11NVokLZ4zLG X-Google-Smtp-Source: ALg8bN7wCdRKoF1cTySvd06ZwKccoUi24I5PJH0653Twl0YKxUjKt5D+GD9VwWCAQaNBlqVTDJhGBg== X-Received: by 2002:a5d:664a:: with SMTP id f10mr10626679wrw.311.1548410876207; Fri, 25 Jan 2019 02:07:56 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:02 +0100 Message-Id: <1548410831-19553-44-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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 43/52] i2c: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Acked-by: Thomas Huth Message-Id: <20190123065618.3520-38-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 2 -- hw/Makefile.objs | 2 +- hw/audio/Kconfig | 1 + hw/display/Kconfig | 3 +++ hw/gpio/Kconfig | 1 + hw/i2c/Kconfig | 6 ++++++ hw/i386/Kconfig | 1 + hw/input/Kconfig | 1 + hw/isa/Kconfig | 1 + hw/misc/Kconfig | 4 ++++ hw/timer/Kconfig | 3 +++ 11 files changed, 22 insertions(+), 3 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 9eb9a5e..4aa04e4 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -22,8 +22,6 @@ CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy CONFIG_PXB=3Dy CONFIG_ACPI_VMGENID=3Dy -CONFIG_SMBUS_EEPROM=3Dy -CONFIG_I2C=3Dy CONFIG_PCI_DEVICES=3Dy =20 # Boards: diff --git a/hw/Makefile.objs b/hw/Makefile.objs index e2fcd6a..225f6cc 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -10,7 +10,7 @@ devices-dirs-$(CONFIG_SOFTMMU) +=3D display/ devices-dirs-$(CONFIG_SOFTMMU) +=3D dma/ devices-dirs-$(CONFIG_SOFTMMU) +=3D gpio/ devices-dirs-$(CONFIG_HYPERV) +=3D hyperv/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D i2c/ +devices-dirs-$(CONFIG_I2C) +=3D i2c/ devices-dirs-$(CONFIG_SOFTMMU) +=3D ide/ devices-dirs-$(CONFIG_SOFTMMU) +=3D input/ devices-dirs-$(CONFIG_SOFTMMU) +=3D intc/ diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index 01aea55..e9c6fed 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -40,6 +40,7 @@ config PCSPK =20 config WM8750 bool + depends on I2C =20 config PL041 bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 64a5764..66044ca 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -24,9 +24,11 @@ config PL110 =20 config SII9022 bool + depends on I2C =20 config SSD0303 bool + depends on I2C =20 config SSD0323 bool @@ -71,6 +73,7 @@ config MILKYMIST_TMU2 =20 config SM501 bool + depends on I2C =20 config TCX bool diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig index d0a4abf..9227cb5 100644 --- a/hw/gpio/Kconfig +++ b/hw/gpio/Kconfig @@ -1,5 +1,6 @@ config MAX7310 bool + depends on I2C =20 config PL061 bool diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index d6d4402..74c9328 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -3,18 +3,24 @@ config I2C =20 config SMBUS_EEPROM bool + depends on I2C =20 config DDC bool + depends on I2C =20 config VERSATILE_I2C bool + select I2C =20 config ACPI_SMBUS bool + select I2C =20 config BITBANG_I2C bool + select I2C =20 config IMX_I2C bool + select I2C diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 8814b7c..966c97c 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -27,6 +27,7 @@ config PC_ACPI select ACPI_X86 select ACPI_CPU_HOTPLUG select ACPI_MEMORY_HOTPLUG + select SMBUS_EEPROM depends on ACPI_SMBUS =20 config I440FX diff --git a/hw/input/Kconfig b/hw/input/Kconfig index bdb4237..ec014a9 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -3,6 +3,7 @@ config ADB =20 config LM832X bool + depends on I2C =20 config PCKBD bool diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 6f0812d..fcd87b4 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -19,6 +19,7 @@ config PIIX4 config VT82C686 bool select ISA_BUS + select ACPI_SMBUS =20 config SMC37C669 bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index ca051fb..0680d1e 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -7,9 +7,11 @@ config MAX111X =20 config TMP105 bool + depends on I2C =20 config TMP421 bool + depends on I2C =20 config ISA_DEBUG bool @@ -34,6 +36,7 @@ config EDU =20 config PCA9552 bool + depends on I2C =20 config PL310 bool @@ -100,3 +103,4 @@ config PVPANIC =20 config AUX bool + select I2C diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 7dbc121..e1a6e74 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -9,6 +9,7 @@ config A9_GTIMER =20 config DS1338 bool + depends on I2C =20 config HPET bool @@ -18,6 +19,7 @@ config I8254 =20 config M41T80 bool + depends on I2C =20 config M48T59 bool @@ -27,6 +29,7 @@ config PL031 =20 config TWL92230 bool + depends on I2C =20 config XLNX_ZYNQMP bool --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412601975684.4252558162877; Fri, 25 Jan 2019 02:36:41 -0800 (PST) Received: from localhost ([127.0.0.1]:41665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyqS-00054E-Q6 for importer@patchew.org; Fri, 25 Jan 2019 05:36:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP9-00080A-P3 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyP1-0002CZ-T8 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:07 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:37375) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyP1-0002BH-H7 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:59 -0500 Received: by mail-wr1-x434.google.com with SMTP id s12so9632870wrt.4 for ; Fri, 25 Jan 2019 02:07:59 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:56 -0800 (PST) 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=mdbqke55AfREtZ9QtdgpfrlNo7RRYHXfOnOZaO3c1fw=; b=iM6KTTN6s9USJSxY1rZC8ddLJoqH2H1smTgOJhqekkxwSJsURqBvAEbiyYl35DKGVq 2AWd+IvU7ZOT7Z3nrPLclsX0IFhczPNgogPAXHqxldhFrH4lqayhh6KydURSDx0eleAp m3neJ4vp3NNeRknWN5hRLZQHLlW7KaRLzhVTdvq6m71fn9daB0ZEwpXJg4Cz4UX07Fxn pACUkSvBxABLeXgPyVw4Jc4bIoOiGEStHdBS8qA2ThDyKKX5DBPV2rmYtn46akVuTST1 XwKaRG0gthyFdCHr8a2P9dIgHtB8lBBK+CUFDfz37JsseFJhH3pCPgPwjNamg3uwfaco YIQw== 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=mdbqke55AfREtZ9QtdgpfrlNo7RRYHXfOnOZaO3c1fw=; b=hSVlb5BcxyDpPAc7ZjdHHceF8ftnhLCK18gbqf5Ejs1N5sxsC+Tbt77dhTruiXtBy0 FxF6elvg80n0VlpX+aTVV3iG5iXCVbZOy8/1lcGDkTOvTYpGN9mfHs1KS/InXygAbD/u aakeAwyqfz349/teqF8uD8k318djPIbKRCbIFrj6dOLlxgRUFs22QXjbvcMesL1p+VdV 8Na5GJ1aOIFV9pw0FjRn5URc/Y2SYJGxnYp8hE4w+6QSAyWuSdWV2ZGpectM3TVA3I0v J+xjCgii6IUWpF2qbmuzTXcYdAvo9Qb+kvEp1oaDPkzoKGqgXgAKLhu9zXvLfiyupRqs UAhg== X-Gm-Message-State: AJcUukdD5m3Gkq31XKzLuy0Z5C3rCH67fxcJPXo80AHwYXYsqdIQdiGL ex4beCbHKYiqzjXzYoWqz7xs638p X-Google-Smtp-Source: ALg8bN52uup5EWyWWgObCnBP/3tzAE/HbRorPcc+zOX1ks2L1WmgUMKebM6X8jtH3cA9ATIUQtDTsQ== X-Received: by 2002:a5d:4d87:: with SMTP id b7mr10222994wru.316.1548410877096; Fri, 25 Jan 2019 02:07:57 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:03 +0100 Message-Id: <1548410831-19553-45-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::434 Subject: [Qemu-devel] [PATCH 44/52] ptimer: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-39-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 - default-configs/cris-softmmu.mak | 1 - default-configs/lm32-softmmu.mak | 1 - default-configs/m68k-softmmu.mak | 1 - default-configs/microblaze-softmmu.mak | 1 - default-configs/nios2-softmmu.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - default-configs/unicore32-softmmu.mak | 1 - hw/Kconfig | 2 ++ hw/arm/Kconfig | 4 ++++ hw/cris/Kconfig | 1 + hw/lm32/Kconfig | 2 ++ hw/m68k/Kconfig | 2 ++ hw/mips/Kconfig | 1 + hw/misc/Kconfig | 1 + hw/net/Kconfig | 2 ++ hw/sh4/Kconfig | 1 + hw/sparc/Kconfig | 2 ++ hw/timer/Kconfig | 6 ++++++ hw/unicore32/Kconfig | 1 + hw/watchdog/Kconfig | 1 + 25 files changed, 26 insertions(+), 12 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 07d0a62..f8a7742 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,7 +6,6 @@ CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy CONFIG_SERIAL=3Dy -CONFIG_PTIMER=3Dy CONFIG_SD=3Dy CONFIG_MAX7310=3Dy CONFIG_WM8750=3Dy diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmm= u.mak index a637c4b..b3cae59 100644 --- a/default-configs/cris-softmmu.mak +++ b/default-configs/cris-softmmu.mak @@ -2,6 +2,5 @@ =20 CONFIG_ETRAXFS=3Dy CONFIG_NAND=3Dy -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_AXIS=3Dy diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmm= u.mak index ef0f4ba..f489838 100644 --- a/default-configs/lm32-softmmu.mak +++ b/default-configs/lm32-softmmu.mak @@ -3,7 +3,6 @@ CONFIG_LM32=3Dy CONFIG_MILKYMIST=3Dy CONFIG_FRAMEBUFFER=3Dy -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SD=3Dy diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmm= u.mak index 27f5274..a12eece 100644 --- a/default-configs/m68k-softmmu.mak +++ b/default-configs/m68k-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for m68k-softmmu =20 CONFIG_COLDFIRE=3Dy -CONFIG_PTIMER=3Dy CONFIG_AN5206=3Dy CONFIG_MCF5208=3Dy diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/micro= blaze-softmmu.mak index 14837cf..a4a6770 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for microblaze-softmmu =20 -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_SERIAL=3Dy CONFIG_XILINX=3Dy diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-soft= mmu.mak index ab42d0f..b3c507e 100644 --- a/default-configs/nios2-softmmu.mak +++ b/default-configs/nios2-softmmu.mak @@ -2,6 +2,5 @@ =20 CONFIG_NIOS2=3Dy CONFIG_SERIAL=3Dy -CONFIG_PTIMER=3Dy CONFIG_ALTERA_TIMER=3Dy CONFIG_NIOS2_10M50=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index c60a483..f38c14c 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -13,7 +13,6 @@ CONFIG_OPENPIC=3Dy CONFIG_PPCE500_PCI=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy -CONFIG_PTIMER=3Dy CONFIG_I8259=3Dy CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 7446fc8..9e8e487 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -4,7 +4,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index e37a532..2a26946 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -4,7 +4,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-soft= mmu.mak index 59a4a3d..223b0be 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -6,7 +6,6 @@ CONFIG_SCSI=3Dy CONFIG_ESP=3Dy CONFIG_ESCC=3Dy CONFIG_M48T59=3Dy -CONFIG_PTIMER=3Dy CONFIG_FDC=3Dy CONFIG_EMPTY_SLOT=3Dy CONFIG_PCNET_COMMON=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 4a6e997..aef26a2 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -3,7 +3,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_M48T59=3Dy -CONFIG_PTIMER=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PARALLEL=3Dy diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/unicor= e32-softmmu.mak index 5f6c4a8..17a7915 100644 --- a/default-configs/unicore32-softmmu.mak +++ b/default-configs/unicore32-softmmu.mak @@ -1,5 +1,4 @@ # Default configuration for unicore32-softmmu CONFIG_ISA_BUS=3Dy CONFIG_PUV3=3Dy -CONFIG_PTIMER=3Dy CONFIG_PCKBD=3Dy diff --git a/hw/Kconfig b/hw/Kconfig index c4f1547..e3c380f 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -63,6 +63,8 @@ source xtensa/Kconfig # Symbols used by multiple targets config XILINX bool + select PTIMER # for hw/timer/xilinx_timer.c =20 config XILINX_AXI bool + select PTIMER # for hw/dma/xilinx_axidma.c diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 1a0a5c9..f136952 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -3,9 +3,11 @@ config VIRT =20 config DIGIC bool + select PTIMER =20 config EXYNOS4 bool + select PTIMER =20 config HIGHBANK bool @@ -18,6 +20,7 @@ config MAINSTONE =20 config MUSICPAL bool + select PTIMER =20 config NETDUINO2 bool @@ -99,6 +102,7 @@ config NRF51_SOC =20 config MSF2 bool + select PTIMER =20 config ZAURUS bool diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig index 86954ab..b7738ab 100644 --- a/hw/cris/Kconfig +++ b/hw/cris/Kconfig @@ -3,3 +3,4 @@ config AXIS =20 config ETRAXFS bool + select PTIMER diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig index 84c530e..4f45840 100644 --- a/hw/lm32/Kconfig +++ b/hw/lm32/Kconfig @@ -1,5 +1,7 @@ config LM32 bool + select PTIMER =20 config MILKYMIST bool + select PTIMER diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig index cd66ada..8e91eda 100644 --- a/hw/m68k/Kconfig +++ b/hw/m68k/Kconfig @@ -3,6 +3,8 @@ config AN5206 =20 config MCF5206 bool + select PTIMER =20 config MCF5208 bool + select PTIMER diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 348c9bf..cdc07e5 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -15,6 +15,7 @@ config FULONG =20 config MIPS_CPS bool + select PTIMER =20 config MIPS_BOSTON bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 0680d1e..55170f6 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -66,6 +66,7 @@ config ECCMEMCTL =20 config IMX bool + select PTIMER =20 config STM32F2XX_SYSCFG bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 6d15720..e575bf5 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -45,6 +45,7 @@ config SMC91C111 =20 config LAN9118 bool + select PTIMER =20 config NE2000_ISA bool @@ -96,6 +97,7 @@ config VIRTIO_NET =20 config ETSEC bool + select PTIMER =20 config ROCKER bool diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 417a72f..1ea2bc3 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -9,3 +9,4 @@ config SH7750 =20 config SH4 bool + select PTIMER diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index 3795754..c9c2142 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -6,6 +6,8 @@ config LEON3 =20 config GRLIB bool + select PTIMER =20 config SLAVIO bool + select PTIMER diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index e1a6e74..a021c74 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -1,8 +1,10 @@ config ARM_TIMER bool + select PTIMER =20 config ARM_MPTIMER bool + select PTIMER =20 config A9_GTIMER bool @@ -36,12 +38,14 @@ config XLNX_ZYNQMP =20 config ALTERA_TIMER bool + select PTIMER =20 config MC146818RTC bool =20 config ALLWINNER_A10_PIT bool + select PTIMER =20 config STM32F2XX_TIMER bool @@ -51,6 +55,8 @@ config SUN4V_RTC =20 config CMSDK_APB_TIMER bool + select PTIMER =20 config CMSDK_APB_DUALTIMER bool + select PTIMER diff --git a/hw/unicore32/Kconfig b/hw/unicore32/Kconfig index b3cf294..a03a996 100644 --- a/hw/unicore32/Kconfig +++ b/hw/unicore32/Kconfig @@ -1,2 +1,3 @@ config PUV3 bool + select PTIMER diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index 35ccb72..2118d89 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -1,5 +1,6 @@ config CMSDK_APB_WATCHDOG bool + select PTIMER =20 config WDT_IB6300ESB bool --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413267981199.41423336412595; Fri, 25 Jan 2019 02:47:47 -0800 (PST) Received: from localhost ([127.0.0.1]:41849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmz1Q-0005vX-1x for importer@patchew.org; Fri, 25 Jan 2019 05:47:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP2-0007wF-Qx for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyP1-0002CH-Ms for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:00 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44945) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyP1-0002BJ-Db for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:59 -0500 Received: by mail-wr1-x442.google.com with SMTP id z5so9599232wrt.11 for ; Fri, 25 Jan 2019 02:07:59 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:57 -0800 (PST) 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=NnljgDSPRTTfxWAPP6UaiotSt2WNwdmoLtEly2s+G+Y=; b=QNVD8vIK0azB19mVH5c7oEleFgKQiwYjTXHnV23YJRnj28IdgEEgCZBajR3tnkllft AJmWBJB9Wj+3PVSoFlB3Aebzrh2cyznHZXlKyWPBvGNo9VKnmzOZR0jGWy59nHORrZGw jfhFhtGIItyAcd7niu734cl5ENGj2y9BxKDD7N7RYj5sI9MAgIGugV3FV7/tYNtiyaYu rVKiTBwwNitVD7JDQl5vcD7KpYVhG/RrCU1p6w2prAW161CScwHf230qJ3tywIwakQbY jnOpnDy9xzCtgsgT/xAsRs7b9jAyli8YCvaNmd4DX11QoKCsAiJPeq3SIDh+r50OKML8 dqtA== 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=NnljgDSPRTTfxWAPP6UaiotSt2WNwdmoLtEly2s+G+Y=; b=V8Emdq79rK1cJxZksJPPUXNIzEAtWJ06SlH+B3wPyaAWmZT1EgpB1JXrB3pw635eQ3 hDPS8abB50mYdFYca1m7TmktLrYkQC57RP09lioNwAM/PfFbtUiH3J9K4mmN3qll3t+l FFG7+pJPQER8VBUmJSmsk3nRhCS/KtXlHgObTVb//Dn9wrK2owHO7k2xz1Y62gNpdPe6 dn+HLhs3NVE5qQ+Y3C80VojSXX9Fo3OjZZQKm6UJ+IeWUu5xOkMJuXbsq358TrKcObS3 ScNc/5ipSHtjSWNxTaBdythJ1h//lpeXESaRf42yaF8EpfRC/5xSIk17uJcjXlvGAbpn Of8w== X-Gm-Message-State: AJcUukdvZZcH4gB/OLAdUm2bs7Yij7uc91B/aPms/11gYYW53mE1VEWk m4ick7gYSgk6K1RQaeHQbtlDOv3f X-Google-Smtp-Source: ALg8bN7rBxRyM8otwAmzF5GI1v5wMtSwn3QpOd4KeR3hiG221hSobV9GGHBf0FFn3bP4MwWt5V8P1A== X-Received: by 2002:adf:fc09:: with SMTP id i9mr10369078wrr.299.1548410878075; Fri, 25 Jan 2019 02:07:58 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:04 +0100 Message-Id: <1548410831-19553-46-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::442 Subject: [Qemu-devel] [PATCH 45/52] display: express dependencies with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-40-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- hw/display/Kconfig | 4 +++- hw/i2c/Kconfig | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 66044ca..bbd772b 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -38,6 +38,7 @@ config VGA_PCI default y if PCI_DEVICES depends on PCI select VGA + select EDID =20 config VGA_ISA bool @@ -59,6 +60,7 @@ config BOCHS_DISPLAY default y if PCI_DEVICES depends on PCI select VGA + select EDID =20 config BLIZZARD bool @@ -69,7 +71,7 @@ config FRAMEBUFFER config MILKYMIST_TMU2 bool default y - depends on OPENGL + depends on OPENGL && MILKYMIST =20 config SM501 bool diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index 74c9328..ef1caa6 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -8,6 +8,7 @@ config SMBUS_EEPROM config DDC bool depends on I2C + select EDID =20 config VERSATILE_I2C bool --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413145589282.18438782801366; Fri, 25 Jan 2019 02:45:45 -0800 (PST) Received: from localhost ([127.0.0.1]:41812 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyzX-0004LM-FQ for importer@patchew.org; Fri, 25 Jan 2019 05:45:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP3-0007xN-Se for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyP2-0002DP-Rw for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:01 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:41258) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyP2-0002Co-KF for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:00 -0500 Received: by mail-wr1-x444.google.com with SMTP id x10so9615122wrs.8 for ; Fri, 25 Jan 2019 02:08:00 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:58 -0800 (PST) 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=ZnV/MM7SP3JF0DnJIkWpKM0Tboq41iT0lFCreYzj0iY=; b=C2IPFj5bFTHx/sclRuBGIAn4xOyH5UWl6za3ldh5nGICwi5aKpbgs3W3NvTVxpQmn0 ZVA23PSmPdFhvtKV8YHxIZ0t+PhRtFuPgb8/0ebxxu6qYDjZbeIykdwyWrxsSE53rqEr 6dSFxLGB4ZCAyu2R1jHm+TyHNvTmkrKjLGAuV9l3XAgBzwVoumEV8I416GjfbgQ/nhFY TR3d/FVRRM+cL/auDGKLPk3MQZNhI/G6OX8y3KYKMajVlt+s3wpMmlEsHw6PtpaeKXrG y2ZY9Qv9/dnh87D99Fx9toKYPglR3M37zWCTDqMDsMkUW2m2RxwVnRa1f08bXErGA6xP tPsQ== 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=ZnV/MM7SP3JF0DnJIkWpKM0Tboq41iT0lFCreYzj0iY=; b=nf22J90QsTW5s5Nhgr0OZl10obdkXaYq4URgK/qZA60Cb4eLmzwCJ/OYTTvbc26X20 pGxj2NGA+B3T53mlLVWNAzv1hWNjqIOJAbJgrr+4uk0KVoiMKjgAJ2M8GMU7tS8pwxLv S/bUGd13IRXltImOQdr1uChOw/4gKelpJKQlyQllQ7H7Hr7iVSBbFKojg6dYi4d8avox JmGzZa4YdKp8qA8VseyOX19L9qqzwu1nUFITHPDnrG82frXh50JgaBaC/fjj7AOx5r3p HHn1I1lKIAjkXtERGSawWExvjx83nb+5ORLHun7rhmdojhije9lTCXRjKhtljYNSICT6 MrLw== X-Gm-Message-State: AJcUukfXohuTAcGo2DA3s4YUaHN5T5YM6R5OtrpRAYa2aogMCN2ixtI+ CotpwbfCkZGa+43e329xZjFsM9VD X-Google-Smtp-Source: ALg8bN7h2SmS7S0APJxCtW5rU+brqa1Rc4KwljwVsZgUvAo6hw2/Q2VzGymPn6FL1CHL31Fw0TW31Q== X-Received: by 2002:a5d:444a:: with SMTP id x10mr11017048wrr.162.1548410879320; Fri, 25 Jan 2019 02:07:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:05 +0100 Message-Id: <1548410831-19553-47-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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 46/52] hyperv: express dependencies with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong remove default-configs/hyperv.mak and make dependencies with Kconfig. Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-41-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/hyperv.mak | 2 -- default-configs/i386-softmmu.mak | 1 - hw/hyperv/Kconfig | 4 ++++ 3 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 default-configs/hyperv.mak diff --git a/default-configs/hyperv.mak b/default-configs/hyperv.mak deleted file mode 100644 index 5d0d9fd..0000000 --- a/default-configs/hyperv.mak +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_HYPERV=3D$(CONFIG_KVM) -CONFIG_HYPERV_TESTDEV=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 4aa04e4..42435d7 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for i386-softmmu =20 -include hyperv.mak CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_IPMI=3Dy diff --git a/hw/hyperv/Kconfig b/hw/hyperv/Kconfig index be724b7..a178bac 100644 --- a/hw/hyperv/Kconfig +++ b/hw/hyperv/Kconfig @@ -1,5 +1,9 @@ config HYPERV bool + default y if PC + depends on KVM =20 config HYPERV_TESTDEV bool + default y if PC + depends on HYPERV --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413634792304.4445334818529; Fri, 25 Jan 2019 02:53:54 -0800 (PST) Received: from localhost ([127.0.0.1]:41998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmz7L-0002gu-JS for importer@patchew.org; Fri, 25 Jan 2019 05:53:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP5-0007z1-Am for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyP3-0002Eq-Vm for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:03 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:36104) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyP3-0002Dg-No for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:01 -0500 Received: by mail-wm1-x342.google.com with SMTP id p6so6036503wmc.1 for ; Fri, 25 Jan 2019 02:08:01 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:59 -0800 (PST) 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=EjedFl6rvc7qQwk4UFRorlH0yqEhKvLbzrk6GvwqeRM=; b=S45Q0UL5L2kd57EzSJMfRnHVU3OD0ls7Kz2/Fq+V7K/6eDRid2ll0REnLKr/TdAUu4 HZLT8N6aednU9pYQNSQ5ZpYqjZqEN25ckEBAzGYf2aMIrRdhRad7CY47RSWDxhvWN1vz Hc9oyEzzSMSPH1eUVKAzr8mGpyCcYjvOu/eGjO3ORb6wj7KnEnutIE6kIL6VPnhpIOEi tkxtrRsfQklTpEc5T6a2sHRiqVS0BoAFzy8VtwisqJmPl1SbvTDK0LFUdWAbLW1A437g SMfAd3okgQOJiY9dFM4TJbOlOr4C3kgm8GcFSScLdOJbUJt+ZT9h/eeCW6A7MRV04FE4 2MPQ== 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=EjedFl6rvc7qQwk4UFRorlH0yqEhKvLbzrk6GvwqeRM=; b=KFRjIAE4kleo5Nv6pgY7zQe0my1ggPVYXxGbERpXNWhDtDEFHgfFKcniiGfqX8VCNq UjUSEO6tIFXJca2qo2nr0Kno37LfrEw805CTQ3OfhiLp3PDC5gB4hQ4Pb4Sy/C7zM3OU Z0krJURkwK7WBUWOm+X0NWoG540sQ1fOq8nhMY9Y+efduKgrPx21eMTWGL31fdLtJO22 +/Tz1hwm4jzQKrc0uan+EjUrDZm58p8fxUDNrA2xpvzUqeqyXnyD2A85msKSfleD61mQ c8wy2b5w8ysqVJRjMbH/KB67p51PC+QyGwhu1BElrpxiY0PNvxRKnIekX3nFisOH9VPa fLlQ== X-Gm-Message-State: AJcUukf2MuDMY8opBJDjqzAomd6xNczQHZEMSW4dSO3ViQpHz/fgCQlP FD0Nyca2/FqjdJKHAja2JpcC42rC X-Google-Smtp-Source: ALg8bN7nvg0qF7z615njmlyfWQh1/IMA1fUz/zY+v7LW8XZ5oIZu2SH0ZIxXzwL9gBYo17K2wR4pJQ== X-Received: by 2002:a1c:a00f:: with SMTP id j15mr5980939wme.84.1548410880403; Fri, 25 Jan 2019 02:08:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:06 +0100 Message-Id: <1548410831-19553-48-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::342 Subject: [Qemu-devel] [PATCH 47/52] vfio: express vfio dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Signed-off-by: Paolo Bonzini --- hw/vfio/Kconfig | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/vfio/Kconfig b/hw/vfio/Kconfig index f896779..ebda9fd 100644 --- a/hw/vfio/Kconfig +++ b/hw/vfio/Kconfig @@ -7,28 +7,30 @@ config VFIO_PCI select VFIO depends on LINUX =20 -config VFIO_SPAPR - bool - default y - depends on VFIO && LINUX && PSERIES - config VFIO_CCW bool + default y select VFIO - depends on LINUX + depends on LINUX && S390_CCW_VIRTIO =20 config VFIO_PLATFORM bool + default y select VFIO - depends on LINUX + depends on LINUX && PLATFORM_BUS =20 config VFIO_XGMAC bool + default y + depends on VFIO_PLATFORM =20 config VFIO_AMD_XGBE bool + default y + depends on VFIO_PLATFORM =20 config VFIO_AP bool + default y select VFIO - depends on LINUX + depends on LINUX && S390_CCW_VIRTIO --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413637798873.2890048007833; Fri, 25 Jan 2019 02:53:57 -0800 (PST) Received: from localhost ([127.0.0.1]:41992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmz7C-0002Z2-NT for importer@patchew.org; Fri, 25 Jan 2019 05:53:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP7-0007z2-4f for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyP4-0002FY-VT for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:04 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:34472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyP4-0002Ex-Mt for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:02 -0500 Received: by mail-wm1-x342.google.com with SMTP id y185so4410505wmd.1 for ; Fri, 25 Jan 2019 02:08:02 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.08.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:08:00 -0800 (PST) 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=gqE25SheIbG6Dva3ncPmM+nl+vPJ2HoFzZg1RBJclNU=; b=AZVeEIwo8MJjskhK6ExipCLlbZdtb/hxqBZkrDGnOwG6rdkL3Z2Sa0wrV1gt+NOGAM ydbfE1iSYQeH9h1T7eeNxEvV78vSZXYH6zeoltLerNc3/YqSKJPTmBICxI9stZwcXuza Kw9UJDbmrltOC+kY+e0f0svO7XaDJS5kPldZ1WnRIdokwkV6iV/uNViCj1pHBpiiaEG1 MBXcKLi0qcPQ7E0Iazj7RIXzFPxs6YUB8CzUs4bV2w6yT4sCG+u7o3i4ld4U73Gj/b16 MMsZdTdzYvkcpUsK9bGJrC1DfFXQeN3asMxCMvpqyPWwi3tNZJbWOA2wLhKbmEGkBm91 x+/A== 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=gqE25SheIbG6Dva3ncPmM+nl+vPJ2HoFzZg1RBJclNU=; b=GhOkJb/yeiLUk6n2xwlYkVL7SWf+R2aev0CStkzVZy6vQWWBygD51mfihAKdE1tuW7 BFFKpAJVCDKBEq6IIQoUPKGecvH8ZhMz1JrmEjPOToO2EOURi23lm884y7ibHMphPA5M iHh240PHHfbuXnYXY3VsEJCvIbZTuGmpnGFWJ3Kqk/KBoGsVyQXzmi8BnniOhv1r3pO8 Hg2/aitSSfSVJw8RK2Ax0NFjannyxwesTu607mrjw/hpGDU1XB8iHDrBJKO0qqCrleHb RSl3etQajYPeYHdlqoURh+mZ2nVb7XR/Ksz8RC8gvVnHvpq6IfGNgONP47JabSeeHoX/ Q5mg== X-Gm-Message-State: AJcUukc7SnSEuM0dtz1ZAtbmalvAz+Yx4uRoec+1vVKQtWLvl0pXOnmT mwNNUSlyXErZir0zVMJHfvNi4eLi X-Google-Smtp-Source: ALg8bN4PPbXiRP/bmcio4WcP+1sNVMzfU1//z6lE3DIcIhvHWrSD6i3ViMyDJL9Zw3VLtN9jgNqZ7Q== X-Received: by 2002:a1c:c10f:: with SMTP id r15mr6158297wmf.27.1548410881389; Fri, 25 Jan 2019 02:08:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:07 +0100 Message-Id: <1548410831-19553-49-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::342 Subject: [Qemu-devel] [PATCH 48/52] virtio: express virtio dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-42-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 1 - default-configs/s390x-softmmu.mak | 1 - default-configs/virtio.mak | 12 ------------ hw/9pfs/Kconfig | 1 + hw/block/Kconfig | 6 +++++- hw/char/Kconfig | 2 ++ hw/display/Kconfig | 6 ++++-- hw/input/Kconfig | 4 +++- hw/net/Kconfig | 2 ++ hw/scsi/Kconfig | 4 +++- hw/virtio/Kconfig | 7 +++++++ 11 files changed, 27 insertions(+), 19 deletions(-) delete mode 100644 default-configs/virtio.mak diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 42435d7..f29f83e 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,7 +1,6 @@ # Default configuration for i386-softmmu =20 CONFIG_VMXNET3_PCI=3Dy -CONFIG_VIRTIO_VGA=3Dy CONFIG_IPMI=3Dy CONFIG_IPMI_LOCAL=3Dy CONFIG_IPMI_EXTERN=3Dy diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 2794ffb..2be5059 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,6 +1,5 @@ CONFIG_PCI=3Dy CONFIG_VIRTIO_PCI=3Dy -include virtio.mak CONFIG_SCLPCONSOLE=3Dy CONFIG_TERMINAL3270=3Dy CONFIG_S390_FLIC=3Dy diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak deleted file mode 100644 index 51599ed..0000000 --- a/default-configs/virtio.mak +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG_VIRTIO=3Dy -CONFIG_VIRTIO_9P=3D$(CONFIG_VIRTFS) -CONFIG_VIRTIO_BALLOON=3Dy -CONFIG_VIRTIO_BLK=3Dy -CONFIG_VIRTIO_CRYPTO=3Dy -CONFIG_VIRTIO_GPU=3Dy -CONFIG_VIRTIO_INPUT=3Dy -CONFIG_VIRTIO_NET=3Dy -CONFIG_VIRTIO_RNG=3Dy -CONFIG_SCSI=3Dy -CONFIG_VIRTIO_SCSI=3Dy -CONFIG_VIRTIO_SERIAL=3Dy diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index 84d2366..0a4296d 100644 --- a/hw/9pfs/Kconfig +++ b/hw/9pfs/Kconfig @@ -3,3 +3,4 @@ config VIRTFS config VIRTIO_9P bool default y if VIRTFS + depends on VIRTIO diff --git a/hw/block/Kconfig b/hw/block/Kconfig index dc91e67..00f9dad 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -28,7 +28,11 @@ config NVME_PCI =20 config VIRTIO_BLK bool + default y + depends on VIRTIO =20 config VHOST_USER_BLK bool - default y if VHOST_USER && LINUX + # Only PCI devices are provided for now + default y if VIRTIO_PCI + depends on VIRTIO && VHOST_USER && LINUX diff --git a/hw/char/Kconfig b/hw/char/Kconfig index fc18481..6360c9f 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -26,6 +26,8 @@ config SERIAL_PCI =20 config VIRTIO_SERIAL bool + default y + depends on VIRTIO =20 config STM32F2XX_USART bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index bbd772b..c784fe8 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -94,11 +94,13 @@ config QXL =20 config VIRTIO_GPU bool + default y + depends on VIRTIO =20 config VIRTIO_VGA bool - default y if PCI_DEVICES && VIRTIO - depends on PCI + default y if PCI_DEVICES + depends on VIRTIO && PCI select VGA =20 config DPCD diff --git a/hw/input/Kconfig b/hw/input/Kconfig index ec014a9..41eb1db 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -21,11 +21,13 @@ config TSC2005 =20 config VIRTIO_INPUT bool + default y + depends on VIRTIO =20 config VIRTIO_INPUT_HOST bool default y if LINUX - depends on LINUX + depends on VIRTIO && LINUX =20 config TSC210X bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index e575bf5..47368d7 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -94,6 +94,8 @@ config XILINX_ETHLITE =20 config VIRTIO_NET bool + default y + depends on VIRTIO =20 config ETSEC bool diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index b9cf269..b3ba540 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -43,10 +43,12 @@ config SPAPR_VSCSI =20 config VIRTIO_SCSI bool + default y + depends on VIRTIO select SCSI =20 config VHOST_USER_SCSI bool # Only PCI devices are provided for now default y if VIRTIO_PCI - depends on VHOST_USER && LINUX + depends on VIRTIO && VHOST_USER && LINUX diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index 5dafbe3..74f4573 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -3,6 +3,8 @@ config VIRTIO =20 config VIRTIO_RNG bool + default y + depends on VIRTIO =20 config VIRTIO_PCI bool @@ -12,9 +14,14 @@ config VIRTIO_PCI =20 config VIRTIO_MMIO bool + select VIRTIO =20 config VIRTIO_BALLOON bool + default y + depends on VIRTIO =20 config VIRTIO_CRYPTO bool + default y + depends on VIRTIO --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412197512159.6886413868334; Fri, 25 Jan 2019 02:29:57 -0800 (PST) Received: from localhost ([127.0.0.1]:41551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyk2-00085O-9n for importer@patchew.org; Fri, 25 Jan 2019 05:29:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP7-0007z5-Lh for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyP6-0002H7-82 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:05 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40514) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyP5-0002Fn-KA for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:03 -0500 Received: by mail-wm1-x343.google.com with SMTP id f188so5998263wmf.5 for ; Fri, 25 Jan 2019 02:08:03 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.08.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:08:01 -0800 (PST) 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=x35U2dz1dlYsYPFvjpvpw/LHj4wRHwILF4921Bb7MnQ=; b=Y9+6SWNgPrXHb/z4qDDoCg0NqZKEl4e1HpSDR06oOh57IquhI4QjrCb7qqB8BJRS/5 JVLcYl5PIcdp3Pm57FBb7aG5bBVxzBEo9SKrjGWhPm39ntz51NE+eTYfNVzVvkIWYGVv Sy0/qhpwgnJmOxd7gwQd5teVn21sMZF5nQnLQi7eS6WwvP+Ng0WVNgKv7nzQpQn0PDub vkV/hDX0fizm/Wa9f0MQj43prxgureOo2Cs33hXCS+WY2tfq85DlbbONgL3lh69Uasw/ +cuom7D2ed3AcIXJPTeO8ceICMpy5qTgbMCMeyS6VftMOdwCi5ceudJfRt79oy5pvwzb spSw== 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=x35U2dz1dlYsYPFvjpvpw/LHj4wRHwILF4921Bb7MnQ=; b=TNurR6nPF3kQqew4YYlEc2a+1axe7lkokz8eS23hdXCQ3TIPIGgFM/WOVMtDfGk5OZ hiZih1rLuMYcy5HF1+uATTkvKRNKLN150z3fcfXHaV3cvyndQotb/bczNQX2/rP2pi6j uMEjpqAC3vnIoZJ1PyzdGPopA/Jr153QCLXJdgR1J2OU/eeSPCxfaoE266oxtjSsCluj k/IBvQWcSV3/nEGiG3Ps5SoNO2bLdOlNV3EK+mWSBx1GM03aqR/emOVSfwGMmjZzUsSQ 6RCMvtm3nHQGTDGnSPEJW8Quow+5W5pCG7xTd9Xr+XFMo5RBTEqG4f9Jr2TLuUAVzKhU dE5A== X-Gm-Message-State: AJcUukdPlgDgAky+YoaW3MLJQsimikdT1or/iH8ojWfOj54g3v/S3suj uM3SNv89M8+NziyIcGqOMVXMaT2A X-Google-Smtp-Source: ALg8bN4CCOD6vttaqoWIdBbJDq5HhxfU8w4wbvPMhbGVwH7sGq0D7Qo/sGsB8kdaXMNdrRBBs+0ZTg== X-Received: by 2002:a1c:5984:: with SMTP id n126mr6020808wmb.62.1548410882443; Fri, 25 Jan 2019 02:08:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:08 +0100 Message-Id: <1548410831-19553-50-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::343 Subject: [Qemu-devel] [PATCH 49/52] tpm: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" This automatically removes the SCSI subsystem from the binary altogether if no controllers are selected. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-34-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- hw/tpm/Kconfig | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index 8a63597..88890a2 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -1,18 +1,27 @@ config TPM bool =20 +config TPMDEV + bool + config TPM_TIS bool default y if PC depends on TPM + select TPMDEV =20 config TPM_CRB bool - default y - depends on TPM && PC + default y if PC + depends on TPM + select TPMDEV =20 config TPM_PASSTHROUGH bool + default y + depends on TPMDEV =20 config TPM_EMULATOR bool + default y + depends on TPMDEV --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412398999752.8502182498173; Fri, 25 Jan 2019 02:33:18 -0800 (PST) Received: from localhost ([127.0.0.1]:41607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmynG-0002Bm-UR for importer@patchew.org; Fri, 25 Jan 2019 05:33:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP9-000802-LU for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyP7-0002Hy-G8 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:07 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:53986) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyP6-0002Gt-Nq for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:05 -0500 Received: by mail-wm1-x342.google.com with SMTP id d15so6164447wmb.3 for ; Fri, 25 Jan 2019 02:08:04 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.08.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:08:02 -0800 (PST) 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=JeHVm5iMB3CniXfrKYOLKxoVkwQBIwgo90B/hYDlVY4=; b=bfQKOOOuhn707nE84glUzbut1Gy3bcPIQUpJS/bwzDW1KyvbMsJeoC718KfB2D4H9P if5aLDCmoKHfuw4Ojc40wnW5OFb+6V9LAiph8T/pmrNjBXbEqSCjwoo15rUn95MKhT9H /WaAhS+hczut/+S+/chCtKCZCt9P1f2yX9qnVgMc01FLreovmvVkWZstEIJFdUVOOHhu 0kkl07+hyZ+LuCqrotPj1mljvFon0XopI8rWN9Y7JtU/b/TAIVmnhVR6sULOs8o9Zfty oukka4QNxYamD5sX9yma7FU8SCeMEED56hZxgOnNrBKRjqejX4NjcLDGw1K2ByPGtBTw IKng== 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=JeHVm5iMB3CniXfrKYOLKxoVkwQBIwgo90B/hYDlVY4=; b=s4DJW0ZI8F4pWWyV5+QZFIJuIcLPoL9Bttc2pHAwprFmqptOxnFImJsooq6wdPWaL6 kge1YPuw2+yk18lC0CyUmRHdk4C1BznC+jX/ZFvO/t9El9GbbsF7fgVEsj2bxw3zOP76 6vibg2Dn8NQqc/mam3e58R6628UMdKF+j+Na2w1IjG60RxtRrEiaP0HNMU2eXYhat6n8 UDWt/HrD/JBDDEc7SsV1UNdkNpenU2dldfQ4YhuOlcQpbQUiB4Py/Ey+AhV3YwrozN3q 0zL5zWS7BAw2uJtHy1BXiDfRy4n0PQEGbf4+H0QIUMb3bxFExl5aIMARWsuPIn7FjWib +RJg== X-Gm-Message-State: AJcUukcDS9wqUbponndhi81Q0ZSAmCoZOQu07N1P6eTxzxgx4tEHeuXf 92zXaMltzOmngj5J0/zpqoRakXjc X-Google-Smtp-Source: ALg8bN58u3QcWvrcxd+t1/xeiwZ1NF8WjAYnV889wMsLZCieW077+UIwFRrbXTu6YKSxHC8LyjYH9A== X-Received: by 2002:a1c:5dce:: with SMTP id r197mr5814886wmb.130.1548410883378; Fri, 25 Jan 2019 02:08:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:09 +0100 Message-Id: <1548410831-19553-51-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::342 Subject: [Qemu-devel] [PATCH 50/52] isa: express SuperIO dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 5 ----- default-configs/ppc-softmmu.mak | 9 --------- default-configs/sh4-softmmu.mak | 9 ++------- default-configs/sh4eb-softmmu.mak | 6 ------ hw/isa/Kconfig | 21 +++++++++++++++++++++ 5 files changed, 23 insertions(+), 27 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index f44c5bc..2ad4d40 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -2,13 +2,8 @@ =20 CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_I82374=3Dy CONFIG_I8254=3Dy -CONFIG_I8257=3Dy -CONFIG_PARALLEL=3Dy -CONFIG_FDC=3Dy CONFIG_PCKBD=3Dy CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index f38c14c..87c2d6d 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -8,12 +8,10 @@ CONFIG_ISA_BUS=3Dy CONFIG_PPC4XX=3Dy CONFIG_M48T59=3Dy CONFIG_SERIAL=3Dy -CONFIG_I8257=3Dy CONFIG_OPENPIC=3Dy CONFIG_PPCE500_PCI=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy -CONFIG_I8259=3Dy CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_E500=3Dy @@ -59,18 +57,11 @@ CONFIG_MAC_NEWWORLD=3Dy # For PReP CONFIG_PREP=3Dy CONFIG_PREP_PCI=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_MC146818RTC=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_RS6000_MC=3Dy -CONFIG_PARALLEL=3Dy CONFIG_I82374=3Dy CONFIG_I82378=3Dy -CONFIG_I8254=3Dy CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy CONFIG_NE2000_ISA=3Dy CONFIG_PC87312=3Dy -CONFIG_PCSPK=3Dy -CONFIG_IDE_ISA=3Dy CONFIG_CS4231A=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 9e8e487..1b4582a 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,9 +1,8 @@ -# Default configuration for sh4-softmmu +# Default configuration for sh4eb-softmmu =20 CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy @@ -12,11 +11,7 @@ CONFIG_I2C=3Dy CONFIG_DDC=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_I82378=3Dy -CONFIG_I8259=3Dy -CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy CONFIG_I82374=3Dy -CONFIG_I8257=3Dy -CONFIG_MC146818RTC=3Dy CONFIG_R2D=3Dy CONFIG_SHIX=3Dy +CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 2a26946..baed9a4 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -3,7 +3,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy @@ -12,11 +11,6 @@ CONFIG_I2C=3Dy CONFIG_DDC=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_I82378=3Dy -CONFIG_I8259=3Dy -CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy CONFIG_I82374=3Dy -CONFIG_I8257=3Dy -CONFIG_MC146818RTC=3Dy CONFIG_R2D=3Dy CONFIG_SHIX=3Dy diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index fcd87b4..34711d0 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -7,26 +7,47 @@ config APM config I82378 bool select ISA_BUS + select I8259 + select I8254 + select I8257 + select MC146818RTC =20 config PC87312 bool select ISA_BUS + select I8259 + select I8254 + select I8257 + select MC146818RTC + select SERIAL_ISA + select PARALLEL + select FDC + select IDE_ISA =20 config PIIX4 bool + # For historical reasons, SuperIO devices are created in the board + # for PIIX4. select ISA_BUS =20 config VT82C686 bool select ISA_BUS select ACPI_SMBUS + select SERIAL_ISA + select FDC =20 config SMC37C669 bool select ISA_BUS + select SERIAL_ISA + select PARALLEL + select FDC =20 config LPC_ICH9 bool + # For historical reasons, SuperIO devices are created in the board + # for ICH9. select ISA_BUS select ACPI_SMBUS select ACPI_X86_ICH --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 154841376187184.38684110459587; Fri, 25 Jan 2019 02:56:01 -0800 (PST) Received: from localhost ([127.0.0.1]:42081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmz9H-0004JN-QL for importer@patchew.org; Fri, 25 Jan 2019 05:55:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyPB-00082U-TD for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyP9-0002Jc-Ol for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:09 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:39528) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyP7-0002HU-Lx for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:07 -0500 Received: by mail-wm1-x343.google.com with SMTP id y8so6010472wmi.4 for ; Fri, 25 Jan 2019 02:08:05 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.08.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:08:03 -0800 (PST) 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=MzwK+mwKyMDcXuLOAkp6IzsZM48JWYDqi7BbRKNXZM8=; b=bq5W35dN4R1tBOUp1oxlYmY+FyPM40Yy4ywEhguhPYRO07tBZnrPz10SmYnE28ht1B VWPR6xmpKhijUrXYpf/b3VWc75RGOVSSMx6HTB8kQDNa1AHOgipXX6FOQ/fwu07MXjC9 KjvqkQvvrjy2OLGFouxr+urTIPn4XI1wes2UJe4VuRjT1JywheZH9Sn9PB9McQYKbx7c 2z3T0oYawMbHFZT9b1swj8hG8vFhrISy8rffLJTjT0ZpUfm6ZFO3RvOqs3KWEQbAwqNJ kiYglJy4BheuQBnobKfVTt2k1mjNzDZrDbPXBn65myJ+vNDaTLb+e0IZD7S4aKHAmNBw y7TQ== 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=MzwK+mwKyMDcXuLOAkp6IzsZM48JWYDqi7BbRKNXZM8=; b=AgNyezBL3AYZF3TtoEYNTluQVb57BnAYUnK4yFh1R8zFXQtNYDdkDkAKyAZYhORmTS y68H9Em6aSGR/XB+Psaep3C0s18JobxBeZtSQmiWzr/0U8NphJFIuj6hhnDeQszWlgPC etAk35Z6N1WeJdTosk2hTlcWUGeW636acJlIN7cAFhytCYsqm9hco0NFX4EKTd1D9FYV TVnHgfa2swy10mgEOmnc6vMouG+NvqdJUFWUf/6Xla3x0J1hCVX9O6IgfvpzEEa88Lf4 iIFwxct6fb9c/enSgXDn2R2vS0A5zq9ArYoFWNmD7BLfC4vx6N/DCZKAj/nI45meC0Xk 2BZw== X-Gm-Message-State: AJcUukcqndiKi51kb22DrHa2mwihjZJUS0JPg+BgrOeuXDiJ4T7xCpBR NItyE+adNdQVjnW4d8U8UkoyayL5 X-Google-Smtp-Source: ALg8bN65OSDam1ZK1BXQX9Cb18+lJrJnpI4NdRlcRsx3BFyJSc4Xfk1lQaXtrjbdGW/HLis4dOpmqw== X-Received: by 2002:a1c:4108:: with SMTP id o8mr6011832wma.91.1548410884225; Fri, 25 Jan 2019 02:08:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:10 +0100 Message-Id: <1548410831-19553-52-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::343 Subject: [Qemu-devel] [PATCH 51/52] i386-softmmu.mak: remove all CONFIG_* except boards definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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: Yang Zhong %-softmmu.mak only keep boards definitions in Kconfig mode. Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-43-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 18 ------------------ hw/acpi/Kconfig | 6 ++++++ hw/i386/Kconfig | 5 +++++ hw/ipmi/Kconfig | 8 ++++++++ hw/mem/Kconfig | 2 ++ hw/misc/Kconfig | 4 ++++ hw/pci-bridge/Kconfig | 1 + hw/timer/Kconfig | 1 + 8 files changed, 27 insertions(+), 18 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index f29f83e..07b1e82 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,25 +1,7 @@ # Default configuration for i386-softmmu =20 -CONFIG_VMXNET3_PCI=3Dy -CONFIG_IPMI=3Dy -CONFIG_IPMI_LOCAL=3Dy -CONFIG_IPMI_EXTERN=3Dy -CONFIG_ISA_IPMI_KCS=3Dy -CONFIG_ISA_IPMI_BT=3Dy - # Optional devices: # -CONFIG_HPET=3Dy -CONFIG_APPLESMC=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_ISA_TESTDEV=3Dy -CONFIG_SGA=3Dy -CONFIG_PVPANIC=3Dy -CONFIG_MEM_DEVICE=3Dy -CONFIG_NVDIMM=3Dy -CONFIG_ACPI_NVDIMM=3Dy -CONFIG_PXB=3Dy -CONFIG_ACPI_VMGENID=3Dy CONFIG_PCI_DEVICES=3Dy =20 # Boards: diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index 035a28f..eca3bee 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -4,6 +4,9 @@ config ACPI config ACPI_X86 bool select ACPI + select ACPI_NVDIMM + select ACPI_CPU_HOTPLUG + select ACPI_MEMORY_HOTPLUG =20 config ACPI_X86_ICH bool @@ -18,6 +21,9 @@ config ACPI_MEMORY_HOTPLUG =20 config ACPI_NVDIMM bool + depends on ACPI =20 config ACPI_VMGENID bool + default y + depends on PC diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 966c97c..8f0d6ce 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -5,6 +5,10 @@ config SEV config PC bool =20 +config SEV + bool + default y if PC && KVM + config PC bool select ISA_DEBUG @@ -28,6 +32,7 @@ config PC_ACPI select ACPI_CPU_HOTPLUG select ACPI_MEMORY_HOTPLUG select SMBUS_EEPROM + select PFLASH_CFI01 depends on ACPI_SMBUS =20 config I440FX diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig index 68f8ba1..b15c7b3 100644 --- a/hw/ipmi/Kconfig +++ b/hw/ipmi/Kconfig @@ -3,12 +3,20 @@ config IPMI =20 config IPMI_LOCAL bool + default y + depends on IPMI =20 config IPMI_EXTERN bool + default y + depends on IPMI =20 config ISA_IPMI_KCS bool + default y if PC + select IPMI =20 config ISA_IPMI_BT bool + default y if PC + select IPMI diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index a3a4372..d1e635c 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -6,3 +6,5 @@ config MEM_DEVICE =20 config NVDIMM bool + default y + depends on PC diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 55170f6..823135c 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -1,5 +1,6 @@ config APPLESMC bool + default y if PC depends on ISA_BUS =20 config MAX111X @@ -19,10 +20,12 @@ config ISA_DEBUG =20 config SGA bool + default y if PC depends on ISA_BUS =20 config ISA_TESTDEV bool + default y if PC =20 config PCI_TESTDEV bool @@ -100,6 +103,7 @@ config IOTKIT_SYSINFO =20 config PVPANIC bool + default y if PC depends on ISA_BUS =20 config AUX diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index 0519eb1..b167b98 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -5,6 +5,7 @@ config PCIE_PORT =20 config PXB bool + default y if Q35 =20 config XIO3130 bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index a021c74..51921eb 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -15,6 +15,7 @@ config DS1338 =20 config HPET bool + default y if PC =20 config I8254 bool --=20 1.8.3.1 From nobody Sat Feb 7 03:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412865942437.51528322503486; Fri, 25 Jan 2019 02:41:05 -0800 (PST) Received: from localhost ([127.0.0.1]:41730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyun-0000CP-S1 for importer@patchew.org; Fri, 25 Jan 2019 05:40:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyPL-0008Cv-9O for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyP9-0002Jr-SS for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:17 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:33548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyP9-0002IN-LB for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:07 -0500 Received: by mail-wr1-x442.google.com with SMTP id p7so9673314wru.0 for ; Fri, 25 Jan 2019 02:08:06 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.08.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:08:04 -0800 (PST) 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=k0MhAqIQD4IKNwcjVBjHqp1gv0srcUlPRTKaAo4UN0s=; b=nOlUNqKH2he63SJTQZCqAR/IUAn0VPlA4QxGbdOBlz9hGf07M8+xibX74VXjwgApnj iGIkb7rq3NYYV1HroEXGja3WOfzYoQOElsSx5OXEXJcedaEsvLyIe+Tw8zqhIVy1y/Rc OXQqn9/LH1/UhILvr03DxF5xn1+2HvPHCzFH7aBg8RxbdDCTpHSbh35pCp+jO3x/jL/h l/E8Eosf5do0O9v9rnpeO8ae/VAftjorQbJPPcj8ryAAyTSi8AEUr5BqHLG24h9T0qmF VMraTUzVEOqPGHzT4Wo/MLL+zNF/6UqOTDUSdQfDjpF2ZAmHPVlmNUewK0hXxZJnMQA2 jjwg== 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=k0MhAqIQD4IKNwcjVBjHqp1gv0srcUlPRTKaAo4UN0s=; b=DAbp8bx3t8cDSDnGV0IyvvIbiwzQWkhp0tQPxzTNxghIg5Yzw+cYFqUmjRg8ZCUkLA X3DvxBbOmw+QR1aX/xI0zTnyCEO7A0J0V+s01hv02E5NAnhgy3inTuFfrYp3bfQx4ly/ IkuqkPzoE5g99tknKUGd3CfY1g7wPvMx0z++JofSr2sINpm5cm/7arqe2DwRvE2WJEb+ 93oIk4RloUjr13pB9nKKqMot1XKLaFLe0/YHrrTy9QpwIEXT2bWAJGQsrHcSgcVUol1U nct9L8G2HKfpToI8d03WYaFl7aLomrGIZT0flPBGPvknqsBUjUR6cBBx4iOHJViAeKKP t85Q== X-Gm-Message-State: AJcUukeGcSupQ5OmnPH7V/a6//FwzD/SY/ZlJDPpStB+etzYT/vAPC3u RKo/11SZDh878n72ysE5MzKnq8io X-Google-Smtp-Source: ALg8bN4Ox5zYT2t0dp9pkzI4LHdmRPwhffzTTSLRt/ssDBmyxmhAscn1jZxBdmR5pupwtt6Y+XjfcQ== X-Received: by 2002:adf:81c4:: with SMTP id 62mr10158505wra.266.1548410885189; Fri, 25 Jan 2019 02:08:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:11 +0100 Message-Id: <1548410831-19553-53-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::442 Subject: [Qemu-devel] [PATCH 52/52] kconfig: introduce CONFIG_TEST_DEVICES X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com 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" This moves some devices that are mostly used for testing purposes (for example in endianness-test) under a new symbol CONFIG_TEST_DEVICES that has to be enabled explicitly in the default-configs file. This makes it easier to drop this code from QEMU if desirable. Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 2 +- default-configs/i386-softmmu.mak | 1 + default-configs/mips-softmmu-common.mak | 2 +- default-configs/ppc-softmmu.mak | 2 +- default-configs/sh4-softmmu.mak | 3 +-- default-configs/sh4eb-softmmu.mak | 2 +- default-configs/sparc64-softmmu.mak | 2 +- hw/Kconfig | 3 +++ hw/hyperv/Kconfig | 2 +- hw/misc/Kconfig | 7 ++++--- 10 files changed, 15 insertions(+), 11 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 2ad4d40..762e3a2 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -10,6 +10,6 @@ CONFIG_VMWARE_VGA=3Dy CONFIG_IDE_CMD646=3Dy CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_SMC37C669=3Dy CONFIG_DP264=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 07b1e82..0f30bd6 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -3,6 +3,7 @@ # Optional devices: # CONFIG_PCI_DEVICES=3Dy +CONFIG_TEST_DEVICES=3Dy =20 # Boards: # diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index e5f0841..ac70f00 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -31,7 +31,6 @@ CONFIG_MIPSNET=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_EMPTY_SLOT=3Dy CONFIG_MIPS_CPS=3Dy CONFIG_MIPS_ITU=3Dy @@ -41,3 +40,4 @@ CONFIG_MALTA=3Dy CONFIG_MIPSSIM=3Dy CONFIG_ACPI_SMBUS=3Dy CONFIG_SMBUS_EEPROM=3Dy +CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 87c2d6d..05ba726 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -3,6 +3,7 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ISA_BUS=3Dy +CONFIG_TEST_DEVICES=3Dy =20 # For embedded PPCs: CONFIG_PPC4XX=3Dy @@ -57,7 +58,6 @@ CONFIG_MAC_NEWWORLD=3Dy # For PReP CONFIG_PREP=3Dy CONFIG_PREP_PCI=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_RS6000_MC=3Dy CONFIG_I82374=3Dy CONFIG_I82378=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 1b4582a..4ebcaaa 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -9,9 +9,8 @@ CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy -CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I82374=3Dy CONFIG_R2D=3Dy CONFIG_SHIX=3Dy -CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index baed9a4..4ebcaaa 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -9,7 +9,7 @@ CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy -CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I82374=3Dy CONFIG_R2D=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index aef26a2..7fe1005 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -14,7 +14,7 @@ CONFIG_PCI_SABRE=3Dy CONFIG_SIMBA=3Dy CONFIG_SUNHME=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_SUN4V_RTC=3Dy CONFIG_SUN4U=3Dy CONFIG_NIAGARA=3Dy diff --git a/hw/Kconfig b/hw/Kconfig index e3c380f..d5ecd02 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -61,6 +61,9 @@ source unicore32/Kconfig source xtensa/Kconfig =20 # Symbols used by multiple targets +config TEST_DEVICES + bool + config XILINX bool select PTIMER # for hw/timer/xilinx_timer.c diff --git a/hw/hyperv/Kconfig b/hw/hyperv/Kconfig index a178bac..892a472 100644 --- a/hw/hyperv/Kconfig +++ b/hw/hyperv/Kconfig @@ -5,5 +5,5 @@ config HYPERV =20 config HYPERV_TESTDEV bool - default y if PC + default y if TEST_DEVICES depends on HYPERV diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 823135c..3ebe30f 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -25,16 +25,17 @@ config SGA =20 config ISA_TESTDEV bool - default y if PC + default y if TEST_DEVICES + depends on ISA_BUS =20 config PCI_TESTDEV bool - default y if PCI_DEVICES + default y if TEST_DEVICES depends on PCI =20 config EDU bool - default y if PCI_DEVICES + default y if TEST_DEVICES depends on PCI =20 config PCA9552 --=20 1.8.3.1