From patchwork Thu Feb 3 21:01:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 81777 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 ozlabs.org (Postfix) with ESMTPS id E496BB70EB for ; Fri, 4 Feb 2011 11:37:12 +1100 (EST) Received: from localhost ([127.0.0.1]:60978 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl6VR-00068g-Js for incoming@patchwork.ozlabs.org; Thu, 03 Feb 2011 16:14:21 -0500 Received: from [140.186.70.92] (port=43326 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl6J3-0000DP-B5 for qemu-devel@nongnu.org; Thu, 03 Feb 2011 16:01:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pl6Iy-0004zH-KT for qemu-devel@nongnu.org; Thu, 03 Feb 2011 16:01:30 -0500 Received: from mail-pz0-f45.google.com ([209.85.210.45]:46848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pl6Iy-0004yg-FY for qemu-devel@nongnu.org; Thu, 03 Feb 2011 16:01:28 -0500 Received: by pzk2 with SMTP id 2so357247pzk.4 for ; Thu, 03 Feb 2011 13:01:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:from:date:message-id:subject:to :content-type; bh=SYW4ebZ3hF7w1q02sU7mlK1xsTTEVivpNU6NQ8Thbus=; b=NQHIHZri1tt1Scj3lvVo3cuLoXCJq0aX1xn5gWxnWU5y+DCtDT9GPE4xT+tnZoYsKC lCT+Z7jttXAa2BPfcGJaC1rN41DC+zjii65/MCwq5qCnYwmsrSWxNot6UhMJq6BcfdJT PDsqOIV3H5w77/cQQG1l8qYVHmvxIw1YhxyqU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=WKKnCjmpmdDyqH+2k6MBEywXm0pWlh4dVdzOAxaHD4D4bGOlPGZhJuYPJ9U1DvMkrh WiEKOWQyHEyObedfmky0dAf7nRCsJNETqCYQr0Lnjs7EUs/N6fgrD2IatkVDVknSj+Rc R0HBB+ywhnKVewqmH3bEXqkUTLPB6HgFd5qsU= Received: by 10.143.157.7 with SMTP id j7mr3448036wfo.403.1296766887531; Thu, 03 Feb 2011 13:01:27 -0800 (PST) MIME-Version: 1.0 Received: by 10.142.52.1 with HTTP; Thu, 3 Feb 2011 13:01:07 -0800 (PST) From: Blue Swirl Date: Thu, 3 Feb 2011 21:01:07 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.45 Subject: [Qemu-devel] [PATCH 06/10] vmmouse: convert to qdev 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 Convert to qdev, also add a proper reset function. Signed-off-by: Blue Swirl --- hw/pc.c | 5 +++-- hw/pc.h | 3 --- hw/vmmouse.c | 37 +++++++++++++++++++++++++++++-------- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index fcee09a..f66ac5d 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1096,7 +1096,7 @@ void pc_basic_device_init(qemu_irq *isa_irq, PITState *pit; qemu_irq rtc_irq = NULL; qemu_irq *a20_line; - ISADevice *i8042, *port92; + ISADevice *i8042, *port92, *vmmouse; qemu_irq *cpu_exit_irq; register_ioport_write(0x80, 1, 1, ioport80_write, NULL); @@ -1133,7 +1133,8 @@ void pc_basic_device_init(qemu_irq *isa_irq, a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2); i8042 = isa_create_simple("i8042"); i8042_setup_a20_line(i8042, &a20_line[0]); - vmmouse_init(i8042); + vmmouse = isa_create("vmmouse"); + qdev_prop_set_ptr(&vmmouse->qdev, "ps2_mouse", i8042); port92 = isa_create_simple("port92"); port92_init(port92, &a20_line[1]); diff --git a/hw/pc.h b/hw/pc.h index 603a2a3..ae83934 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -67,9 +67,6 @@ void hpet_pit_enable(void); /* vmport.c */ void vmport_register(unsigned char command, IOPortReadFunc *func, void *opaque); -/* vmmouse.c */ -void *vmmouse_init(void *m); - /* pckbd.c */ void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base); diff --git a/hw/vmmouse.c b/hw/vmmouse.c index 2097119..3b39144 100644 --- a/hw/vmmouse.c +++ b/hw/vmmouse.c @@ -25,6 +25,7 @@ #include "console.h" #include "ps2.h" #include "pc.h" +#include "qdev.h" /* debug only vmmouse */ //#define DEBUG_VMMOUSE @@ -52,6 +53,7 @@ typedef struct _VMMouseState { + ISADevice dev; uint32_t queue[VMMOUSE_QUEUE_SIZE]; int32_t queue_size; uint16_t nb_queue; @@ -270,22 +272,41 @@ static const VMStateDescription vmstate_vmmouse = { } }; -void *vmmouse_init(void *m) +static void vmmouse_reset(DeviceState *d) { - VMMouseState *s = NULL; + VMMouseState *s = container_of(d, VMMouseState, dev.qdev); - DPRINTF("vmmouse_init\n"); + s->status = 0xffff; +} - s = qemu_mallocz(sizeof(VMMouseState)); +static int vmmouse_initfn(ISADevice *dev) +{ + VMMouseState *s = DO_UPCAST(VMMouseState, dev, dev); - s->status = 0xffff; - s->ps2_mouse = m; - s->queue_size = VMMOUSE_QUEUE_SIZE; + DPRINTF("vmmouse_init\n"); vmport_register(VMMOUSE_STATUS, vmmouse_ioport_read, s); vmport_register(VMMOUSE_COMMAND, vmmouse_ioport_read, s); vmport_register(VMMOUSE_DATA, vmmouse_ioport_read, s); vmstate_register(NULL, 0, &vmstate_vmmouse, s); - return s; + return 0; +} + +static ISADeviceInfo vmmouse_info = { + .init = vmmouse_initfn, + .qdev.name = "vmmouse", + .qdev.size = sizeof(VMMouseState), + .qdev.no_user = 1, + .qdev.reset = vmmouse_reset, + .qdev.props = (Property[]) { + DEFINE_PROP_PTR("ps2_mouse", VMMouseState, ps2_mouse), + DEFINE_PROP_END_OF_LIST(), + } +}; + +static void vmmouse_dev_register(void) +{ + isa_qdev_register(&vmmouse_info); } +device_init(vmmouse_dev_register)