Commit 2ecd7e2f authored by Laurent Vivier's avatar Laurent Vivier Committed by David Gibson
Browse files

libqos: add PCI management in qtest_vboot()/qtest_shutdown() 



Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent cf716b31

tests/e1000e-test.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static void data_test_init(e1000e_device *d) 
    qtest_start(cmdline);

    g_free(cmdline);



    test_bus = qpci_init_pc();

    test_bus = qpci_init_pc(NULL);

    g_assert_nonnull(test_bus);



    test_alloc = pc_alloc_init();

tests/i440fx-test.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static QPCIBus *test_start_get_bus(const TestData *s) 
    cmdline = g_strdup_printf("-smp %d", s->num_cpus);

    qtest_start(cmdline);

    g_free(cmdline);

    return qpci_init_pc();

    return qpci_init_pc(NULL);

}



static void test_i440fx_defaults(gconstpointer opaque)

tests/ide-test.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static QPCIDevice *get_pci_device(uint16_t *bmdma_base) 
    uint16_t vendor_id, device_id;



    if (!pcibus) {

        pcibus = qpci_init_pc();

        pcibus = qpci_init_pc(NULL);

    }



    /* Find PCI device and verify it's the right one */

tests/ivshmem-test.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static void setup_vm_cmd(IVState *s, const char *cmd, bool msix) 
    uint64_t barsize;



    s->qtest = qtest_start(cmd);

    s->pcibus = qpci_init_pc();

    s->pcibus = qpci_init_pc(NULL);

    s->dev = get_device(s->pcibus);



    s->reg_base = qpci_iomap(s->dev, 0, &barsize);

tests/libqos/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ QPCIDevice *get_ahci_device(uint32_t *fingerprint) 
    uint32_t ahci_fingerprint;

    QPCIBus *pcibus;



    pcibus = qpci_init_pc();

    pcibus = qpci_init_pc(NULL);



    /* Find the AHCI PCI device and verify it's the right one. */

    ahci = qpci_device_find(pcibus, QPCI_DEVFN(0x1F, 0x02));