From patchwork Wed Jul 25 03:31:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 173099 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 BF91B2C0083 for ; Wed, 25 Jul 2012 13:31:57 +1000 (EST) Received: from localhost ([::1]:50762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StsKJ-0000Bu-Rp for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2012 23:31:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StsK0-0008TX-0T for qemu-devel@nongnu.org; Tue, 24 Jul 2012 23:31:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StsJy-0004IA-Lh for qemu-devel@nongnu.org; Tue, 24 Jul 2012 23:31:35 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:37536) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StsJy-0004GK-Eo for qemu-devel@nongnu.org; Tue, 24 Jul 2012 23:31:34 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so656664pbb.4 for ; Tue, 24 Jul 2012 20:31:34 -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=F0/Y5xqpRdulOT+h7TbaDUY+SUi71+mdUyFVbCraKws=; b=haL8njLwi9Xaz09DlMwWpclluqh9U2R5acPzUl6O2ciTFJewgVvBHdeXfkgmc0aDaw Q5XC5LNYPRWJAKwT5R/l8+266ek+c2KgDn92wbltrPPnRMPHrKlnhP5IK3UQFhR2rt/0 BK+VQqWYeWN+/8Y/djckKYs226fouS1a3rqnHAf5ApDnn/JMIVDzI3QcIENLMx8OMup0 CiFs/tcnotCsEwH+Cs+fOb7WDIK8w035+JuvnvCxDzyFxCQ51fxc4M804fCd+x69Bjl4 Y1HqaO67fwaYKTIo/p7WZeoR7XQd1exjCN7X5y2EB/4AwqxVYjIjVDt04GtnhgCvIVWo lvsQ== Received: by 10.68.203.73 with SMTP id ko9mr50692394pbc.66.1343187094115; Tue, 24 Jul 2012 20:31:34 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPS id og4sm13428490pbb.48.2012.07.24.20.31.32 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 20:31:33 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Wed, 25 Jul 2012 11:31:08 +0800 Message-Id: <1343187070-27371-4-git-send-email-qemulist@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1343187070-27371-1-git-send-email-qemulist@gmail.com> References: <1343187070-27371-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.160.45 Cc: kvm@vger.kernel.org, Stefan Hajnoczi , Marcelo Tosatti , Avi Kivity , Anthony Liguori , Jan Kiszka Subject: [Qemu-devel] [PATCH 3/5] hotplug: introduce qdev_unplug_ack() to remove device from views 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 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/qdev.c | 28 ++++++++++++++++++++++++++++ hw/qdev.h | 3 ++- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 0aace60..c174247 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_ack(qdev, NULL); } } } diff --git a/hw/qdev.c b/hw/qdev.c index ac55e45..3f7dfa5 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_ack(DeviceState *dev, Error **errp) +{ + qemu_rwlock_wrlock_devtree(); + /* isolate from device tree */ + qdev_unset_parent(dev); + /* isolate from mem view */ + qdev_unmap(dev); + qemu_rwlock_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..fc5ff02 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_ack(DeviceState *dev, Error **errp); void qdev_free(DeviceState *dev); int qdev_simple_unplug_cb(DeviceState *dev); void qdev_machine_creation_done(void);