From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41339) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpmWg-0005b1-Vk for qemu-devel@nongnu.org; Tue, 24 Jan 2012 14:59:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpmIE-00064g-HK for qemu-devel@nongnu.org; Tue, 24 Jan 2012 14:44:35 -0500 Received: from e2.ny.us.ibm.com ([32.97.182.142]:56511) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpmIE-00064c-DG for qemu-devel@nongnu.org; Tue, 24 Jan 2012 14:44:34 -0500 Received: from /spool/local by e2.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 24 Jan 2012 14:44:33 -0500 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id B16FD6E81B2 for ; Tue, 24 Jan 2012 14:41:21 -0500 (EST) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q0OJZZ26161466 for ; Tue, 24 Jan 2012 14:40:04 -0500 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q0OJXR4h007322 for ; Tue, 24 Jan 2012 12:33:27 -0700 From: Anthony Liguori Date: Tue, 24 Jan 2012 13:32:55 -0600 Message-Id: <1327433600-7403-4-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1327433600-7403-1-git-send-email-aliguori@us.ibm.com> References: <1327433600-7403-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 03/28] pci: call reset unconditionally List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , "Michael S. Tsirkin" Because now all PCI devices are converted to qdev. Signed-off-by: Anthony Liguori --- hw/pci.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 54400ac..ab3b53d 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -159,11 +159,8 @@ void pci_device_deassert_intx(PCIDevice *dev) void pci_device_reset(PCIDevice *dev) { int r; - /* TODO: call the below unconditionally once all pci devices - * are qdevified */ - if (dev->qdev.info) { - qdev_reset_all(&dev->qdev); - } + + qdev_reset_all(&dev->qdev); dev->irq_state = 0; pci_update_irq_status(dev); -- 1.7.4.1