[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/18] libqos: Use explicit QTestState for rtas opera
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PULL 05/18] libqos: Use explicit QTestState for rtas operations |
Date: |
Wed, 14 Feb 2018 12:20:21 +0100 |
From: Eric Blake <address@hidden>
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 <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
[thuth: Use nicer indentation in rtas.h]
Signed-off-by: Thomas Huth <address@hidden>
---
tests/libqos/pci-spapr.c | 18 ++++++++++++------
tests/libqos/rtas.c | 36 ++++++++++++++++++++----------------
tests/libqos/rtas.h | 12 +++++++-----
tests/rtas-test.c | 2 +-
4 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/tests/libqos/pci-spapr.c b/tests/libqos/pci-spapr.c
index ef52fcb..c0f7e6d 100644
--- a/tests/libqos/pci-spapr.c
+++ b/tests/libqos/pci-spapr.c
@@ -108,21 +108,24 @@ static uint8_t qpci_spapr_config_readb(QPCIBus *bus, int
devfn, uint8_t offset)
{
QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);
uint32_t config_addr = (devfn << 8) | offset;
- return qrtas_ibm_read_pci_config(s->alloc, s->buid, config_addr, 1);
+ return qrtas_ibm_read_pci_config(bus->qts, s->alloc, s->buid,
+ config_addr, 1);
}
static uint16_t qpci_spapr_config_readw(QPCIBus *bus, int devfn, uint8_t
offset)
{
QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);
uint32_t config_addr = (devfn << 8) | offset;
- return qrtas_ibm_read_pci_config(s->alloc, s->buid, config_addr, 2);
+ return qrtas_ibm_read_pci_config(bus->qts, s->alloc, s->buid,
+ config_addr, 2);
}
static uint32_t qpci_spapr_config_readl(QPCIBus *bus, int devfn, uint8_t
offset)
{
QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);
uint32_t config_addr = (devfn << 8) | offset;
- return qrtas_ibm_read_pci_config(s->alloc, s->buid, config_addr, 4);
+ return qrtas_ibm_read_pci_config(bus->qts, s->alloc, s->buid,
+ config_addr, 4);
}
static void qpci_spapr_config_writeb(QPCIBus *bus, int devfn, uint8_t offset,
@@ -130,7 +133,8 @@ static void qpci_spapr_config_writeb(QPCIBus *bus, int
devfn, uint8_t offset,
{
QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);
uint32_t config_addr = (devfn << 8) | offset;
- qrtas_ibm_write_pci_config(s->alloc, s->buid, config_addr, 1, value);
+ qrtas_ibm_write_pci_config(bus->qts, s->alloc, s->buid,
+ config_addr, 1, value);
}
static void qpci_spapr_config_writew(QPCIBus *bus, int devfn, uint8_t offset,
@@ -138,7 +142,8 @@ static void qpci_spapr_config_writew(QPCIBus *bus, int
devfn, uint8_t offset,
{
QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);
uint32_t config_addr = (devfn << 8) | offset;
- qrtas_ibm_write_pci_config(s->alloc, s->buid, config_addr, 2, value);
+ qrtas_ibm_write_pci_config(bus->qts, s->alloc, s->buid,
+ config_addr, 2, value);
}
static void qpci_spapr_config_writel(QPCIBus *bus, int devfn, uint8_t offset,
@@ -146,7 +151,8 @@ static void qpci_spapr_config_writel(QPCIBus *bus, int
devfn, uint8_t offset,
{
QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);
uint32_t config_addr = (devfn << 8) | offset;
- qrtas_ibm_write_pci_config(s->alloc, s->buid, config_addr, 4, value);
+ qrtas_ibm_write_pci_config(bus->qts, s->alloc, s->buid,
+ config_addr, 4, value);
}
#define SPAPR_PCI_BASE (1ULL << 45)
diff --git a/tests/libqos/rtas.c b/tests/libqos/rtas.c
index 0269803..d81ff42 100644
--- a/tests/libqos/rtas.c
+++ b/tests/libqos/rtas.c
@@ -7,26 +7,28 @@
#include "libqtest.h"
#include "libqos/rtas.h"
-static void qrtas_copy_args(uint64_t target_args, uint32_t nargs,
- uint32_t *args)
+static void qrtas_copy_args(QTestState *qts, uint64_t target_args,
+ uint32_t nargs, uint32_t *args)
{
int i;
for (i = 0; i < nargs; i++) {
- writel(target_args + i * sizeof(uint32_t), args[i]);
+ qtest_writel(qts, target_args + i * sizeof(uint32_t), args[i]);
}
}
-static void qrtas_copy_ret(uint64_t target_ret, uint32_t nret, uint32_t *ret)
+static void qrtas_copy_ret(QTestState *qts, uint64_t target_ret,
+ uint32_t nret, uint32_t *ret)
{
int i;
for (i = 0; i < nret; i++) {
- ret[i] = readl(target_ret + i * sizeof(uint32_t));
+ ret[i] = qtest_readl(qts, target_ret + i * sizeof(uint32_t));
}
}
-static uint64_t qrtas_call(QGuestAllocator *alloc, const char *name,
+static uint64_t qrtas_call(QTestState *qts, QGuestAllocator *alloc,
+ const char *name,
uint32_t nargs, uint32_t *args,
uint32_t nret, uint32_t *ret)
{
@@ -36,10 +38,9 @@ static uint64_t qrtas_call(QGuestAllocator *alloc, const
char *name,
target_args = guest_alloc(alloc, nargs * sizeof(uint32_t));
target_ret = guest_alloc(alloc, nret * sizeof(uint32_t));
- qrtas_copy_args(target_args, nargs, args);
- res = qtest_rtas_call(global_qtest, name,
- nargs, target_args, nret, target_ret);
- qrtas_copy_ret(target_ret, nret, ret);
+ qrtas_copy_args(qts, target_args, nargs, args);
+ res = qtest_rtas_call(qts, name, nargs, target_args, nret, target_ret);
+ qrtas_copy_ret(qts, target_ret, nret, ret);
guest_free(alloc, target_ret);
guest_free(alloc, target_args);
@@ -47,12 +48,13 @@ static uint64_t qrtas_call(QGuestAllocator *alloc, const
char *name,
return res;
}
-int qrtas_get_time_of_day(QGuestAllocator *alloc, struct tm *tm, uint32_t *ns)
+int qrtas_get_time_of_day(QTestState *qts, QGuestAllocator *alloc,
+ struct tm *tm, uint32_t *ns)
{
int res;
uint32_t ret[8];
- res = qrtas_call(alloc, "get-time-of-day", 0, NULL, 8, ret);
+ res = qrtas_call(qts, alloc, "get-time-of-day", 0, NULL, 8, ret);
if (res != 0) {
return res;
}
@@ -70,7 +72,8 @@ int qrtas_get_time_of_day(QGuestAllocator *alloc, struct tm
*tm, uint32_t *ns)
return res;
}
-uint32_t qrtas_ibm_read_pci_config(QGuestAllocator *alloc, uint64_t buid,
+uint32_t qrtas_ibm_read_pci_config(QTestState *qts, QGuestAllocator *alloc,
+ uint64_t buid,
uint32_t addr, uint32_t size)
{
int res;
@@ -80,7 +83,7 @@ uint32_t qrtas_ibm_read_pci_config(QGuestAllocator *alloc,
uint64_t buid,
args[1] = buid >> 32;
args[2] = buid & 0xffffffff;
args[3] = size;
- res = qrtas_call(alloc, "ibm,read-pci-config", 4, args, 2, ret);
+ res = qrtas_call(qts, alloc, "ibm,read-pci-config", 4, args, 2, ret);
if (res != 0) {
return -1;
}
@@ -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)
{
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/libqos/rtas.h b/tests/libqos/rtas.h
index 498eb19..459e23a 100644
--- a/tests/libqos/rtas.h
+++ b/tests/libqos/rtas.h
@@ -7,9 +7,11 @@
#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,
- uint32_t addr, uint32_t size);
-int qrtas_ibm_write_pci_config(QGuestAllocator *alloc, uint64_t buid,
- uint32_t addr, uint32_t size, uint32_t val);
+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(QTestState *qts, QGuestAllocator *alloc,
+ uint64_t buid, uint32_t addr, uint32_t size,
+ uint32_t val);
#endif /* LIBQOS_RTAS_H */
diff --git a/tests/rtas-test.c b/tests/rtas-test.c
index 276c87e..34a6921 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 */
--
1.8.3.1
- [Qemu-devel] [PULL 00/18] qtest patches, Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 01/18] tests: Clean up wait for event, Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 03/18] libqos: Track QTestState with QPCIBus, Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 02/18] libqtest: Use qemu_strtoul(), Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 05/18] libqos: Use explicit QTestState for rtas operations,
Thomas Huth <=
- [Qemu-devel] [PULL 04/18] libqos: Use explicit QTestState for fw_cfg operations, Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 06/18] libqos: Use explicit QTestState for i2c operations, Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 07/18] libqos: Use explicit QTestState for ahci operations, Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 09/18] qmp-test: Drop dependence on global_qtest, Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 08/18] libqos: Use explicit QTestState for remaining libqos operations, Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 12/18] tests/boot-serial: Enable the boot-serial test on SPARC machines, too, Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 11/18] wdt_ib700-test: Drop dependence on global_qtest, Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 10/18] tests/boot-sector: Drop dependence on global_qtest, Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 13/18] tests/boot-serial: Add tests for PowerPC Mac machines, Thomas Huth, 2018/02/14
- [Qemu-devel] [PULL 14/18] tests/boot-serial-test: Add support for the aarch64 virt machine, Thomas Huth, 2018/02/14