On Thu, 5 Aug 2021 15:34:31 -0400 Eduardo Habkost <[email protected]> wrote:
> OBJECT_CHECK(PciHostState, ..., TYPE_PCI_HOST_BRIDGE) is exactly > what the PCI_HOST_BRIDGE macro does. We can just use the macro > instead of using OBJECT_CHECK manually. > > Signed-off-by: Eduardo Habkost <[email protected]> Reviewed-by: Igor Mammedov <[email protected]> > --- > Cc: "Michael S. Tsirkin" <[email protected]> > Cc: Igor Mammedov <[email protected]> > Cc: Paolo Bonzini <[email protected]> > Cc: Richard Henderson <[email protected]> > Cc: Eduardo Habkost <[email protected]> > Cc: Marcel Apfelbaum <[email protected]> > Cc: [email protected] > --- > hw/i386/acpi-build.c | 8 ++------ > hw/pci-host/i440fx.c | 4 +--- > 2 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index a33ac8b91e1..3c6bbb1beb3 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -303,13 +303,9 @@ Object *acpi_get_i386_pci_host(void) > { > PCIHostState *host; > > - host = OBJECT_CHECK(PCIHostState, > - object_resolve_path("/machine/i440fx", NULL), > - TYPE_PCI_HOST_BRIDGE); > + host = PCI_HOST_BRIDGE(object_resolve_path("/machine/i440fx", NULL)); > if (!host) { > - host = OBJECT_CHECK(PCIHostState, > - object_resolve_path("/machine/q35", NULL), > - TYPE_PCI_HOST_BRIDGE); > + host = PCI_HOST_BRIDGE(object_resolve_path("/machine/q35", NULL)); > } > return OBJECT(host); > diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c > index 28c9bae8994..cd87e21a9b2 100644 > --- a/hw/pci-host/i440fx.c > +++ b/hw/pci-host/i440fx.c > @@ -316,9 +316,7 @@ PCIBus *i440fx_init(const char *host_type, const char > *pci_type, > > PCIBus *find_i440fx(void) > { > - PCIHostState *s = OBJECT_CHECK(PCIHostState, > - object_resolve_path("/machine/i440fx", > NULL), > - TYPE_PCI_HOST_BRIDGE); > + PCIHostState *s = PCI_HOST_BRIDGE(object_resolve_path("/machine/i440fx", > NULL)); > return s ? s->bus : NULL; > } >
