From patchwork Wed Aug 8 06:25:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Ping Fan X-Patchwork-Id: 1292791 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 1EED73FC23 for ; Wed, 8 Aug 2012 06:27:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932199Ab2HHG1R (ORCPT ); Wed, 8 Aug 2012 02:27:17 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:51936 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932126Ab2HHG1P (ORCPT ); Wed, 8 Aug 2012 02:27:15 -0400 Received: by mail-ob0-f174.google.com with SMTP id uo13so685038obb.19 for ; Tue, 07 Aug 2012 23:27:15 -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=HowOYwEVTAeCE/cJcF4+61F3YChN0v16Y+sCgcKCE8E=; b=YNYBOu6M2HvfNcn8tPe6YrQPKZW5eg6hhJ/RuQBekC5K12wjdUYT2gjF3dx3CFgy46 NhNLIlP0EgfzoA5N4mLQEA0sJbICx3kZoD4NXBQSX/FVdZdkHDk2pclkmnxiTQv12ZkU w+z7ustoF04zSEk6L7abPIcUEkXcLRHyBTkA3Ka/lKuauHMuu/KfIps1QAwvqXPe6YhG y1g2HT9iMgkhnt5EHnsB9DWOkPB4ih1A52HvK2jaJalKwzCV8APdRsxR4efM9xhYbw8p xqOmj9xxig5W2oMEzFZaTEp1k6zRG9gc6o8CPw/kAz0gHRgqQu/f9SvzkDA8a3CS/A7Q jy3w== Received: by 10.60.30.101 with SMTP id r5mr28292016oeh.68.1344407235491; Tue, 07 Aug 2012 23:27:15 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPS id aa6sm16666210oec.0.2012.08.07.23.27.13 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 23:27:14 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, Anthony Liguori , Avi Kivity , Jan Kiszka , Marcelo Tosatti , Stefan Hajnoczi , Paolo Bonzini , Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemulist@gmail.com Subject: [PATCH 13/15] hotplug: introduce qdev_unplug_complete() to remove device from views Date: Wed, 8 Aug 2012 14:25:54 +0800 Message-Id: <1344407156-25562-14-git-send-email-qemulist@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1344407156-25562-1-git-send-email-qemulist@gmail.com> References: <1344407156-25562-1-git-send-email-qemulist@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Liu Ping Fan When guest confirm the removal of device, we should --unmap from MemoryRegion view --isolated from device tree view Signed-off-by: Liu Ping Fan --- hw/acpi_piix4.c | 4 ++-- hw/pci.c | 13 ++++++++++++- hw/pci.h | 2 ++ hw/qdev.c | 28 ++++++++++++++++++++++++++++ hw/qdev.h | 3 ++- 5 files changed, 46 insertions(+), 4 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 0aace60..c209ff7 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -305,8 +305,8 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots) if (pc->no_hotplug) { slot_free = false; } else { - object_unparent(OBJECT(dev)); - qdev_free(qdev); + /* refcnt will be decreased */ + qdev_unplug_complete(qdev, NULL); } } } diff --git a/hw/pci.c b/hw/pci.c index 99a4304..2095abf 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -856,12 +856,22 @@ static int pci_unregister_device(DeviceState *dev) if (ret) return ret; - pci_unregister_io_regions(pci_dev); pci_del_option_rom(pci_dev); do_pci_unregister_device(pci_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) { @@ -2022,6 +2032,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 79d38fd..1c5b909 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -145,6 +145,8 @@ typedef struct PCIDeviceClass { DeviceClass parent_class; int (*init)(PCIDevice *dev); + void (*unmap)(PCIDevice *dev); + PCIUnregisterFunc *exit; PCIConfigReadFunc *config_read; PCIConfigWriteFunc *config_write; diff --git a/hw/qdev.c b/hw/qdev.c index 17525fe..530eabe 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -104,6 +104,14 @@ void qdev_set_parent_bus(DeviceState *dev, BusState *bus) bus_add_child(bus, dev); } +static void qdev_unset_parent(DeviceState *dev) +{ + BusState *b = dev->parent_bus; + + object_unparent(OBJECT(dev)); + bus_remove_child(b, dev); +} + /* Create a new device. This only initializes the device state structure and allows properties to be set. qdev_init should be called to initialize the actual device emulation. */ @@ -194,6 +202,26 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, dev->alias_required_for_version = required_for_version; } +static int qdev_unmap(DeviceState *dev) +{ + DeviceClass *dc = DEVICE_GET_CLASS(dev); + if (dc->unmap) { + dc->unmap(dev); + } + return 0; +} + +void qdev_unplug_complete(DeviceState *dev, Error **errp) +{ + /* isolate from mem view */ + qdev_unmap(dev); + qemu_lock_devtree(); + /* isolate from device tree */ + qdev_unset_parent(dev); + qemu_unlock_devtree(); + object_unref(OBJECT(dev)); +} + void qdev_unplug(DeviceState *dev, Error **errp) { DeviceClass *dc = DEVICE_GET_CLASS(dev); diff --git a/hw/qdev.h b/hw/qdev.h index f4683dc..705635a 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -47,7 +47,7 @@ typedef struct DeviceClass { /* callbacks */ void (*reset)(DeviceState *dev); - + void (*unmap)(DeviceState *dev); /* device state */ const VMStateDescription *vmsd; @@ -162,6 +162,7 @@ void qdev_init_nofail(DeviceState *dev); void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, int required_for_version); void qdev_unplug(DeviceState *dev, Error **errp); +void qdev_unplug_complete(DeviceState *dev, Error **errp); void qdev_free(DeviceState *dev); int qdev_simple_unplug_cb(DeviceState *dev); void qdev_machine_creation_done(void);