From patchwork Mon Mar 7 03:22:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao jin X-Patchwork-Id: 8515021 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C052CC0553 for ; Mon, 7 Mar 2016 03:24:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 24C0E2013D for ; Mon, 7 Mar 2016 03:24:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6704620138 for ; Mon, 7 Mar 2016 03:24:33 +0000 (UTC) Received: from localhost ([::1]:53267 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aclma-0003uY-Nf for patchwork-qemu-devel@patchwork.kernel.org; Sun, 06 Mar 2016 22:24:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aclkW-0000Ki-Nl for qemu-devel@nongnu.org; Sun, 06 Mar 2016 22:22:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aclkS-0001P6-29 for qemu-devel@nongnu.org; Sun, 06 Mar 2016 22:22:24 -0500 Received: from [59.151.112.132] (port=31026 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aclkR-0001HQ-6c for qemu-devel@nongnu.org; Sun, 06 Mar 2016 22:22:20 -0500 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="4286095" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 07 Mar 2016 11:22:03 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id EB23442B4B07; Mon, 7 Mar 2016 11:22:01 +0800 (CST) Received: from G08FNSTD140223.g08.fujitsu.local (10.167.226.69) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Mon, 7 Mar 2016 11:22:01 +0800 From: Cao jin To: Date: Mon, 7 Mar 2016 11:22:59 +0800 Message-ID: <1457320984-6540-7-git-send-email-caoj.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1457320984-6540-1-git-send-email-caoj.fnst@cn.fujitsu.com> References: <1457320984-6540-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.69] X-yoursite-MailScanner-ID: EB23442B4B07.A8CDE X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: caoj.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: chen.fan.fnst@cn.fujitsu.com, izumi.taku@jp.fujitsu.com, alex.williamson@redhat.com, mst@redhat.com Subject: [Qemu-devel] [PATCH v2 06/11] pci: add a is_valid_func callback to check device if complete X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chen Fan Signed-off-by: Chen Fan --- hw/pci/pci.c | 39 +++++++++++++++++++++++++++++++++++++++ include/hw/pci/pci.h | 1 + 2 files changed, 40 insertions(+) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index d940f79..72650c5 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1836,6 +1836,31 @@ PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn) return bus->devices[devfn]; } +static void pci_bus_check_device(PCIDevice *pdev, Error **errp) +{ + PCIBus *bus = pdev->bus; + PCIDeviceClass *pc; + int i; + Error *local_err = NULL; + + for (i = 0; i < ARRAY_SIZE(bus->devices); ++i) { + if (!bus->devices[i]) { + continue; + } + + pc = PCI_DEVICE_GET_CLASS(bus->devices[i]); + if (!pc->is_valid_func) { + continue; + } + + pc->is_valid_func(bus->devices[i], &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + } +} + static void pci_qdev_realize(DeviceState *qdev, Error **errp) { PCIDevice *pci_dev = (PCIDevice *)qdev; @@ -1878,6 +1903,20 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp) pci_qdev_unrealize(DEVICE(pci_dev), NULL); return; } + + /* + * If the function is func 0, indicate the closure of the slot. + * then we get the chance to check all functions on same device + * if valid. + */ + if (pci_get_function_0(pci_dev) == pci_dev) { + pci_bus_check_device(pci_dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); + pci_qdev_unrealize(DEVICE(pci_dev), NULL); + return; + } + } } static void pci_default_realize(PCIDevice *dev, Error **errp) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index dedf277..4e56256 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -191,6 +191,7 @@ typedef struct PCIDeviceClass { void (*realize)(PCIDevice *dev, Error **errp); int (*init)(PCIDevice *dev);/* TODO convert to realize() and remove */ + void (*is_valid_func)(PCIDevice *dev, Error **errp); PCIUnregisterFunc *exit; PCIConfigReadFunc *config_read; PCIConfigWriteFunc *config_write;