From nobody Thu May 9 22:38:27 2024 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=1602444760; cv=none; d=zohomail.com; s=zohoarc; b=ZjaF3otHPXmvuZ1MfqoPBN0ZICG2VsYiDcIvSBc9DlqSw21UIPVc+nuYsfZ2LO8rlukPbY3OI/ztJ3R7V6pPyhP28Wa82Qwg0bwYk4ikJh9tuoYjFwkDHH+PBggwb4czp6PGMqxm0q7fHNpqM77sXEU7gloifXYp4ijGRnkgvDc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602444760; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fmlcfpwvQZt/h1AszpZppC7oD9iO0g2rLKUxf53gOoA=; b=drsbSODa9gB1phu8UfMtrwxJ0mZDg5ZQ+71Usx26F0rmmKfL3zjaDTworrn4KrccyKvNJoQ8UdzkRgNJTKNKRKkdURUrPUt+8GtUYwvSOvhCgheCMSYKYzoLZi9mwJ1kVLPdLT46jROkxfttkCXRXEoJl0JCHJN0gm6BmPTgj6I= 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 1602444760933635.9951983837734; Sun, 11 Oct 2020 12:32:40 -0700 (PDT) Received: by mail-wr1-f68.google.com with SMTP id h5so6489826wrv.7 for ; Sun, 11 Oct 2020 12:32:40 -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 a17sm21215068wra.29.2020.10.11.12.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:32:38 -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=fmlcfpwvQZt/h1AszpZppC7oD9iO0g2rLKUxf53gOoA=; b=NcaMislMSa6o2M9nrk/84IKWm5dGHuZv+nc/Y5349o6NNgIRrLhaJECEb9XqbZy/iP FJEBH+1yHoPomXvovucwcoHXfyV5MAEe8PtZ9xIevsX6JRO7zY2dJI8QCSE2gZfDQvVf 0LV3Xn7cffiBCxI2nPjyRsXlb1taDc4uo03PGy5bQXNIHUJxzCk8BRffsDy+B8iAbfyj YLwUSl2lCmat12M6ZHLdBREMFHpch1t33lvaOyLzH9no/iQCkM30yPLcN6YC/hJI82TM KFiXDx4daXw81RFX92NM2YTVGjEQFqX1Mw9G9o/6vd3vIDemOsPme+kinFp7Cf97uIFQ b6jw== 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=fmlcfpwvQZt/h1AszpZppC7oD9iO0g2rLKUxf53gOoA=; b=ESFvPKlXB8J6JkpyPKoepC5om6j1ajkQswvDc3i7XB7jFKr1lTONTHwUifkNpT0QlN LJDpAhPaRiyp5EF9w9h36ubyQL3ukxc/X6Cl/TGXlEq/iLcJdIvgbYSUn7ubFWUo/Nhv w400qUWST9dpEB5lILYQS1MqgwEucsoEEaGOZBFN4Fsx7fPVIWqJFU00TLtaddTAn4uc 92VrT4nG+zuCBkCg6arhE6XA+ixmxSSe6Dsj1X7e8aiLgyvzPS5J9y20D2XDRGDJPLkB 8z124vpDzrsEhy1iz188hJvXKj40i05qJuHriX2q0+KLj/NsUwcInEy7+bekUDun4U2a DJSg== X-Gm-Message-State: AOAM532vFClinW7K1C5FLs5dF/9Fi7LjGKKwABl9cB3e41+VFVCBWnxi Tz4YIGfd3BppFuDR3l06ISY= X-Google-Smtp-Source: ABdhPJwP4pvSU3pkp8ODHNw31Z3zzsI/u/U0SIw4XgY9isItuzQmKM/BuB8bCTlwgEcDb4/3n0RBbQ== X-Received: by 2002:adf:97cb:: with SMTP id t11mr27954881wrb.292.1602444759130; Sun, 11 Oct 2020 12:32:39 -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 01/10] hw/isa: Introduce IsaIrqNumber enum Date: Sun, 11 Oct 2020 21:32:20 +0200 Message-Id: <20201011193229.3210774-2-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) We are going to list all default ISA IRQs. As all the definitions are related, introduce the IsaIrqNumber type to enumerate them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/isa/isa.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index ddaae89a853..2a052ffa025 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -8,7 +8,9 @@ #include "hw/qdev-core.h" #include "qom/object.h" =20 -#define ISA_NUM_IRQS 16 +enum IsaIrqNumber { + ISA_NUM_IRQS =3D 16 +}; =20 #define TYPE_ISA_DEVICE "isa-device" OBJECT_DECLARE_TYPE(ISADevice, ISADeviceClass, ISA_DEVICE) --=20 2.26.2 From nobody Thu May 9 22:38:27 2024 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 From nobody Thu May 9 22:38:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) client-ip=209.85.221.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602444771; cv=none; d=zohomail.com; s=zohoarc; b=Lk3VNNP2+VoGmdvq0k+JN73flu4QmNc20VOTbN+w0BSzQVHd/x/fAM5QJvCWGiW+TzPsy0SlqVgQPR49zcHt1uAmCLlpFnvaWtagScJcO73GZreM82kSQN8p6uGf56fRH73tRQPHrahJDAo9R/6Ke1Tyv3vpsuL7asWLAUOT+wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602444771; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0jpaxMymalQzJe7nkt3fK37nWgDJARQE9RMKxlzHDKI=; b=aCDAdEz+g9hCtIPW6zoBO9lNcWTd3aNltH1ktlIA9n0tgePpwP56ZusCZvSnIXGe065M9QYzp5GXAB8StXQ3gnAz4g5RJLzmwZYyBzc2yNA9/oL2C9TAcKj0vZMz031kyA/n+ngcf08nn8D2suk3hM5xGPY0SdP57FQNW0qFDIM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.zohomail.com with SMTPS id 1602444771252109.08421635765569; Sun, 11 Oct 2020 12:32:51 -0700 (PDT) Received: by mail-wr1-f67.google.com with SMTP id b8so3351769wrn.0 for ; Sun, 11 Oct 2020 12:32:50 -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 a81sm23030618wmf.32.2020.10.11.12.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:32:48 -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=0jpaxMymalQzJe7nkt3fK37nWgDJARQE9RMKxlzHDKI=; b=uz+5gg1wHDtPr/S5ORv4Td1PAh5DSIAfCQWuFHeFFoQsmiwviFwUO9X+mxPY4AcYvY dhEklevtq1PXGH+HkTxJ3yLLf65URD5rG/8a9FTAiShuYX4A5SYs+Zpqy8/3fNWflOhW fFtuldLo4fTV2TxhVgyaoxqkIYIocYWAKRKzwdax30CpjGi1oRo3ojqEFiby0OlDJjZr KtFy4Kq9WsGkvJUD6QfCL643E3hjiQvlQJ/121uiF/CEdiDItNOXUMYwBoE4wAv803Zo txC9m71bcSEWbXa3lSSaSve+AU8z6U8MKvjtXyToez1LfPTD3pMY9McEdi+ujrY0blKX yO6w== 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=0jpaxMymalQzJe7nkt3fK37nWgDJARQE9RMKxlzHDKI=; b=SGZDk/NMHL3xXTEStfGIum9O+AqHJXI0fqU7YkG6zRofD/08zNgI64PY+bNi3dbY5v cAy+GC1Xkhm9IzvtkNzEQ8F7a4yGQCVuvQfZLvth0uqxyK7Cq1ACUxfJ2reey/rEEiLP frrpMhKdvKiDVpCZkN5EwpizXZiFzmDxBYgCfTPd/s0K7KER4Sdc8dtKr7esZQt+m6Ou lsam5J9URW8jF7+9aJJkKcNDg29Vjm8eKLJ5aQ6Kg3ik2KiE9mMkCF7qRpRcSCjiMWCG EUmVH3RFMa3+0WDBxDKbd6SAj/V0PXJqu2eYaO0TbvSdsZqwV5qRzUQQSugUwAHRuivn JCaw== X-Gm-Message-State: AOAM532rp5LSdz2t0Mi44KgQXwHMgFJqPGljxMbQDhPRuQo+L7F5Xwnx cIYTPPUFMC2MezGxZEGy5gY= X-Google-Smtp-Source: ABdhPJzhnI81QO4NuG8+dCiW+MMDXBui58TatPQ8g+Lc44KzsdSlLSS4QaC7ExFGWP3IQSy0YyDHJQ== X-Received: by 2002:adf:bacc:: with SMTP id w12mr16965624wrg.66.1602444769499; Sun, 11 Oct 2020 12:32:49 -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 03/10] hw/isa: Add the ISA_IRQ_SER_DEFAULT definition Date: Sun, 11 Oct 2020 21:32:22 +0200 Message-Id: <20201011193229.3210774-4-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 first serial port uses IRQ #4 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 e139b88c992..519296d5823 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -10,6 +10,7 @@ =20 enum IsaIrqNumber { ISA_IRQ_KBD_DEFAULT =3D 1, + ISA_IRQ_SER_DEFAULT =3D 4, ISA_NUM_IRQS =3D 16 }; =20 diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index d4c39490cd9..6e42467d5cc 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -619,7 +619,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, 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)); - qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 4, + qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", ISA_IRQ_SER_DEFAU= LT, qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_SER_IRQ)); =20 switch (vga_interface_type) { --=20 2.26.2 From nobody Thu May 9 22:38:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) client-ip=209.85.221.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602444776; cv=none; d=zohomail.com; s=zohoarc; b=AaRzBJ7l/fI2S8qLVe+zs6y6SxnErRmVFTTHNL1P+YnLmQIAQmmBCJrkZILIlaR9DBCumlkBnkhrjQKoqz4b1Ms4rLWjGMHGujVOvSIv7Fnw/MSvLRzBPeW9jTHpM57VLyobGT7hua6FHb2tn7U1uUjqbin/PZSMMUGRAr0266E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602444776; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=owliHLOWbWXpZmpPZaYeHDfZXoImwW9/yfAFwtcxj6M=; b=ZMU1rzGN79m74MQuQ6e8S8pbci+56W5FQMi65o8gnjeO6G99y0OCsN1J44YmVF2JKSLTBTwuUrivBA71ssphuWJlXVDCTd3AKmzQ+taFA2xLOOqGVuMCkqi7dsLGJlrEywKugFpA5XQ5680Zj1l0wT4JJJI7eO3Zim1LmnPUSMo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.zohomail.com with SMTPS id 1602444776894538.2771845277774; Sun, 11 Oct 2020 12:32:56 -0700 (PDT) Received: by mail-wr1-f65.google.com with SMTP id e17so16544410wru.12 for ; Sun, 11 Oct 2020 12:32:56 -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 w1sm22162629wrp.95.2020.10.11.12.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:32:54 -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=owliHLOWbWXpZmpPZaYeHDfZXoImwW9/yfAFwtcxj6M=; b=g7OQZQXcv3KXHokyULyGv+Ywkf4wWXZ5c7oE+RwQzJcG0si14dbQfekusSJzoJ9MgO 5XG1W9SlmtpG6HEQ1jCYywVYL56I+FZfIsGyjfwCliqv2NABM0sHdW4IAlPQlLM6r8tW sZcbmbj/Q7dqKpHmk5BE+K74LQTsNYlD8fw4vTGhcSeCb3CGaCebhkpwVrY5cL2oOhrH LMwOiWy4+DkMbJ+kABjF34uAOHxMoCAE0IFnEpvFFSBYRsj40oWg1bxYwcSO+ScI77uv njgAZgZx0+u9xZ3YtutxvbVzPcaBBuWtr0XXy+ZtePPG3QVPFU5IKXylmBHrfRIrEjRQ 698w== 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=owliHLOWbWXpZmpPZaYeHDfZXoImwW9/yfAFwtcxj6M=; b=uUF8sky0ikFDbxYQgRoRSCZsFoDjSagcPmUmmoiXt0/cbGqkHX2jBa8JJrOFuBocuw N1/OmT96CRiqnfcuRZZKNVNNnYdv9AZB9cewIKq3F5dZt0kNntIOLOvtPiN7X3/bSm/a TvV0pDcD6WBYid0cfQSKpe6m0i0Q0ItAzBqNVUUNETcmKW1tIMzSHB1fu90yGCe4tavi TlrwadzANa49R3yJTmUISTgiy8F9HYZI0Fk99SL75DRuXseA2aTTufYSVFxA8nH7FEB4 xqGOIx8YjOUEZ8A35IjTZhqwA6m/8Xhb2NBZI62u+35CTf9epqMoXwVbcy8o0nyFZDmm ul8g== X-Gm-Message-State: AOAM530UZEXEmpSAd4tJTqnhC2VY5akhoWWvsql4+rQ1mAwiBNypk8NJ O97GsdpOotr76rkfEQ73cgk= X-Google-Smtp-Source: ABdhPJxy68Wf0o+etONuXcLIVKe+JDROsKLnvKm0eP9LYZzuySddD8NjhEjBnsX/mx3QpFlm9+JN1Q== X-Received: by 2002:adf:fa06:: with SMTP id m6mr20571534wrr.253.1602444774960; Sun, 11 Oct 2020 12:32:54 -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 04/10] hw/isa: Add the ISA_IRQ_TPM_DEFAULT definition Date: Sun, 11 Oct 2020 21:32:23 +0200 Message-Id: <20201011193229.3210774-5-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 TPM TIS device uses IRQ #5 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/i386/acpi-build.c | 2 +- hw/ipmi/isa_ipmi_bt.c | 2 +- hw/ipmi/isa_ipmi_kcs.c | 2 +- hw/tpm/tpm_tis_isa.c | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 519296d5823..e4f2aed004f 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -11,6 +11,7 @@ enum IsaIrqNumber { ISA_IRQ_KBD_DEFAULT =3D 1, ISA_IRQ_SER_DEFAULT =3D 4, + ISA_IRQ_TPM_DEFAULT =3D 5, ISA_NUM_IRQS =3D 16 }; =20 diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 45ad2f95334..2b6038ab015 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1886,7 +1886,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Rewrite to take IRQ from TPM device model and fix default IRQ value there to use some unused IRQ */ - /* aml_append(crs, aml_irq_no_flags(TPM_TIS_IRQ)); */ + /* aml_append(crs, aml_irq_no_flags(ISA_IRQ_TPM_DEFAULT));= */ aml_append(dev, aml_name_decl("_CRS", crs)); =20 tpm_build_ppi_acpi(tpm, dev); diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index b7c2ad557b2..13a92bd2c44 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -137,7 +137,7 @@ static void *isa_ipmi_bt_get_backend_data(IPMIInterface= *ii) =20 static Property ipmi_isa_properties[] =3D { DEFINE_PROP_UINT32("ioport", ISAIPMIBTDevice, bt.io_base, 0xe4), - DEFINE_PROP_INT32("irq", ISAIPMIBTDevice, isairq, 5), + DEFINE_PROP_INT32("irq", ISAIPMIBTDevice, isairq, ISA_IRQ_TPM_DEFAULT), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index 7dd6bf0040a..c956b539688 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -144,7 +144,7 @@ static void *isa_ipmi_kcs_get_backend_data(IPMIInterfac= e *ii) =20 static Property ipmi_isa_properties[] =3D { DEFINE_PROP_UINT32("ioport", ISAIPMIKCSDevice, kcs.io_base, 0xca2), - DEFINE_PROP_INT32("irq", ISAIPMIKCSDevice, isairq, 5), + DEFINE_PROP_INT32("irq", ISAIPMIKCSDevice, isairq, ISA_IRQ_TPM_DEFAULT= ), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c index 6fd876eebf1..5a4afda42df 100644 --- a/hw/tpm/tpm_tis_isa.c +++ b/hw/tpm/tpm_tis_isa.c @@ -91,7 +91,7 @@ static void tpm_tis_isa_reset(DeviceState *dev) } =20 static Property tpm_tis_isa_properties[] =3D { - DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num, TPM_TIS_IRQ), + DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num, ISA_IRQ_TPM_DEFA= ULT), DEFINE_PROP_TPMBE("tpmdev", TPMStateISA, state.be_driver), DEFINE_PROP_BOOL("ppi", TPMStateISA, state.ppi_enabled, true), DEFINE_PROP_END_OF_LIST(), --=20 2.26.2 From nobody Thu May 9 22:38:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) client-ip=209.85.128.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1602444782; cv=none; d=zohomail.com; s=zohoarc; b=XZZ4GFNOmlLmn1cC1MJFNJOub1SBdnKmo1A0l1YPpBJMzL8t+2ulPolGd8oCpv+teBzGxiLb7OGyJVX5IOwnopxQdarralhqxOdVx9qoccR3BI2EhPBzrDCKuvh4lBSBMK90I8CxP6RqgMHtnKJ3LC17VMXI29OkOkX6ype1N7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602444782; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WNozgBziJzkT1dGIty7aG0vAuuPyLVJMvqy8EJgjQmQ=; b=hithGCLIujdQMmM9ajqShwSKtTd6kZY5bQEaGhbeM92QZll7oT89X7j3Aotte8HIVvcXtzDdkCK6X6sE+SibL977OKVg9i4V1Ot1LVldqUF8MOhnCVTCg4rHLp1rF/qbdalgqA5MxSkqw9M7ZJvXVN7DFWZcxoAValsN4IcyMOc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.zohomail.com with SMTPS id 1602444782025284.936198714389; Sun, 11 Oct 2020 12:33:02 -0700 (PDT) Received: by mail-wm1-f68.google.com with SMTP id e2so15334581wme.1 for ; Sun, 11 Oct 2020 12:33:01 -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 k18sm3380247wrx.96.2020.10.11.12.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:32:59 -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=WNozgBziJzkT1dGIty7aG0vAuuPyLVJMvqy8EJgjQmQ=; b=DWmvBL6IRfp99BX6ScEK2l7vWxbpQihjtrvIHXvb7k3RF3C5Ld1HPgFjhmstZkGXhU Gg9/IGJVL6vwxFl5E31OeToshS0ktziFNXtKXJ9+YLvSEKHnAnB4xlq4AYNHdiGnweYz +NicU+1RVd4SfQJNrCCLwBWX9oZ1WP75uQs04t0G8PF3gEvN1v2gRMbSQIS+Q0Vv6Wx9 jaNewj+2pmQgC9Fa2ICcnwdC8Ov4izfSfFr4L+zEzi/ozMcgCcB6YWmXqYmvLXNZ1bZl f/NyMPUgFcH+1Kgqf792g2uRmj5F7lr89zdVSs+/sHXnoAKd2rBIcoCTcQqTmADg+A9H ssEg== 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=WNozgBziJzkT1dGIty7aG0vAuuPyLVJMvqy8EJgjQmQ=; b=nG/8c77HyxeTFTOBFrtlYwKd6RUHkGbzome3T1RKSGPj7vrqaPLCv12Vrz3fvfLzgi udkSAWQvMJ+Yv3FTRqADzE044DDylfGLJSR2cWvIzuyRexF8+7T7sYu6b6SNCYOVYdzl NC3HVLbNDUXKvhC2/unOTRn9r5qJ3RWUhQL4XdMAdjTD8PAz6U9BykYqTbNFzaDxCWxe 8dQbhTpr8Wc6PSyei6YqV1oLwtRXS8d0tUbHYNdpSF8ilT30EZpO0tKLaM66R6hG71aD ZxGPQWrkGw0LvIx3e6ysVa8rQ2h/WlSQR1l9qDh5csjpvB5Kumbqut1WoTyyHvmSslm5 DXSA== X-Gm-Message-State: AOAM531IBfc08zL0ZEtT8stTsbb+0zYqf8uswLuiVIlGdL2P1IXVAZMJ K77ncSxf7ZC1QArvrYnLRF0= X-Google-Smtp-Source: ABdhPJz6AmeuRpZSCDikDKC2ojYg88N8DYb0MNlaB6nGe34OruJt1e0b/fQxXy+WKu6hXrNPAKi73A== X-Received: by 2002:a1c:a5c4:: with SMTP id o187mr7716393wme.171.1602444780053; Sun, 11 Oct 2020 12:33:00 -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 05/10] hw/isa: Add the ISA_IRQ_FDC_DEFAULT definition Date: Sun, 11 Oct 2020 21:32:24 +0200 Message-Id: <20201011193229.3210774-6-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 floppy disk controller uses IRQ #6 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 Acked-by: John Snow --- include/hw/isa/isa.h | 1 + hw/block/fdc.c | 4 ++-- hw/sparc64/sun4u.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index e4f2aed004f..214a6730598 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -12,6 +12,7 @@ enum IsaIrqNumber { ISA_IRQ_KBD_DEFAULT =3D 1, ISA_IRQ_SER_DEFAULT =3D 4, ISA_IRQ_TPM_DEFAULT =3D 5, + ISA_IRQ_FDC_DEFAULT =3D 6, ISA_NUM_IRQS =3D 16 }; =20 diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 4c2c35e223a..531fc4c0b72 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2855,7 +2855,7 @@ static void fdc_isa_build_aml(ISADevice *isadev, Aml = *scope) crs =3D aml_resource_template(); aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04)); aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01)); - aml_append(crs, aml_irq_no_flags(6)); + aml_append(crs, aml_irq_no_flags(ISA_IRQ_FDC_DEFAULT)); aml_append(crs, aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2)); =20 @@ -2889,7 +2889,7 @@ static const VMStateDescription vmstate_isa_fdc =3D{ =20 static Property isa_fdc_properties[] =3D { DEFINE_PROP_UINT32("iobase", FDCtrlISABus, iobase, 0x3f0), - DEFINE_PROP_UINT32("irq", FDCtrlISABus, irq, 6), + DEFINE_PROP_UINT32("irq", FDCtrlISABus, irq, ISA_IRQ_FDC_DEFAULT), DEFINE_PROP_UINT32("dma", FDCtrlISABus, dma, 2), DEFINE_PROP_DRIVE("driveA", FDCtrlISABus, state.qdev_for_drives[0].blk= ), DEFINE_PROP_DRIVE("driveB", FDCtrlISABus, state.qdev_for_drives[1].blk= ), diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 6e42467d5cc..458dc215e6f 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -613,7 +613,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, /* Wire up "well-known" ISA IRQs to PBM legacy obio IRQs */ qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 7, qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_LPT_IRQ)); - qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 6, + qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", ISA_IRQ_FDC_DEFAU= LT, qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_FDD_IRQ)); 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)); --=20 2.26.2 From nobody Thu May 9 22:38:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) client-ip=209.85.128.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602444786; cv=none; d=zohomail.com; s=zohoarc; b=DVy6T1IPFsK76c6kB1Xdx73TP165K7Ph3LW5XPtJNQnTglpyIyo7tUiDsw/XVRYEcr7EcNJR0fIXunZsGXKYhWMgErURvU/36aLljgHBmLTcwgY1ijI24X9YJqaPO8ORAPG8qsLIhTspql+FJ5x4HD9Tw/Wdmyjr/O/I46/OiI0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602444786; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T47fdn4RxOEr/33O8p4c1fGY3UD39OWzHlO0HGQUKaU=; b=hLc0H6WxUEs2yswjiHtigCAipHhqJqZ454iKhq5lzPNJznttlpv+HvUPXPQwCCBymh4KmSqkV8YJ6bHQigJm6y+ctQwnBMlsws716CT3ppxND6xpadrSI8kwS0LNpkRuOpIv53w1Rz4tX6jdRosoXqqjTieolwUJv6mQyMevdsc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.zohomail.com with SMTPS id 1602444786932989.8904982206758; Sun, 11 Oct 2020 12:33:06 -0700 (PDT) Received: by mail-wm1-f65.google.com with SMTP id d81so15224781wmc.1 for ; Sun, 11 Oct 2020 12:33:06 -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 n2sm21770729wrt.82.2020.10.11.12.33.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:33:04 -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=T47fdn4RxOEr/33O8p4c1fGY3UD39OWzHlO0HGQUKaU=; b=mC1slaEerXeh3/utyzoo5ACyMyf3Uyzu0ByT32VzXV0ZAGOzsxTHm59fCAreGa37sB s9sy5HEqF+6m5iiyTUz1BchC6JRy7vrxUJ/VV+CB6hjMekOdQd1Vua2HlbTO9lzdhLjy BzNKy6oZ67uRWx+nHvKq0YeJP+lMte3UNFHQE/pW9rbUH90pblr83VgFvVkgQbnycvlG x8KQVx/pwjPO75dQ0MjwTQjqeDWrSMMmRDMPZL1MhFXGYpyzxBvTG3xQvk0ifLluGF8R 5tmJ+eqt0zVF83s3mukbRsCKIFN4pA//5wi7REfSH7FiWyAI+5Bzw7H6Xyih1AM7Mzhz bU4Q== 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=T47fdn4RxOEr/33O8p4c1fGY3UD39OWzHlO0HGQUKaU=; b=YnOJMiJuKYLasI/H26IjflRAeFTzMOJbhMHprXiEVJEnXnkbGhCb4IbMo9hiu7kZOu g++qx2kgu3KRwzGfHOzRee/iqp27RXCDma8RLiB+dJDPxNbMdU5n2NS8mfwN64D0PK48 e10lcthLH4MUZlQGwK+axyo+mbHIOr7cMNJohdfa5t9FFkrNmOiI3sLFKb6bUVbkEMwq bfyf3hFlqHCkNyTDHyvKbtzS4YZdPomjuxl0CBtQk2JL+NdEMTzaZni1vPIUsKqk9FD0 Nsh2ZjmKWdXNAZ+hNgHaWk2+OeIYWWt9MmLZvsTNdE3lAGBUI2VgdruU130FFKrBg1Dx 6dDQ== X-Gm-Message-State: AOAM532duKpsRFJbX4H0YcN0oM3JYwRL6KBG89zsxiS1TGB92cEc+rQb tXZk3riehJ3x4fB6HY9q8+A= X-Google-Smtp-Source: ABdhPJz2DOe4Z1/29V0nxb/owBp2f0xdwN7f8+GhaG+tphVo+1QSQfP243Li5kkzVC/ofYRDjbJtlg== X-Received: by 2002:a05:600c:210f:: with SMTP id u15mr8170317wml.53.1602444785001; Sun, 11 Oct 2020 12:33:05 -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 06/10] hw/isa: Add the ISA_IRQ_PAR_DEFAULT definition Date: Sun, 11 Oct 2020 21:32:25 +0200 Message-Id: <20201011193229.3210774-7-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 parallel port uses IRQ #7 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/char/parallel.c | 2 +- hw/sparc64/sun4u.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 214a6730598..081fa446152 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -13,6 +13,7 @@ enum IsaIrqNumber { ISA_IRQ_SER_DEFAULT =3D 4, ISA_IRQ_TPM_DEFAULT =3D 5, ISA_IRQ_FDC_DEFAULT =3D 6, + ISA_IRQ_PAR_DEFAULT =3D 7, ISA_NUM_IRQS =3D 16 }; =20 diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 8b418abf719..9e0d80ec0d0 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -636,7 +636,7 @@ bool parallel_mm_init(MemoryRegion *address_space, static Property parallel_isa_properties[] =3D { DEFINE_PROP_UINT32("index", ISAParallelState, index, -1), DEFINE_PROP_UINT32("iobase", ISAParallelState, iobase, -1), - DEFINE_PROP_UINT32("irq", ISAParallelState, isairq, 7), + DEFINE_PROP_UINT32("irq", ISAParallelState, isairq, ISA_IRQ_PAR_DEF= AULT), DEFINE_PROP_CHR("chardev", ISAParallelState, state.chr), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 458dc215e6f..c5b3e838ac2 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -611,7 +611,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, pci_realize_and_unref(ebus, pci_busA, &error_fatal); =20 /* Wire up "well-known" ISA IRQs to PBM legacy obio IRQs */ - qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 7, + qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", ISA_IRQ_PAR_DEFAU= LT, qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_LPT_IRQ)); qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", ISA_IRQ_FDC_DEFAU= LT, qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_FDD_IRQ)); --=20 2.26.2 From nobody Thu May 9 22:38:28 2024 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=1602444792; cv=none; d=zohomail.com; s=zohoarc; b=igegvYgvFrcx1YzebC6jX8og7JaLIsmFNUTuNyffr3c3ccW6Br8B10puZhaG8GdUbNv7IQjYzeojaYIUHMqOoV7RuLNNAbl9EHjyWJ82yf0O2Yevi/9FKrO1kh39S7g507UO+yn2qTuUdYPRnWlrqDTfRfTTHnTMkgbU4+kcZuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602444792; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0QbPMBGbr2e8OygEfUqckUt1pMEO3ugEPGl8j5TDG5o=; b=Z1T3M5bt8FWdHF5SRQ4CyF73pLgCTa2YkgquNI/R+O+mZjL0NXhuA+m7IAKgjlzJlwiMeHO/V3+ke1Fpo1Htv23uuCS59Q276tf0mkXPsisEQTqnnnx1Z1cDvnDCI8ak9vZsS2zvjg2KstaRPkcuY4lS76cjEX6Y6R3UxfGbvWA= 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 1602444792032108.21791446501527; Sun, 11 Oct 2020 12:33:12 -0700 (PDT) Received: by mail-wr1-f68.google.com with SMTP id y12so11192628wrp.6 for ; Sun, 11 Oct 2020 12:33:11 -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 z11sm21498835wrh.70.2020.10.11.12.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:33: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=0QbPMBGbr2e8OygEfUqckUt1pMEO3ugEPGl8j5TDG5o=; b=Ftn7bHiDyZHW5cvXmnoVfxhIZ7x0GAUDWdhKYIp/hJsQQdkQjk3xFHKr2bE32ZUsTx OxkxZ8/FBeopmFzh9avflV6h87EtXxfM4cijGzielzjl88XTJCzZzfaxZUkTItX9gAHb CLrnZtGlC6tE+lxRTmg1270LdbOjcIkeG5WHj6jHawfqgjSKLufBdjis4mMwK66y/OSO TcqFClXiuxiiqAEcECDveoNEz6bLHh5C9rAB0CATtw6us/zyCMReFCPIb5H7mojw2CAj 5IfyLDg26JDoJzaddYnqsUGTkg0GeR2ISv2WtIPtkEiGu9LaBMq5Aqy5cwLgdtLe3V82 xdHA== 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=0QbPMBGbr2e8OygEfUqckUt1pMEO3ugEPGl8j5TDG5o=; b=YaYc7OVs64G7D8ZbM/t7rP1dP4+YyrirkosQK0PAcr75/2U/N7Eh9Obz9wNGUJn2uG mwPB/GFh5CS7W9E3LE5DvSEWrF8jIaKRiMZJNYJYIijRWrcw84Ifl4CT5MhUzQMz4UWi pKG7E6I4VCUmHV1yVLECMSTWxcZyO2PMvkNZTSSEwdGtsmOU8antMuuHbqPZheAj9yLi iAH8OdhAbmRAGB10T+xtb5UuavbJUwuhPyHpXjpFChFl7pMqMVKKjgVkiVIsCvGL4vMU TxsGBLC34BEwRIOw7Gi8prbxx1KRx8O9rOODDvOkC7aNPK4C5N7iVGAOI0rkawHL7bF5 PCmA== X-Gm-Message-State: AOAM5331bwt/X3ZWd0fkfBCboZMHoVjOI/eZferA38fMjFTbHtwU0q70 CPWeQ0+hoaWl3v0NjjB6xsw= X-Google-Smtp-Source: ABdhPJx2nHHdw1cijWbRr03kOBOnQuibBEjmOLn5hkpeJFmTJLtLlItz1XL8TxPfbcWpGyc3J4e5dQ== X-Received: by 2002:adf:c5c3:: with SMTP id v3mr26840799wrg.205.1602444790002; Sun, 11 Oct 2020 12:33:10 -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 07/10] hw/isa: Add the ISA_IRQ_RTC_DEFAULT definition Date: Sun, 11 Oct 2020 21:32:26 +0200 Message-Id: <20201011193229.3210774-8-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 RTC time keep clock ses IRQ #8 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 + include/hw/rtc/mc146818rtc.h | 1 - hw/isa/piix4.c | 2 +- hw/rtc/m48t59-isa.c | 2 +- hw/rtc/mc146818rtc.c | 4 ++-- hw/timer/hpet.c | 8 ++++---- tests/qtest/rtc-test.c | 8 ++++---- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 081fa446152..9f78ff11246 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -14,6 +14,7 @@ enum IsaIrqNumber { ISA_IRQ_TPM_DEFAULT =3D 5, ISA_IRQ_FDC_DEFAULT =3D 6, ISA_IRQ_PAR_DEFAULT =3D 7, + ISA_IRQ_RTC_DEFAULT =3D 8, ISA_NUM_IRQS =3D 16 }; =20 diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h index 5b45b229244..1cca26399ce 100644 --- a/include/hw/rtc/mc146818rtc.h +++ b/include/hw/rtc/mc146818rtc.h @@ -47,7 +47,6 @@ struct RTCState { QLIST_ENTRY(RTCState) link; }; =20 -#define RTC_ISA_IRQ 8 #define RTC_ISA_BASE 0x70 =20 ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index a50d97834c7..d9cceff9c84 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -185,7 +185,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp) if (!qdev_realize(DEVICE(&s->rtc), BUS(isa_bus), errp)) { return; } - isa_init_irq(ISA_DEVICE(&s->rtc), &s->rtc.irq, RTC_ISA_IRQ); + isa_init_irq(ISA_DEVICE(&s->rtc), &s->rtc.irq, ISA_IRQ_RTC_DEFAULT); =20 piix4_dev =3D dev; } diff --git a/hw/rtc/m48t59-isa.c b/hw/rtc/m48t59-isa.c index cae315e4885..bdde427a945 100644 --- a/hw/rtc/m48t59-isa.c +++ b/hw/rtc/m48t59-isa.c @@ -124,7 +124,7 @@ static void m48t59_isa_realize(DeviceState *dev, Error = **errp) =20 s->model =3D u->info.model; s->size =3D u->info.size; - isa_init_irq(isadev, &s->IRQ, 8); + isa_init_irq(isadev, &s->IRQ, ISA_IRQ_RTC_DEFAULT); m48t59_realize_common(s, errp); memory_region_init_io(&d->io, OBJECT(dev), &m48t59_io_ops, s, "m48t59"= , 4); if (d->io_base !=3D 0) { diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index 7a38540cb9d..ba156b9a0bd 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -981,7 +981,7 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_year= , qemu_irq intercept_irq) if (intercept_irq) { qdev_connect_gpio_out(dev, 0, intercept_irq); } else { - isa_connect_gpio_out(isadev, 0, RTC_ISA_IRQ); + isa_connect_gpio_out(isadev, 0, ISA_IRQ_RTC_DEFAULT); } =20 object_property_add_alias(qdev_get_machine(), "rtc-time", OBJECT(isade= v), @@ -1020,7 +1020,7 @@ static void rtc_build_aml(ISADevice *isadev, Aml *sco= pe) crs =3D aml_resource_template(); aml_append(crs, aml_io(AML_DECODE16, RTC_ISA_BASE, RTC_ISA_BASE, 0x01, 0x08)); - aml_append(crs, aml_irq_no_flags(RTC_ISA_IRQ)); + aml_append(crs, aml_irq_no_flags(ISA_IRQ_RTC_DEFAULT)); =20 dev =3D aml_device("RTC"); aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0B00"))); diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 05fd86af817..579a9faecf3 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -196,7 +196,7 @@ static void update_irq(struct HPETTimer *timer, int set) * timer0 be routed to IRQ0 in NON-APIC or IRQ2 in the I/O APIC, * timer1 be routed to IRQ8 in NON-APIC or IRQ8 in the I/O APIC. */ - route =3D (timer->tn =3D=3D 0) ? 0 : RTC_ISA_IRQ; + route =3D (timer->tn =3D=3D 0) ? 0 : ISA_IRQ_RTC_DEFAULT; } else { route =3D timer_int_route(timer); } @@ -615,11 +615,11 @@ static void hpet_ram_write(void *opaque, hwaddr addr, if (activating_bit(old_val, new_val, HPET_CFG_LEGACY)) { qemu_set_irq(s->pit_enabled, 0); qemu_irq_lower(s->irqs[0]); - qemu_irq_lower(s->irqs[RTC_ISA_IRQ]); + qemu_irq_lower(s->irqs[ISA_IRQ_RTC_DEFAULT]); } else if (deactivating_bit(old_val, new_val, HPET_CFG_LEGACY)= ) { qemu_irq_lower(s->irqs[0]); qemu_set_irq(s->pit_enabled, 1); - qemu_set_irq(s->irqs[RTC_ISA_IRQ], s->rtc_irq_level); + qemu_set_irq(s->irqs[ISA_IRQ_RTC_DEFAULT], s->rtc_irq_leve= l); } break; case HPET_CFG + 4: @@ -711,7 +711,7 @@ static void hpet_handle_legacy_irq(void *opaque, int n,= int level) } else { s->rtc_irq_level =3D level; if (!hpet_in_legacy_mode(s)) { - qemu_set_irq(s->irqs[RTC_ISA_IRQ], level); + qemu_set_irq(s->irqs[ISA_IRQ_RTC_DEFAULT], level); } } } diff --git a/tests/qtest/rtc-test.c b/tests/qtest/rtc-test.c index c7af34f6b1b..9ae90d4925c 100644 --- a/tests/qtest/rtc-test.c +++ b/tests/qtest/rtc-test.c @@ -278,7 +278,7 @@ static void alarm_time(void) /* set DEC mode */ cmos_write(RTC_REG_B, REG_B_24H | REG_B_DM); =20 - g_assert(!get_irq(RTC_ISA_IRQ)); + g_assert(!get_irq(ISA_IRQ_RTC_DEFAULT)); cmos_read(RTC_REG_C); =20 now.tm_sec =3D (now.tm_sec + 2) % 60; @@ -288,14 +288,14 @@ static void alarm_time(void) cmos_write(RTC_REG_B, cmos_read(RTC_REG_B) | REG_B_AIE); =20 for (i =3D 0; i < 2 + wiggle; i++) { - if (get_irq(RTC_ISA_IRQ)) { + if (get_irq(ISA_IRQ_RTC_DEFAULT)) { break; } =20 clock_step(1000000000); } =20 - g_assert(get_irq(RTC_ISA_IRQ)); + g_assert(get_irq(ISA_IRQ_RTC_DEFAULT)); g_assert((cmos_read(RTC_REG_C) & REG_C_AF) !=3D 0); g_assert(cmos_read(RTC_REG_C) =3D=3D 0); } @@ -645,7 +645,7 @@ static void uip_stuck(void) =20 static uint64_t wait_periodic_interrupt(uint64_t real_time) { - while (!get_irq(RTC_ISA_IRQ)) { + while (!get_irq(ISA_IRQ_RTC_DEFAULT)) { real_time =3D clock_step_next(); } =20 --=20 2.26.2 From nobody Thu May 9 22:38:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) client-ip=209.85.128.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602444796; cv=none; d=zohomail.com; s=zohoarc; b=WU06FaiQdROfKga3PYANAdVwqTjX8UXssG08Vk7zAtAn5lUC8S8R/p6yf2pptyMGLtb/h5/j1UCDCb8cI1UN65L61fkSmobdg93ePqMnPggA8vSOWMUDLSuXIbkFhVe1EH4UvW8QqIRw0GZYfw6pnF8Gv9SKxaOJz8qHnDgVrfU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602444796; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ottyxadkfdG6t1j9EHj71mxgUhLG6Ki7NMaGNynZJD0=; b=VSaaKhpkhhyIBGjqOluO8RE1Xobqr1+1Nv2y1p/jON9ocwOUZ7/VMoldqf2dbJDIGNWct96Shez/UvMdJKQTx6Mk6U27u/7qBHg9U64NydINBVQU2tCyXHlBN5lRNKsMDobAQ1Enqa0WkgmDgrYL+qpCT36mr9b9bFActcwmVSY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.zohomail.com with SMTPS id 1602444796908393.138254902442; Sun, 11 Oct 2020 12:33:16 -0700 (PDT) Received: by mail-wm1-f66.google.com with SMTP id e2so15335161wme.1 for ; Sun, 11 Oct 2020 12:33:16 -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 88sm22673596wrl.76.2020.10.11.12.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:33:14 -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=ottyxadkfdG6t1j9EHj71mxgUhLG6Ki7NMaGNynZJD0=; b=qEwwLhXfmlgPiK25yyOcjxsJ3q6RS8jvY3+SEaEz2+i7iO1P0LlvcWHDK4l3Ri4LPB qGpOdydfbM0UerCDmcJ94eviy2yU5Sb2QSx5PCS3a9QmWlP6G4lmErLaesEeYq33Eqk8 Oq78gsC/3iuwPT39zyXdDhPj8J+50eBMUnUYHnZxrdpgtDRdcFOqnLT2l88GYI1PwJy+ SAP4Eqycljc26DjboqgJ+oXEl852pxyECm7Fyg1eLe7CaIhjeqiMnkVMGG1AYRdlgKoF F75IVc/9m9kzcxiIa8Ts3FWnLnRpJQXeCvUZQBxZFW7R5dbuW5PBhnAz/sjMa4x7qfmq 8Ugw== 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=ottyxadkfdG6t1j9EHj71mxgUhLG6Ki7NMaGNynZJD0=; b=uNUwIvO7NCcK7e1QiGchjYePq406aPbktO6T4DK9W7Ty3zaTmpQ0TjUTZufONyV3pP CHqnUlTVBsn/t9v7sgWfkNuMkvbiRIK9nEYNaxGnyYB9TdF4e7pR9hy4Amb8I2teNVBE NC6ZrWNOG7uREcQ363HPhIPyivJFoSYEdHc+1dzKG0H9LgeNOrbGnjz3IAZmjb+MA/+e WH57NMkGF0Z+GOyNsQmOjEecIptgUipMCv8O/ueMQoryHE8wy6TwN4fP+M1nre45UvDg D+oM18ZaMlzbtLj1CqRgfxadKAlylqU7rAlauaovPyBi6GjzLP5dlgJJePYuwKz3z3ei p1DA== X-Gm-Message-State: AOAM530B/lp8A/5ldZyGcN6sA2K16bB95eQuC1pYfSgLMbm8Cppc0UJ6 5MyCFu6Fx56daDVk4s//vYs= X-Google-Smtp-Source: ABdhPJxwCHk9ZmaUKr7CkbYZxWaEQIWMZ6rAQBHwbNpxGejuErNgC8kytvS3q5p8QQv7R4bsOtQhNQ== X-Received: by 2002:a1c:3b8a:: with SMTP id i132mr7793744wma.178.1602444795066; Sun, 11 Oct 2020 12:33:15 -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 08/10] hw/isa: Add the ISA_IRQ_NET_DEFAULT definition Date: Sun, 11 Oct 2020 21:32:27 +0200 Message-Id: <20201011193229.3210774-9-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 network devices use IRQ #9 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/net/ne2000-isa.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 9f78ff11246..11166592246 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -15,6 +15,7 @@ enum IsaIrqNumber { ISA_IRQ_FDC_DEFAULT =3D 6, ISA_IRQ_PAR_DEFAULT =3D 7, ISA_IRQ_RTC_DEFAULT =3D 8, + ISA_IRQ_NET_DEFAULT =3D 9, ISA_NUM_IRQS =3D 16 }; =20 diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c index dd6f6e34d3c..e31e86c14af 100644 --- a/hw/net/ne2000-isa.c +++ b/hw/net/ne2000-isa.c @@ -80,7 +80,7 @@ static void isa_ne2000_realizefn(DeviceState *dev, Error = **errp) =20 static Property ne2000_isa_properties[] =3D { DEFINE_PROP_UINT32("iobase", ISANE2000State, iobase, 0x300), - DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 9), + DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, ISA_IRQ_NET_DEFAULT), DEFINE_NIC_PROPERTIES(ISANE2000State, ne2000.c), DEFINE_PROP_END_OF_LIST(), }; --=20 2.26.2 From nobody Thu May 9 22:38:28 2024 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=1602444802; cv=none; d=zohomail.com; s=zohoarc; b=hnPtCX08inaiGb4xIgndG/NjcPl61UVZVfaM8r6EFCJPOip2OOJCuTybAlQ4MuGuhS8QVnbZa5pxGjnnSUq3jHQk46SzJaf1meTP06HgxvJ46DH72ws0CdteJWRawvQUt5kFj0Zbh798OwUst2Nvxg8hdiZ4kXAIAlGDjQiuBj4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602444802; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=76wJgIrqTSi0DDRrVUiOHwWarPfXaZKRh0PO2TH3Udg=; b=D160qa4NoTef56gnI4ps4vRc6Iw+STRcn060GKhRzmHEouTgZTZ8DtbFzeM5oGHs0mNwZINoa8YKdf6IC9DkekMTU1roeRiCU/euLHxdEEOFUNL7nfrOXC6GxzjUck9p0x0YyUZOuPbV14zBNqFoqM/aPQHmsA9qN/iwxeziQ2I= 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 1602444802103328.04640686388575; Sun, 11 Oct 2020 12:33:22 -0700 (PDT) Received: by mail-wr1-f68.google.com with SMTP id e17so16545254wru.12 for ; Sun, 11 Oct 2020 12:33:21 -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 t5sm21663725wrb.21.2020.10.11.12.33.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:33:19 -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=76wJgIrqTSi0DDRrVUiOHwWarPfXaZKRh0PO2TH3Udg=; b=glKKe2MexCos8D4mlixBOKwOdTUN6RsBj1DiGhj3sc3TpL0PkRI2uq5EjQlyvJmlae GvVDZ+GpYX5iCitruMHihden4WKXVDfnzaesPSu/g45rxInn3hIQyLttEipiSCPO6beZ Rka9pIp9eni2aQCBduBCn9bnIkxH1U4CxO8GPLoVcMcj0Z3spMiLZkDVjJkhWuaLYzVR iIKGjsTW1Gn4/fYVTJ6/njhBtjGANDnhSa5LGV8or1Zs+gsEez9b8vKfA336eleFnG6F zO9PeT6SeIdQ477zmubsj1gBY4YmQvviCgU5qSg8N7GLmtZ5Mh27nxlPCtD6p712Psr9 klww== 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=76wJgIrqTSi0DDRrVUiOHwWarPfXaZKRh0PO2TH3Udg=; b=CY47avT4vjIAYuQpgfuDzB6wI+WK3ffRLmEQ6Kr1Qpzd9/V28eUhpaTzf0NT9bBVx2 InrpR9Sn+3dX7ZkdGzkNHowEEhK7Y7NAz3fVTFzSg7xh5zXVXS+uEKrick155RAJs1E9 RAQkoZ7BS71MGsBFclZMvAmXfKAdk3DHJvFdgbfzXZEZ8fnlcCvAwfQ9EriJOOK7Xo5I rwAWMPzaHyMjivmUjUa4enF8ljWwGCLugTvHplI/Dh6hMq/PoYB+plTdd32/Yj+cby0z X+4tZzPxseAEcbcG1KMUyTbsUt1iimQAjDWzqQlH/UNs+iTllxcTCFIpGZufYNYNuffy tHkA== X-Gm-Message-State: AOAM5331OtObXcPeqoHyRAS7tASqUQvIjNnw+XBlNQ/BADeEk1vrpqSA C9thRxKzWSKhQ9p2C+7Ml3iCw2v/Srk= X-Google-Smtp-Source: ABdhPJzO9f2oN+VJQaGJdLE0ijcw7BO3YppTUBTPgvef2k2DlR+3vVWdWVgaMP9no0LDs/RazXUMQA== X-Received: by 2002:adf:f78d:: with SMTP id q13mr877669wrp.258.1602444800147; Sun, 11 Oct 2020 12:33:20 -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 09/10] hw/isa: Add the ISA_IRQ_MOU_DEFAULT definition Date: Sun, 11 Oct 2020 21:32:28 +0200 Message-Id: <20201011193229.3210774-10-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 mouse uses IRQ #12 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/input/pckbd.c | 2 +- hw/sparc64/sun4u.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 11166592246..43cdc3c47b6 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -16,6 +16,7 @@ enum IsaIrqNumber { ISA_IRQ_PAR_DEFAULT =3D 7, ISA_IRQ_RTC_DEFAULT =3D 8, ISA_IRQ_NET_DEFAULT =3D 9, + ISA_IRQ_MOU_DEFAULT =3D 12, ISA_NUM_IRQS =3D 16 }; =20 diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index dde85ba6c68..140c992b03b 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -577,7 +577,7 @@ static void i8042_build_aml(ISADevice *isadev, Aml *sco= pe) aml_append(kbd, aml_name_decl("_CRS", crs)); =20 crs =3D aml_resource_template(); - aml_append(crs, aml_irq_no_flags(12)); + aml_append(crs, aml_irq_no_flags(ISA_IRQ_MOU_DEFAULT)); =20 mou =3D aml_device("MOU"); aml_append(mou, aml_name_decl("_HID", aml_eisaid("PNP0F13"))); diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index c5b3e838ac2..ddd51c7cbbe 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -617,7 +617,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_FDD_IRQ)); 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_connect_gpio_out_named(DEVICE(ebus), "isa-irq", ISA_IRQ_MOU_DEFAU= LT, qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_MSE_IRQ)); qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", ISA_IRQ_SER_DEFAU= LT, qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_SER_IRQ)); --=20 2.26.2 From nobody Thu May 9 22:38:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) client-ip=209.85.128.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602444808; cv=none; d=zohomail.com; s=zohoarc; b=YE3aWzw7S9oDM/nvH09yXiimUzNZ7cYnVdQY2zBUgmSaX6dpHh9Mj1ovSaefWpFZGeLLBgzAN7PVRou6DxziVpo0nTzG1iIiebbKBnkP7hgdPLf50DTlETgGFQziymN9uWINYR3Gd5+NQuQqQTkfln8aJwgUVxQ4gMdhcLn4+qM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602444808; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gejAdYQY/teMYz2RHH6Mc87RW7QIZIz1gQu9dTLuxMg=; b=gZRwUTd4RTQXG9xAgATcQAgseF9Up684DeNpuxcTHsbZXRHQojUVsHBNtjeEnKEIRpiQ2qlsjW5dKjG87Iw0dngShkrUtBSOA09E6BsvAB6n+vhrY8i3N0istr/kKIpcRiI8W9Vt6alHO1VRCpDI78QShWnTRiYw56Ds7wM/04w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.zohomail.com with SMTPS id 1602444808142502.55309268099734; Sun, 11 Oct 2020 12:33:28 -0700 (PDT) Received: by mail-wm1-f66.google.com with SMTP id k18so15323516wmj.5 for ; Sun, 11 Oct 2020 12:33:26 -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 i14sm20536215wml.24.2020.10.11.12.33.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:33:24 -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=gejAdYQY/teMYz2RHH6Mc87RW7QIZIz1gQu9dTLuxMg=; b=hmnrpmtDQ1h8IpxAsATjEWAyJt6HnVV89VQFF+cY0RjjXVPeqTXZY5Dcl5X0//qDDW LzpQBwowdPn6+AWsK3f1NGZk2BSFOXibGnIfFb7HBKfjcjOkGq6g/0s8RLM0asrI0Oc8 eYO8mD+QSdXE2ODsKW7bviGCec1fBcNf2vr4SWN62Hzoc5/3fT/UprYLBV9odC74hGeV 7r9ZsIJMdl7y0+fgVTyfCrdAE6qLA9VGXOurdDeSxKj1zbQhEVd6sZuV+Zm3T/nzgp52 Ik1RYh79Qf69uCIMokB1jqFiPJvkleq3LshytFsuYSBf7tI8vBGOx+C25Lc1Dw35dLHJ MysA== 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=gejAdYQY/teMYz2RHH6Mc87RW7QIZIz1gQu9dTLuxMg=; b=e07B2RDQ242w79Gk3NfAzbe/X5yNxmTERRjyVYGyHAhgO6AviVm4WfoaoIWDOh6M8+ 4RLTvhNVYH0m6zy3ShwKa7OLB4VavcFr4wFMu4w2/U++NiwfRVSnAxNZcCSRqcCZK19R hCk/y1qUmrjX7ZdtUNZcydN92tYcrz91EKsUV7G/tvSWs7/+gUEplq2PR8npO2NkCll0 ov8ZkXM/LKLS43ykX17Ax9soi3FJx1Fq/UejNhaNyybDaRBLC8qEum2WaQd0Cski+Fkn 6f4HtHkkjaFWBiw6+E4gCl7r9jh1TMxSBOK5MWAeoKTCb9qwTHnD7El1SK4qgGyn1w6k PBVQ== X-Gm-Message-State: AOAM5338N/rNxh7MJ/3tBEOSTu7izVOEkq/0sTD0BNjxPNcdqqvqYwjA rsLf4jBa3bCeVyNE55Nuwlw= X-Google-Smtp-Source: ABdhPJxBLeYlan/olq39IXZxlC37Oueo1eu0SAO7/jy1Ukn3zHUcPt1OS23XOGWG1GLsYM74q0ne2g== X-Received: by 2002:a7b:ce11:: with SMTP id m17mr7686924wmc.8.1602444805250; Sun, 11 Oct 2020 12:33:25 -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 10/10] hw/isa: Add the ISA_IRQ_IDE_DEFAULT definition Date: Sun, 11 Oct 2020 21:32:29 +0200 Message-Id: <20201011193229.3210774-11-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 IDE controller uses IRQ #14 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 Acked-by: John Snow --- include/hw/isa/isa.h | 1 + hw/ide/isa.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 43cdc3c47b6..05622ee11e2 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -17,6 +17,7 @@ enum IsaIrqNumber { ISA_IRQ_RTC_DEFAULT =3D 8, ISA_IRQ_NET_DEFAULT =3D 9, ISA_IRQ_MOU_DEFAULT =3D 12, + ISA_IRQ_IDE_DEFAULT =3D 14, ISA_NUM_IRQS =3D 16 }; =20 diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 6bc19de2265..2412d568937 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -108,7 +108,7 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int io= base2, int isairq, static Property isa_ide_properties[] =3D { DEFINE_PROP_UINT32("iobase", ISAIDEState, iobase, 0x1f0), DEFINE_PROP_UINT32("iobase2", ISAIDEState, iobase2, 0x3f6), - DEFINE_PROP_UINT32("irq", ISAIDEState, isairq, 14), + DEFINE_PROP_UINT32("irq", ISAIDEState, isairq, ISA_IRQ_IDE_DEFAULT), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.26.2