From nobody Tue Feb 10 13:17:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1639832704; cv=none; d=zohomail.com; s=zohoarc; b=RipDOpOwSk+aGSgJ2mUPZoyzWdTQIDi5QBXwMD0eQWMndgVfmUgVlmvRGl8tJXVpBLEL7JoRoazpm5UxI5ow37JZSbL33mXz4SmrP55gEZYscsRlvSzhWJuFn3q19hIHkJEEY0YWn9L58hOhuWgWfihbh7Hq4xRcvXt2IRjS4a4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639832704; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8/1cFQTZGSmutFWyDr1r0PKcIlyY0ksRKQJO1ZCewVA=; b=bcBqHmsxs7JUNL/yvF2cmiwhbhVBHKdBnMN8g6N3LXfzeePOMg2BsFUiJpE+Iwe+xeWpFj2FH90vEKWK+k1X7P3cW1dxbJi1stOTpXqEEFP9WGe7FaEPI7GX/0BxPPGPtU8kcYYvubuXZcdhK/1OM24sycNR+s+pVIkj9AjacVw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1639832704745220.0741598186802; Sat, 18 Dec 2021 05:05:04 -0800 (PST) Received: by mail-wr1-f52.google.com with SMTP id s1so9426668wrg.1 for ; Sat, 18 Dec 2021 05:05:04 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id m17sm9929469wrw.11.2021.12.18.05.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Dec 2021 05:05:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8/1cFQTZGSmutFWyDr1r0PKcIlyY0ksRKQJO1ZCewVA=; b=HI1A2NgnIVCuzXwDavJARF8J3mH+LCFBBl1keRinrAJSUQuEagYX5kVJ/+hQGxWZqI S/jgykCdIUYD8hm5pKIFXmHXQjSz7Wflx4rtPK8acRNsXfTW66uO49rnTT1BYOpMYJ91 wK+G3BDaUfXSZGocRDvK7qlf9D5tK/tsKLaYiHoISPkOC4NppAqojRpW24NrjbOMMhUr DfzYY9L5lEyhQLUJmVfrcAMYO8xfiA68hCNU1a0dTdveeZqgX5W1VDF5GTXoGYx2vaPk +x6VFlH8c/0XYvHBsEcc/0G3RZp/pTERQk31Y/HmnQn3yCGKtaE6GKzgZchI1CVJZUP6 F2QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8/1cFQTZGSmutFWyDr1r0PKcIlyY0ksRKQJO1ZCewVA=; b=PKuOiP5dWc9up+kLvWyF7BTScogg6h1SOhV6LTx7YaMXI0vF3DnOeuzS48073FuSUZ mlwOmrUYdgSuIPqgHbB6JyD/yjk3F4gLxX+ZDk38YRp8go3Al4Yb7gD13S5motml+Q3a /89pokociDnCNiYcxGvTSlkvskV9uEobYyAJj9RjAN3IVU53ACOT7KqyeoO2oikohlta EgtKLVLKqxs+kyPACYVNED3v7cfCVwA9FClVgAICRIagGzdanazU1rICGR2m4sV5xw5N 9evH0ijwIKZxYC/JESmSCFJMbnaFsxBVmvE43oNPHmM3ZMvQZDdO6eE3cdiRzJlv81Le 0Jew== X-Gm-Message-State: AOAM5312V/41r/vqdCd6/Hu57THNYWji0kwFY3l8BGGf2d1vJm4a4Mnp IotFPVArXV3o6WxLXf7aWeI1P4DYJyM= X-Google-Smtp-Source: ABdhPJzinvdzh16oEvDcoKPyGLRL4VlpZWXSHHQeFx8690Y3ZRi0z4BitHYtQ/sL/2YBJelq3ljFvw== X-Received: by 2002:adf:d843:: with SMTP id k3mr466019wrl.303.1639832703030; Sat, 18 Dec 2021 05:05:03 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Richard Henderson , Eduardo Habkost , qemu-trivial@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 5/5] hw/input/pckbd: Open-code i8042_setup_a20_line() wrapper Date: Sat, 18 Dec 2021 14:04:37 +0100 Message-Id: <20211218130437.1516929-6-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211218130437.1516929-1-f4bug@amsat.org> References: <20211218130437.1516929-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1639832706582100001 Since the named GPIO lines are a "public" interface to the device, we can directly call qdev_connect_gpio_out_named(), making it consistent with how the other A20 input source (port92) is wired. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Yanan Wang --- include/hw/input/i8042.h | 1 - hw/i386/pc.c | 3 ++- hw/input/pckbd.c | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h index 1d90432daef..1cd53b8d221 100644 --- a/include/hw/input/i8042.h +++ b/include/hw/input/i8042.h @@ -21,6 +21,5 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, MemoryRegion *region, ram_addr_t size, hwaddr mask); void i8042_isa_mouse_fake_event(ISAKBDState *isa); -void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out); =20 #endif /* HW_INPUT_I8042_H */ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a2ef40ecbc2..e2f7cd4aec6 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1045,7 +1045,8 @@ static void pc_superio_init(ISABus *isa_bus, bool cre= ate_fdctrl, bool no_vmport) port92 =3D isa_create_simple(isa_bus, TYPE_PORT92); =20 a20_line =3D qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2); - i8042_setup_a20_line(i8042, a20_line[0]); + qdev_connect_gpio_out_named(DEVICE(i8042), + I8042_A20_LINE, 0, a20_line[0]); qdev_connect_gpio_out_named(DEVICE(port92), PORT92_A20_LINE, 0, a20_line[1]); g_free(a20_line); diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index baba62f357a..7fd4477d742 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -680,11 +680,6 @@ void i8042_isa_mouse_fake_event(ISAKBDState *isa) ps2_mouse_fake_event(s->mouse); } =20 -void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out) -{ - qdev_connect_gpio_out_named(DEVICE(dev), I8042_A20_LINE, 0, a20_out); -} - static const VMStateDescription vmstate_kbd_isa =3D { .name =3D "pckbd", .version_id =3D 3, --=20 2.33.1