From nobody Tue Feb 10 04:16:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520549162707624.1070018169177; Thu, 8 Mar 2018 14:46:02 -0800 (PST) Received: from localhost ([::1]:42248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eu4IT-0002sf-VK for importer@patchew.org; Thu, 08 Mar 2018 17:46:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eu4Cx-00073F-TV for qemu-devel@nongnu.org; Thu, 08 Mar 2018 17:40:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eu4Cw-00048A-Sw for qemu-devel@nongnu.org; Thu, 08 Mar 2018 17:40:19 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:50533) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eu4Cw-00046v-MZ; Thu, 08 Mar 2018 17:40:18 -0500 Received: by mail-wm0-x243.google.com with SMTP id w128so727554wmw.0; Thu, 08 Mar 2018 14:40:18 -0800 (PST) Received: from x1.local (ABayonne-654-1-76-150.w86-222.abo.wanadoo.fr. [86.222.219.150]) by smtp.gmail.com with ESMTPSA id x190sm19315070wme.27.2018.03.08.14.40.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Mar 2018 14:40:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Oehs6xlUmOsUjom/w1oCrrUi/fyPjf1Ki6I4jmiAps0=; b=W/hM2Qz8zCHQAC6n+Ng8z0LR4kKBlYE4aN9dNPjd2xjDrZCoeQmL8MKSPfmqgbwLzL GkaF3mjT9w8tmEL4Rxj5qi/qWiXJ7hITmvtepmTiNQ7LFQaoaItOaTY3fyOhMnGgWfxP ZyQBoAeBtiwzMQCPwdGLWQ1E9ehNH/5BEurcJcobt8DAQmkAjcSKmwK2Pz+Yb+cnmOAA gSg+Qw0nkpppKfdLpItxVl8hrN/MV7bEu1qY6nF92czWN7Jr0PSvXffh4tiICYbKJhQS 6EunIa76CK+HPl89GD4tkUgJvc/Rms2XfNd4UhBBSJMnRONuEm2FHwKBeUp2Mc8ECh5E w68A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Oehs6xlUmOsUjom/w1oCrrUi/fyPjf1Ki6I4jmiAps0=; b=cITTK5nQS46LVXOjWn5kYNcJvDcplHYbELJhlN6v/IL0ToLKSYpuCo0p0sZvLXjvAs kGkYRuxMhaP3EXapzA+9lYhRSY2db78zCLWtH5eViXmWEhq1+6BiEgsnYf0P9FIjwUYp GdFdel1ZaOGJc5kIaZHxwUDADFw1kbQuc977vQLePaMT8+pSPZzo6oNP+a6ahk3Ix2Cl 9iT25zCjWIszM5veSxKlRIB335pMJN4kCbnlbCOPPN6EXmoI6QpBij7Hi5N/idm14LY2 NwGIabv2PL/RpHE6WZlwtkHk1jUOlBWHlsYiZmKFx6DTirNjwLowjH31l6edkZe33zbC yDZg== X-Gm-Message-State: AElRT7HMp9Sfb/l9sNKCamcIykawPZMDSRMKPjot80okCisp0y811ypy YWybc5DpUpKTIAiiYKf6SqQ= X-Google-Smtp-Source: AG47ELsumHRLj9sGKHRwF3juZq7ipkiEttMddW92Gs/Txd0tWDUm7k132ajqsGYqMbp8Bvhkw/T96A== X-Received: by 10.28.52.9 with SMTP id b9mr333384wma.134.1520548817694; Thu, 08 Mar 2018 14:40:17 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Michael S . Tsirkin" , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , Aurelien Jarno , Mark Cave-Ayland , Alexey Kardashevskiy , Thomas Huth , Laurent Vivier Date: Thu, 8 Mar 2018 23:39:34 +0100 Message-Id: <20180308223946.26784-14-f4bug@amsat.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180308223946.26784-1-f4bug@amsat.org> References: <20180308223946.26784-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH 13/25] hw/isa/superio: Add a keyboard/mouse controller (8042) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Graf , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, "open list:PReP" , David Gibson , Guan Xuetao , Yongbok Kim , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Since the PC87312 inherits this abstract model, we remove the I8042 instance in the PREP machine. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson --- include/hw/isa/superio.h | 1 + hw/isa/isa-superio.c | 3 +++ hw/ppc/prep.c | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/hw/isa/superio.h b/include/hw/isa/superio.h index e8007b9eee..2fc33bf3d3 100644 --- a/include/hw/isa/superio.h +++ b/include/hw/isa/superio.h @@ -30,6 +30,7 @@ typedef struct ISASuperIODevice { ISADevice *parallel[MAX_PARALLEL_PORTS]; ISADevice *serial[MAX_SERIAL_PORTS]; ISADevice *floppy; + ISADevice *kbc; } ISASuperIODevice; =20 typedef struct ISASuperIOFuncs { diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index 4b5e280b38..041b47bdbf 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -17,6 +17,7 @@ #include "sysemu/blockdev.h" #include "chardev/char.h" #include "hw/isa/superio.h" +#include "hw/input/i8042.h" #include "hw/char/serial.h" #include "trace.h" =20 @@ -143,6 +144,8 @@ static void isa_superio_realize(DeviceState *dev, Error= **errp) k->floppy.get_irq(sio, 0) : -1); } =20 + /* Keyboard, mouse */ + sio->kbc =3D isa_create_simple(bus, TYPE_I8042); } =20 static void isa_superio_class_init(ObjectClass *oc, void *data) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 610ec7ec32..96d319b87c 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -642,7 +642,6 @@ static void ppc_prep_init(MachineState *machine) hd[2 * i], hd[2 * i + 1]); } - isa_create_simple(isa_bus, TYPE_I8042); =20 cpu =3D POWERPC_CPU(first_cpu); sysctrl->reset_irq =3D cpu->env.irq_inputs[PPC6xx_INPUT_HRESET]; --=20 2.16.2