From patchwork Sun Nov 25 02:02:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 201505 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 85ED52C0092 for ; Sun, 25 Nov 2012 13:04:47 +1100 (EST) Received: from localhost ([::1]:57284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcRaP-00005O-MX for incoming@patchwork.ozlabs.org; Sat, 24 Nov 2012 21:04:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcRaJ-0008WM-1w for qemu-devel@nongnu.org; Sat, 24 Nov 2012 21:04:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcRaH-0004XA-Sr for qemu-devel@nongnu.org; Sat, 24 Nov 2012 21:04:38 -0500 Received: from mail-pb0-f45.google.com ([209.85.160.45]:37788) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcRaH-0004X5-Jg for qemu-devel@nongnu.org; Sat, 24 Nov 2012 21:04:37 -0500 Received: by mail-pb0-f45.google.com with SMTP id mc8so6902158pbc.4 for ; Sat, 24 Nov 2012 18:04:37 -0800 (PST) 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=ZQShdVoNZSyzmyQM8LA/KHlFq3BTbR7c7ynZnQhDX7k=; b=HSZPfso5hU6nIjAJ3JBD1QjOlqNCvpAPGDXfmlWPgl4QPEgujDqiBGnAu7trnfScCK AfD50gMOTHCkAOVgI1tTBHpg57vlzbjixDR0BnzK9B183ldSx65ntC2pWbQjCN8e8mzN jZX+OPcDoUCdbATsQ+5mErprHH5v3aWFduj/C7MCarWvq6YoC8wLPvs421KuQWiOZTiw wcwZVZKS5OaLBavSpTzNzK1M+rHXr6NGcw5ACwcHLDUaL5SY5a0BTW8b0C1SezQKmyJS luPTTqBe8ssU4npQDCtFLrGK6+2idsXbpY453HUOd4VgQGFtVJBVjV1A7+BwiuvxEFYp h2Ng== Received: by 10.68.252.168 with SMTP id zt8mr26678253pbc.43.1353809076939; Sat, 24 Nov 2012 18:04:36 -0800 (PST) Received: from localhost ([222.128.159.174]) by mx.google.com with ESMTPS id o5sm6217306paz.32.2012.11.24.18.03.57 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 24 Nov 2012 18:04:35 -0800 (PST) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Sun, 25 Nov 2012 10:02:59 +0800 Message-Id: <1353808984-22368-3-git-send-email-qemulist@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1353808984-22368-1-git-send-email-qemulist@gmail.com> References: <1353808984-22368-1-git-send-email-qemulist@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.45 Cc: Peter Maydell , gleb@redhat.com, Jan Kiszka , Marcelo Tosatti , Anthony Liguori , Stefan Hajnoczi , Paolo Bonzini Subject: [Qemu-devel] [PATCH v7 2/7] hotplug: introduce qdev_unplug_complete() 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 device unplug has been ack by guest, we first remove it from memory to prevent incoming access from dispatcher. Then we isolate it from device composition tree Signed-off-by: Liu Ping Fan --- hw/qdev.c | 26 ++++++++++++++++++++++++++ hw/qdev.h | 3 ++- 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 9b9aba3..681e133 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -98,6 +98,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. */ @@ -187,6 +195,24 @@ 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); + /* isolate from device tree */ + qdev_unset_parent(dev); + 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 c6ac636..71eb9ca 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; @@ -160,6 +160,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);