From nobody Sun Sep 28 16:33:49 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1756568258; cv=none; d=zohomail.com; s=zohoarc; b=ZLURQSVYPv+ci7wE/F7Rwap1k18pclxnH1x3RFO6erac06/nTvjuj/3+LCOd754H3USWpIj9imvrtLrNu0X1C2ZfRzDC5NsKcfGeCRbJTG9wcZdJMlU9YXcQbo/M43A3CXB2JmGJNKgezhJffqrxscIW+PYtPfCDVqAZrA4orr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756568258; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=H5XyWjtcymfCh9S1xq8Wstwa2XXrkJ5+hnuyZ3TJMF4=; b=KmHJWd0KLCHVxXxExpkpzpULI4Z1vGyGQs1cyWOyZY9RN4y/DIgEqlyrqURTAkT+ryAZMEt8O07N66MZjPC9KEsoruJQdlF53gLkWhij/CxIcaSA9oGYU8dB4dgFEtdNIl6JT1wTxpbeD/STeavwRyz0r0COvx4o0rgZ0rt2xao= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1756568258787952.7176718603723; Sat, 30 Aug 2025 08:37:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usNGi-0007Qg-UW; Sat, 30 Aug 2025 11:13:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uryiQ-0001Bi-UL for qemu-devel@nongnu.org; Fri, 29 Aug 2025 09:00:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uryiK-0008Or-KW for qemu-devel@nongnu.org; Fri, 29 Aug 2025 09:00:26 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-622-FoZLBsEMOQ-Hqt9J3qTQZA-1; Fri, 29 Aug 2025 09:00:17 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3c79f0a5ff1so922662f8f.1 for ; Fri, 29 Aug 2025 06:00:17 -0700 (PDT) Received: from [192.168.10.48] ([151.95.56.250]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3cf270fd01csm3455782f8f.12.2025.08.29.06.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Aug 2025 06:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756472419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H5XyWjtcymfCh9S1xq8Wstwa2XXrkJ5+hnuyZ3TJMF4=; b=QC5DT44/r0ZaXamkXRIc9u/JxDOW8XxwL5Ear01Yb/I5ZjjkpinRBGm7gvzsCexbxFtk9U 6WO/0u/CM5A5wU0LzgGIYRoB4UjCW7Iu9f4XdQ+PeguZIW1cKGEy+arDOQTqiIJ+amxHqb 3WTwxeXD+eQ2WKKNVMsRLLAqyx8ifx4= X-MC-Unique: FoZLBsEMOQ-Hqt9J3qTQZA-1 X-Mimecast-MFC-AGG-ID: FoZLBsEMOQ-Hqt9J3qTQZA_1756472416 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756472415; x=1757077215; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H5XyWjtcymfCh9S1xq8Wstwa2XXrkJ5+hnuyZ3TJMF4=; b=whUXPPGGXRXQfTuR/eZDiszkFg9BOHQZbZrvLLpn6nTRuAbget2PkALYDI4+bfQ6w0 7Qoz0j7Qf0u8DQRS4zXFvfB8owrK5rt6wMttNv/soK7C70yIMauom2k1FuctWyGIB7EC VhFMtYmTlzn8SSuSJESAz3BPd65vtRwr9xaq+NNhlAyL647Flf8rgPmbHAgr7NA23ckV DoyoPCS06H6tHcpz7LhwrDVW7jtYvRIhaPMtvxQXByF8CxcY6HxjqBFjjQE286DOu04H I7RyJ2ytELyu1n71/PRdycpOlQ6GaygpaGEVNFYB1IIbe6XQxcJ5JxOxsk/pUtkBDRqV YXRQ== X-Gm-Message-State: AOJu0Yy0xVPRyhkKCMZoYrL7/atvzPxx/WWdjlv29PHsHAcJWtdSkT6Y 77GYa8W0WXWMRhnm/dBSm+K5AK8Gq4Qi4/qpIa9JxP1Jld9VSIFpDwxil9d1UZOr52SX97UeRJ0 UOAtVX/knz6vzq/FhMQwbHda6A/ewc2Q6ywPWsyCp2lLsHnJ2whs6JX8WM9JhM4MADUdnNBNGFL lB7De74IPO3nbi+VlmqL7coCymia68qHtpeBNsIZMG X-Gm-Gg: ASbGncvULn4z3OtuTQoNMOyQu9pFydPMHNz3AKfCBIKo4ZfNBHOdzyAcbT6bKKrECvV +18Gk25X+j/txIOpPfi7Id4S8rtOCM0dNfr1/YwPA0AvjNKJJDuzUSLe8a0j2tOg4QDAdZ8z6eD xrVsOzie7uyKnVuQjtfM0CLzf7T+/KH9AKjtS9cfx7PRrONP0V2Nv9iG7XvzK3A51EVD7+AUn5K yLDgmZPdsZVU7H09T3Z4nFqmNPPVf0ChGV3pSaPoBdQlNnTSv/Jd6vQnrHOjW11s0VIDVGzguN8 d5ffrCjzKPEu4fxdtLxurSfU8/JBqS/6KS1s6LU+X8YidtRbRksBVE8uOYXdzohAiGKCL6ADqvc YNGvOqonkBD8DgXbXaNzGtMoNT19YYFXfzjDSXZ3Osbw= X-Received: by 2002:a05:6000:2289:b0:3c9:58b0:dad4 with SMTP id ffacd0b85a97d-3c958b0db85mr15058793f8f.35.1756472415467; Fri, 29 Aug 2025 06:00:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEZjB/BRd9ep+ScA2MqOT8Eq1UUz0XEjActCby77NbkoMJIeuOsI/S5OSNJmO8sagmHTw1J+w== X-Received: by 2002:a05:6000:2289:b0:3c9:58b0:dad4 with SMTP id ffacd0b85a97d-3c958b0db85mr15058753f8f.35.1756472414891; Fri, 29 Aug 2025 06:00:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiaoyao Li Subject: [PULL 14/28] hw/i386/pc_piix.c: always initialise ISA IDE drives in pc_init_isa() Date: Fri, 29 Aug 2025 14:59:21 +0200 Message-ID: <20250829125935.1526984-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250829125935.1526984-1-pbonzini@redhat.com> References: <20250829125935.1526984-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1756568260439124100 From: Mark Cave-Ayland By definition an isapc machine must always use ISA IDE drives so ensure tha= t they are always enabled. At the same time also remove the surrounding CONFIG_IDE= _ISA define since it will be enabled via the ISAPC Kconfig. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Xiaoyao Li Link: https://lore.kernel.org/r/20250828111057.468712-15-mark.caveayland@nu= tanix.com Signed-off-by: Paolo Bonzini --- hw/i386/pc_piix.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index fb936748bd1..72ddd9b149d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -445,6 +445,8 @@ static void pc_init_isa(MachineState *machine) GSIState *gsi_state; MemoryRegion *ram_memory; MemoryRegion *rom_memory =3D system_memory; + DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + int i; =20 /* * There is a small chance that someone unintentionally passes "-cpu m= ax" @@ -541,27 +543,20 @@ static void pc_init_isa(MachineState *machine) =20 pc_nic_init(pcmc, isa_bus, NULL); =20 -#ifdef CONFIG_IDE_ISA - if (!pcmc->pci_enabled) { - DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; - int i; - - ide_drive_get(hd, ARRAY_SIZE(hd)); - for (i =3D 0; i < MAX_IDE_BUS; i++) { - ISADevice *dev; - char busname[] =3D "ide.0"; - dev =3D isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], - ide_irq[i], - hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i += 1]); - /* - * The ide bus name is ide.0 for the first bus and ide.1 for t= he - * second one. - */ - busname[4] =3D '0' + i; - pcms->idebus[i] =3D qdev_get_child_bus(DEVICE(dev), busname); - } + ide_drive_get(hd, ARRAY_SIZE(hd)); + for (i =3D 0; i < MAX_IDE_BUS; i++) { + ISADevice *dev; + char busname[] =3D "ide.0"; + dev =3D isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], + ide_irq[i], + hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]= ); + /* + * The ide bus name is ide.0 for the first bus and ide.1 for the + * second one. + */ + busname[4] =3D '0' + i; + pcms->idebus[i] =3D qdev_get_child_bus(DEVICE(dev), busname); } -#endif } #endif =20 --=20 2.51.0