On 11.09.2017 19:19, Eric Blake wrote: > Drop one more client of global_qtest by teaching all rtas test > functionality to pass in an explicit QTestState, adjusting all > callers. > > Signed-off-by: Eric Blake <ebl...@redhat.com> > > --- > v7: catch a couple more operations, drop R-b > --- > tests/libqos/rtas.h | 9 ++++++--- > tests/libqos/pci-spapr.c | 18 ++++++++++++------ > tests/libqos/rtas.c | 36 ++++++++++++++++++++---------------- > tests/rtas-test.c | 2 +- > 4 files changed, 39 insertions(+), 26 deletions(-) > > diff --git a/tests/libqos/rtas.h b/tests/libqos/rtas.h > index 498eb19230..e3d0f850a7 100644 > --- a/tests/libqos/rtas.h > +++ b/tests/libqos/rtas.h > @@ -7,9 +7,12 @@ > #define LIBQOS_RTAS_H > #include "libqos/malloc.h" > > -int qrtas_get_time_of_day(QGuestAllocator *alloc, struct tm *tm, uint32_t > *ns); > -uint32_t qrtas_ibm_read_pci_config(QGuestAllocator *alloc, uint64_t buid, > +int qrtas_get_time_of_day(QTestState *qts, QGuestAllocator *alloc, > + struct tm *tm, uint32_t *ns); > +uint32_t qrtas_ibm_read_pci_config(QTestState *qts, QGuestAllocator *alloc, > + uint64_t buid, > uint32_t addr, uint32_t size); > -int qrtas_ibm_write_pci_config(QGuestAllocator *alloc, uint64_t buid, > +int qrtas_ibm_write_pci_config(QTestState *qts, QGuestAllocator *alloc, > + uint64_t buid, > uint32_t addr, uint32_t size, uint32_t val);
Nit: I'd prefer if you rather put hte "uint32_t val" on a separate line instead of the "buid". [...] > @@ -92,7 +95,8 @@ uint32_t qrtas_ibm_read_pci_config(QGuestAllocator *alloc, > uint64_t buid, > return ret[1]; > } > > -int qrtas_ibm_write_pci_config(QGuestAllocator *alloc, uint64_t buid, > +int qrtas_ibm_write_pci_config(QTestState *qts, QGuestAllocator *alloc, > + uint64_t buid, > uint32_t addr, uint32_t size, uint32_t val) dito > { > int res; > @@ -103,7 +107,7 @@ int qrtas_ibm_write_pci_config(QGuestAllocator *alloc, > uint64_t buid, > args[2] = buid & 0xffffffff; > args[3] = size; > args[4] = val; > - res = qrtas_call(alloc, "ibm,write-pci-config", 5, args, 1, ret); > + res = qrtas_call(qts, alloc, "ibm,write-pci-config", 5, args, 1, ret); > if (res != 0) { > return -1; > } > diff --git a/tests/rtas-test.c b/tests/rtas-test.c > index 276c87ef84..34a692163f 100644 > --- a/tests/rtas-test.c > +++ b/tests/rtas-test.c > @@ -16,7 +16,7 @@ static void test_rtas_get_time_of_day(void) > qs = qtest_spapr_boot("-machine pseries"); > > t1 = time(NULL); > - ret = qrtas_get_time_of_day(qs->alloc, &tm, &ns); > + ret = qrtas_get_time_of_day(qs->qts, qs->alloc, &tm, &ns); > g_assert_cmpint(ret, ==, 0); > t2 = mktimegm(&tm); > g_assert(t2 - t1 < 5); /* 5 sec max to run the test */ > Reviewed-by: Thomas Huth <th...@redhat.com>