From nobody Tue Feb 10 14:33:57 2026 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