From patchwork Tue Sep 1 07:56:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 32728 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 5C537B7B8E for ; Tue, 1 Sep 2009 18:00:31 +1000 (EST) Received: from localhost ([127.0.0.1]:46624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MiOHx-00086U-TA for incoming@patchwork.ozlabs.org; Tue, 01 Sep 2009 04:00:25 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MiOEt-00076Y-Hv for qemu-devel@nongnu.org; Tue, 01 Sep 2009 03:57:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MiOEo-000741-9Q for qemu-devel@nongnu.org; Tue, 01 Sep 2009 03:57:14 -0400 Received: from [199.232.76.173] (port=47429 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MiOEo-00073k-1K for qemu-devel@nongnu.org; Tue, 01 Sep 2009 03:57:10 -0400 Received: from mx20.gnu.org ([199.232.41.8]:3540) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MiOEn-0008Lu-Cz for qemu-devel@nongnu.org; Tue, 01 Sep 2009 03:57:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MiOEm-0001P3-M6 for qemu-devel@nongnu.org; Tue, 01 Sep 2009 03:57:08 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n817uK2A000751 for ; Tue, 1 Sep 2009 03:56:20 -0400 Received: from zweiblum.home.kraxel.org (vpn1-4-213.ams2.redhat.com [10.36.4.213]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n817uIos009197; Tue, 1 Sep 2009 03:56:18 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 66F2B700E1; Tue, 1 Sep 2009 09:56:16 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 1 Sep 2009 09:56:13 +0200 Message-Id: <1251791775-5358-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1251791775-5358-1-git-send-email-kraxel@redhat.com> References: <1251791775-5358-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-Detected-Operating-System: by mx20.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 2/4] qdev: convert rtl8139 to reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/rtl8139.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/rtl8139.c b/hw/rtl8139.c index b3542a3..3bd72e5 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -3465,7 +3465,6 @@ static int pci_rtl8139_init(PCIDevice *dev) PCI_ADDRESS_SPACE_MEM, rtl8139_mmio_map); qdev_get_macaddr(&dev->qdev, s->macaddr); - qemu_register_reset(rtl8139_reset, s); rtl8139_reset(s); s->vc = qdev_get_vlan_client(&dev->qdev, rtl8139_can_receive, rtl8139_receive, NULL, @@ -3489,9 +3488,10 @@ static int pci_rtl8139_init(PCIDevice *dev) } static PCIDeviceInfo rtl8139_info = { - .qdev.name = "rtl8139", - .qdev.size = sizeof(RTL8139State), - .init = pci_rtl8139_init, + .qdev.name = "rtl8139", + .qdev.size = sizeof(RTL8139State), + .qdev.reset = rtl8139_reset, + .init = pci_rtl8139_init, }; static void rtl8139_register_devices(void)