Commit d06bce95 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Michael S. Tsirkin
Browse files

pci: Initialize pci_dev->name before use 



This moves pci_dev->name initialization earlier so
pci_dev->bus_master_as could get a name instead of an empty string.

Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 7abea552

hw/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1030,6 +1030,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, 


    pci_dev->devfn = devfn;

    pci_dev->requester_id_cache = pci_req_id_cache_get(pci_dev);

    pstrcpy(pci_dev->name, sizeof(pci_dev->name), name);



    memory_region_init(&pci_dev->bus_master_container_region, OBJECT(pci_dev),

                       "bus master container", UINT64_MAX);
@@ -1039,7 +1040,6 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, 
    if (qdev_hotplug) {

        pci_init_bus_master(pci_dev);

    }

    pstrcpy(pci_dev->name, sizeof(pci_dev->name), name);

    pci_dev->irq_state = 0;

    pci_config_alloc(pci_dev);