From nobody Tue Feb 10 06:27:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) client-ip=209.85.221.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602444766; cv=none; d=zohomail.com; s=zohoarc; b=OI1Bt3Jhi604Bfwy/D5JpLPiDj31d4zoNt+EgrwKGDxWoBGVfznBITIn4ybduKjhJhh94RfoTuXQNMp65DvdMBsKQb7Ll3rI99072cbvu/yMIhPwGZzJMoYFToh8f5i2GggFaOlrwsQyAe1XDBK1UpWLVVhSavUKOhYq5K12IH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602444766; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KNrZ+qtKi0zNMWfipUbnBZPxCaUXk1d2Q2TEnE3E2xk=; b=CgvB/qtMWvoDKw5IoCjm/TS8I3GSLI39GY9eyspaG2Y1PlwCN1oecUuDbIlCQ/reUOYBiAaucEHzzcvtHAOUa444f1Lkb3et1Qr1U3jUGnU5XzuyAO8oSofc+GNNVUXSwm3M7m7DNBBrdwuBlSYJMzk30lqW5n4R7mBfUvt4i40= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.zohomail.com with SMTPS id 160244476617968.53375234877137; Sun, 11 Oct 2020 12:32:46 -0700 (PDT) Received: by mail-wr1-f68.google.com with SMTP id n6so16270806wrm.13 for ; Sun, 11 Oct 2020 12:32:45 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id 64sm1625675wmd.3.2020.10.11.12.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:32:43 -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=KNrZ+qtKi0zNMWfipUbnBZPxCaUXk1d2Q2TEnE3E2xk=; b=qyhEDrzJeDz52xoatSi74sFpVvUSxTWSOg9vhzvqcWGcIYm++zmA0hTZIWyOrg3tKX BUhSMsCPhUf5mYYl+jYALWSWBU/iWa+d12aUl1Q0R+mkdIs2IZKv9xbAO7zdWX6UCmKJ G9MBdkQuccs3QUov9AQa9KQWMhbh8hLZ3QOPeTny4n5o50W1suF8b93sNcWadmHcIvF9 R3xNufZsnx+n+nd4c+iRhj8c56xU7CL7VwwXgcQh8cQYTyShr/vpq8kiUZglqKQk5CUI J02wJh357SsHTZPuV2XogXyQabSmXTLbbkgvYCoriswBxjePnSQYJLkxA5IbSFVUEQ54 Gq4Q== 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=KNrZ+qtKi0zNMWfipUbnBZPxCaUXk1d2Q2TEnE3E2xk=; b=gb57IwdaRsPVeV+wkIA+vjpmQRlEzUtUv/sVvqo2Su+A7VooQyKWKi61G2BFJjRTc2 FEtniIc17FbWg/Ju93taYyP+C0WQVJbukLnXF8h2GqHM0YIMxwj7G0qOEf4imgOhvLIS 3KjQzHM+KAFHiNRzC/fxarcR6tnhjIgQiGIuE5zRkBFhzFhH7v6/Zy/lEtSXu4dSC33F kNJSX9AI9FhiNJfPdhnkKocl1p0Lx3qAZzy3szxiakUJ4o9qGwr069qAdCIvuTRbj6i9 dsHRRU03vY+3AZ7jamZF+6s8C0H6DuKuOP+4KQTY5XZDIGj2+Dhv8iwi5M1A+mP/WfF5 FGrg== X-Gm-Message-State: AOAM532+DbW4gqXr6kOe2N7443tPSXMSVWwb5bkUiON0RB2dOWnn6R63 iTXuAbWcc7jYVYsCrbPwd0A= X-Google-Smtp-Source: ABdhPJyWUKibpQ3WuPa7rpong1wHY4Bi5G98qh48QJpelYdlg+Inl4jBHACkMDF6xUAJ/M05PA+UTw== X-Received: by 2002:adf:d4c5:: with SMTP id w5mr1270365wrk.226.1602444764214; Sun, 11 Oct 2020 12:32:44 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Eduardo Habkost , Corey Minyard , Paolo Bonzini , Aurelien Jarno , Kevin Wolf , Mark Cave-Ayland , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Stefan Berger , qemu-ppc@nongnu.org, Marcel Apfelbaum , Max Reitz , "Michael S. Tsirkin" , Laurent Vivier , Thomas Huth , John Snow , Igor Mammedov , Richard Henderson , qemu-trivial@nongnu.org, Artyom Tarasenko , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Wang Subject: [PATCH 02/10] hw/isa: Add the ISA_IRQ_KBD_DEFAULT definition Date: Sun, 11 Oct 2020 21:32:21 +0200 Message-Id: <20201011193229.3210774-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201011193229.3210774-1-f4bug@amsat.org> References: <20201011193229.3210774-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The PS2 keyboard uses IRQ #1 by default. Add this default definition to the IsaIrqNumber enum. Avoid magic values in the code, replace them by the newly introduced definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/isa/isa.h | 1 + hw/sparc64/sun4u.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 2a052ffa025..e139b88c992 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -9,6 +9,7 @@ #include "qom/object.h" =20 enum IsaIrqNumber { + ISA_IRQ_KBD_DEFAULT =3D 1, ISA_NUM_IRQS =3D 16 }; =20 diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index ad5ca2472a4..d4c39490cd9 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -615,7 +615,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_LPT_IRQ)); qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 6, qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_FDD_IRQ)); - qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 1, + qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", ISA_IRQ_KBD_DEFAU= LT, qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_KBD_IRQ)); qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 12, qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_MSE_IRQ)); --=20 2.26.2