Re: [Qemu-devel] [PATCH 2/5] tests/libqos: rename qpci_init_pc and qpci_init_spapr functions

[Thomas Huth]

On 2019-01-15 19:19, Paolo Bonzini wrote:
> From: Emanuele Giuseppe Esposito <address@hidden>
> 
> Rename qpci_init_pc in qpci_pc_new and qpci_init_spapr in qpci_spapr_new,
> since theese function actually allocate a new pci struct and initialize it.
> Changed QOSOps field name from qpci_init to qpci_new.
> 
> Signed-off-by: Emanuele Giuseppe Esposito <address@hidden>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  tests/e1000e-test.c         | 2 +-
>  tests/i440fx-test.c         | 2 +-
>  tests/ide-test.c            | 2 +-
>  tests/libqos/ahci.c         | 2 +-
>  tests/libqos/libqos-pc.c    | 2 +-
>  tests/libqos/libqos-spapr.c | 2 +-
>  tests/libqos/libqos.c       | 2 +-
>  tests/libqos/libqos.h       | 2 +-
>  tests/libqos/pci-pc.c       | 2 +-
>  tests/libqos/pci-pc.h       | 9 ++++++++-
>  tests/libqos/pci-spapr.c    | 2 +-
>  tests/libqos/pci-spapr.h    | 2 +-
>  tests/q35-test.c            | 4 ++--
>  tests/rtl8139-test.c        | 2 +-
>  tests/sdhci-test.c          | 2 +-
>  tests/tco-test.c            | 2 +-
>  tests/usb-hcd-ehci-test.c   | 2 +-
>  tests/vhost-user-test.c     | 2 +-
>  18 files changed, 26 insertions(+), 19 deletions(-)
> 
> diff --git a/tests/e1000e-test.c b/tests/e1000e-test.c
> index c9408a5..5525589 100644
> --- a/tests/e1000e-test.c
> +++ b/tests/e1000e-test.c
> @@ -395,7 +395,7 @@ static void data_test_init(e1000e_device *d)
>      test_alloc = pc_alloc_init(global_qtest);
>      g_assert_nonnull(test_alloc);
>  
> -    test_bus = qpci_init_pc(global_qtest, test_alloc);
> +    test_bus = qpci_new_pc(global_qtest, test_alloc);
>      g_assert_nonnull(test_bus);
>  
>      e1000e_device_init(test_bus, d);
> diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c
> index 4390e55..69205b5 100644
> --- a/tests/i440fx-test.c
> +++ b/tests/i440fx-test.c
> @@ -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(global_qtest, NULL);
> +    return qpci_new_pc(global_qtest, NULL);
>  }
>  
>  static void test_i440fx_defaults(gconstpointer opaque)
> diff --git a/tests/ide-test.c b/tests/ide-test.c
> index f0280e6..8f5adae 100644
> --- a/tests/ide-test.c
> +++ b/tests/ide-test.c
> @@ -157,7 +157,7 @@ static QPCIDevice *get_pci_device(QPCIBar *bmdma_bar, 
> QPCIBar *ide_bar)
>      uint16_t vendor_id, device_id;
>  
>      if (!pcibus) {
> -        pcibus = qpci_init_pc(global_qtest, NULL);
> +        pcibus = qpci_new_pc(global_qtest, NULL);
>      }
>  
>      /* Find PCI device and verify it's the right one */
> diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
> index 63fbc9e..cc1b08e 100644
> --- a/tests/libqos/ahci.c
> +++ b/tests/libqos/ahci.c
> @@ -130,7 +130,7 @@ QPCIDevice *get_ahci_device(QTestState *qts, uint32_t 
> *fingerprint)
>      uint32_t ahci_fingerprint;
>      QPCIBus *pcibus;
>  
> -    pcibus = qpci_init_pc(qts, NULL);
> +    pcibus = qpci_new_pc(qts, NULL);
>  
>      /* Find the AHCI PCI device and verify it's the right one. */
>      ahci = qpci_device_find(pcibus, QPCI_DEVFN(0x1F, 0x02));
> diff --git a/tests/libqos/libqos-pc.c b/tests/libqos/libqos-pc.c
> index a9c1ace..293f9b6 100644
> --- a/tests/libqos/libqos-pc.c
> +++ b/tests/libqos/libqos-pc.c
> @@ -6,7 +6,7 @@
>  static QOSOps qos_ops = {
>      .init_allocator = pc_alloc_init_flags,
>      .uninit_allocator = pc_alloc_uninit,
> -    .qpci_init = qpci_init_pc,
> +    .qpci_new = qpci_new_pc,
>      .qpci_free = qpci_free_pc,
>      .shutdown = qtest_pc_shutdown,
>  };
> diff --git a/tests/libqos/libqos-spapr.c b/tests/libqos/libqos-spapr.c
> index a37791e..64addfe 100644
> --- a/tests/libqos/libqos-spapr.c
> +++ b/tests/libqos/libqos-spapr.c
> @@ -6,7 +6,7 @@
>  static QOSOps qos_ops = {
>      .init_allocator = spapr_alloc_init_flags,
>      .uninit_allocator = spapr_alloc_uninit,
> -    .qpci_init = qpci_init_spapr,
> +    .qpci_new = qpci_new_spapr,
>      .qpci_free = qpci_free_spapr,
>      .shutdown = qtest_spapr_shutdown,
>  };
> diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c
> index c514187..6c91371 100644
> --- a/tests/libqos/libqos.c
> +++ b/tests/libqos/libqos.c
> @@ -25,7 +25,7 @@ QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, 
> va_list ap)
>      qs->ops = ops;
>      if (ops) {
>          qs->alloc = ops->init_allocator(qs->qts, ALLOC_NO_FLAGS);
> -        qs->pcibus = ops->qpci_init(qs->qts, qs->alloc);
> +        qs->pcibus = ops->qpci_new(qs->qts, qs->alloc);
>      }
>  
>      g_free(cmdline);
> diff --git a/tests/libqos/libqos.h b/tests/libqos/libqos.h
> index 07d4b93..1af6035 100644
> --- a/tests/libqos/libqos.h
> +++ b/tests/libqos/libqos.h
> @@ -10,7 +10,7 @@ typedef struct QOSState QOSState;
>  typedef struct QOSOps {
>      QGuestAllocator *(*init_allocator)(QTestState *qts, QAllocOpts);
>      void (*uninit_allocator)(QGuestAllocator *);
> -    QPCIBus *(*qpci_init)(QTestState *qts, QGuestAllocator *alloc);
> +    QPCIBus *(*qpci_new)(QTestState *qts, QGuestAllocator *alloc);
>      void (*qpci_free)(QPCIBus *bus);
>      void (*shutdown)(QOSState *);
>  } QOSOps;
> diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c
> index a4fc02b..43d7082 100644
> --- a/tests/libqos/pci-pc.c
> +++ b/tests/libqos/pci-pc.c
> @@ -116,7 +116,7 @@ static void qpci_pc_config_writel(QPCIBus *bus, int 
> devfn, uint8_t offset, uint3
>      qtest_outl(bus->qts, 0xcfc, value);
>  }
>  
> -QPCIBus *qpci_init_pc(QTestState *qts, QGuestAllocator *alloc)
> +QPCIBus *qpci_new_pc(QTestState *qts, QGuestAllocator *alloc)
>  {
>      QPCIBusPC *ret = g_new0(QPCIBusPC, 1);
>  
> diff --git a/tests/libqos/pci-pc.h b/tests/libqos/pci-pc.h
> index 491eeac..84cc300 100644
> --- a/tests/libqos/pci-pc.h
> +++ b/tests/libqos/pci-pc.h
> @@ -16,7 +16,14 @@
>  #include "libqos/pci.h"
>  #include "libqos/malloc.h"
>  
> -QPCIBus *qpci_init_pc(QTestState *qts, QGuestAllocator *alloc);
> +/* qpci_new_pc():
> +* this function creates a new QPCIBusPC object,

Hmm, you did not notice my previous review, did you? See:

https://lists.gnu.org/archive/html/qemu-devel/2018-12/msg01417.html

 Thomas