From patchwork Fri Aug 11 15:11:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9896201 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5EF5D602DA for ; Fri, 11 Aug 2017 15:14:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50D3F28BBD for ; Fri, 11 Aug 2017 15:14:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4593928C46; Fri, 11 Aug 2017 15:14:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EF61728BBD for ; Fri, 11 Aug 2017 15:14:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dgBbN-0003rF-15; Fri, 11 Aug 2017 15:11:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dgBbL-0003r3-Lt for xen-devel@lists.xenproject.org; Fri, 11 Aug 2017 15:11:51 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 10/CC-01731-639CD895; Fri, 11 Aug 2017 15:11:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHSDva7xyd5 Ig5N79C2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyn/Q+YCo4KVKy6vYqpgXEXTxcjJ4eEgL/E sh2P2UBsNgEDiRXTrzKC2CIC0hL9c9rZuxi5OJgF3jJKNM3byAySEBaIkNjU8wesgUVAVWLLv UdgNq+AncTOTR2MEEPlJfp3LGcCsTkF7CXmr78I1isEVDO58RsrhK0mcWPhMhaIXkGJkzOfgN nMAhISB1+8YJ7AyDsLSWoWktQCRqZVjOrFqUVlqUW6pnpJRZnpGSW5iZk5uoYGpnq5qcXFiem pOYlJxXrJ+bmbGIHBwwAEOxi/9DsfYpTkYFIS5U3w6Y0U4kvKT6nMSCzOiC8qzUktPsQow8Gh JMF74DhQTrAoNT21Ii0zBxjGMGkJDh4lEV59kDRvcUFibnFmOkTqFKMux6sJ/78xCbHk5eelS onzHgMpEgApyijNgxsBi6lLjLJSwryMQEcJ8RSkFuVmlqDKv2IU52BUEubdADKFJzOvBG7TK6 AjmICO6PMBO6IkESEl1cCY/ezKy/WFYftnJLNr30tVPNsv6bbfSk2+ftluPm3RpkuTpy2ziih mOnh62lZO77Q444tbpOsDA68GxUddlQj0eFVf9f0c38Oc8MUusR82LhWfv19rY5XVh3bvu4z3 Zee+qvLhEvSXqwjXOLTApnHW1+D+cJnfZx3Orl63T/X9Z5b/fCYrDJuVWIozEg21mIuKEwH3r ILwpAIAAA== X-Env-Sender: prvs=3891006ae=anthony.perard@citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1502464305!104002164!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61570 invoked from network); 11 Aug 2017 15:11:47 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 11 Aug 2017 15:11:47 -0000 X-IronPort-AV: E=Sophos;i="5.41,358,1498521600"; d="scan'208";a="443486901" From: Anthony PERARD To: Date: Fri, 11 Aug 2017 16:11:38 +0100 Message-ID: <20170811151138.29405-3-anthony.perard@citrix.com> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170811151138.29405-1-anthony.perard@citrix.com> References: <20170811151138.29405-1-anthony.perard@citrix.com> MIME-Version: 1.0 Cc: Stefano Stabellini , "Michael S. Tsirkin" , Bruce Rogers , Igor Mammedov , Anthony PERARD , xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH for-2.10 2/2] Revert "ACPI: don't call acpi_pcihp_device_plug_cb on xen" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 153eba4726dfa1bdfc31d1fe973b2a61b9035492. This patch prevents PCI passthrough hotplug on Xen. Even if the Xen tool stack prepares its own ACPI tables, we still rely on QEMU for hotplug ACPI notifications. The original issue is fixed by the previous patch (hw/acpi: Call acpi_set_pci_info when no ACPI tables needed). Signed-off-by: Anthony PERARD --- CC: Stefano Stabellini CC: Bruce Rogers --- hw/acpi/piix4.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index f276967365..f4fd5907b8 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -385,10 +385,7 @@ static void piix4_device_plug_cb(HotplugHandler *hotplug_dev, dev, errp); } } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) { - if (!xen_enabled()) { - acpi_pcihp_device_plug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev, - errp); - } + acpi_pcihp_device_plug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { if (s->cpu_hotplug_legacy) { legacy_acpi_cpu_plug_cb(hotplug_dev, &s->gpe_cpu, dev, errp); @@ -411,10 +408,8 @@ static void piix4_device_unplug_request_cb(HotplugHandler *hotplug_dev, acpi_memory_unplug_request_cb(hotplug_dev, &s->acpi_memory_hotplug, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) { - if (!xen_enabled()) { - acpi_pcihp_device_unplug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev, - errp); - } + acpi_pcihp_device_unplug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev, + errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) && !s->cpu_hotplug_legacy) { acpi_cpu_unplug_request_cb(hotplug_dev, &s->cpuhp_state, dev, errp);