From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553690583414712.904951411608; Wed, 27 Mar 2019 05:43:03 -0700 (PDT) Received: from localhost ([127.0.0.1]:47155 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97tN-0007WX-Bp for importer@patchew.org; Wed, 27 Mar 2019 08:42:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97ol-0003hi-0D for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97oj-0002SN-Ml for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:06 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:44773) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97oj-0002S9-Dk for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:05 -0400 Received: by mail-wr1-x431.google.com with SMTP id y7so14249340wrn.11 for ; Wed, 27 Mar 2019 05:38:05 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=jNLJBzxaQQ5hlWAxWUD1d7BS7waGC/dkG+C9AtTyfyc=; b=rjuvu0UkNUa2NYK9z7/EJ3qMCp8nYhWQFHHVMTZ5sshjXf2M5msWvbO1at6QbJ+Scr v/yyEfQnijJuaM1U9ywWWaNuqeBFCbKvSOG4ozakhF1/hMBE3uh8IodH295d24tFYcKN 7GQcCUgf9q2hAZrFvoeITyZRgyesNbNWS11N/5aWoVpRHSl7ynE7puY9jVknazgYZiKW I6RleSthWc1iBqSznk0k0WFyTsIOT1tORzI1W9+Yl5zfXYRJydjKYxuTJp1Efbl4G9p5 U/qsNVvVqWgp6fh2UuXjl6r/4x3AFaNpfhMuBHY/jkN3tuK3OhnoeyH+63qQw34hzV05 YU9A== 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=jNLJBzxaQQ5hlWAxWUD1d7BS7waGC/dkG+C9AtTyfyc=; b=aodfgQChc1HO/4crfAodi5YZjMMMNw3z288IfgnOEtX7eDynPLwEypoOMZOlkToDvY Dd8waJbfz+Rqm1ZDuh0CufxfHYeT9E9x9NPLbfxtSgr4EhcHdfs9GtxMS06VpoC5GPDM AkTb1kpv4asnelHXGacQeGg2LJtQMosDtZs3+cLLb3hjVBOwro12J+8TWtpR3k5pFUSo XtRl/3zgHWRxZFGb1nzheNYOLrSCbTh8lBBaLIkLCgiDL+GDob7shWz2OBxRZRXC6vkS 2QAmvmEwMjnZA+LOLNSbENJAmmarZndCASx7w2UG0CPJ/5eg17dhbv7jpOueSOeY3j2B m5zQ== X-Gm-Message-State: APjAAAVkjGHAj1d6YssHZ6CLFBd2vH9mbTnaS3jvk2EAYbWs7UkifvGK Md7w4Whz3lWw6R1qaOJxd9EfjyX2 X-Google-Smtp-Source: APXvYqx+jSvx2P/eNa5VBRYMpIxdSKgQs0QQFeaQO7Q7yRoy8uaZ6Pbn5bNUEKSxE6kVBs+6DR5bQQ== X-Received: by 2002:adf:cd90:: with SMTP id q16mr22583700wrj.75.1553690284133; Wed, 27 Mar 2019 05:38:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:39 +0100 Message-Id: <1553690281-81854-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::431 Subject: [Qemu-devel] [PULL 01/23] riscv: plic: Set msi_nonbroken as true 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: Alistair Francis 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: Alistair Francis Set msi_nonbroken as true for the PLIC. According to the comment located here: https://git.qemu.org/?p=3Dqemu.git;a=3Dblob;f=3Dhw/pci/msi.c;h=3D47d2b0f33c= 664533b8dbd5cb17faa8e6a01afe1f;hb=3DHEAD#l38 the msi_nonbroken variable should be set to true even if they don't support MSI. In this case that is what we are doing as we don't support MSI. Signed-off-by: Alistair Francis Reported-by: Andrea Bolognani Reported-by: David Abdurachmanov Message-Id: <256afbb2da005dc62c159b0f4a4fc0d95c050660.1552679970.git.alista= ir.francis@wdc.com> Signed-off-by: Paolo Bonzini --- hw/riscv/sifive_plic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/riscv/sifive_plic.c b/hw/riscv/sifive_plic.c index d12ec3f..4b0537c 100644 --- a/hw/riscv/sifive_plic.c +++ b/hw/riscv/sifive_plic.c @@ -22,6 +22,7 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "hw/sysbus.h" +#include "hw/pci/msi.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_plic.h" =20 @@ -443,6 +444,8 @@ static void sifive_plic_realize(DeviceState *dev, Error= **errp) plic->enable =3D g_new0(uint32_t, plic->bitfield_words * plic->num_add= rs); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &plic->mmio); qdev_init_gpio_in(dev, sifive_plic_irq_request, plic->num_sources); + + msi_nonbroken =3D true; } =20 static void sifive_plic_class_init(ObjectClass *klass, void *data) --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553690578212405.8534941181466; Wed, 27 Mar 2019 05:42:58 -0700 (PDT) Received: from localhost ([127.0.0.1]:47151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97tL-0007UM-3r for importer@patchew.org; Wed, 27 Mar 2019 08:42:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97om-0003i0-Vb for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97ok-0002Sw-Sm for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:08 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:37255) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97ok-0002Sa-JI for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:06 -0400 Received: by mail-wr1-x441.google.com with SMTP id w10so18382110wrm.4 for ; Wed, 27 Mar 2019 05:38:06 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=zSJEqu6Q4/n4BrURKnFhVLXdmdiMLkMX3qO5THUb5UY=; b=unD/bpa9NG6J9emJzSmi/eE1PrRMVFD3ch6VsWj8yv2uXmRnQfsFbEzqEsEkike/mq g5nVE7KU9w6UU8hEvjXhqthIkfORvH1k6zkhPQk7gdx288l3zhCLeROYat8Fhjo1OZAi jhsiJWl6WrA9jilWhM8zj7kYyIRGa9ChmlznQy20UgK5VZJQw4oaDgC+C5ILwV7P7Ebh JUTLmn7KwCiI6A0zy4zFefLJwBmXxk59Rj9nFo30PawDWIhzu4DA2ZG+iM4cROzxteQy rDAROz2mc2HGqzinwSKjFH3z0OPSeWHRiMinY1/mVKeS2bv1347avogz+E/WxS/KNVXU 0xeg== 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:subject:date:message-id :in-reply-to:references; bh=zSJEqu6Q4/n4BrURKnFhVLXdmdiMLkMX3qO5THUb5UY=; b=AGw/18AVDcEnwL4jN4SuE6LsPlIDDzabViXxseOWmhwRPEWNdvWJoOQbxUc5/QI/jC T3VNdXKwCoIzt/V+Se5FLpLpzF/I8raYpC325jpCU4vT89tj5YBnoorFuwx1vFuvqj8R byFo0IycoK75rT4iz2FlqStOnsp9ntZj+tz3Ch5SyYsgX3jhxHoRxkhg1+3vMPIho2Zx bVJ9PgJoElSmRJpy4tgCwGjpXTzjT+0eJqrsRhj6XCltRmV5GKX/zJoYhVQH6emdaL9M Oiaur34s4anJuAdbhsqnL0djoWmq9D2vy7z3Q/oVgOc/xL8LDtpnTnq1C+h4jxui9YR9 fCig== X-Gm-Message-State: APjAAAU5m7ukZLjz7fXj8uZ9FPdwTvAGVYEBhmlQ5xpvUlpwSWc8ya93 UqkOP6XoEZmBwwttfQs2m3hTi1Jc X-Google-Smtp-Source: APXvYqxnSp7UX7uEgPOF1AWTeOK9uXoEG+ST8t4sbEVJMzxmu+kQI3TwHdAKgtvoqySpExrTA2rFoQ== X-Received: by 2002:a5d:6a12:: with SMTP id m18mr5608085wru.325.1553690285324; Wed, 27 Mar 2019 05:38:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:40 +0100 Message-Id: <1553690281-81854-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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] [PULL 02/23] kconfig: add CONFIG_MSI_NONBROKEN 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: , 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" Not all interrupt controllers have a working implementation of message-signalled interrupts; in some cases, the guest may expect MSI to work but it won't due to the buggy or lacking emulation. In QEMU this is represented by the "msi_nonbroken" variable. This patch adds a new configuration symbol enabled whenever the binary contains an interrupt controller that will set "msi_nonbroken". We can then use it to remove devices that cannot be possibly added to the machine, because they require MSI. Signed-off-by: Paolo Bonzini --- hw/intc/Kconfig | 3 +++ hw/pci-host/Kconfig | 1 + hw/pci/Kconfig | 6 ++++++ hw/ppc/Kconfig | 1 + hw/riscv/Kconfig | 1 + hw/s390x/Kconfig | 1 + 6 files changed, 13 insertions(+) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index de10a6b..5347f84 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -12,12 +12,15 @@ config IOAPIC =20 config ARM_GIC bool + select MSI_NONBROKEN =20 config OPENPIC bool + select MSI_NONBROKEN =20 config APIC bool + select MSI_NONBROKEN =20 config ARM_GIC_KVM bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index b39ea29..8c16d96 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -49,3 +49,4 @@ config PCI_EXPRESS_XILINX config PCI_EXPRESS_DESIGNWARE bool select PCI_EXPRESS + select MSI_NONBROKEN diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig index 3b8638b..77f8b00 100644 --- a/hw/pci/Kconfig +++ b/hw/pci/Kconfig @@ -7,3 +7,9 @@ config PCI_EXPRESS =20 config PCI_DEVICES bool + +config MSI_NONBROKEN + # selected by interrupt controllers that do not support MSI, + # or support it and have a good implementation. See commit + # 47d2b0f33c664533b8dbd5cb17faa8e6a01afe1f. + bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 2b83637..73b473c 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -8,6 +8,7 @@ config PSERIES select VFIO if LINUX # needed by spapr_pci_vfio.c select XICS_SPAPR select XIVE_SPAPR + select MSI_NONBROKEN =20 config SPAPR_RNG bool diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index 8c7fc1f..8674211 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -6,6 +6,7 @@ config HART =20 config SIFIVE bool + select MSI_NONBROKEN =20 config SIFIVE_E bool diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig index a7046ea..5e7d8a2 100644 --- a/hw/s390x/Kconfig +++ b/hw/s390x/Kconfig @@ -9,3 +9,4 @@ config S390_CCW_VIRTIO select S390_FLIC select SCLPCONSOLE select VIRTIO_CCW + select MSI_NONBROKEN --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553690411506219.66488430154845; Wed, 27 Mar 2019 05:40:11 -0700 (PDT) Received: from localhost ([127.0.0.1]:47101 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97qh-00054w-7s for importer@patchew.org; Wed, 27 Mar 2019 08:40:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97on-0003i2-BG for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97ol-0002Tg-VZ for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:09 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39440) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97ol-0002T1-JW for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:07 -0400 Received: by mail-wr1-x435.google.com with SMTP id j9so18371817wrn.6 for ; Wed, 27 Mar 2019 05:38:07 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=eNZ/rIJrYQN8S/ccrTrVuTZDomHJE2kVO3FAgtN3SjA=; b=I0QEhtQTvsu7KlykcDXV+TanW6NcaABFoolTgMzbN23rSEs08IgyKLkCYVJapXgOSQ hz9w9f5wQb3Th4B4jZNaIh/RYb8/I/M2x7u1w17oNacgII9JJ+Vv9XLLYcWv9FvQpyG2 M6kY4SgFOO2loR0rzB8XqaQxVn2yooIgE7zvzc+FU2Pf5xO7W8o18tL8u+ytBpvtwt3z bF6Eulykf7ARjE0Xdu7MkcSQfeKoOGmOdW189SE0lggmeDJIhmJtMipNgW0Gt2nhEcNm UjZZnkIMrf0NZR8Yf8ObMISnSVIhtYwx7A0RvO/LKqgOFVHMHhq15jr8RiKLQJ0o5439 +a2g== 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:subject:date:message-id :in-reply-to:references; bh=eNZ/rIJrYQN8S/ccrTrVuTZDomHJE2kVO3FAgtN3SjA=; b=T4Rsm6B5Waer7hZcYV+n5hBXIm9M3KsuXkGsWdukNwBLSP0k6Cmp+K6o/5pxFVM5BP ySwq81coDpo2hZN9oIB30kSy1peUUGhanDSYqZ2HGOyY2CIe+hvRjk0iVVkm0PId9p/5 98hJcTllDM7vW2dKCBfK6eYd2LCwWEC9C3u7yLHiaKrIr9hphdC7N2Y2o0hVfNRqB85T OxYU66fNMBzUtkgi6qQFq33GL17a8MDuSS6iAB8T+JL77V2dMqYrmBuZ5v7QlxvbUQkk GGKNTPZv4JU05otFGR4nVMFd6o89zO0m/9W24y7+/pidV2Mp/uRZlhmMLsLtCuQyO4Va 5yAw== X-Gm-Message-State: APjAAAWSsjrFbgW6APIM6Pr8wZ1AGHp9jr5pKwtOooR99ESAI+gSoerf ToL3nusGsjW7QzJ7Tzxh/clWr9lQ X-Google-Smtp-Source: APXvYqzsS7+bfh6H/tLlE4PXryZpFAbcVc8tGaf7WXSdmn5nD49NEdJ6S9QjQ6PSdtsFSnS4zBcVRw== X-Received: by 2002:adf:f451:: with SMTP id f17mr19978403wrp.272.1553690286288; Wed, 27 Mar 2019 05:38:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:41 +0100 Message-Id: <1553690281-81854-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::435 Subject: [Qemu-devel] [PULL 03/23] kconfig: add dependencies on CONFIG_MSI_NONBROKEN 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: , 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" For devices that require msi_init/msix_init to succeed, add a dependency on CONFIG_MSI_NONBROKEN. This will prevent those devices from appearing in a binary that cannot instantiate them. Signed-off-by: Paolo Bonzini --- Kconfig.host | 3 +++ Makefile | 3 ++- hw/Kconfig | 1 + hw/misc/Kconfig | 4 ++-- hw/net/Kconfig | 4 ++-- hw/pci-bridge/Kconfig | 6 +++--- hw/rdma/Kconfig | 3 +++ hw/rdma/Makefile.objs | 6 ++---- 8 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 hw/rdma/Kconfig diff --git a/Kconfig.host b/Kconfig.host index add5b17..aec9536 100644 --- a/Kconfig.host +++ b/Kconfig.host @@ -31,3 +31,6 @@ config XEN =20 config VIRTFS bool + +config PVRDMA + bool diff --git a/Makefile b/Makefile index d8dad39..dbb8e13 100644 --- a/Makefile +++ b/Makefile @@ -356,7 +356,8 @@ MINIKCONF_ARGS =3D \ CONFIG_X11=3D$(CONFIG_X11) \ CONFIG_VHOST_USER=3D$(CONFIG_VHOST_USER) \ CONFIG_VIRTFS=3D$(CONFIG_VIRTFS) \ - CONFIG_LINUX=3D$(CONFIG_LINUX) + CONFIG_LINUX=3D$(CONFIG_LINUX) \ + CONFIG_PVRDMA=3D$(CONFIG_PVRDMA) =20 MINIKCONF_INPUTS =3D $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig MINIKCONF =3D $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \ diff --git a/hw/Kconfig b/hw/Kconfig index d5ecd02..88b9f15 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -26,6 +26,7 @@ source pci-bridge/Kconfig source pci-host/Kconfig source pcmcia/Kconfig source pci/Kconfig +source rdma/Kconfig source scsi/Kconfig source sd/Kconfig source smbios/Kconfig diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 2c60be9..5f67d0d 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -34,7 +34,7 @@ config PCI_TESTDEV config EDU bool default y if TEST_DEVICES - depends on PCI + depends on PCI && MSI_NONBROKEN =20 config PCA9552 bool @@ -67,7 +67,7 @@ config MACIO config IVSHMEM_DEVICE bool default y if PCI_DEVICES - depends on PCI && LINUX && IVSHMEM + depends on PCI && LINUX && IVSHMEM && MSI_NONBROKEN =20 config ECCMEMCTL bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index c00ec03..7d7bbc5 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -28,7 +28,7 @@ config E1000_PCI config E1000E_PCI_EXPRESS bool default y if PCI_DEVICES - depends on PCI_EXPRESS + depends on PCI_EXPRESS && MSI_NONBROKEN =20 config RTL8139_PCI bool @@ -107,7 +107,7 @@ config ETSEC config ROCKER bool default y if PCI_DEVICES - depends on PCI + depends on PCI && MSI_NONBROKEN =20 config CAN_BUS bool diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index b167b98..a51ec71 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -1,7 +1,7 @@ config PCIE_PORT bool default y if PCI_DEVICES - depends on PCI_EXPRESS + depends on PCI_EXPRESS && MSI_NONBROKEN =20 config PXB bool @@ -10,12 +10,12 @@ config PXB config XIO3130 bool default y if PCI_DEVICES - depends on PCI_EXPRESS + depends on PCI_EXPRESS && MSI_NONBROKEN =20 config IOH3420 bool default y if PCI_DEVICES - depends on PCI_EXPRESS + depends on PCI_EXPRESS && MSI_NONBROKEN =20 config I82801B11 bool diff --git a/hw/rdma/Kconfig b/hw/rdma/Kconfig new file mode 100644 index 0000000..8e22112 --- /dev/null +++ b/hw/rdma/Kconfig @@ -0,0 +1,3 @@ +config VMW_PVRDMA + default y if PCI_DEVICES + depends on PVRDMA && PCI && MSI_NONBROKEN diff --git a/hw/rdma/Makefile.objs b/hw/rdma/Makefile.objs index bd36cbf..533ab2f 100644 --- a/hw/rdma/Makefile.objs +++ b/hw/rdma/Makefile.objs @@ -1,5 +1,3 @@ -ifeq ($(CONFIG_PVRDMA),y) -obj-$(CONFIG_PCI) +=3D rdma_utils.o rdma_backend.o rdma_rm.o -obj-$(CONFIG_PCI) +=3D vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \ +obj-$(CONFIG_VMW_PVRDMA) +=3D rdma_utils.o rdma_backend.o rdma_rm.o +obj-$(CONFIG_VMW_PVRDMA) +=3D vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \ vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o -endif --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553690744316930.7074374330839; Wed, 27 Mar 2019 05:45:44 -0700 (PDT) Received: from localhost ([127.0.0.1]:47181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97w3-0001PY-Ly for importer@patchew.org; Wed, 27 Mar 2019 08:45:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97oo-0003iK-R9 for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97on-0002U9-1I for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:10 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:35399) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97om-0002Tm-NU for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:08 -0400 Received: by mail-wr1-x42e.google.com with SMTP id w1so18425638wrp.2 for ; Wed, 27 Mar 2019 05:38:08 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=4pxU1Sz3Gr5ADhrdOf3/1CUawf+drvrWeGmjj+sJ2L8=; b=U/Rwoz1tQdS6s5dzsh7zGSfbgMKxEyW452yUTjhe4BrySAKbKhumTkGOieTVk8ltkS 44P9ShK2TbXoHVZucYbtB8JKDDVJva4N8CxuxWF4WQBYRjekDl8kn3inJ+YqZ3qJrlL0 SiaiJUkY6E2N0q6UBEBX5FCAZzZEGArq8n96FWwvAE5b0ITlOoXxTswKklS4+4WeNRAk DWe5avATcMeHymIlTlHp1lT/Lcpizd4StFc02HXg16nPpKa6CTdOOkFmdZ7c4wfPEGHZ AazqTnIpghep4AD+ab9E5a4PgnvkjIYhVmKC0hQ3THfxsq9Ps8YvQ2eyPbQmlsh6pp1L c/3Q== 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=4pxU1Sz3Gr5ADhrdOf3/1CUawf+drvrWeGmjj+sJ2L8=; b=AT7kaRG3KC5nnyWTiO/TYr2R1tkpEgBj/HsQstmK9q5FspcR+RoLP/NjrHi+Cwm1lb xzjsJGSy0eeojGDXyBHbsc5Bn9WYrKDb+lOGGcuXRCJPJpLJ3SfyqpVcXoORCUCeNCvv EixJ1x9m34zfoA6U4gVt4Hf1Iq5VRYbPi7TkforZ8+lQL7KzLqjNTt/Y3qB+m8ueO4mm 7CeXWo5mVRBUsVxSs9bZHwRQmoNre9cCZrv+lwLVG42u8oMftxBLit4IpmCOEcUx0mbe 6fhhymZSZj9MsZinn97fx7FP/PusmwJTr7R6Uu5DkcvOr76iKPqc9fh7SFUJiqHU4/3z XX2g== X-Gm-Message-State: APjAAAVk6oTN2XRQOc/gSwIewGe4Umw42O8+ZE4eUiq+uznBChnKhzou lpo6wosE88h6QwKl2gv6/GS465nH X-Google-Smtp-Source: APXvYqx9GkpKVcO/x6jTLwGuQOTHqr5oCoaLgFC49e/xB6IMtQhK4vT3/HamdeJ4k/ctTBMGzXonbg== X-Received: by 2002:adf:db10:: with SMTP id s16mr15349360wri.181.1553690287505; Wed, 27 Mar 2019 05:38:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:42 +0100 Message-Id: <1553690281-81854-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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] [PULL 04/23] memory: Fix the memory region type assignment order 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: "Singh, Brijesh" 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: "Singh, Brijesh" Currently, a callback registered through the RAMBlock notifier is not able to get the memory region type (i.e callback is not able to use memory_region_is_ram_device function). This is because mr->ram assignment happens _after_ the memory is allocated whereas the callback is executed during allocation. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D1667249 Suggested-by: Alex Williamson Cc: Paolo Bonzini Reviewed-by: Alex Williamson Signed-off-by: Brijesh Singh Message-Id: <20190204222322.26766-2-brijesh.singh@amd.com> Signed-off-by: Paolo Bonzini --- memory.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/memory.c b/memory.c index e49369d..9fbca52 100644 --- a/memory.c +++ b/memory.c @@ -1649,10 +1649,17 @@ void memory_region_init_ram_device_ptr(MemoryRegion= *mr, uint64_t size, void *ptr) { - memory_region_init_ram_ptr(mr, owner, name, size, ptr); + memory_region_init(mr, owner, name, size); + mr->ram =3D true; + mr->terminates =3D true; mr->ram_device =3D true; mr->ops =3D &ram_device_mem_ops; mr->opaque =3D mr; + mr->destructor =3D memory_region_destructor_ram; + mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; + /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ + assert(ptr !=3D NULL); + mr->ram_block =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal); } =20 void memory_region_init_alias(MemoryRegion *mr, --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553690744274195.79940729045904; Wed, 27 Mar 2019 05:45:44 -0700 (PDT) Received: from localhost ([127.0.0.1]:47190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97w4-0001RJ-A6 for importer@patchew.org; Wed, 27 Mar 2019 08:45:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97oo-0003ia-V8 for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97on-0002VU-UB for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:10 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:54924) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97on-0002U2-KE for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:09 -0400 Received: by mail-wm1-x334.google.com with SMTP id f3so16054966wmj.4 for ; Wed, 27 Mar 2019 05:38:09 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Vw2dihVNPb/Py984z8eJC0i9M3sxcAsCX62xcFgfpDc=; b=vLhlGwvh5zpvBoCn6kcjtycOj0gJ0EQe64BA4eTHDkeC0C8dTAwio1t9V6vh0c4hwJ srsURa2KRagD7dm0jzjS7WhFJwYfr3wZ1S6TKYxH+CYTFwzHekTe7/qleopu6j8evS6J b88zMrKODxqXGachv2VYhlpTIt/JcKMIQEVT7Vf2uf8+BlpmDdIL3WOZexvh7g5cwibB giYVky5DRTPeMoSCPHXAsEBdZkZ8nSXqCWGRZ8h+ShnIpFg7eH1US17CZcaDDIi2j/bU cFU+oGaV5No7cqNt4YNYz2H4v7F/cDpO+qxyJzd4WJgH1c08ukSV+zDRVrCde2mBPBt1 4w9g== 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=Vw2dihVNPb/Py984z8eJC0i9M3sxcAsCX62xcFgfpDc=; b=DO+j316ED8LE+Ss36Wtq0vS+kAdxZHXqMlivLo+PPAc8W8pZG3N6pzSrJZOf5RRCDu eAxi2+dRp0hCoAyUV1rnOHiO8j7CF9GaKaiZs1F1vv7/TklfAsFW45v2OsU3/8kUVm5q Gi5djCM838A3toqyN6ZolMKas1IfMFIAvFfKzpDXrei1n90wTPRJWG/9eqWG2ap0LOlZ tcqa87s/3Kp119+Bn45seXecg21oxkHGRviNl6Wzj0W1zRFwSNBooz95UN6HgR+DXPOR +nlT8nSDE8YkdqVk+gfMUNIeCfJwrj6AU6I4lpESRPz0+a3OPDQMuAZirBhST4EDxDmh BAXQ== X-Gm-Message-State: APjAAAXkyhmBGVmt5DwakT7dqz4TLmB5iSAnyf5EyEZ33+COdadG+LkP uCtEwF8lhMAjpvirqAl4UMxl1D2M X-Google-Smtp-Source: APXvYqz8B6zeeqftJiaS9L4XSIyFxTqVJVlQCEIqtVY88albmzmVOcGMWkTJGPr0FqA8jGwN66YAMA== X-Received: by 2002:a1c:c254:: with SMTP id s81mr12704163wmf.55.1553690288375; Wed, 27 Mar 2019 05:38:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:43 +0100 Message-Id: <1553690281-81854-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::334 Subject: [Qemu-devel] [PULL 05/23] target/i386: sev: Do not pin the ram device memory region 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: Alex Williamson , "Singh, Brijesh" 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: "Singh, Brijesh" The RAM device presents a memory region that should be handled as an IO region and should not be pinned. In the case of the vfio-pci, RAM device represents a MMIO BAR and the memory region is not backed by pages hence KVM_MEMORY_ENCRYPT_REG_REGION fails to lock the memory range. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D1667249 Cc: Alex Williamson Cc: Paolo Bonzini Signed-off-by: Brijesh Singh Message-Id: <20190204222322.26766-3-brijesh.singh@amd.com> Signed-off-by: Paolo Bonzini --- target/i386/sev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/target/i386/sev.c b/target/i386/sev.c index 20b2d32..cd77f6b 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -131,6 +131,17 @@ sev_ram_block_added(RAMBlockNotifier *n, void *host, s= ize_t size) { int r; struct kvm_enc_region range; + ram_addr_t offset; + MemoryRegion *mr; + + /* + * The RAM device presents a memory region that should be treated + * as IO region and should not be pinned. + */ + mr =3D memory_region_from_host(host, &offset); + if (mr && memory_region_is_ram_device(mr)) { + return; + } =20 range.addr =3D (__u64)(unsigned long)host; range.size =3D size; --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553690494988774.885448009553; Wed, 27 Mar 2019 05:41:34 -0700 (PDT) Received: from localhost ([127.0.0.1]:47145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97s3-0006Mi-Ty for importer@patchew.org; Wed, 27 Mar 2019 08:41:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97op-0003ky-Ve for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97oo-0002WN-QL for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:11 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:36007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97oo-0002Ut-GW for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:10 -0400 Received: by mail-wm1-x331.google.com with SMTP id h18so16630858wml.1 for ; Wed, 27 Mar 2019 05:38:10 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=TTZov6GHrBvzKwRQ5SUCi+h39DAk2mxNIVnKmRaXN3Q=; b=eEo0zCjpoFpreujfZLxya+0isL90/k17PTtvTK79n0a1t+7gafah6F4KdB79iR6pME NUeJOowWgYZlA0SmScvRjWEedlBO+jtzVgcrmKrw+sQdW4hIwUVPIImL3dZy3784eFBJ s7OvAf2x7EOG6tKOuIaKOCqFVy09VMwMLFc6ay3W09td5l1ouYnh96CvdQVg5o0+rogr ZtT4AZ7VnEQ0SS1bO//9RMPa/CqLgxZJ0UasVc6JprbS9CMQLHXiEoQ8I3knljxayxKu jcsYsvc2I81rU1Eov//UNy56a+uMgXSly8l1IDm0kZwHmoi628ATvCY+HUaS0MW6gA9C KcBQ== 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=TTZov6GHrBvzKwRQ5SUCi+h39DAk2mxNIVnKmRaXN3Q=; b=hJ+8GoK/6PT8PWv5ftxqPafgNWuW9Xt/Fa6rXjGyDYDXv8BmYn6/5HTHdcaSv3cNXU 2gwSL523mUtQvYd0CTK1EeJPQK3O2tGCwxFdWRblOFmQH34AO8okHOQfjch/2ShUVXCj HUu+xRZpUFlHj/UKJM4VqVPRhwDkQIWoA4Znz7pKcxodtfVsFLOtr8oEjXzb5wpnqm7n Tj2t0POtfvmv6EOfHprkvZuGzbpoiaYfgoNPaC+Q0WjrIg4yac6yocCMDQ21fUfwvkxl aKtulKKj96+/h3/rZYoUP+WCNUzzK47F2QL7Bu9eVReIlwwuw9t3nT4FLAsRAaqaFTFj LAVQ== X-Gm-Message-State: APjAAAVcmWfeWO9HtfmnTlHMx4NRRNr3Mab3T1axr38Si51mnVvSTjGz L8sCOPFyp8xZmG2MapHjE9NBp/O2 X-Google-Smtp-Source: APXvYqzWITqX965S4/VyILHkA6RvDcscZSXab4fKzWvT/FXRr03HUcU2Smw1OaHACAgGk8pxoHjVNA== X-Received: by 2002:a1c:21c1:: with SMTP id h184mr12761082wmh.128.1553690289192; Wed, 27 Mar 2019 05:38:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:44 +0100 Message-Id: <1553690281-81854-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::331 Subject: [Qemu-devel] [PULL 06/23] hw/char/parallel: Make it possible to compile also without CONFIG_PARALLEL 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: Thomas Huth 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: Thomas Huth For the downstream distribution of QEMU, we want to compile without CONFIG_PARALLEL. Commit 9157eee1b1c076ff3 already moved the function parallel_hds_isa_init() (which is still required for linking) into a file that is included anyway, but commit bb3d5ea858e7f888563a moved it to a separate file which is only compiled again if CONFIG_PARALLEL is set. To be able to link QEMU again without CONFIG_PARALLEL, the file should be considered for linking for all targets that have CONFIG_ISA_BUS. And while we're at it, add a proper comment in there with the rationale for the separate file. Signed-off-by: Thomas Huth Message-Id: <1552297854-25847-1-git-send-email-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- hw/char/Makefile.objs | 2 +- hw/char/parallel-isa.c | 3 +++ hw/i386/Kconfig | 3 +-- hw/sparc64/Kconfig | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs index c4947d7..cf086e7 100644 --- a/hw/char/Makefile.objs +++ b/hw/char/Makefile.objs @@ -2,7 +2,7 @@ common-obj-$(CONFIG_IPACK) +=3D ipoctal232.o common-obj-$(CONFIG_ESCC) +=3D escc.o common-obj-$(CONFIG_NRF51_SOC) +=3D nrf51_uart.o common-obj-$(CONFIG_PARALLEL) +=3D parallel.o -common-obj-$(CONFIG_PARALLEL) +=3D parallel-isa.o +common-obj-$(CONFIG_ISA_BUS) +=3D parallel-isa.o common-obj-$(CONFIG_PL011) +=3D pl011.o common-obj-$(CONFIG_SERIAL) +=3D serial.o common-obj-$(CONFIG_SERIAL_ISA) +=3D serial-isa.o diff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c index 639e179..a043832 100644 --- a/hw/char/parallel-isa.c +++ b/hw/char/parallel-isa.c @@ -1,6 +1,9 @@ /* * QEMU Parallel PORT (ISA bus helpers) * + * These functions reside in a separate file since they also might be + * required for linking when compiling QEMU without CONFIG_PARALLEL. + * * Copyright (c) 2003 Fabrice Bellard * * SPDX-License-Identifier: MIT diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 78fd703..4e4415f 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -9,6 +9,7 @@ config PC imply ISA_IPMI_KCS imply ISA_IPMI_BT imply ISA_DEBUG + imply PARALLEL imply PCI_DEVICES imply PVPANIC imply QXL @@ -25,8 +26,6 @@ config PC select I82374 select I8257 select MC146818RTC - # Needed by the board code: - select PARALLEL # For ACPI builder: select SERIAL_ISA select ACPI_VMGENID diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index 4a8166e..d4d76a8 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -3,13 +3,13 @@ config SUN4U imply PCI_DEVICES imply SUNHME imply TEST_DEVICES + imply PARALLEL select M48T59 select ISA_BUS select FDC select SERIAL_ISA select PCI_SABRE select IDE_CMD646 - select PARALLEL select PCKBD select SIMBA =20 --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155369094689722.295671854500824; Wed, 27 Mar 2019 05:49:06 -0700 (PDT) Received: from localhost ([127.0.0.1]:47236 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97zI-0003t2-LN for importer@patchew.org; Wed, 27 Mar 2019 08:49:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97oq-0003lP-CI for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97op-0002Wm-I1 for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:12 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:43504) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97op-0002WG-8H for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:11 -0400 Received: by mail-wr1-x42e.google.com with SMTP id k17so10428533wrx.10 for ; Wed, 27 Mar 2019 05:38:11 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=N8uwJaFy1X2vS6bTcoBf5VTbq/0d3aKigKZ+uuPX22s=; b=csCi4xtuecLztXkLlCtdobpZadDPCH9ClyW7iNE55GdFgfAdXFj+jxPomtr0OYsYAZ hEWHh0/8G2kZgEe09nN5kexfpdHzMVmtGsiWkBsJ9OCTyhl0+QSLzemxVRRG4RUzpIX1 s2mbKnQGUtH+NPRkdRHv8uMF5xpAH/Fp+ITAot7kGwkVXkuYA/YAcpnftK8wE6fYe7ZZ RTyzcO+TrT/ir3HhPczgL6FnEKgQS/jHOUScG9cjYjxw3p2R7VmylJ5czRh1cn3viYSa XAipGtSYgLS4+5x5X+d2eJ1hZY1n3Mklzcn9LYcqS45oNrlbG3xcLgL8Cb6oUhO+K8SM DfiA== 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:subject:date:message-id :in-reply-to:references; bh=N8uwJaFy1X2vS6bTcoBf5VTbq/0d3aKigKZ+uuPX22s=; b=SVaARDJbefMCMdMo4xqn4n9vbyIO2y7QDRRC278HH1133z/27rl7mATHi8q+6ByCZt uSMmucS+nkWFFcY3EdMOk4dejGTtT2T8JIASuCFHFREDFhCKr4cKQ9PyBUBYBXDwlpAY k53vb/4WOMaywNIlW9RBT7PIM+3Yb4gxSkc+QD9vLhQZfuY9Z3WeZ9qyb2FM4u4DUvgc 5M7Ixzq0pGeG8C8UQewjG8xOzy9z1Xjh7oT1NJqd470j0I3bhKjylXsLOXQUH5m7ne7C htpY1FC8ZQwduRy9t7gxPQ9McdChuzi9d7+OlsvkSK9otRMR1gLAVibPwQU0Rr7AFbO8 4pqg== X-Gm-Message-State: APjAAAXKhucftIww08xIEzOAhBHX2SA6MObD9KLjLwurVQiff1F3C8Dz est/kbdQuIj08RfNYPH5YhixpzYi X-Google-Smtp-Source: APXvYqz2Oubkcvt58Kniwj+IMz3Nk/WKCdtEv104YRTnhN7MGS1h1+dVJOMHsRPQ+VfSNpTrgy/uLQ== X-Received: by 2002:a5d:4e87:: with SMTP id e7mr22446321wru.161.1553690290192; Wed, 27 Mar 2019 05:38:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:45 +0100 Message-Id: <1553690281-81854-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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] [PULL 07/23] hw/i386/Kconfig: PC uses I8257, not I82374 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: , 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" CONFIG_I82374 is not needed for PC machines, since they create i8257 directly instead. Reported-by: Miroslav Rezanina Reviewed-by: Stefano Garzarella Signed-off-by: Paolo Bonzini --- hw/i386/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 4e4415f..756b1ea 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -23,7 +23,6 @@ config PC select I8254 select PCKBD select PCSPK - select I82374 select I8257 select MC146818RTC # For ACPI builder: --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553690954181766.9554251847932; Wed, 27 Mar 2019 05:49:14 -0700 (PDT) Received: from localhost ([127.0.0.1]:47232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97zH-0003ru-7P for importer@patchew.org; Wed, 27 Mar 2019 08:48:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97or-0003mK-7c for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97oq-0002X6-Av for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:13 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:35579) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97oq-0002Wi-1Z for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:12 -0400 Received: by mail-wm1-x329.google.com with SMTP id y197so16626574wmd.0 for ; Wed, 27 Mar 2019 05:38:11 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=pUtgQrr+MuUrJ0IN0g0dysC0aS9YNK4mUICFPyPwZME=; b=pUNRaDbT5M4JMxVsE991vKcoT8bT9ZgmJ2FqGU9Vu5/yz/IL6mdCZ7bYhX2W4zUVZw 8ccCUmIxcReYEKE9VUarbc6WcKnkTCmzbLPMfl4gjMft/4R/qm7f0boZ4AO9OCOkXZLw V2iKwc1HcF10Uu0HRDQ9ngxtYm62GAbRBTVtNuguDwUiEejO6QA+dfqPdi8cqByBpafY 8TD9iBF7InrqH5ucRGZwo3U5lVxNkQTpqKarhDa+d1/wpIXle12/U32N194Pc8KK5llQ I0Oto65v0jHG50xgn5wJU92JD38jZKi4vM2Wh7KKUyF/1e+9ZB+wvdzAZ0KqLf+DVr6b CfaQ== 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:subject:date:message-id :in-reply-to:references; bh=pUtgQrr+MuUrJ0IN0g0dysC0aS9YNK4mUICFPyPwZME=; b=RywuZwHxUyv3KUEEYdtYY1sPOa8K/49WzB4oCvE8zScKcdZyUlJ4bwH0G5NSxy/ync G47nDwMzUHvX7tageqRWqsBn2g55tWKZkUis9yB0LX1IF4pgZvKPqsEbgUuaI5vTpIAk b00kfU+LNNxJqb94DOHPA2QNP614UeDelb/dmMSRaK3PHg4RpuhFkJKnWWm4OEKVPKTL VHsomqyr4l7qB66Kj5FTuT8uxY/rAscGlPD5pJ8DI+0TfCLiA/LwbkLI5tZBEzAOg4M0 ea27CCkRJA9Tl/B9b99WOOVuTNvIFzMt0ctGXo5xs43krkufThVkvB3LHnCMHamymYF2 9wVw== X-Gm-Message-State: APjAAAUQorNOp/M2awOtQUI8rpc/joWOtlmI++TO7ScBKJmBzeG8DjWq fhQeppfvk7Ec0hri0Dfg4RuqMwHU X-Google-Smtp-Source: APXvYqwUxeCf5Oif3v3Xjmlv5BgeYDRXyrjoRudYpOW7NLo362yVtRdv6+o9KxqGEhukDTekImzThA== X-Received: by 2002:a1c:f205:: with SMTP id s5mr12696753wmc.124.1553690290960; Wed, 27 Mar 2019 05:38:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:46 +0100 Message-Id: <1553690281-81854-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::329 Subject: [Qemu-devel] [PULL 08/23] prep: do not select I82374 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: , 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" It is only needed through I82378, which also selects it. Reviewed-by: Stefano Garzarella Signed-off-by: Paolo Bonzini --- hw/ppc/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 73b473c..bbe5a64 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -64,7 +64,6 @@ config PREP imply TEST_DEVICES select CS4231A select PREP_PCI - select I82374 select I82378 select LSI_SCSI_PCI select M48T59 --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553691240081179.01947752828266; Wed, 27 Mar 2019 05:54:00 -0700 (PDT) Received: from localhost ([127.0.0.1]:47306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9841-0000aS-UT for importer@patchew.org; Wed, 27 Mar 2019 08:53:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97os-0003nY-9g for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97or-0002Xa-7n for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:14 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:39437) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97oq-0002XA-U8 for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:13 -0400 Received: by mail-wr1-x431.google.com with SMTP id j9so18372133wrn.6 for ; Wed, 27 Mar 2019 05:38:12 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5gASBOas8DOdk3afNS42lvYh7NhqEltw9YFFpB7JuF0=; b=dtUW5UD9sQ1ikkydRCBQjhMuua80a/iGbZMnXEb4+I3VoqJGo8lBIXnhlTZBgzz/Qf umxCSCoM1C4fO63tdCsfuj+pq/tMdk5vOWLcq8ROsyr0/j6Ju/in4/f7XNB3HXvLKBCH y0WLPxi0v6+I1qzLg150wmzVLtBcPA5QVzt1dejXO/aNEMGScRKu0rRShCMYNYgWIlV8 0hh3HL6T88hfizORJfErSyEH156nOx8JfHPxCpJKTz8Q/VAxZdoDJCW81P1XG3I+/puj XsyUDRPkJETbA914EmbhMdI0y1OSehSk/f61W9F0Ind8NbQKtvSMmS/3LCRKtm5aeTQJ 9KkQ== 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=5gASBOas8DOdk3afNS42lvYh7NhqEltw9YFFpB7JuF0=; b=dO7hDZd9gEt7OKRQ6fTHbaKlVxlsNfdXw8zKrZ6scjUA1NAexPeXqOcKbv1ItlFjA5 eoiBx009BhRH08PsfkumpbyA5lmw5fmPaNluuuzXcAG1x5Zp18nioB3X6XBy1/tw6dvC uUtFg/4CRXymcMMf8r1Z+MGfnjS9M1rVk7yRHEW0f64Zk/08ujxVTl/h5kCTCBdhw51S OGja2dhBGG9iHpnUC6KczSylaU2OFWfBelTJzj9Xexz5XiNO1clGkTLXYw57uyhV+gqp s0z7WHGTaRyedI8GI4TcSHUK8SSjp7TknPQQUMJUQU1snGwtxjtdbMlMn9FD0sUalAqt l92A== X-Gm-Message-State: APjAAAUM2DNcd1U8gkFCh0MVG2Wu8RAfkNS8ES198TI2rvW3u75KF+UY o9yaCvf7J9MSvJxOP05IZ6yORlwA X-Google-Smtp-Source: APXvYqyvitI0duCnNlebZnwS9St0+xGbjNLOqiW/mL0bQvR0SYSEtZcpRE8r1YY4eNsty6XeZ3Z15g== X-Received: by 2002:a5d:5284:: with SMTP id c4mr9040219wrv.281.1553690291805; Wed, 27 Mar 2019 05:38:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:47 +0100 Message-Id: <1553690281-81854-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::431 Subject: [Qemu-devel] [PULL 09/23] hw/isa/Kconfig: i82378 SuperIO requires PC speaker 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes when configuring with --without-default-devices: $ qemu-system-ppc -M prep qemu-system-ppc: Machine type 'prep' is deprecated: use 40p machine type = instead qemu-system-ppc: Unknown device 'isa-pcspk' for bus 'ISA' Fixes: dd0ff8191ab Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190316200818.8265-3-philmd@redhat.com> --- hw/isa/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 57e09a0..c9a26c7 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -11,6 +11,7 @@ config I82378 select I8254 select I82374 select MC146818RTC + select PCSPK =20 config PC87312 bool --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553690416548848.5841362155068; Wed, 27 Mar 2019 05:40:16 -0700 (PDT) Received: from localhost ([127.0.0.1]:47105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97qm-0005AA-I8 for importer@patchew.org; Wed, 27 Mar 2019 08:40:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97ot-0003oJ-0k for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97or-0002Xr-VK for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:15 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:41364) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97or-0002XS-Mn for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:13 -0400 Received: by mail-wr1-x434.google.com with SMTP id r4so10693794wrq.8 for ; Wed, 27 Mar 2019 05:38:13 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zmgD7m1phhAFkAHVC/pRj+Hswl5wCaV55DIW4T9EEpM=; b=i2E748TP8FUhhVVjRgWP20Lq6zAvCQRhKRY0OidSFBZQjQT4PB+uCBY1j1Vdfau2kN fkt6RGcZ5rc3Qa/LxEK92DaTmIjWh303tewhg/dt0DYo0x7sZr+LRa/TIlXKqyjaO1Ku cwS+GUuqfUSiR/4wdDe1GBdoa0MgpuMwXJ9tZ28VmVGrJak7FHOb9wFAcckPJWmf6I0B jS7n3hjIHjAvUJDeGOFPHVvGWuo1wsKoD3OxPS62mfFFbSIXpbc6LL41s9H8l31wDzvB +I4fYDZR514dYTTeEUr5iR5y9whnTxrr/mUTJrfq8PyfnZeCQ8W8jsGjJjLbzISgHB0p Um8A== 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=zmgD7m1phhAFkAHVC/pRj+Hswl5wCaV55DIW4T9EEpM=; b=tKpZ6dfIbMy2WmHwwAkZnILGIG7d0I1PvH6kGO4cD0TkfQohRQdW3seq2gDfLcJ8TN udRW6sHHd/8w+hx9asjCM6UsSKb7bFLsc5XBL4YA0E6lY/x90nIhGixCWXvE9KtXm7Nr nPE2o+dB8aja+ozjNbkp6V/f41MhOcr85yxpSvrVO+lLyj2GE2nL4Y0M/gT+/VXVELgD JHFPlDiqtpsU3rLL4Eq6NgCSjLgM1YGkfzYKSUDm8Ng27Gmkpro/xr+nqonEvTBk7B+Z GQmWSAKijiyzyNw9xLPXEbhpgjkuEzTZTXxEdxHu/6bn9LntyhLvAV+0wbC6lUha2CA6 Gktw== X-Gm-Message-State: APjAAAV2AYYbuRX8KKFMiM2+a8hRtMAOO11GF62OAAQ5IsOYaNGfclo1 +2qBbhNe4+busrU7vkNoU9dB2MPO X-Google-Smtp-Source: APXvYqwsCXbBnwtoxw7UpLYWwTspp8Zl3KTo6Zi1ShRjzZPlmOUOo60WRSldOQHGq7KehhGTYszirQ== X-Received: by 2002:adf:f102:: with SMTP id r2mr5959405wro.136.1553690292518; Wed, 27 Mar 2019 05:38:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:48 +0100 Message-Id: <1553690281-81854-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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] [PULL 10/23] hw/isa/Kconfig: PIIX4 southbridge requires USB UHCI 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes when configuring with --without-default-devices: $ qemu-system-mips64 -bios /dev/null -M malta qemu-system-mips64: Unknown device 'piix4-usb-uhci' for bus 'PCI' Fixes: 7c28b925b7e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190316200818.8265-2-philmd@redhat.com> --- hw/isa/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index c9a26c7..6db0d79 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -30,6 +30,7 @@ config PIIX4 # For historical reasons, SuperIO devices are created in the board # for PIIX4. select ISA_BUS + select USB_UHCI =20 config VT82C686 bool --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553690665108804.1997917659742; Wed, 27 Mar 2019 05:44:25 -0700 (PDT) Received: from localhost ([127.0.0.1]:47169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97uk-0000Fx-TC for importer@patchew.org; Wed, 27 Mar 2019 08:44:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97ov-0003qK-28 for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97ou-0002Yl-33 for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:17 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:34367) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97ot-0002YP-QP for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:16 -0400 Received: by mail-wm1-x335.google.com with SMTP id o10so4724406wmc.1 for ; Wed, 27 Mar 2019 05:38:15 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7EIRJL7/WdFL0A3x9tuXJR5ajmkVFRk5tL4Vm1jvdvc=; b=MyA39dKlv5IW2kKRS/HTUVGGBKpDg2u2mEJepLJRuQcDr2l/5fv3pEb8wp4MV+0Z9W Je7y1ekezVtoPQ+Krxy8oex0eyYK9BG/47zrgTNIRblKaGosfT5EOG5MKl5o53Qm9Fao 7+QcjdYAfqd048ISG0JaIuMCDUlyQnVANyA5ozD/nHHAQysK9e2JNGP3JsxjWiIjxPtp x1W22qB8/UOtO5whWqrCt2gKiIcJS9JvFa1vKsBGTmCFXGeZPahZQ84iwdrcenMPwvic Eq2iw7GpMKaaBRi69co4l5g92TBnVJuk7lM4DeH4cfNjIu6eBUFTTlzQQl2EQSwOwA8x eQoQ== 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=7EIRJL7/WdFL0A3x9tuXJR5ajmkVFRk5tL4Vm1jvdvc=; b=DlvZ6LbIWi6gd21oOJlIv6xbcClIkAztMAleCO8c6Hujcaxgcqt8Lq5DgZ8sjXW6Ev 4xOy2FcvTFY4HfDDd28pVNWEGZEr+Gt+S/1HQ9LeGrDCIk9sYQkm9I433IIJ0B2A/tXt imUZeo86Fl4lFNLWnSJRvsCYMKa1/cJseqSLVkmxANVkmWITHOC8HjpO6MgbUnPKnIN/ fCy+RjXr5k5PH7Tar3EB2fJVEO/SRKVctnbXjoJmJ3YcmSBKEZnq6vfH5hfbZV5lux8D HMXWGBjIRNxyfewdPWImSnO4UiTllGTH1oZoXWbcIIWmktS+cXQ+FxnpdV0RIcJ4or9P Z1Vw== X-Gm-Message-State: APjAAAVwI2p2nBgh2TFiJzwatYTsHTCusvUaUvvwnv3eDxO0rcS74Jcx vzpDv2qCkFu3jje0Hx4Zibohtd29 X-Google-Smtp-Source: APXvYqwMrSFNvjwHsa2S0jFGCK5j3+xusAUttrMdWgXNcXieNemf8lWik72nX3UpoNmOSf+n6RcHkA== X-Received: by 2002:a05:600c:219:: with SMTP id 25mr11987838wmi.7.1553690294461; Wed, 27 Mar 2019 05:38:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:49 +0100 Message-Id: <1553690281-81854-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::335 Subject: [Qemu-devel] [PULL 11/23] hw/i386/Kconfig: enable devices that can be created by default 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes when configuring with CONFIG_PCI_DEVICES=3Dn: $ qemu-system-x86_64 -M q35 qemu-system-x86_64: Unsupported NIC model: e1000e $ qemu-system-x86_64 -M pc qemu-system-x86_64: Unsupported NIC model: e1000 Fixes: 7c28b925b7e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190316200818.8265-4-philmd@redhat.com> --- hw/i386/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 756b1ea..8e8444d 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -18,6 +18,7 @@ config PC imply TEST_DEVICES imply TPM_CRB imply TPM_TIS + imply VGA_PCI select FDC select I8259 select I8254 @@ -47,6 +48,7 @@ config PC_ACPI =20 config I440FX bool + imply E1000_PCI select PC_PCI select PC_ACPI select ACPI_SMBUS @@ -72,6 +74,7 @@ config Q35 bool imply VTD imply AMD_IOMMU + imply E1000E_PCI_EXPRESS select PC_PCI select PC_ACPI select PCI_EXPRESS_Q35 --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553691163192529.087027379311; Wed, 27 Mar 2019 05:52:43 -0700 (PDT) Received: from localhost ([127.0.0.1]:47290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h982m-000849-1I for importer@patchew.org; Wed, 27 Mar 2019 08:52:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97ov-0003r9-OH for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97ou-0002ZE-UI for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:17 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:43500) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97ou-0002Yi-Kt for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:16 -0400 Received: by mail-wr1-x429.google.com with SMTP id k17so10428828wrx.10 for ; Wed, 27 Mar 2019 05:38:16 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5shjD76EQjtN9cePd5waGyQTgls9Gn+52zwoPJK/NG8=; b=Eo+L4fyRaR6Kx/xIA39x/6dihwJZGRrm815JrSb2tZXbqXs4Hs11pZGb+cuz4ysajw yIBUZmD0GVC/sbk6vxFDb88fAv1d01Ylb3kkYi3Hmm63UVWiUxk55eatMGPmhjMAh7ay Z+HESkd5+JG7i58Z0iVeNjZUJPNxHQIrOOXbkjW29CR3dsW8XJoxITXeHFbeTGdIUAn+ XRFscYY3P6Cu0Gehb3u8U0fW20vi02Vdz0wtAPGF9kgea6WeIwD0xjFzdEUbqlJEMKSo RSefhhxul8Yu3zl/td56IskKPEItVD3XWzpACKwG+9wnzAX3SeKeLwm0X+uvO5+DTJyw h3Vw== 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=5shjD76EQjtN9cePd5waGyQTgls9Gn+52zwoPJK/NG8=; b=iE3JlcxIonZOCcJoZDvCfJiYHihpZ4yWiDeZjLFUKEzajfnIwAd6zVaSfuClHz8a4m 3/zTv7XebD5zeK2ewwpzKwTETyO20p7sN6VbdBfcRkFlKJvXQcQdKOp+Ytv4HmCQPr0e XEvKV9buTy0H3cKX4spQ1Yz6jlRoECp92ZRxFDSLdCbV83MsWY69y8NT+mAyMIcixx3j 4HrjSsWhEGDsBUyw26d1M+Mg5uvnWqz2hSWa4YupMCnL2gVNbmjPAt50SxTDVIvpxvtp G0VbSklBBq96DKYeK10tA+kjSiXgRD0r5bgUjGGU1NS+4B3hwyMlNQE/R1SoaJSIGZzC MryA== X-Gm-Message-State: APjAAAWP8z9+6O1vlI+xR9cp1Nj0EeN72bK2eXjJjSCbfk81gwsQDpwW RU6ncd6g7OVBWmPJr1ovGXX3wHUC X-Google-Smtp-Source: APXvYqwxQs9kWDMaCskBkPrh39WNf1Qndz/YEYMubxehX+WDI6MwrfG4cixNaMzz2X09/tAgASiz7g== X-Received: by 2002:adf:ebc8:: with SMTP id v8mr23216570wrn.172.1553690295302; Wed, 27 Mar 2019 05:38:15 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:50 +0100 Message-Id: <1553690281-81854-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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] [PULL 12/23] hw/mips/Kconfig: Malta machine requires the pcnet network card 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes when configuring with --without-default-devices: $ qemu-system-mips64 -bios /dev/null -M malta qemu-system-mips64: Unsupported NIC model: pcnet Fixes: 7c28b925b7e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190316200818.8265-7-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- default-configs/mips-softmmu-common.mak | 1 + 1 file changed, 1 insertion(+) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 0795d52..8e54a74 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -35,6 +35,7 @@ CONFIG_MIPS_CPS=3Dy CONFIG_MIPS_ITU=3Dy CONFIG_R4K=3Dy CONFIG_MALTA=3Dy +CONFIG_PCNET_PCI=3Dy CONFIG_MIPSSIM=3Dy CONFIG_ACPI_SMBUS=3Dy CONFIG_SMBUS_EEPROM=3Dy --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553691432845202.32227738393544; Wed, 27 Mar 2019 05:57:12 -0700 (PDT) Received: from localhost ([127.0.0.1]:47371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9875-0003jB-Ku for importer@patchew.org; Wed, 27 Mar 2019 08:57:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97ox-0003t3-3s for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97ow-0002Zf-1I for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:19 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:41989) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97ov-0002ZM-Nf for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:17 -0400 Received: by mail-wr1-x435.google.com with SMTP id g3so14893079wrx.9 for ; Wed, 27 Mar 2019 05:38:17 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HGhMK4qg8Oc69Gu4eox8MPHgjpjEDblPHtnNZaoRysw=; b=u0PY09HzqYuz8FBhMGU9qZFmB/W8wsek2o/tx/O9twAUFrY0RGlKkCUvdBBAfq1hPk hY4SyxsHMnIvShkshkqWQylZSl0JDBaknmxF65d9eELeO0IxmSgFhxtmyzr6sPSPRKvj Z4LHbGvD7nNIPb22jLavAHW+plBrG7HIgQC12LbpiwChJoxoWQ9MxsNlw8NAC2r4AuKU Ly1hpySa+BRGs6aAnndCkcLecG26smZoVx/Nf6rn3oFqScfUUFXtrW2Ggf4bw3ADEner NoujKT2S8m8Omow4pp3vtBBtqxZQrA4a7OO7koKMuKUw835Bv44l9neELhaNu0OJlFwG yZJQ== 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=HGhMK4qg8Oc69Gu4eox8MPHgjpjEDblPHtnNZaoRysw=; b=JENP4biQF7Gp63y2rQpwxWWoWMFBhCxWYkzV3FsBOTj6FN63u6i0vHy/qg+Lji1hGO wNRgkla8Ld4sKApZ3/00ihdXSfB0ce2o0xCDIBJhi8qtpzaDmbK5Rxlxu3j50MIVRoZw potES7pGJXK08kQEtCC0i4uiuB6zmKmDAqw+tMjjLpDHP8EY/F4w9+uhV4lqWEdXVj/I kPtEvrBLsF9QsngaKNiJvLwdj0FHVQq59Up1Eba5Agb7VZTd1aRxK72sT4OhInVikSBi 2c4mGF/HmWLnxzgjb253rlyzuiHt0DA6LAIxTyimIuR2ri8OuBocnxnQxLaZo1RsCT23 QDaA== X-Gm-Message-State: APjAAAXqppmxE9fKKVBayOO0cMTWJrhqVyRJSnDuz5mYtuMWCbL+tCVB 9ztUQvE0Ahj72aQzvOEL+d56tnrY X-Google-Smtp-Source: APXvYqxHxGyoxShEnSltIjNebOZxAtDW2PE6+lSCQrAq/j2ebyaGkdH/xGuma5iNJfOZvi1TRqgD8Q== X-Received: by 2002:adf:b612:: with SMTP id f18mr5951500wre.236.1553690296489; Wed, 27 Mar 2019 05:38:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:51 +0100 Message-Id: <1553690281-81854-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::435 Subject: [Qemu-devel] [PULL 13/23] hw/mips/Kconfig: Fulong 2e board requires ati-vga/rtl8139 PCI 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes when configuring with --without-default-devices: $ qemu-system-mips64el -bios /dev/null -M fulong2e qemu-system-mips64el: Unknown device 'ati-vga' for bus 'PCI' Aborted (core dumped) (gdb) bt #0 0x00007ffff5a2753f in __GI_raise (sig=3Dsig@entry=3D6) at ../sysdeps/= unix/sysv/linux/raise.c:50 #1 0x00007ffff5a11895 in __GI_abort () at abort.c:79 #2 0x00005555558768d3 in qdev_create (bus=3Dbus@entry=3D0x5555562664b0, = name=3Dname@entry=3D0x555555b24efb "ati-vga") at hw/core/qdev.c:131 #3 0x00005555558d15e1 in pci_create_multifunction (bus=3Dbus@entry=3D0x5= 555562664b0, devfn=3Ddevfn@entry=3D-1, multifunction=3Dmultifunction@entry= =3Dfalse, name=3Dname@entry=3D0x555555b24efb "ati-vga") at hw/pci/pci.c:2104 #4 0x00005555558d1a7a in pci_create (bus=3Dbus@entry=3D0x5555562664b0, d= evfn=3Ddevfn@entry=3D-1, name=3Dname@entry=3D0x555555b24efb "ati-vga") at h= w/pci/pci.c:2121 #5 0x0000555555763081 in mips_fulong2e_init (machine=3D) = at hw/mips/mips_fulong2e.c:352 #6 0x000055555587e23b in machine_run_board_init (machine=3D0x5555560b200= 0) at hw/core/machine.c:1030 #7 0x00005555556cbea2 in main (argc=3D, argv=3D, envp=3D) at vl.c:4463 And then: $ qemu-system-mips64el -bios /dev/null -M fulong2e qemu-system-mips64el: Unsupported NIC model: rtl8139 Fixes: 862b4a291dc and 7c28b925b7e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190316200818.8265-8-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- default-configs/mips64el-softmmu.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-softmmu.mak index 8b255ef..a67c951 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -6,6 +6,8 @@ CONFIG_RC4030=3Dy CONFIG_DP8393X=3Dy CONFIG_DS1225Y=3Dy CONFIG_FULONG=3Dy +CONFIG_ATI_VGA=3Dy +CONFIG_RTL8139_PCI=3Dy CONFIG_JAZZ=3Dy CONFIG_G364FB=3Dy CONFIG_JAZZ_LED=3Dy --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553691354630382.8663089187319; Wed, 27 Mar 2019 05:55:54 -0700 (PDT) Received: from localhost ([127.0.0.1]:47349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h985v-0002k5-I6 for importer@patchew.org; Wed, 27 Mar 2019 08:55:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97ox-0003u1-VS for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97ox-0002a0-1G for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:19 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:44769) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97ow-0002Zj-Ov for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:18 -0400 Received: by mail-wr1-x42b.google.com with SMTP id y7so14250196wrn.11 for ; Wed, 27 Mar 2019 05:38:18 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jPkqx40Ftj8pZAKqFT6rSB2vh8K8kHOj+GVnmBLVnSc=; b=patgwKbiKEPQsBCHz3DY5ai7zS0YiyIvtJE1UxU74U1OS6bmM9UNK/KyfA7OoO1Qog KC632QSPtmFFJFVHJlaYu5WbIDsN+cL+nyk3nudPTHZTtg/nHGBX955lI5PHQ+0xgRO/ OZTqpY9vS75ghsgr4eBCBmVw/ZtZC0QYyuxSOdBg7XoAJMdixnVsWYTHbi0WLhaKXt3q W4IgvbAPRhvJW/Ydb3CQfaIm9bSn2zktY3l31Wwv4MeKaZ0ckfHfG9ktNdEqqkYLFfG6 UwPu3vhh1uwTGfGOH/dZg4MiUBTH1O1Wu3yelEsypmAnq60LoD9PPqtOd7lZSBkGX1Ab z1zg== 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=jPkqx40Ftj8pZAKqFT6rSB2vh8K8kHOj+GVnmBLVnSc=; b=SF97in2tVqiuXCMlnssvpWamz1GsrTFwK+w6XcaWMBd1t6xQkA2EzD5h9TG5MjWmG0 kYfhshSp1osksRwREfIGjHV/Ef16gn6f1LgvBb85NEXX8wFDPcV4dO8jO4tvxCxeeYhe 1DHJbXU2DOwi5Sp0BglGEZqhJycukLczMHjH2XaXMiFv+k7WFkbwEzXFdsvoj5frvYee LCIricsOw6nclzLXmFvg/Dl6R82q4uOyBf38jeaDOzFIusw3WFBFrNOfPss+ws87+PTi EQeYgeLOXBBUCsV4tDwk4/lykXXT8we491OW8UtH7W4V/3JTxssY/pGDAg3bbA+R6wSL kT3A== X-Gm-Message-State: APjAAAVR2tvMOF0Bk8sHYZLMbZD5GQa+jlLZYomymZbHBNjeKOrZj9TJ 3/96f7Pzn/Amb/IobEPF2476wOdx X-Google-Smtp-Source: APXvYqzkH0yXvQjlGLxR9QYJT31q64Whu1JZSWxY71Z0xyECe4ZSvLAHYH7CLA4TwgCPzrYw9kjrlA== X-Received: by 2002:adf:eb84:: with SMTP id t4mr24840304wrn.100.1553690297509; Wed, 27 Mar 2019 05:38:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:52 +0100 Message-Id: <1553690281-81854-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::42b Subject: [Qemu-devel] [PULL 14/23] hw/ppc/Kconfig: Bamboo machine requires e1000 network card 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes when configuring with CONFIG_PCI_DEVICES=3Dn: $ qemu-system-ppc64 -bios /dev/null -M bamboo qemu-system-ppc64: Unsupported NIC model: e1000 Fixes: 7c28b925b7e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Message-Id: <20190316200818.8265-9-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/ppc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index bbe5a64..0024873 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -37,6 +37,7 @@ config PPC440 bool imply PCI_DEVICES imply TEST_DEVICES + imply E1000_PCI select PCI_EXPRESS select PPC4XX select SERIAL --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553690583682735.4754326503614; Wed, 27 Mar 2019 05:43:03 -0700 (PDT) Received: from localhost ([127.0.0.1]:47159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97tR-0007Zr-Ls for importer@patchew.org; Wed, 27 Mar 2019 08:42:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97oz-0003vC-5Q for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97oy-0002aX-66 for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:21 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:51607) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97ox-0002a8-TD for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:20 -0400 Received: by mail-wm1-x330.google.com with SMTP id 4so15990833wmf.1 for ; Wed, 27 Mar 2019 05:38:19 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1fSSLGCvLaM7lxdmVLhti1xMzSlQVU3DEiU+iWji3OA=; b=U3iXlQP7PXKjcdzze2kW60vwqYFAnoEBjqYxZoHTO8Tmis4mWRqlq4zsdN9+Lv1yWK i5510xHj7xiKrW3XRv4L/1XVyqo7SlXnipcbHZxhecB/4yDGAWAmgLfL5POdxQoap2lC R8i4ZNncSq6RXhb61WiH6kCDrymFs21slxxJ9PNN3aBhgCuUJthDCn7dtB92GTfD427X PLf8ycdj1EfSvtVHo0T/MnsymY659OUGEIVbKnbwYDVcgSdFS3DRLvbJXo6tYEMBtrQa YuJu+IUaNvJ6NIf5LqXvboRlxD6ZeIynQZQj4sqd0ZAL1ht+F+iCcu6ABq5fKE1glmmC 9v9w== 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=1fSSLGCvLaM7lxdmVLhti1xMzSlQVU3DEiU+iWji3OA=; b=GBR/BWabzJ06xhlm2heMfIYtPSmMzAS/R+64+Q+zEYDskwQFrXl70SyDeejN9EfBVr /0PfZsSdej8LoBV5NxPwspUozB40QNrWce96ewdpEfWWFFlKri5e7d3IW+SrOCZw500q HcO5uZq4dv7dnBe94tkPOcoEJXhAURWhDxj6tgUecpP9udxmnAoFe1Rb0neBxFBmAypD Zn/9bzoSu1hWYVVq67LN3EDkbStbhtbijy+/l1uIyCtcm6F5BmJgRy0aHyprilkIPfwK OYBFx4ifWgmfHnAK4cX4iYkgYPv5xnuQSCKBi517d5AlGeq4DQVcU0kNbodETmtR8WT6 6mew== X-Gm-Message-State: APjAAAWlp6WC+r0+C6wq+EDPVcVEmHmEV5cUNdWWwDhkQIpjGASHeoGg FoM8KRmOPtCx+8c2MaBdJsu6FEH4 X-Google-Smtp-Source: APXvYqzHuutXWUw8WSMbIU3qILWM6IvLmn4Vkt7YsmHGzCO+rAAWWw6rMzFG5yTOxrlM/RI+k1wqhQ== X-Received: by 2002:a1c:804c:: with SMTP id b73mr17545139wmd.116.1553690298583; Wed, 27 Mar 2019 05:38:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:53 +0100 Message-Id: <1553690281-81854-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::330 Subject: [Qemu-devel] [PULL 15/23] hw/ppc/Kconfig: e500 based machines require virtio-net-pci 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes when configuring with CONFIG_PCI_DEVICES=3Dn: $ qemu-system-ppc64 -bios /dev/null -M ppce500 qemu-system-ppc64: Unsupported NIC model: virtio-net-pci And: $ qemu-system-ppc64 -bios /dev/null -M mpc8544ds qemu-system-ppc64: Unsupported NIC model: virtio-net-pci Fixes: 98bd1db99f Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Message-Id: <20190316200818.8265-10-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/ppc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 0024873..ae07b4d 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -98,6 +98,7 @@ config MAC_NEWWORLD config E500 bool imply AT24C + imply VIRTIO_PCI select ETSEC select OPENPIC select PLATFORM_BUS --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553691604385617.9817867723751; Wed, 27 Mar 2019 06:00:04 -0700 (PDT) Received: from localhost ([127.0.0.1]:47401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h989u-0006O1-7K for importer@patchew.org; Wed, 27 Mar 2019 08:59:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97p1-0003xY-2i for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97oz-0002ap-0J for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:23 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:39212) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97oy-0002ab-Np for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:20 -0400 Received: by mail-wm1-x331.google.com with SMTP id t124so16547960wma.4 for ; Wed, 27 Mar 2019 05:38:20 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7jGPvF7nGF+Mkr+6Gf7saKkX3WPUb7V91K/oAWR42ck=; b=JSbzvhViae7AuRmU/IXHO+NgDf4Q/dfjRZOfFva2h9wJh5J+/p9DV20DIUFJI3QeJI XD6GbOZra2MinJscQLXT7vKorw9FOlRVs1dkRGSmD+W9U+IEO9QRhhBGLdcGv8bLQrOk hgelnr1PpcKFbURad82857+nU423sCcS81b787bcohTGOXtKeoWdRApHFhGAmIqnA64M CAagqpoM4YzKyxYhypIa9W8UMiTMA7Qs292iHsv8tkyWlAwr26Hrgoxuag4frjNuDxJb RgyplPqW2XSlkiFL8KkCOscMlBUXCkSH9U8HkdpBPgjGBQYBBtT3CYRyJMCvvEAZ7e7X 4Kig== 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=7jGPvF7nGF+Mkr+6Gf7saKkX3WPUb7V91K/oAWR42ck=; b=ltwiprXrLQxD/xjI6YIIpq3JAiTtUCdRMveFKyLxXNwayasSISCJaNAxIVbuHkqFP6 LOexxx7nUrvaUhimPoV8BV4dkM88gpvm4J21rlDnthyZbPyri0jd5mI7BznEpb72x7C7 FTA47KcXZVEjJHoihYoaUhXbFGXL3+IcxhrDgTySflkyBTEUOaIn83pyOiCkU/4LFYg3 fVr7o8LQQ8EvUVRn5f8cRvd3cmu6PL70xPPCu4bm8Wctg7rJgyIcEeb/FVqpAwbqregg tUD2sTMCY22k3qMEs59UAeuBqd4tR4bSG4xnxN65AoRHUaJzAIl5IA2oKew5WISW037j /wMw== X-Gm-Message-State: APjAAAUDIb1iq9eMQ20S4bYv1+6mX7mBdNvKzkaZNXwTXvBTdHDceEPZ CtgE4DwEfl3CN9gCAEjsE4ZTR1wu X-Google-Smtp-Source: APXvYqw9oS8E/pCJ26Z5SOhkmCEdOtFBvmglahbaa78WZ5Wf1Jjbxst8HUbuseICZBJntOzl1u5JLQ== X-Received: by 2002:a1c:a8d3:: with SMTP id r202mr19331822wme.106.1553690299532; Wed, 27 Mar 2019 05:38:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:54 +0100 Message-Id: <1553690281-81854-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::331 Subject: [Qemu-devel] [PULL 16/23] hw/sh4/Kconfig: r2d machine requires the rtl8139 network card 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes when configuring with CONFIG_PCI_DEVICES=3Dn: $ qemu-system-sh4 -M r2d qemu-system-sh4: Unsupported NIC model: rtl8139 Fixes: 7ab58d4c84 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190316200818.8265-13-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/sh4/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 8597613..593662d 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -2,6 +2,7 @@ config R2D bool imply PCI_DEVICES imply TEST_DEVICES + imply RTL8139_PCI select I82378 if TEST_DEVICES select IDE_MMIO select PFLASH_CFI02 --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553691769284951.318920104569; Wed, 27 Mar 2019 06:02:49 -0700 (PDT) Received: from localhost ([127.0.0.1]:47468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h98CY-0008T9-4z for importer@patchew.org; Wed, 27 Mar 2019 09:02:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97p3-0003zz-JM for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97p1-0002bc-Eu for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:24 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:41366) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97p1-0002b1-2W for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:23 -0400 Received: by mail-wr1-x435.google.com with SMTP id r4so10694289wrq.8 for ; Wed, 27 Mar 2019 05:38:21 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZywK5mXiO+GhBsczw2NsuWQgYK92+v2s/T9N3IMJDMs=; b=KS82d+cQ0vlNIncwoJZklpA/CuiaLEHXjFdyHyih/MQoudZzaJJS1P2O08epRIneDN Wuvm27NcxQzNiWnP9A2CQPyorhUbJHOcTS8qXDr1boxGBS4j4EpVpw40kswY6c2PrGq4 jAr+nqotaj7JPy50PkQCPJIhX8aRJKaz35rSCxJT4lOYfSnPvVMrhS6OHap/Nw+sIYb0 pXtxyJAMJmf4165zllIRJRGEbhJzLLya8Psed4euZgY7C3EcgNRneikqzueoxYCckRgH Uy0rLvFnP+JrIoMBObHsfbjHWJvKgjv0RkNPX9Kj/GtSUzWthcqctTYKDxKvCfaSb4B1 FKnw== 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=ZywK5mXiO+GhBsczw2NsuWQgYK92+v2s/T9N3IMJDMs=; b=gY6BRRoTavzQIaOXi/yCRH8lYt8WrtO3R+TJYMAZCKDFmGl2yvE8pzyNrIuCaupg2M DZw/+EOI4djsa67OYc2g646N+H1MUm+qtEDjn1SF1zysJ/J/E4H4x5VJ02L0EzBQtkkg gHS44EZLRUwg13vRYekkX1nCkQuZT7wVpWg6kCGj6t8QR3WX/g5BDWUi6nsBy+hjVgSU WVyIht2pW622oDYhQZltiWvLkuzhnZeEtlsufx3a9FB30u0Mq+BFhy7FvwuRtYYSYzzP CNPg7ihSDT9tinJX88qD163su7A8xBSBxTscyt3TF0BR0pyYCnFsuzgfDLjMHIOb8CMp iQpA== X-Gm-Message-State: APjAAAWt4fsG8dA2c9SE0pDNv3xATZZrvFBp6O5ODXFbKcYbAKW/pkdW IHBdTnsKPbSnyIeIJPbSkFkjzBWy X-Google-Smtp-Source: APXvYqyXaz6D0hXS0EiHTb+6m6xW1d+e62LU4MNMsT0Yt9A3qTKcIkRASkK0ohfxMV9WR4FZqapKOw== X-Received: by 2002:a5d:53c1:: with SMTP id a1mr16461905wrw.174.1553690300907; Wed, 27 Mar 2019 05:38:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:55 +0100 Message-Id: <1553690281-81854-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::435 Subject: [Qemu-devel] [PULL 17/23] hw/hppa/Kconfig: Dino board requires e1000 network card 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes when configuring with CONFIG_PCI_DEVICES=3Dn: $ qemu-system-hppa qemu-system-hppa: Unsupported NIC model: e1000 Fixes: 9483cf27dd Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190316200818.8265-14-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/hppa/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig index 2d9b072..7334f57 100644 --- a/hw/hppa/Kconfig +++ b/hw/hppa/Kconfig @@ -1,6 +1,7 @@ config DINO bool imply PCI_DEVICES + imply E1000_PCI select PCI select SERIAL select ISA_BUS --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553690848144893.2209591269468; Wed, 27 Mar 2019 05:47:28 -0700 (PDT) Received: from localhost ([127.0.0.1]:47224 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97xj-0002ih-Qc for importer@patchew.org; Wed, 27 Mar 2019 08:47:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97p4-00041M-V2 for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97p3-0002cD-Kf for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:26 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:33567) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97p1-0002bD-Ed for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:24 -0400 Received: by mail-wm1-x32d.google.com with SMTP id z6so4744344wmi.0 for ; Wed, 27 Mar 2019 05:38:23 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oICyiAK4697OQsffi9j6B90uDAwrfrn3zA4LSSZIPKc=; b=T3oQUDHnxqbo+W6j12f+wa46k71WTi5JjARSZ4R+o0dPqu7Oq7n+022/S8e3Vr8msL jBk18eGjc5BAoPiL+ARHaQb/j8i6M/qYu6Ov0ctc6+GLkUBseH9++qT8E3OStA5SKsVv dStamGKnUS0UYzjgRVhX3qF9MLTOa6wt7AWE/AdFCfgaE7bzCVe89ZSJOhU7pp0Z+ODS 0pz1qOevPDy1Qr+fPNR7ltVVIEii2f5XxbLWM0Jk9QKikugcu4CmXtMjZq7vhuNK0wqQ mEH+hueX0tprkDj6Y2yPvg03RLzPY58ajwe5IPqrRYHANYrYNazxKVqLhzGHy48irnV0 m8wA== 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=oICyiAK4697OQsffi9j6B90uDAwrfrn3zA4LSSZIPKc=; b=aPFs+ei8cZi4OPgw18TtWbs6JvewNs0y9ctAoaeN4P4ej7NCBECxgsUUa60iM18XgA BqX7Z2IIThDTtDet3FSXO/aCMDOxtFa2hEbRRIRWz5JI3pz/fFL8wFEpVNuUt/SkbUJ8 md3Z7QtHGa3SWF1EZ0pCJi6Na+lKqTyMh643FiAmgGGLPBdXd3yxhFuGY2T5QCxHbcwu BJfbFZPTzNq9ASzF3K7fOn0Jryl9lWMoQCC837qf5uHewnHBZLT6WG5ygS1ys/2nmMGO V9TKMS1WYctyRVUlnF/anj5hHhZ3zn4Jyv66x1SaZvlddWp9qOC9kdIjA26R1yhtbb1p Mkcg== X-Gm-Message-State: APjAAAV1nAUwGS6YsT9C4Jk11Joy3SJ/qb9aAuwJGeTazEx6v32ULl45 LsXnoJn6RK1glI/i9RALlvrNB8Yt X-Google-Smtp-Source: APXvYqyXNg0rZbUOpsej6KEfvSdl4+9vL1bfy1PNAIk23aAKfITwl+adWGMej+iinL3GPjs/wa0yzg== X-Received: by 2002:a1c:2885:: with SMTP id o127mr13301379wmo.135.1553690301844; Wed, 27 Mar 2019 05:38:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:56 +0100 Message-Id: <1553690281-81854-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::32d Subject: [Qemu-devel] [PULL 18/23] hw/alpha/Kconfig: DP264 hardware requires e1000 network card 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This fixes when configuring with CONFIG_PCI_DEVICES=3Dn: $ qemu-system-alpha qemu-system-alpha: Unsupported NIC model: e1000 Fixes: d1a95ef4ac Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190316200818.8265-15-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/alpha/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/alpha/Kconfig b/hw/alpha/Kconfig index 22cefd9..15c59ff 100644 --- a/hw/alpha/Kconfig +++ b/hw/alpha/Kconfig @@ -2,6 +2,7 @@ config DP264 bool imply PCI_DEVICES imply TEST_DEVICES + imply E1000_PCI select I82374 select I8254 select I8259 --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553690751325441.6392533132513; Wed, 27 Mar 2019 05:45:51 -0700 (PDT) Received: from localhost ([127.0.0.1]:47203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97wB-0001W3-2d for importer@patchew.org; Wed, 27 Mar 2019 08:45:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97p6-000434-MB for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97p4-0002cZ-Px for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:28 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:43004) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97p3-0002br-Jz for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:26 -0400 Received: by mail-wr1-x42a.google.com with SMTP id g3so14893528wrx.9 for ; Wed, 27 Mar 2019 05:38:24 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=ohp1lm3UbXesrdiDT24wW5d4PpN7Vdd3eBbpaGMjeEM=; b=O507E5gg/3fz8DSWwLFuCLj5jcbDiZr8z/g+vjgvZomM3zM5w9H+wX8ta3qXVA7Ejz 881efyKnD5LL2Loj+ZIB8VT2IpTMBhUuTTDC0w9rXhbkGzH6bsrtgqcy4YotbsBa7ktb oWMgIHs2NMqJdvFnYPBxJsb8QN0GPvs6N6qzs5kXofyRhqe1FSd2B86ORG6JpQp+tvjH fyhBtEGC35m+7ZAomECkNbbWQRxR7ltHSlKpHRcWnHAclBryDjvDhYudlRBoCCl7Q3jo dJ60E3FctkuEl9FbtQh84HspGamgjZDuzwPiSTKqeerVZRjUwNwHbxys+rsIKyTO9wj8 pFOg== 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:subject:date:message-id :in-reply-to:references; bh=ohp1lm3UbXesrdiDT24wW5d4PpN7Vdd3eBbpaGMjeEM=; b=HASSzmK2rMP7jraOrXOkhDq9g4+t4Kr81Ef+hKzJNhpxn33OTKjKiamCX27owRBC+Z wsFxOdzi0tFhDIImSR5Kt+scN1sb1heltLjF2izgPQXEjp11n5aTcBuJQvFvDSeWf1fO LBwbAGp+Z2X4NactnKkGwgmGyNcs5XBXZmeCwNc6atZ9dHvi75vM24da404pIK5xrnRQ IQggKo0nVhvwYKK5mM3tx1/49UMe5wUiMwq8mC14MBy41r+s8hwKiJAkdvEsJHLzAdrO 1uPNDg2xY/z9E4GMStcXKEILIZDVMOQFM1a/BL2nb3OxfGoKgHwsMT94Y3XHq575xJx1 pAfg== X-Gm-Message-State: APjAAAWNPVAIUyjlwB0Sp+jlNU76e/911piyC+qZdwq4IvknGvys10IY 0VuWnXVRHd4fbrAvk+/bJRqpT9i1 X-Google-Smtp-Source: APXvYqywMhdGGeTuGwUUAdxr5eloPbaBbGjApHPjKD9PuNW4wCueL+fn4ARSZJDNDABXWAGAHIK5qQ== X-Received: by 2002:adf:f5c7:: with SMTP id k7mr22512644wrp.197.1553690303432; Wed, 27 Mar 2019 05:38:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:57 +0100 Message-Id: <1553690281-81854-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::42a Subject: [Qemu-devel] [PULL 19/23] test-announce-self: convert to qgraph 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: , 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 removes the duplicated initialization code. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 3 -- tests/test-announce-self.c | 73 ------------------------------------------= ---- tests/virtio-net-test.c | 30 +++++++++++++++++++ 3 files changed, 30 insertions(+), 76 deletions(-) delete mode 100644 tests/test-announce-self.c diff --git a/tests/Makefile.include b/tests/Makefile.include index 852f17b..6b904d7 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -195,7 +195,6 @@ check-qtest-i386-$(CONFIG_SLIRP) +=3D tests/test-netfil= ter$(EXESUF) check-qtest-i386-$(CONFIG_POSIX) +=3D tests/test-filter-mirror$(EXESUF) check-qtest-i386-$(CONFIG_RTL8139_PCI) +=3D tests/test-filter-redirector$(= EXESUF) check-qtest-i386-y +=3D tests/migration-test$(EXESUF) -check-qtest-i386-y +=3D tests/test-announce-self$(EXESUF) check-qtest-i386-y +=3D tests/test-x86-cpuid-compat$(EXESUF) check-qtest-i386-y +=3D tests/numa-test$(EXESUF) check-qtest-x86_64-y +=3D $(check-qtest-i386-y) @@ -232,7 +231,6 @@ check-qtest-ppc64-y +=3D $(check-qtest-ppc-y) check-qtest-ppc64-$(CONFIG_PSERIES) +=3D tests/device-plug-test$(EXESUF) check-qtest-ppc64-$(CONFIG_POWERNV) +=3D tests/pnv-xscom-test$(EXESUF) check-qtest-ppc64-y +=3D tests/migration-test$(EXESUF) -check-qtest-ppc64-y +=3D tests/test-announce-self$(EXESUF) check-qtest-ppc64-$(CONFIG_PSERIES) +=3D tests/rtas-test$(EXESUF) check-qtest-ppc64-$(CONFIG_SLIRP) +=3D tests/pxe-test$(EXESUF) check-qtest-ppc64-$(CONFIG_USB_UHCI) +=3D tests/usb-hcd-uhci-test$(EXESUF) @@ -817,7 +815,6 @@ tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-te= st.o $(libqos-usb-obj-y) tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-o= bj-y) tests/cpu-plug-test$(EXESUF): tests/cpu-plug-test.o tests/migration-test$(EXESUF): tests/migration-test.o -tests/test-announce-self$(EXESUF): tests/test-announce-self.o tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_s= cm_helper.o tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-= qapi-obj-y) diff --git a/tests/test-announce-self.c b/tests/test-announce-self.c deleted file mode 100644 index 0e6d466..0000000 --- a/tests/test-announce-self.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * QTest testcase for qemu_announce_self - * - * Copyright (c) 2017 Red hat, Inc. - * Copyright (c) 2014 SUSE LINUX Products GmbH - * - * This work is licensed under the terms of the GNU GPL, version 2 or late= r. - * See the COPYING file in the top-level directory. - */ - -#include "qemu/osdep.h" -#include "libqtest.h" -#include "qapi/qmp/qdict.h" -#include "qemu-common.h" -#include "qemu/sockets.h" -#include "qemu/iov.h" -#include "libqos/libqos-pc.h" -#include "libqos/libqos-spapr.h" - -#ifndef ETH_P_RARP -#define ETH_P_RARP 0x8035 -#endif - - -static void test_announce(QTestState *qs, int socket) -{ - char buffer[60]; - int len; - QDict *rsp; - int ret; - uint16_t *proto =3D (uint16_t *)&buffer[12]; - - rsp =3D qtest_qmp(qs, "{ 'execute' : 'announce-self', " - " 'arguments': {" - " 'initial': 50, 'max': 550," - " 'rounds': 10, 'step': 50 } }"); - assert(!qdict_haskey(rsp, "error")); - qobject_unref(rsp); - - /* Catch the packet and make sure it's a RARP */ - ret =3D qemu_recv(socket, &len, sizeof(len), 0); - g_assert_cmpint(ret, =3D=3D, sizeof(len)); - len =3D ntohl(len); - - ret =3D qemu_recv(socket, buffer, len, 0); - g_assert_cmpint(*proto, =3D=3D, htons(ETH_P_RARP)); -} - -static void setup(gconstpointer data) -{ - QTestState *qs; - void (*func) (QTestState *qs, int socket) =3D data; - int sv[2], ret; - - ret =3D socketpair(PF_UNIX, SOCK_STREAM, 0, sv); - g_assert_cmpint(ret, !=3D, -1); - - qs =3D qtest_initf("-netdev socket,fd=3D%d,id=3Dhs0 -device " - "virtio-net-pci,netdev=3Dhs0", sv[1]); - func(qs, sv[0]); - - /* End test */ - close(sv[0]); - qtest_quit(qs); -} - -int main(int argc, char **argv) -{ - g_test_init(&argc, &argv, NULL); - qtest_add_data_func("/virtio/net/test_announce_self", test_announce, s= etup); - - return g_test_run(); -} diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index c58e670..0d956f3 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -15,6 +15,10 @@ #include "libqos/qgraph.h" #include "libqos/virtio-net.h" =20 +#ifndef ETH_P_RARP +#define ETH_P_RARP 0x8035 +#endif + #define PCI_SLOT_HP 0x06 #define PCI_SLOT 0x04 =20 @@ -168,6 +172,31 @@ static void hotplug(void *obj, void *data, QGuestAlloc= ator *t_alloc) } } =20 +static void announce_self(void *obj, void *data, QGuestAllocator *t_alloc) +{ + int *sv =3D data; + char buffer[60]; + int len; + QDict *rsp; + int ret; + uint16_t *proto =3D (uint16_t *)&buffer[12]; + + rsp =3D qmp("{ 'execute' : 'announce-self', " + " 'arguments': {" + " 'initial': 50, 'max': 550," + " 'rounds': 10, 'step': 50 } }"); + assert(!qdict_haskey(rsp, "error")); + qobject_unref(rsp); + + /* Catch the packet and make sure it's a RARP */ + ret =3D qemu_recv(sv[0], &len, sizeof(len), 0); + g_assert_cmpint(ret, =3D=3D, sizeof(len)); + len =3D ntohl(len); + + ret =3D qemu_recv(sv[0], buffer, len, 0); + g_assert_cmpint(*proto, =3D=3D, htons(ETH_P_RARP)); +} + static void virtio_net_test_cleanup(void *sockets) { int *sv =3D sockets; @@ -233,6 +262,7 @@ static void register_virtio_net_test(void) qos_add_test("basic", "virtio-net", send_recv_test, &opts); qos_add_test("rx_stop_cont", "virtio-net", stop_cont_test, &opts); #endif + qos_add_test("announce-self", "virtio-net", announce_self, &opts); =20 /* These tests do not need a loopback backend. */ opts.before =3D virtio_net_test_setup_nosocket; --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15536909517151013.833984673003; Wed, 27 Mar 2019 05:49:11 -0700 (PDT) Received: from localhost ([127.0.0.1]:47240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97zQ-0003y8-GD for importer@patchew.org; Wed, 27 Mar 2019 08:49:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97p6-000432-La for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97p5-0002cp-0Y for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:28 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:38346) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97p4-0002c3-FS for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:26 -0400 Received: by mail-wr1-x433.google.com with SMTP id k11so10978924wro.5 for ; Wed, 27 Mar 2019 05:38:25 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=6jxqpoYv/Ah9HXF2rTQPf1hmVPWdTiYAbI+gtoubbo4=; b=U6wlG9UPGVGwKVyjInZik1X93YV5Svqi1LXPrqVGg8khp3+PTz5mhxHwXK8k7YzpWN YeTl+mCjKco4LJUwDYHqDv0KYXXjeHEuZlXBnK75Of65ouXn4C/ELxsnks7+FCWP6ubZ 9pP9wBqwEJf2VPXfHzA1ropZzAFZBIeJLQtxVE14EsY+U5w582S4NB2txl3fdxkbvHrW jq/Q4N4zkqSHCkgeFhQ45hze9/xMpSUgOsX/CamFRzS/Z+wnfkORTdg5qIRPDOqSlU11 8RxL6uks1Ia69mWvgVTvMYV2v9jqemnyOH8Fkbl0phHrNOHGhVn1CZBqHv2xhY0nhxAe 0g7w== 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=6jxqpoYv/Ah9HXF2rTQPf1hmVPWdTiYAbI+gtoubbo4=; b=uETdMgq1DeIL7OvtFqCaawWZ0KSiKVbI6GwdDJhni9YYCEpnUMP25HbOecUJksusMI xumdbUnSjp1DBJzAGx+JzkPFSD3aI8sSQW+8R/DZER+3n6Y0CERcTpuqpQeCl5vrAXui hlPSQUNKbfdTh3gj4CNcD2Jt7yOJ+os/HOdBiImBNbXYq2K9tfdlJMRQs2jZjKIsw7V6 l427L6Q9jibMuhN6ETbdO5TLw3HODZrMpjLmm78LfGc2Xv5Z6+KBOIse3jNe/1Rjvrba lf+qA/tx3i6PQ4ExcyZaY40BDAo1QXfHy5hA83BSBh9TxhQD8SROmBoPc/eXuT5ZuyGx 70DA== X-Gm-Message-State: APjAAAUA5D/YlG5d0y1jmIP4ge5210K5QQA5CMGY/gCtfQSDhgLn3ENn 6wurucmz7n1L+OtumIp3e5cDkBzI X-Google-Smtp-Source: APXvYqzsTAwjM5aFqukKDnK2yccynihtPbygD7zlXkAw9gepwkn686vvtruZnUvF2vozvKYWnhlNMw== X-Received: by 2002:adf:f803:: with SMTP id s3mr23797297wrp.54.1553690304470; Wed, 27 Mar 2019 05:38:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:58 +0100 Message-Id: <1553690281-81854-21-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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] [PULL 20/23] intel-iommu: optimize nodmar memory regions 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: Peter Xu 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: Peter Xu Previously we have per-device system memory aliases when DMAR is disabled by the system. It will slow the system down if there are lots of devices especially when DMAR is disabled, because each of the aliased system address space will contain O(N) slots, and rendering such N address spaces will be O(N^2) complexity. This patch introduces a shared nodmar memory region and for each device we only create an alias to the shared memory region. With the aliasing, QEMU memory core API will be able to detect when devices are sharing the same address space (which is the nodmar address space) when rendering the FlatViews and the total number of FlatViews can be dramatically reduced when there are a lot of devices. Suggested-by: Paolo Bonzini Signed-off-by: Peter Xu Message-Id: <20190313094323.18263-1-peterx@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/intel_iommu.c | 91 +++++++++++++++++++++++++++------------= ---- include/hw/i386/intel_iommu.h | 7 +++- 2 files changed, 63 insertions(+), 35 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index b90de6c..055a1e8 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -1485,11 +1485,11 @@ static bool vtd_switch_address_space(VTDAddressSpac= e *as) =20 /* Turn off first then on the other */ if (use_iommu) { - memory_region_set_enabled(&as->sys_alias, false); + memory_region_set_enabled(&as->nodmar, false); memory_region_set_enabled(MEMORY_REGION(&as->iommu), true); } else { memory_region_set_enabled(MEMORY_REGION(&as->iommu), false); - memory_region_set_enabled(&as->sys_alias, true); + memory_region_set_enabled(&as->nodmar, true); } =20 if (take_bql) { @@ -3286,7 +3286,8 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, = PCIBus *bus, int devfn) vtd_dev_as =3D vtd_bus->dev_as[devfn]; =20 if (!vtd_dev_as) { - snprintf(name, sizeof(name), "intel_iommu_devfn_%d", devfn); + snprintf(name, sizeof(name), "vtd-%02x.%x", PCI_SLOT(devfn), + PCI_FUNC(devfn)); vtd_bus->dev_as[devfn] =3D vtd_dev_as =3D g_malloc0(sizeof(VTDAddr= essSpace)); =20 vtd_dev_as->bus =3D bus; @@ -3295,44 +3296,53 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s= , PCIBus *bus, int devfn) vtd_dev_as->context_cache_entry.context_cache_gen =3D 0; vtd_dev_as->iova_tree =3D iova_tree_new(); =20 + memory_region_init(&vtd_dev_as->root, OBJECT(s), name, UINT64_MAX); + address_space_init(&vtd_dev_as->as, &vtd_dev_as->root, "vtd-root"); + /* - * Memory region relationships looks like (Address range shows - * only lower 32 bits to make it short in length...): - * - * |-----------------+-------------------+----------| - * | Name | Address range | Priority | - * |-----------------+-------------------+----------+ - * | vtd_root | 00000000-ffffffff | 0 | - * | intel_iommu | 00000000-ffffffff | 1 | - * | vtd_sys_alias | 00000000-ffffffff | 1 | - * | intel_iommu_ir | fee00000-feefffff | 64 | - * |-----------------+-------------------+----------| + * Build the DMAR-disabled container with aliases to the + * shared MRs. Note that aliasing to a shared memory region + * could help the memory API to detect same FlatViews so we + * can have devices to share the same FlatView when DMAR is + * disabled (either by not providing "intel_iommu=3Don" or with + * "iommu=3Dpt"). It will greatly reduce the total number of + * FlatViews of the system hence VM runs faster. + */ + memory_region_init_alias(&vtd_dev_as->nodmar, OBJECT(s), + "vtd-nodmar", &s->mr_nodmar, 0, + memory_region_size(&s->mr_nodmar)); + + /* + * Build the per-device DMAR-enabled container. * - * We enable/disable DMAR by switching enablement for - * vtd_sys_alias and intel_iommu regions. IR region is always - * enabled. + * TODO: currently we have per-device IOMMU memory region only + * because we have per-device IOMMU notifiers for devices. If + * one day we can abstract the IOMMU notifiers out of the + * memory regions then we can also share the same memory + * region here just like what we've done above with the nodmar + * region. */ + strcat(name, "-dmar"); memory_region_init_iommu(&vtd_dev_as->iommu, sizeof(vtd_dev_as->io= mmu), TYPE_INTEL_IOMMU_MEMORY_REGION, OBJECT(s), - "intel_iommu_dmar", - UINT64_MAX); - memory_region_init_alias(&vtd_dev_as->sys_alias, OBJECT(s), - "vtd_sys_alias", get_system_memory(), - 0, memory_region_size(get_system_memory()= )); - memory_region_init_io(&vtd_dev_as->iommu_ir, OBJECT(s), - &vtd_mem_ir_ops, s, "intel_iommu_ir", - VTD_INTERRUPT_ADDR_SIZE); - memory_region_init(&vtd_dev_as->root, OBJECT(s), - "vtd_root", UINT64_MAX); - memory_region_add_subregion_overlap(&vtd_dev_as->root, + name, UINT64_MAX); + memory_region_init_alias(&vtd_dev_as->iommu_ir, OBJECT(s), "vtd-ir= ", + &s->mr_ir, 0, memory_region_size(&s->mr_i= r)); + memory_region_add_subregion_overlap(MEMORY_REGION(&vtd_dev_as->iom= mu), VTD_INTERRUPT_ADDR_FIRST, - &vtd_dev_as->iommu_ir, 64); - address_space_init(&vtd_dev_as->as, &vtd_dev_as->root, name); - memory_region_add_subregion_overlap(&vtd_dev_as->root, 0, - &vtd_dev_as->sys_alias, 1); + &vtd_dev_as->iommu_ir, 1); + + /* + * Hook both the containers under the root container, we + * switch between DMAR & noDMAR by enable/disable + * corresponding sub-containers + */ memory_region_add_subregion_overlap(&vtd_dev_as->root, 0, MEMORY_REGION(&vtd_dev_as->iom= mu), - 1); + 0); + memory_region_add_subregion_overlap(&vtd_dev_as->root, 0, + &vtd_dev_as->nodmar, 0); + vtd_switch_address_space(vtd_dev_as); } return vtd_dev_as; @@ -3676,6 +3686,21 @@ static void vtd_realize(DeviceState *dev, Error **er= rp) memset(s->vtd_as_by_bus_num, 0, sizeof(s->vtd_as_by_bus_num)); memory_region_init_io(&s->csrmem, OBJECT(s), &vtd_mem_ops, s, "intel_iommu", DMAR_REG_SIZE); + + /* Create the shared memory regions by all devices */ + memory_region_init(&s->mr_nodmar, OBJECT(s), "vtd-nodmar", + UINT64_MAX); + memory_region_init_io(&s->mr_ir, OBJECT(s), &vtd_mem_ir_ops, + s, "vtd-ir", VTD_INTERRUPT_ADDR_SIZE); + memory_region_init_alias(&s->mr_sys_alias, OBJECT(s), + "vtd-sys-alias", get_system_memory(), 0, + memory_region_size(get_system_memory())); + memory_region_add_subregion_overlap(&s->mr_nodmar, 0, + &s->mr_sys_alias, 0); + memory_region_add_subregion_overlap(&s->mr_nodmar, + VTD_INTERRUPT_ADDR_FIRST, + &s->mr_ir, 1); + sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->csrmem); /* No corresponding destroy */ s->iotlb =3D g_hash_table_new_full(vtd_uint64_hash, vtd_uint64_equal, diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index c11e3d5..536f626 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -105,8 +105,8 @@ struct VTDAddressSpace { uint8_t devfn; AddressSpace as; IOMMUMemoryRegion iommu; - MemoryRegion root; - MemoryRegion sys_alias; + MemoryRegion root; /* The root container of the device */ + MemoryRegion nodmar; /* The alias of shared nodmar MR */ MemoryRegion iommu_ir; /* Interrupt region: 0xfeeXXXXX */ IntelIOMMUState *iommu_state; VTDContextCacheEntry context_cache_entry; @@ -221,6 +221,9 @@ union VTD_IR_MSIAddress { struct IntelIOMMUState { X86IOMMUState x86_iommu; MemoryRegion csrmem; + MemoryRegion mr_nodmar; + MemoryRegion mr_ir; + MemoryRegion mr_sys_alias; uint8_t csr[DMAR_REG_SIZE]; /* register values */ uint8_t wmask[DMAR_REG_SIZE]; /* R/W bytes */ uint8_t w1cmask[DMAR_REG_SIZE]; /* RW1C(Write 1 to Clear) bytes */ --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553691537013254.3107760845843; Wed, 27 Mar 2019 05:58:57 -0700 (PDT) Received: from localhost ([127.0.0.1]:47387 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h988r-0005Aj-Sp for importer@patchew.org; Wed, 27 Mar 2019 08:58:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97p7-00043r-Gg for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97p6-0002dI-L8 for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:29 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:38339) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97p4-0002cS-UC for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:27 -0400 Received: by mail-wr1-x42b.google.com with SMTP id k11so10978984wro.5 for ; Wed, 27 Mar 2019 05:38:26 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=//xWVoKYDcl4F82NikiZ0SrOfYmKbba5Gi8b85vmc1M=; b=aNVRbvLUNP38Pzr90lP53/hgz3HmMrbv4ISw3iwuvrZR8ARg3SQcuD5jt+wQMahBqb IPmqpXKEUP2n0UT7BeGQdpw5vbdZCZANCnaAhz6ONr/NKOU7IhuwN0O8xAONNFGEXrNT 3I9YwrH/cA7VGdQIDaxxqPqrs1nE4hIfNO4wbqlkAwJp6l2bNB3/0q9/ZK9zPjYSvvX8 i4ELAHtOFIsjHiX8bU1Y5Le5PHlmIeAC1wA0iZuaBhSA8+wIMR1ZxqNRT7qQ4LU5zGC6 tEHa1odvSvTaEEiQW0kzXJGqOVpb6i2sRbWYBvBA5zPZETFjU4Z+VCba0jUHsAOR3edz 5l0A== 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:subject:date:message-id :in-reply-to:references; bh=//xWVoKYDcl4F82NikiZ0SrOfYmKbba5Gi8b85vmc1M=; b=Ht7zS4ap+t4XJirTFaFsCNLznHYp52zCy+IIMGwvz7C8UXmumSZhpIEH5pH0mr2PnX iQDZowNqx6OJKKBKHncjAHPPUY2cLpchcMpf4tS6gr2Onddz/vaZucQeIOeo/TbFwvTB HY6geSrw/S7TewvG7vbntkPH7ab9BHz/kdnhsuHB3OzBL0IAo8t9bMZcYeUVbnV5coZw 2foIwwce7k4XndvDZb99XpmfBqx3RE9Izr6uBLDs+gytcjXmTtelqSh35ZFBKnFj/vEL OocrP80UNVTLsxMBunsBn+WKYGwYBT4SFaMYy3KCNYbnoYe/a/u0UmhR3rEIt9Mq7XUK ZEGA== X-Gm-Message-State: APjAAAW44sZQKxq657NEj1AhjTrZ5pGtXnv/FpLJa5MEhNCIw47sYbx0 iLpUeCH5PXq3Sk0zLnslIK+hain5 X-Google-Smtp-Source: APXvYqw+o2OvlJvP7nDnNCWIE2ar7ccgOEL3GqesYx0rG6/G6hateqEVFdx+sONEk0SnRD5mCxB4AQ== X-Received: by 2002:adf:c788:: with SMTP id l8mr14128144wrg.143.1553690305546; Wed, 27 Mar 2019 05:38:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:37:59 +0100 Message-Id: <1553690281-81854-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::42b Subject: [Qemu-devel] [PULL 21/23] minikconf: fix parser typo 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: , 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 result of this typo would be that "select_foo" would be treated as a "s= elect" keyword followed by "_foo". Nothing too bad, but easy to fix so let's be c= lean. Signed-off-by: Paolo Bonzini --- scripts/minikconf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/minikconf.py b/scripts/minikconf.py index 5421db0..0ffc6c3 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -592,7 +592,7 @@ class KconfigParser: 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 '|': + if self.src[self.cursor + length].isalnum() or self.src[self.curso= r + length] =3D=3D '_': return False self.cursor +=3D length return True --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553691869888215.41144797077243; Wed, 27 Mar 2019 06:04:29 -0700 (PDT) Received: from localhost ([127.0.0.1]:47515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h98EB-00016T-RH for importer@patchew.org; Wed, 27 Mar 2019 09:04:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97p8-000456-Jp for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97p7-0002dh-DA for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:30 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:37199) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97p5-0002cv-U2 for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:28 -0400 Received: by mail-wm1-x329.google.com with SMTP id v14so16620696wmf.2 for ; Wed, 27 Mar 2019 05:38:27 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=/4RBoZ4TaH+g5jSRPbcbvrLlhp0ZdMO62ZIb9wyjr8o=; b=QjeMiaSgxaBucDIBnArhk0cMVE0xnzqFLuN4JNKc5feBOubNKA69TV0GxOS4cEqX7H oglhUcG7dcVI3B/xZkWSSRSGqIFTFRt/8Tb5BDdBV2Ysb3IwTvz4wdRGLCi5iMIOxASU F652wm5mL2raDKw19KZwklM3A7TdmvA6AhEEB74HkSlduIruiWdHG8Mcpd6t4WzSLCmv TPV8jBqz5YnQHavi5mjQIyOVnHOkZTA6BPiFbLMf58VOs50rxlZvyxm4KpctNzoJAZhD duRo4/RnU1J7Aee0M35D3vT+cfYUK8r8WdoBFb/9xc8WU6srI9IsUl8LjFldsBFvAi9U /L2Q== 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:subject:date:message-id :in-reply-to:references; bh=/4RBoZ4TaH+g5jSRPbcbvrLlhp0ZdMO62ZIb9wyjr8o=; b=qxgdUQaJuH+clwjXcyUhd1jKgcJK4XEWJ5MP+bUBIlYtXZTUWwNWbphjsCV8m0PFd2 9QyKcPVByNxMsG+1UjZ9O+HSyDsZiF1U63RgFsWcKRvxOGn20bP3OYM+SWZmyZqH9tPo /xHmPXEsA+vDvipp0CM/vPMIsMVUY8r1kO5+5a2n4Wcx1kXndDxYGTN9MXa6YjxQyJtg HTF9q7o/M026VJqVCx9Cn77HgnZMynkylBz2X3Igm3xqwNFCLCPk+Z49O9SDfOMWszhN f8rccMqE6GheTJD0YVcn5g4YnalwF8NnafiIjvl+ToeJqAN1WBQWRN9Fw3dt04+Kz1bP EMvA== X-Gm-Message-State: APjAAAXyg4OSndfjqAwimmFCCggFa4yqlK9NHqnVc1v0hEUZW/l36YcG lBqjyolOaL5cIjOjXMa14Q95unuv X-Google-Smtp-Source: APXvYqyzmxSgi2MBLzT6Gv75+X0KHYBK+vfwc8FZbmiGCtbqPiAXfX2BxDgVabiD7FANCDAPihzrzw== X-Received: by 2002:a1c:1dc3:: with SMTP id d186mr16670466wmd.64.1553690306423; Wed, 27 Mar 2019 05:38:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:38:00 +0100 Message-Id: <1553690281-81854-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::329 Subject: [Qemu-devel] [PULL 22/23] config-all-devices.mak: rebuild on reconfigure 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: , 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 ensures that softmmu directories are culled after a "./configure --target-list=3Dx86_64-linux-user". Reviewed-by: Stefano Garzarella Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dbb8e13..04a0d45 100644 --- a/Makefile +++ b/Makefile @@ -331,10 +331,10 @@ SUBDIR_DEVICES_MAK=3D$(patsubst %, %/config-devices.m= ak, $(filter %-softmmu, $(TAR SUBDIR_DEVICES_MAK_DEP=3D$(patsubst %, %.d, $(SUBDIR_DEVICES_MAK)) =20 ifeq ($(SUBDIR_DEVICES_MAK),) -config-all-devices.mak: +config-all-devices.mak: config-host.mak $(call quiet-command,echo '# no devices' > $@,"GEN","$@") else -config-all-devices.mak: $(SUBDIR_DEVICES_MAK) +config-all-devices.mak: $(SUBDIR_DEVICES_MAK) config-host.mak $(call quiet-command, sed -n \ 's|^\([^=3D]*\)=3D\(.*\)$$|\1:=3D$$(findstring y,$$(\1)\2)|p'= \ $(SUBDIR_DEVICES_MAK) | sort -u > $@, \ --=20 1.8.3.1 From nobody Fri May 3 07:01:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553691170627786.6584472653562; Wed, 27 Mar 2019 05:52:50 -0700 (PDT) Received: from localhost ([127.0.0.1]:47294 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h982t-0008AX-Jp for importer@patchew.org; Wed, 27 Mar 2019 08:52:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h97p9-00046E-Qt for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h97p7-0002ds-Lj for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:31 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:40825) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h97p7-0002d7-Cx for qemu-devel@nongnu.org; Wed, 27 Mar 2019 08:38:29 -0400 Received: by mail-wm1-x336.google.com with SMTP id z24so13388168wmi.5 for ; Wed, 27 Mar 2019 05:38:28 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c20sm27722863wre.28.2019.03.27.05.38.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:38:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=kKT0/3MIJJRIyGZ5lW5LX9NPFoZ9i6uVujq59b8DJKI=; b=axavsLo3yjI4c0v5G+7K6sHfAo8uQTjikMYeBahf9fl2W9a8kQIRc/k6HTU4ywJw3h PAFzWvBSQwB1EbSJ4OmEI/N+5ml07oi83T3I2ZGcczePszfIZPF2uj6pI1eqmAxCnFnX URGyBhgYdCq/iKvOb9fZsItf47lRo+fzLfZ98ypiCM0uCbTHZ0lKXLuUykb5kcOVbU/N dcJN/hHrfFsvnp9X6tIp7LzMnwIqOuJl9YtmqoenEvpv3GDOZ1o0Q55ALbZnBwV8Ic5e 2FhvZ4RpSHMuC5muZw2NxuOV5+UqkabeaW1Rp4e+O9GNeV2AioAQMAQqqVX+AftgCCHg 5Sfw== 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:subject:date:message-id :in-reply-to:references; bh=kKT0/3MIJJRIyGZ5lW5LX9NPFoZ9i6uVujq59b8DJKI=; b=R0/8evzGK1Rz6YtzuKOe60C2plLVaxYyTkd0y4hDI7yqt6fYYG2pyF1gyKWIBskUxj N4pELHmAizyMiDLc7vT0CtmZ+VJ6VeWr2QDlpCkjMDoP3QAVL/JGZSqUxH2Ko6tGAt2u Wqt2MyL8JV/h4+R5mmxH2SF1Vx6hEmROv0ehkoVP31mg/80J55OXpbI3shR15TQWgZXh xfjeDhQh4Z2i22EEA9chTlbw2QcrVctJJYS5wvkcsIe2ZyXZj2RJ+Ddh4J9odorvtJmI 6IVpZtGRfW6AKtVE4LKUTARkLkG3v5xtuv8/Okua5XCr5XqlPNzTEAttlj2hgkJWDAi2 /jFQ== X-Gm-Message-State: APjAAAUwZzD7nW8mZvvZDH9/SjGU9j1QwK70A1IQfzPtg5k70YttmFtF lCAAr1goP/2yg4+eI3NPc724r6P6 X-Google-Smtp-Source: APXvYqw8RvX0LKd+2Mg7MMvb4DCirXTt3N0p4QXsgH7qne2LGGpKJpSpimk9YyCe5FPulwfNNZL+vg== X-Received: by 2002:a1c:f205:: with SMTP id s5mr12697608wmc.124.1553690307684; Wed, 27 Mar 2019 05:38:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 13:38:01 +0100 Message-Id: <1553690281-81854-24-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553690281-81854-1-git-send-email-pbonzini@redhat.com> References: <1553690281-81854-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::336 Subject: [Qemu-devel] [PULL 23/23] virtio-vga: only enable for specific 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: , 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" When virtio-vga was added, the intention was to only support it for those machines where the firmware does not know about virtio-gpu, and supported VGA legacy hardware before virtio-{gpu,vga} were introduced. The Kconfig switch however enabled virtio-vga for all machines with a PCI bus, and libvirt then prefers it even on hardware where virtio-gpu would be preferrable. At least for now, only enable virtio-vga for PC, hppa and pSeries machines, as was the case before Kconfig dependencies were introduced. Reported-by: Laszlo Ersek Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- hw/display/Kconfig | 2 +- hw/hppa/Kconfig | 1 + hw/i386/Kconfig | 1 + hw/ppc/Kconfig | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 86c1d54..72be57a 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -100,7 +100,7 @@ config VIRTIO_GPU =20 config VIRTIO_VGA bool - default y if PCI_DEVICES + # defaults to "N", enabled by specific boards depends on VIRTIO_PCI select VGA =20 diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig index 7334f57..6e5d74a 100644 --- a/hw/hppa/Kconfig +++ b/hw/hppa/Kconfig @@ -2,6 +2,7 @@ config DINO bool imply PCI_DEVICES imply E1000_PCI + imply VIRTIO_VGA select PCI select SERIAL select ISA_BUS diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 8e8444d..a6aed7c 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -19,6 +19,7 @@ config PC imply TPM_CRB imply TPM_TIS imply VGA_PCI + imply VIRTIO_VGA select FDC select I8259 select I8254 diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index ae07b4d..a346515 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -2,6 +2,7 @@ config PSERIES bool imply PCI_DEVICES imply TEST_DEVICES + imply VIRTIO_VGA select DIMM select PCI select SPAPR_VSCSI --=20 1.8.3.1