From nobody Tue Dec 16 07:06:21 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520983123762723.893639723637; Tue, 13 Mar 2018 16:18:43 -0700 (PDT) Received: from localhost ([::1]:43447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evtBq-0005S0-TM for importer@patchew.org; Tue, 13 Mar 2018 19:18:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsiL-0005yF-01 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsiJ-0003kq-R2 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:12 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:45030) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsiJ-0003jP-Kc for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:11 -0400 Received: by mail-wr0-x242.google.com with SMTP id v65so2494159wrc.11 for ; Tue, 13 Mar 2018 15:48:11 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.48.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:48:09 -0700 (PDT) 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=zdXOHOoyQ2N4wPRnnOjrHBXDdcAD2/q1FYM8IFQIpSw=; b=VGYs671VVFvlRx9EdPx4W82rRhgmi2oAwxVOy5ja4OevSLaFWIS4Mojm26ETELjSFN fS/ucvdijkyDi1GLgGFbDu1wTvNxuOrfAh38d9Bj95jtqqfiWBC5NuLqI3KrYYELUDU+ HAxRRf8qZzgUYsy/LeH9bD4KCjUFTGCJgZilXwywiq3/lhP/+ObAsFu+7yfdpjAUMyOu 4Of831fFRNGc/VNqBk+EHDEcZLYj19fEevCtmjdy81S51GNkZ0qZsxceo1jQ7Wy06jOp lCUAcyZgw6QHGOY8w2j3FisKeqTH/2/szdSYF7uxZ1Bs/ZPbDlF26w+RU0QfxHvqYU8R s0mQ== 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=zdXOHOoyQ2N4wPRnnOjrHBXDdcAD2/q1FYM8IFQIpSw=; b=Cjs7uTAhbL8hHoRWMA9x8gevbeu5/BKtD2TmBzI1rcaK/0uR23KKNpUISLJcIWTkj6 ylkT1e9i1vYz0QxDOdDOSznArcWVPQbyDlNqhaszN1aohxQoyRuhvN/ijKAJjE3DZDii o5xZnnYky+y/A2d3CpgQLLl8y1k3KXRAesQ/WDFiEMnJKNOSW2nTKEvK8wKe4F+gptMK 3EUrFoj9Ahv9KIK5Isgep1bTo39x38PMmE1Lf5r7hKBGQXcxptAV6TtIQqZxcGGuVLR6 d14ELcp3pkFl+uanL8XanVI2Upu2OB+DO4I5JKNpnnUKWbDzvnPACQD5lB8BH+XY6BOo ljiw== X-Gm-Message-State: AElRT7Gnim9oOIIf/loZA9TkWOG/z0H9Al3ZHnpWonKSvxqXrWvDLpKM qBZJ02qRg+4UIJOVLLY5h41+0jgP X-Google-Smtp-Source: AG47ELsfPL0Bbuw8d+dKgTR7SKUJb/ZB3pxrhcbtOyOSrhGPQZiaATqOnfR1BfxOs/pn5GYNzv2rBg== X-Received: by 10.223.164.138 with SMTP id g10mr1827738wrb.74.1520981290317; Tue, 13 Mar 2018 15:48:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:49 +0100 Message-Id: <20180313224719.4954-40-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> 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::242 Subject: [Qemu-devel] [PULL 39/69] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 From: Philippe Mathieu-Daud=C3=A9 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 Message-Id: <20180308223946.26784-14-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/isa/isa-superio.c | 3 +++ hw/ppc/prep.c | 1 - include/hw/isa/superio.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) 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 df774bd384..5c78503069 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -641,7 +641,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]; 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 { --=20 2.14.3