{"id":817615,"url":"http://patchwork.ozlabs.org/api/patches/817615/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922154014.29350-23-f4bug@amsat.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170922154014.29350-23-f4bug@amsat.org>","list_archive_url":null,"date":"2017-09-22T15:40:02","name":"[22/34] hw/input/i8042: extract API from hw/i386/pc.h","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"038a5c4a17ec8299af1d0f200db0ba96fb808440","submitter":{"id":70924,"url":"http://patchwork.ozlabs.org/api/people/70924/?format=json","name":"Philippe Mathieu-Daudé","email":"f4bug@amsat.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922154014.29350-23-f4bug@amsat.org/mbox/","series":[{"id":4657,"url":"http://patchwork.ozlabs.org/api/series/4657/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=4657","date":"2017-09-22T15:39:40","name":"remove i386/pc dependency from non-PC world (part 1)","version":1,"mbox":"http://patchwork.ozlabs.org/series/4657/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817615/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817615/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"hijs6x86\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xzJ8B4wwDz9s83\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 23 Sep 2017 01:59:38 +1000 (AEST)","from localhost ([::1]:59677 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dvQMa-0003V2-N8\n\tfor incoming@patchwork.ozlabs.org; Fri, 22 Sep 2017 11:59:36 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42027)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1dvQ5M-0005OB-ME\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 11:41:50 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1dvQ5K-0003eE-VF\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 11:41:48 -0400","from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:33086)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1dvQ5K-0003e7-Q3; Fri, 22 Sep 2017 11:41:46 -0400","by mail-qt0-x242.google.com with SMTP id b1so895065qtc.0;\n\tFri, 22 Sep 2017 08:41:46 -0700 (PDT)","from yoga.lan ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id\n\tz75sm71742qkb.71.2017.09.22.08.41.41\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 22 Sep 2017 08:41:45 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=jxT+oasyePyXxB2t60wzMd3kGn+VqY7gCnr0ggxsMVE=;\n\tb=hijs6x86YOoJXbjfJzuM6qpe8RNxrqDc8SKg+qPEqiVYJj3/4YKGEEfHenObLNIa9c\n\tbSI1Wb9SCjAv6aKUl36Jlm9tq4c7BnFrqIkUT+Ok/+A5lKdgVtkDvfPApMPHPM2dnfRW\n\tzJKwFOxj0+gUNbIkRQ5cg/RtDvZ7yXkY5jLLJUXY2W1KQjuSwAMiZTK5yWHzNWRBQQAW\n\tJD+ljPAZMS/EJYCrn9jYxzaWoKMjGrT7wTVjJ+mKqy664wkWXcgbXXegAmhdkGLF0mgd\n\tu4HsCUv5WiN30dH0RGNbkmoaicjfIkKwgiwCrdKA1xb3QIrd9cCDLbWxC2ukeE92afoC\n\tOToA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references:mime-version:content-transfer-encoding;\n\tbh=jxT+oasyePyXxB2t60wzMd3kGn+VqY7gCnr0ggxsMVE=;\n\tb=PKuX5radR90Tplz5NanKdF5KvJXzRNDn84e88hjNdZYgh7r/QE8+YZteu4tvk2ag83\n\tPQ9lC5iiTITEHM0MXZXJFGl9OIosFpjiubApSBtulj2p3OOS2wo3V6OjiybzQAxFnugo\n\tOZf1iktoGjHlxCgxzp/p/S0pbOR+j1XWUYhsZyyUwmVt2qD9arB1LToQ2HEgrIRPIpkB\n\tl6x1qjDIoyamUP9oEUvBYbIZ+Jj2iO0xCeDzzcVIEl7SHwcMKly6o+/WGcReMe+QIhq7\n\tzrtsS19Hd3r++hvHLZrax4sWqGgqbBfctTWtibb7/+uWdck4Me2HGZAjsW3XY14OW1RX\n\trIvA==","X-Gm-Message-State":"AHPjjUijgpLnSm3PKXMT49tvsX16j+mE240ms8d2sljuYOioJbg4m6L7\n\tTePKUOrI2tCUimh/6znntY9chG0vPJ0=","X-Google-Smtp-Source":"AOwi7QB1H9OIyBazoVA0DUp/GNX+MGwgWofJkwAi1ejFk1JH+STgTEJcVCA+DKcTu0XuALCwy6FuFA==","X-Received":"by 10.237.34.56 with SMTP id n53mr9019348qtc.140.1506094906090; \n\tFri, 22 Sep 2017 08:41:46 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>","To":"Peter Maydell <peter.maydell@linaro.org>, Thomas Huth <thuth@redhat.com>,\n\tPaolo Bonzini <pbonzini@redhat.com>,\n\t\"Michael S. Tsirkin\" <mst@redhat.com>, Aurelien Jarno\n\t<aurelien@aurel32.net>, Yongbok Kim <yongbok.kim@imgtec.com>,\n\tRichard Henderson <rth@twiddle.net>, =?utf-8?q?Herv=C3=A9_Poussineau?=\n\t<hpoussin@reactos.org>, David Gibson <david@gibson.dropbear.id.au>,\n\tAlexander Graf <agraf@suse.de>, \tGuan Xuetao <gxt@mprc.pku.edu.cn>,\n\tMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, \n\tArtyom Tarasenko <atar4qemu@gmail.com>","Date":"Fri, 22 Sep 2017 12:40:02 -0300","Message-Id":"<20170922154014.29350-23-f4bug@amsat.org>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170922154014.29350-1-f4bug@amsat.org>","References":"<20170922154014.29350-1-f4bug@amsat.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2607:f8b0:400d:c0d::242","Subject":"[Qemu-devel] [PATCH 22/34] hw/input/i8042: extract API from\n\thw/i386/pc.h","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?=\n\t<f4bug@amsat.org>, \tqemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"- include vmmouse\n- add entries in MAINTAINERS (pckbd.c, i8042.h)\n\nSigned-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>\n---\n include/hw/i386/pc.h     | 11 -----------\n include/hw/input/i8042.h | 30 ++++++++++++++++++++++++++++++\n hw/alpha/dp264.c         |  3 ++-\n hw/i386/pc.c             |  5 +++--\n hw/input/pckbd.c         |  2 +-\n hw/input/vmmouse.c       |  3 +--\n hw/mips/mips_fulong2e.c  |  3 ++-\n hw/mips/mips_jazz.c      |  1 +\n hw/mips/mips_malta.c     |  3 ++-\n hw/mips/mips_r4k.c       |  3 ++-\n hw/misc/vmport.c         |  1 +\n hw/ppc/prep.c            |  5 +++--\n hw/sparc64/sun4u.c       |  3 ++-\n hw/unicore32/puv3.c      |  1 +\n MAINTAINERS              |  4 +++-\n 15 files changed, 54 insertions(+), 24 deletions(-)\n create mode 100644 include/hw/input/i8042.h","diff":"diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h\nindex 25ba378bd8..6a2e947332 100644\n--- a/include/hw/i386/pc.h\n+++ b/include/hw/i386/pc.h\n@@ -193,17 +193,6 @@ static inline void vmport_init(ISABus *bus)\n }\n \n void vmport_register(unsigned char command, VMPortReadFunc *func, void *opaque);\n-void vmmouse_get_data(uint32_t *data);\n-void vmmouse_set_data(const uint32_t *data);\n-\n-/* pckbd.c */\n-#define I8042_A20_LINE \"a20\"\n-\n-void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,\n-                   MemoryRegion *region, ram_addr_t size,\n-                   hwaddr mask);\n-void i8042_isa_mouse_fake_event(void *opaque);\n-void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);\n \n /* pc.c */\n extern int fd_bootchk;\ndiff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h\nnew file mode 100644\nindex 0000000000..836417304b\n--- /dev/null\n+++ b/include/hw/input/i8042.h\n@@ -0,0 +1,30 @@\n+/*\n+ * QEMU PS/2 Controller\n+ *\n+ * Copyright (c) 2003 Fabrice Bellard\n+ *\n+ * This work is licensed under the terms of the GNU GPL, version 2 or later.\n+ * See the COPYING file in the top-level directory.\n+ */\n+#ifndef HW_INPUT_I8042_H\n+#define HW_INPUT_I8042_H\n+\n+#include \"hw/hw.h\"\n+#include \"hw/isa/isa.h\"\n+\n+#define TYPE_I8042 \"i8042\"\n+\n+#define I8042_A20_LINE \"a20\"\n+\n+void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,\n+                   MemoryRegion *region, ram_addr_t size,\n+                   hwaddr mask);\n+void i8042_isa_mouse_fake_event(void *opaque);\n+void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);\n+\n+#define TYPE_VMMOUSE \"vmmouse\"\n+\n+void vmmouse_get_data(uint32_t *data);\n+void vmmouse_set_data(const uint32_t *data);\n+\n+#endif /* HW_INPUT_I8042_H */\ndiff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c\nindex 1bd5243648..2253990654 100644\n--- a/hw/alpha/dp264.c\n+++ b/hw/alpha/dp264.c\n@@ -19,6 +19,7 @@\n #include \"hw/timer/mc146818rtc.h\"\n #include \"hw/ide.h\"\n #include \"hw/timer/i8254.h\"\n+#include \"hw/input/i8042.h\"\n #include \"hw/char/serial.h\"\n #include \"qemu/cutils.h\"\n \n@@ -82,7 +83,7 @@ static void clipper_init(MachineState *machine)\n     rtc_init(isa_bus, 1900, rtc_irq);\n \n     i8254_pit_init(isa_bus, 0x40, 0, NULL);\n-    isa_create_simple(isa_bus, \"i8042\");\n+    isa_create_simple(isa_bus, TYPE_I8042);\n \n     /* VGA setup.  Don't bother loading the bios.  */\n     pci_vga_init(pci_bus);\ndiff --git a/hw/i386/pc.c b/hw/i386/pc.c\nindex 5cb0ae67cd..3aa10c780b 100644\n--- a/hw/i386/pc.c\n+++ b/hw/i386/pc.c\n@@ -40,6 +40,7 @@\n #include \"multiboot.h\"\n #include \"hw/timer/mc146818rtc.h\"\n #include \"hw/timer/i8254.h\"\n+#include \"hw/input/i8042.h\"\n #include \"hw/audio/pcspk.h\"\n #include \"hw/pci/msi.h\"\n #include \"hw/sysbus.h\"\n@@ -1564,11 +1565,11 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,\n     parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS);\n \n     a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);\n-    i8042 = isa_create_simple(isa_bus, \"i8042\");\n+    i8042 = isa_create_simple(isa_bus, TYPE_I8042);\n     i8042_setup_a20_line(i8042, a20_line[0]);\n     if (!no_vmport) {\n         vmport_init(isa_bus);\n-        vmmouse = isa_try_create(isa_bus, \"vmmouse\");\n+        vmmouse = isa_try_create(isa_bus, TYPE_VMMOUSE);\n     } else {\n         vmmouse = NULL;\n     }\ndiff --git a/hw/input/pckbd.c b/hw/input/pckbd.c\nindex c479f827b6..f17f18e51b 100644\n--- a/hw/input/pckbd.c\n+++ b/hw/input/pckbd.c\n@@ -26,6 +26,7 @@\n #include \"hw/isa/isa.h\"\n #include \"hw/i386/pc.h\"\n #include \"hw/input/ps2.h\"\n+#include \"hw/input/i8042.h\"\n #include \"sysemu/sysemu.h\"\n \n /* debug PC keyboard */\n@@ -480,7 +481,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,\n     qemu_register_reset(kbd_reset, s);\n }\n \n-#define TYPE_I8042 \"i8042\"\n #define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042)\n \n typedef struct ISAKBDState {\ndiff --git a/hw/input/vmmouse.c b/hw/input/vmmouse.c\nindex b6d22086f4..c48c07c564 100644\n--- a/hw/input/vmmouse.c\n+++ b/hw/input/vmmouse.c\n@@ -24,7 +24,7 @@\n #include \"qemu/osdep.h\"\n #include \"hw/hw.h\"\n #include \"ui/console.h\"\n-#include \"hw/input/ps2.h\"\n+#include \"hw/input/i8042.h\"\n #include \"hw/i386/pc.h\"\n #include \"hw/qdev.h\"\n \n@@ -52,7 +52,6 @@\n #define DPRINTF(fmt, ...) do { } while (0)\n #endif\n \n-#define TYPE_VMMOUSE \"vmmouse\"\n #define VMMOUSE(obj) OBJECT_CHECK(VMMouseState, (obj), TYPE_VMMOUSE)\n \n typedef struct VMMouseState\ndiff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c\nindex 22e6c05fb5..a35745a407 100644\n--- a/hw/mips/mips_fulong2e.c\n+++ b/hw/mips/mips_fulong2e.c\n@@ -42,6 +42,7 @@\n #include \"hw/isa/vt82c686.h\"\n #include \"hw/timer/mc146818rtc.h\"\n #include \"hw/timer/i8254.h\"\n+#include \"hw/input/i8042.h\"\n #include \"sysemu/blockdev.h\"\n #include \"exec/address-spaces.h\"\n #include \"sysemu/qtest.h\"\n@@ -367,7 +368,7 @@ static void mips_fulong2e_init(MachineState *machine)\n     DMA_init(isa_bus, 0);\n \n     /* Super I/O */\n-    isa_create_simple(isa_bus, \"i8042\");\n+    isa_create_simple(isa_bus, TYPE_I8042);\n \n     rtc_init(isa_bus, 2000, NULL);\n \ndiff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c\nindex 25f0294236..1bbef7eeb5 100644\n--- a/hw/mips/mips_jazz.c\n+++ b/hw/mips/mips_jazz.c\n@@ -41,6 +41,7 @@\n #include \"hw/timer/i8254.h\"\n #include \"hw/display/vga.h\"\n #include \"hw/audio/pcspk.h\"\n+#include \"hw/input/i8042.h\"\n #include \"sysemu/block-backend.h\"\n #include \"hw/sysbus.h\"\n #include \"exec/address-spaces.h\"\ndiff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c\nindex de547d732f..45c7f589aa 100644\n--- a/hw/mips/mips_malta.c\n+++ b/hw/mips/mips_malta.c\n@@ -45,6 +45,7 @@\n #include \"hw/loader.h\"\n #include \"elf.h\"\n #include \"hw/timer/mc146818rtc.h\"\n+#include \"hw/input/i8042.h\"\n #include \"hw/timer/i8254.h\"\n #include \"sysemu/blockdev.h\"\n #include \"exec/address-spaces.h\"\n@@ -1221,7 +1222,7 @@ void mips_malta_init(MachineState *machine)\n     DMA_init(isa_bus, 0);\n \n     /* Super I/O */\n-    isa_create_simple(isa_bus, \"i8042\");\n+    isa_create_simple(isa_bus, TYPE_I8042);\n \n     rtc_init(isa_bus, 2000, NULL);\n     serial_hds_isa_init(isa_bus, 0, 2);\ndiff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c\nindex 48fad52540..946097a31f 100644\n--- a/hw/mips/mips_r4k.c\n+++ b/hw/mips/mips_r4k.c\n@@ -27,6 +27,7 @@\n #include \"hw/loader.h\"\n #include \"elf.h\"\n #include \"hw/timer/mc146818rtc.h\"\n+#include \"hw/input/i8042.h\"\n #include \"hw/timer/i8254.h\"\n #include \"sysemu/block-backend.h\"\n #include \"exec/address-spaces.h\"\n@@ -295,7 +296,7 @@ void mips_r4k_init(MachineState *machine)\n                      hd[MAX_IDE_DEVS * i],\n \t\t     hd[MAX_IDE_DEVS * i + 1]);\n \n-    isa_create_simple(isa_bus, \"i8042\");\n+    isa_create_simple(isa_bus, TYPE_I8042);\n }\n \n static void mips_machine_init(MachineClass *mc)\ndiff --git a/hw/misc/vmport.c b/hw/misc/vmport.c\nindex 165500223f..bc078eb20a 100644\n--- a/hw/misc/vmport.c\n+++ b/hw/misc/vmport.c\n@@ -25,6 +25,7 @@\n #include \"hw/hw.h\"\n #include \"hw/isa/isa.h\"\n #include \"hw/i386/pc.h\"\n+#include \"hw/input/i8042.h\"\n #include \"sysemu/hw_accel.h\"\n #include \"hw/qdev.h\"\n \ndiff --git a/hw/ppc/prep.c b/hw/ppc/prep.c\nindex 94138a4e8c..16f4537093 100644\n--- a/hw/ppc/prep.c\n+++ b/hw/ppc/prep.c\n@@ -41,6 +41,7 @@\n #include \"hw/ide.h\"\n #include \"hw/loader.h\"\n #include \"hw/timer/mc146818rtc.h\"\n+#include \"hw/input/i8042.h\"\n #include \"hw/isa/pc87312.h\"\n #include \"sysemu/block-backend.h\"\n #include \"sysemu/arch_init.h\"\n@@ -643,7 +644,7 @@ static void ppc_prep_init(MachineState *machine)\n                      hd[2 * i],\n \t\t     hd[2 * i + 1]);\n     }\n-    isa_create_simple(isa_bus, \"i8042\");\n+    isa_create_simple(isa_bus, TYPE_I8042);\n \n     cpu = POWERPC_CPU(first_cpu);\n     sysctrl->reset_irq = cpu->env.irq_inputs[PPC6xx_INPUT_HRESET];\n@@ -775,7 +776,7 @@ static void ibm_40p_init(MachineState *machine)\n \n     /* add some more devices */\n     if (defaults_enabled()) {\n-        isa_create_simple(isa_bus, \"i8042\");\n+        isa_create_simple(isa_bus, TYPE_I8042);\n         m48t59 = NVRAM(isa_create_simple(isa_bus, \"isa-m48t59\"));\n \n         dev = DEVICE(isa_create(isa_bus, \"cs4231a\"));\ndiff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c\nindex c3280aaf38..973daed977 100644\n--- a/hw/sparc64/sun4u.c\n+++ b/hw/sparc64/sun4u.c\n@@ -31,6 +31,7 @@\n #include \"hw/i386/pc.h\"\n #include \"hw/char/serial.h\"\n #include \"hw/timer/m48t59.h\"\n+#include \"hw/input/i8042.h\"\n #include \"hw/block/fdc.h\"\n #include \"net/net.h\"\n #include \"qemu/timer.h\"\n@@ -488,7 +489,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,\n \n     pci_cmd646_ide_init(pci_bus, hd, 1);\n \n-    isa_create_simple(isa_bus, \"i8042\");\n+    isa_create_simple(isa_bus, TYPE_I8042);\n \n     /* Floppy */\n     for(i = 0; i < MAX_FD; i++) {\ndiff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c\nindex 6849bac59c..cf79c89f12 100644\n--- a/hw/unicore32/puv3.c\n+++ b/hw/unicore32/puv3.c\n@@ -19,6 +19,7 @@\n \n #undef DEBUG_PUV3\n #include \"hw/unicore32/puv3.h\"\n+#include \"hw/input/i8042.h\"\n \n #define KERNEL_LOAD_ADDR        0x03000000\n #define KERNEL_MAX_SIZE         0x00800000 /* Just a guess */\ndiff --git a/MAINTAINERS b/MAINTAINERS\nindex f7d377ead9..cc1f8bb66b 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -834,12 +834,13 @@ F: hw/misc/sga.c\n PC Chipset\n M: Michael S. Tsirkin <mst@redhat.com>\n M: Paolo Bonzini <pbonzini@redhat.com>\n-S: Support\n+S: Supported\n F: hw/char/debugcon.c\n F: hw/char/parallel.c\n F: hw/char/serial*\n F: hw/dma/i8257*\n F: hw/i2c/pm_smbus.c\n+F: hw/input/pckbd.c\n F: hw/intc/apic*\n F: hw/intc/ioapic*\n F: hw/intc/i8259*\n@@ -849,6 +850,7 @@ F: hw/timer/hpet*\n F: hw/timer/i8254*\n F: hw/timer/mc146818rtc*\n F: include/hw/i2c/pm_smbus.h\n+F: include/hw/input/i8042.h\n F: include/hw/timer/hpet.h\n F: include/hw/timer/i8254*\n F: include/hw/timer/mc146818rtc*\n","prefixes":["22/34"]}