From nobody Sat Oct 25 08:57:49 2025 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 1520285099556374.6098517193411; Mon, 5 Mar 2018 13:24:59 -0800 (PST) Received: from localhost ([::1]:51611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esxbJ-0000EN-Rk for importer@patchew.org; Mon, 05 Mar 2018 16:24:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esxWZ-0004TD-7b for qemu-devel@nongnu.org; Mon, 05 Mar 2018 16:20:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1esxWY-0001f7-E9 for qemu-devel@nongnu.org; Mon, 05 Mar 2018 16:19:59 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:42735) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1esxWY-0001ei-6n; Mon, 05 Mar 2018 16:19:58 -0500 Received: by mail-wr0-x241.google.com with SMTP id k9so18770964wre.9; Mon, 05 Mar 2018 13:19:58 -0800 (PST) Received: from x1.local (ABayonne-654-1-79-224.w86-222.abo.wanadoo.fr. [86.222.222.224]) by smtp.gmail.com with ESMTPSA id g96sm12904808wrd.73.2018.03.05.13.19.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 13:19:56 -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=AsoLr1/MM62IsbV12d02fGecu677026mzyPu4UM20Is=; b=mH8/iZ+qsK3nEQYb7h/48wybqwI2Reh5XGZKYBpFv2OBrW4LyEFslOqVZ8IswsAjPY gIHyNhkA96UAB0oiyq9fL99PJmjed/uvz5K9arAejPUgLBj83zyAlbHYV953SPJ7JciI AWrDnXlZBWfL5rC8wM/K4DqpAPGxbmaVNZ8veHOq77eCVYoUuMccJ91Gkvozdq1EaCSl ECZQn9fyE5fSK8Up+DmSy/JZlALN5SIUK5SZF7xuu9LOUkjtj1BpqddR7AxX8FiAvETK cAaZEU4j/Ls2NnI0Tm0D5+Xsh6eUkTG4hhBdilwE0XliAWTGiE0k/ThZC696Swlxs116 MXBw== 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=AsoLr1/MM62IsbV12d02fGecu677026mzyPu4UM20Is=; b=XYgIbHJD0SL3MOqTATkabsdmBFakdhfT2qdfaLWFrpqSg1CqBSUKQicsxkGsun6cR6 OROfvPfa/oRZqfGnjk1cU7h9x+92puY8h3ViAj9knEhhulIusYvQkvbIC75dcuKLYJVn fG+UUphO+xI6M62yQrRKcGbgw6XJa1V+TxQnX0Qrnf8vlCCouuCUano666SVCs6TILZn x9yc+uG9F0Z2VIDAmaZbTdnaZn5OEZVYvKNELISYQs91eNMjn9uN+J11R2PnXh/FmwlD 2RLKKaq9qVx0HioT3voQkoHvCcUTh5hQl25+gbPasu23JdGzFZM7RbVQYZh8qq+YCFHc 4hDw== X-Gm-Message-State: APf1xPBZuOykvm6QUF2eync6bV6IS5Mtw+4bYwt4tD/tmORebjahG7FM rzl62EODjsyg+sPPit6xaUc= X-Google-Smtp-Source: AG47ELuw2Qtd/x9+JKxIPo9dkEYx7my0Pq+C0r6eVxCFvn14vSdsQk3N5L/9cwmP2iNPmGz3f2Kj0w== X-Received: by 10.223.161.194 with SMTP id v2mr13247305wrv.48.1520284797286; Mon, 05 Mar 2018 13:19:57 -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 Date: Mon, 5 Mar 2018 18:19:18 -0300 Message-Id: <20180305211928.466-13-f4bug@amsat.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180305211928.466-1-f4bug@amsat.org> References: <20180305211928.466-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:c0c::241 Subject: [Qemu-devel] [RFC PATCH v2 12/22] 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 22bf79d3c3..6a24ac0259 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 @@ -139,6 +140,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