From patchwork Tue Sep 11 07:51:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 183058 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CAE322C0092 for ; Tue, 11 Sep 2012 18:35:49 +1000 (EST) Received: from localhost ([::1]:57269 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBLHL-00089r-9n for incoming@patchwork.ozlabs.org; Tue, 11 Sep 2012 03:53:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBLH0-0007JA-8R for qemu-devel@nongnu.org; Tue, 11 Sep 2012 03:52:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TBLGu-0007KE-Cl for qemu-devel@nongnu.org; Tue, 11 Sep 2012 03:52:42 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:38954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBLGu-0007Gb-7n for qemu-devel@nongnu.org; Tue, 11 Sep 2012 03:52:36 -0400 Received: by mail-ob0-f173.google.com with SMTP id ta14so286204obb.4 for ; Tue, 11 Sep 2012 00:52:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=/24EDfVDSSXDESTuqRP7uzbGOnnRSh8Xy/HjOcF5L1w=; b=iaMezn6amJHVHozyMaGO+oBK9XDhx+Qzt/nHU8kdaqNqQ5nJNHAF28hjpozFi9GoCI FtBsFB/I/gsdNPVoj+BvWR63c28ZAsOYV/FQJJ1wzH3jo4yDO+9bC71VWcIhWerRBqPS 7B/O8ug96dYnNEQlf/w68Lit30rvl4bJ+7uTenVRxVs/rvGu2YTOlZQJM7Og+AAPO1Cf rGo7NA6IzllqEwsjA+vHECqanp82afKtkv9iGWdHZfNKDEPT8pnWcNk4kTXwW5bcfOqy +IMc6fxz12zirowS8JfLQbq2RCjhxmEQD1fg5qi73uZdqCY3qQ/N0A3v1eGvx/noOm8Z 0J+w== Received: by 10.182.44.68 with SMTP id c4mr16921507obm.27.1347349955921; Tue, 11 Sep 2012 00:52:35 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPS id bp7sm15577713obc.12.2012.09.11.00.52.32 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 11 Sep 2012 00:52:35 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Tue, 11 Sep 2012 15:51:45 +0800 Message-Id: <1347349912-15611-5-git-send-email-qemulist@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1347349912-15611-1-git-send-email-qemulist@gmail.com> References: <1347349912-15611-1-git-send-email-qemulist@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.173 Cc: Jan Kiszka , Marcelo Tosatti , Avi Kivity , Anthony Liguori , Paolo Bonzini Subject: [Qemu-devel] [PATCH V3 04/11] pci: remove pci device from mem view when unplug 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Liu Ping Fan Signed-off-by: Liu Ping Fan --- hw/acpi_piix4.c | 2 +- hw/pci.c | 13 ++++++++++++- hw/pci.h | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index c56220b..a78b0e3 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -305,7 +305,7 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots) if (pc->no_hotplug) { slot_free = false; } else { - qdev_free(qdev); + qdev_unplug_complete(qdev, NULL); } } } diff --git a/hw/pci.c b/hw/pci.c index 4d95984..3e2a081 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -850,7 +850,6 @@ static int pci_unregister_device(DeviceState *dev) PCIDevice *pci_dev = PCI_DEVICE(dev); PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(pci_dev); - pci_unregister_io_regions(pci_dev); pci_del_option_rom(pci_dev); if (pc->exit) { @@ -861,6 +860,17 @@ static int pci_unregister_device(DeviceState *dev) return 0; } +static void pci_unmap_device(DeviceState *dev) +{ + PCIDevice *pci_dev = PCI_DEVICE(dev); + PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(pci_dev); + + pci_unregister_io_regions(pci_dev); + if (pc->unmap) { + pc->unmap(pci_dev); + } +} + void pci_register_bar(PCIDevice *pci_dev, int region_num, uint8_t type, MemoryRegion *memory) { @@ -2064,6 +2074,7 @@ static void pci_device_class_init(ObjectClass *klass, void *data) DeviceClass *k = DEVICE_CLASS(klass); k->init = pci_qdev_init; k->unplug = pci_unplug_device; + k->unmap = pci_unmap_device; k->exit = pci_unregister_device; k->bus_type = TYPE_PCI_BUS; k->props = pci_props; diff --git a/hw/pci.h b/hw/pci.h index 4b6ab3d..09bbe2b 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -154,6 +154,7 @@ typedef struct PCIDeviceClass { DeviceClass parent_class; int (*init)(PCIDevice *dev); + void (*unmap)(PCIDevice *dev); PCIUnregisterFunc *exit; PCIConfigReadFunc *config_read; PCIConfigWriteFunc *config_write;