From nobody Mon Feb 9 12:15:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621374970; cv=none; d=zohomail.com; s=zohoarc; b=iLrSTV1vMytMG2GVs4Q920ots7t5TKCNfU4VswyWRRY3QJ0wpmMFv5ithf23SE2chje+2yjf5nK/tlxVJ9AAkfFE3RNFe31zZ5xb6vkCPMdMv06P5nYNJ4COm06+ZYewI6nTvyRxwFnytJPa6/ZCwkIhAQRhLdqjy1BtjxXkJqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621374970; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=4mj2gfnZfCBRpQogSZRkYuV2axSsjwCefiXC31wD6Zo=; b=S4YPWQ46qkybkk/lR8eR9OglXWYqIAFrQj3UhKX4oGE+y04GKevgzh7vUw1rWwYCFxzUS6+4FzUAnuM35VwqkWBz+p4QSs/8qfnfEGMsOpDms4Tf7Q9BJtV1RTHmsgTfQODgHXemKUodhYY1kga/bcqfSgdfAgBTN4iCA1fLj7U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621374970684917.833993821618; Tue, 18 May 2021 14:56:10 -0700 (PDT) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-525-DrPEyNdVNJS9N_zPxODnkw-1; Tue, 18 May 2021 17:56:07 -0400 Received: by mail-ej1-f71.google.com with SMTP id x20-20020a1709061354b02903cff4894505so2926856ejb.14 for ; Tue, 18 May 2021 14:56:07 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id k22sm1728326ejz.108.2021.05.18.14.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 14:56:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621374969; 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=4mj2gfnZfCBRpQogSZRkYuV2axSsjwCefiXC31wD6Zo=; b=KYzI7VdARF2sUuVx49WghkS1QeV2nPDyjOG8GSSZKcqwq8rEDJn7QF7Y6ovG4y7p8+LHt/ DweeNXbu1rXRPfRdbL/eJJmND32KAbD4LKdQb3vy1NgCSEJt+pcALWVoMS7ZxCo6g9kFeW aBWIh0AnH/9y7N6972Yvv1njuwfmCYI= X-MC-Unique: DrPEyNdVNJS9N_zPxODnkw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4mj2gfnZfCBRpQogSZRkYuV2axSsjwCefiXC31wD6Zo=; b=iz5JjIc1Iz5xZfMvaq8zM1T6jXNRQZlClIn8Qx0CES7eO4CK/1BrwcB0R4QM8MuzaS IEbFDwnbYj2Y4WwgCbkVUwNKERfHArp+vCMATQ30Fb80kISoriD1xE6wc2RnnOf+aBg/ Q5ZjWs9M3BCFw+2JLkF/Ybg6weQI6GpXeD8sfDwiGuknLUo3GQIoCac41k53/iVuGXu+ D/0ooByd1XI8qd+LYVbCNJIRARrMwUc3+0Lup4Re0CowxIdi0IaDW/goRYEvBd8MdxJG YHoRpPdKVamQ4U6j1ZD8lsuz7D+tPldrbWCPtuAXzidlgOdXo5F0NQgv7FrE9GKatIQQ 1mWA== X-Gm-Message-State: AOAM531O38Gd+ghutgjjhzPA5h36OrWiyLEcF2iaORZjetn7CXiFLC6w lKSHPW7yBr0iRlSibjjwvTSArHC1R9R7mRTvxhrRQAykA8onRNbBBHi+OTHdkNSRK1Vl/enhD0e +gEtV4dHAFOWBmw== X-Received: by 2002:aa7:d718:: with SMTP id t24mr9681604edq.259.1621374966605; Tue, 18 May 2021 14:56:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLcxhisD70Y685w1e2tU1HSum86pDVs1XDF6xvVyRDYtUtt/up1h9E2iAQytr0lkSJCD6BrQ== X-Received: by 2002:aa7:d718:: with SMTP id t24mr9681585edq.259.1621374966434; Tue, 18 May 2021 14:56:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Snow , qemu-devel@nongnu.org Cc: Elena Ufimtseva , Markus Armbruster , Mark Cave-Ayland , Stefan Hajnoczi , Jagannathan Raman , Thomas Huth , John G Johnson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 04/11] hw/ide/via: Set the ISA-bus QOM link Date: Tue, 18 May 2021 23:55:38 +0200 Message-Id: <20210518215545.1793947-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518215545.1793947-1-philmd@redhat.com> References: <20210518215545.1793947-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Set the ISA Bus link property on the VIA IDE object from the two unique users, the Fuloong and Pegasos machines. Add a check in via_ide_realize() to be sure this property is set. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/via.c | 5 +++++ hw/mips/fuloong2e.c | 4 ++++ hw/ppc/pegasos2.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/hw/ide/via.c b/hw/ide/via.c index 65fdca6dcf4..654e15edfed 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -165,6 +165,11 @@ static void via_ide_realize(PCIDevice *dev, Error **er= rp) uint8_t *pci_conf =3D dev->config; int i; =20 + if (!d->isa_bus) { + error_setg(errp, "via-ide: 'isa-bus' link not set"); + return; + } + pci_config_set_prog_interface(pci_conf, 0x8a); /* legacy mode */ pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0); dev->wmask[PCI_INTERRUPT_LINE] =3D 0; diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 40e9a645e1b..7e644a701bc 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -201,12 +201,16 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bu= s, int slot, qemu_irq intc, I2CBus **i2c_bus) { PCIDevice *dev; + BusState *isa_bus; =20 dev =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), t= rue, TYPE_VT82C686B_ISA); + isa_bus =3D qdev_get_child_bus(DEVICE(dev), "isa.0"); qdev_connect_gpio_out(DEVICE(dev), 0, intc); =20 dev =3D pci_new(PCI_DEVFN(slot, 1), "via-ide"); + object_property_set_link(OBJECT(dev), "isa-bus", + OBJECT(isa_bus), &error_abort); pci_realize_and_unref(dev, pci_bus, &error_abort); pci_ide_create_devs(dev); =20 diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index 8486a2eb8c6..ed6ddc3569b 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -57,6 +57,7 @@ static void pegasos2_init(MachineState *machine) PCIBus *pci_bus; PCIDevice *dev; I2CBus *i2c_bus; + BusState *isa_bus; const char *fwname =3D machine->firmware ?: PROM_FILENAME; char *filename; int sz; @@ -104,11 +105,14 @@ static void pegasos2_init(MachineState *machine) /* VT8231 function 0: PCI-to-ISA Bridge */ dev =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0), tru= e, TYPE_VT8231_ISA); + isa_bus =3D qdev_get_child_bus(DEVICE(dev), "isa.0"); qdev_connect_gpio_out(DEVICE(dev), 0, qdev_get_gpio_in_named(mv, "gpp", 31)); =20 /* VT8231 function 1: IDE Controller */ dev =3D pci_new(PCI_DEVFN(12, 1), "via-ide"); + object_property_set_link(OBJECT(dev), "isa-bus", + OBJECT(isa_bus), &error_abort); pci_realize_and_unref(dev, pci_bus, &error_abort); pci_ide_create_devs(dev); =20 --=20 2.26.3