From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJdCY-0007t8-BB for qemu-devel@nongnu.org; Mon, 05 Nov 2018 06:37:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJdCU-0006YG-DI for qemu-devel@nongnu.org; Mon, 05 Nov 2018 06:37:50 -0500 References: <20181105110313.29312-1-david@redhat.com> <20181105110313.29312-3-david@redhat.com> <20181105122148.2eae5288.cohuck@redhat.com> From: David Hildenbrand Message-ID: <3ba91b23-fbea-edce-3f2e-d3405cb3b4f7@redhat.com> Date: Mon, 5 Nov 2018 12:37:36 +0100 MIME-Version: 1.0 In-Reply-To: <20181105122148.2eae5288.cohuck@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1 2/4] s390x/zpci: use hotplug_dev instead of looking up the host bridge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck Cc: qemu-devel@nongnu.org, "Michael S . Tsirkin" , Igor Mammedov , Alexander Graf , Christian Borntraeger , qemu-s390x@nongnu.org, Richard Henderson , =Collin Walling , Thomas Huth On 05.11.18 12:21, Cornelia Huck wrote: > On Mon, 5 Nov 2018 12:03:11 +0100 > David Hildenbrand wrote: > >> We directly have it in our hands. >> >> Signed-off-by: David Hildenbrand >> --- >> hw/s390x/s390-pci-bus.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c >> index 1eaae3aca6..68660eac74 100644 >> --- a/hw/s390x/s390-pci-bus.c >> +++ b/hw/s390x/s390-pci-bus.c >> @@ -814,9 +814,9 @@ static bool s390_pci_alloc_idx(S390pciState *s, S390PCIBusDevice *pbdev) >> static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, >> Error **errp) >> { >> + S390pciState *s = S390_PCI_HOST_BRIDGE(hotplug_dev); >> PCIDevice *pdev = NULL; >> S390PCIBusDevice *pbdev = NULL; >> - S390pciState *s = s390_get_phb(); >> >> if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) { >> BusState *bus; >> @@ -924,11 +924,11 @@ static void s390_pcihost_timer_cb(void *opaque) >> static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, >> Error **errp) >> { >> + S390pciState *s = S390_PCI_HOST_BRIDGE(hotplug_dev); >> PCIDevice *pci_dev = NULL; >> PCIBus *bus; >> int32_t devfn; >> S390PCIBusDevice *pbdev = NULL; >> - S390pciState *s = s390_get_phb(); >> >> if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) { >> error_setg(errp, "PCI bridge hot unplug currently not supported"); > > Not sure whether that is an improvement (s390_get_phb() caches the > value, and is called from multiple other places as well.) > Looking up a variable that is directly passed as an argument doesn't look clean to me. -- Thanks, David / dhildenb