From patchwork Wed Aug 8 06:25:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 175860 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 E0B072C009E for ; Wed, 8 Aug 2012 16:27:46 +1000 (EST) Received: from localhost ([::1]:37217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Syzk9-0002I6-1W for incoming@patchwork.ozlabs.org; Wed, 08 Aug 2012 02:27:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Syzjs-0001zu-5a for qemu-devel@nongnu.org; Wed, 08 Aug 2012 02:27:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Syzjr-0002Tr-1l for qemu-devel@nongnu.org; Wed, 08 Aug 2012 02:27:27 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:47873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Syzjq-0001rm-RJ for qemu-devel@nongnu.org; Wed, 08 Aug 2012 02:27:26 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so493650pbb.4 for ; Tue, 07 Aug 2012 23:27:26 -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=qvJGOMCWV3PW5ztN3bGV/qk6tZ1ZhDgww91fI0f3y9s=; b=MI1to2mbXi/RCOQO0jzwg0kmAMHjCytsfTjLTfM08puSiJMgoNJxSW5b17mNNO3ohD bHxAhC3HthPk54zTcR18psH+TOhslVvQ+uLgsOt7Yb0M+Fb6QjEWCbSr41TbrE+T1AHG kMihPo4KAz4rJkzWPYqVPoHKMzu/PEcUa8MLlxdxvM8NpM23ljiE8Xvk9IBTVo6jg0e4 YHeAchLVGj9VQVzsDLi0wN1xeDrxCeNDw1j90XeDK1saK/DS/BTQyst3AjeOD6KfQX3B O4EJzHeABg/UzE2CtblyvW6enIjnIwod81w5CDD/m6ZZWuUSTkdzC9pXXZ5dY11LtgZa rAZQ== Received: by 10.68.229.2 with SMTP id sm2mr33493005pbc.57.1344407246463; Tue, 07 Aug 2012 23:27:26 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPS id qb10sm12748465pbc.21.2012.08.07.23.27.24 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 23:27:25 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2012 14:25:56 +0800 Message-Id: <1344407156-25562-16-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> 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 , qemulist@gmail.com, Blue Swirl , Avi Kivity , Anthony Liguori , Jan Kiszka , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 15/15] e1000: using new interface--unmap to 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/e1000.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 4573f13..fa71455 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1192,6 +1192,13 @@ e1000_cleanup(VLANClientState *nc) s->nic = NULL; } +static void +pci_e1000_unmap(PCIDevice *p) +{ + /* DO NOT FREE anything!until refcnt=0 */ + /* isolate from memory view */ +} + static int pci_e1000_uninit(PCIDevice *dev) { @@ -1275,6 +1282,7 @@ static void e1000_class_init(ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = pci_e1000_init; + k->unmap = pci_e1000_unmap; k->exit = pci_e1000_uninit; k->romfile = "pxe-e1000.rom"; k->vendor_id = PCI_VENDOR_ID_INTEL;