[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v6 23/29] tests/acpi-utils: Drop dependence on g
|
From: |
Michael S. Tsirkin |
|
Subject: |
Re: [Qemu-devel] [PATCH v6 23/29] tests/acpi-utils: Drop dependence on global_qtest |
|
Date: |
Fri, 8 Sep 2017 15:48:55 +0300 |
On Fri, Sep 01, 2017 at 01:03:34PM -0500, Eric Blake wrote:
> As a general rule, we prefer avoiding implicit global state
> because it makes code harder to safely copy and paste without
> thinking about the global state. Adjust the helper code to
> use explicit state instead, and update all callers.
>
> Signed-off-by: Eric Blake <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
> ---
> tests/acpi-utils.h | 65 +++++++++----------
> tests/acpi-utils.c | 19 +++---
> tests/bios-tables-test.c | 161
> ++++++++++++++++++++++++-----------------------
> tests/vmgenid-test.c | 18 +++---
> 4 files changed, 133 insertions(+), 130 deletions(-)
>
> diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
> index f8d87236c6..8ec83f71b1 100644
> --- a/tests/acpi-utils.h
> +++ b/tests/acpi-utils.h
> @@ -28,20 +28,20 @@ typedef struct {
> bool tmp_files_retain; /* do not delete the temp asl/aml */
> } AcpiSdtTable;
>
> -#define ACPI_READ_FIELD(field, addr) \
> +#define ACPI_READ_FIELD(qts, field, addr) \
> do { \
> switch (sizeof(field)) { \
> case 1: \
> - field = readb(addr); \
> + field = qtest_readb(qts, addr); \
> break; \
> case 2: \
> - field = readw(addr); \
> + field = qtest_readw(qts, addr); \
> break; \
> case 4: \
> - field = readl(addr); \
> + field = qtest_readl(qts, addr); \
> break; \
> case 8: \
> - field = readq(addr); \
> + field = qtest_readq(qts, addr); \
> break; \
> default: \
> g_assert(false); \
> @@ -49,28 +49,28 @@ typedef struct {
> addr += sizeof(field); \
> } while (0);
>
> -#define ACPI_READ_ARRAY_PTR(arr, length, addr) \
> - do { \
> - int idx; \
> - for (idx = 0; idx < length; ++idx) { \
> - ACPI_READ_FIELD(arr[idx], addr); \
> - } \
> +#define ACPI_READ_ARRAY_PTR(qts, arr, length, addr) \
> + do { \
> + int idx; \
> + for (idx = 0; idx < length; ++idx) { \
> + ACPI_READ_FIELD(qts, arr[idx], addr); \
> + } \
> } while (0);
>
> -#define ACPI_READ_ARRAY(arr, addr) \
> - ACPI_READ_ARRAY_PTR(arr, sizeof(arr) / sizeof(arr[0]), addr)
> +#define ACPI_READ_ARRAY(qts, arr, addr) \
> + ACPI_READ_ARRAY_PTR(qts, arr, sizeof(arr) / sizeof(arr[0]), addr)
>
> -#define ACPI_READ_TABLE_HEADER(table, addr) \
> +#define ACPI_READ_TABLE_HEADER(qts, table, addr) \
> do { \
> - ACPI_READ_FIELD((table)->signature, addr); \
> - ACPI_READ_FIELD((table)->length, addr); \
> - ACPI_READ_FIELD((table)->revision, addr); \
> - ACPI_READ_FIELD((table)->checksum, addr); \
> - ACPI_READ_ARRAY((table)->oem_id, addr); \
> - ACPI_READ_ARRAY((table)->oem_table_id, addr); \
> - ACPI_READ_FIELD((table)->oem_revision, addr); \
> - ACPI_READ_ARRAY((table)->asl_compiler_id, addr); \
> - ACPI_READ_FIELD((table)->asl_compiler_revision, addr); \
> + ACPI_READ_FIELD(qts, (table)->signature, addr); \
> + ACPI_READ_FIELD(qts, (table)->length, addr); \
> + ACPI_READ_FIELD(qts, (table)->revision, addr); \
> + ACPI_READ_FIELD(qts, (table)->checksum, addr); \
> + ACPI_READ_ARRAY(qts, (table)->oem_id, addr); \
> + ACPI_READ_ARRAY(qts, (table)->oem_table_id, addr); \
> + ACPI_READ_FIELD(qts, (table)->oem_revision, addr); \
> + ACPI_READ_ARRAY(qts, (table)->asl_compiler_id, addr); \
> + ACPI_READ_FIELD(qts, (table)->asl_compiler_revision, addr); \
> } while (0);
>
> #define ACPI_ASSERT_CMP(actual, expected) do { \
> @@ -87,18 +87,19 @@ typedef struct {
> g_assert_cmpstr(ACPI_ASSERT_CMP_str, ==, expected); \
> } while (0)
>
> -#define ACPI_READ_GENERIC_ADDRESS(field, addr) \
> - do { \
> - ACPI_READ_FIELD((field).space_id, addr); \
> - ACPI_READ_FIELD((field).bit_width, addr); \
> - ACPI_READ_FIELD((field).bit_offset, addr); \
> - ACPI_READ_FIELD((field).access_width, addr); \
> - ACPI_READ_FIELD((field).address, addr); \
> +#define ACPI_READ_GENERIC_ADDRESS(qts, field, addr) \
> + do { \
> + ACPI_READ_FIELD(qts, (field).space_id, addr); \
> + ACPI_READ_FIELD(qts, (field).bit_width, addr); \
> + ACPI_READ_FIELD(qts, (field).bit_offset, addr); \
> + ACPI_READ_FIELD(qts, (field).access_width, addr); \
> + ACPI_READ_FIELD(qts, (field).address, addr); \
> } while (0);
>
>
> uint8_t acpi_calc_checksum(const uint8_t *data, int len);
> -uint32_t acpi_find_rsdp_address(void);
> -void acpi_parse_rsdp_table(uint32_t addr, AcpiRsdpDescriptor *rsdp_table);
> +uint32_t acpi_find_rsdp_address(QTestState *qts);
> +void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr,
> + AcpiRsdpDescriptor *rsdp_table);
>
> #endif /* TEST_ACPI_UTILS_H */
> diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c
> index 41dc1ea9b4..6dc8ca1a8c 100644
> --- a/tests/acpi-utils.c
> +++ b/tests/acpi-utils.c
> @@ -32,7 +32,7 @@ uint8_t acpi_calc_checksum(const uint8_t *data, int len)
> return sum;
> }
>
> -uint32_t acpi_find_rsdp_address(void)
> +uint32_t acpi_find_rsdp_address(QTestState *qts)
> {
> uint32_t off;
>
> @@ -42,7 +42,7 @@ uint32_t acpi_find_rsdp_address(void)
> int i;
>
> for (i = 0; i < sizeof sig - 1; ++i) {
> - sig[i] = readb(off + i);
> + sig[i] = qtest_readb(qts, off + i);
> }
>
> if (!memcmp(sig, "RSD PTR ", sizeof sig)) {
> @@ -52,14 +52,15 @@ uint32_t acpi_find_rsdp_address(void)
> return off;
> }
>
> -void acpi_parse_rsdp_table(uint32_t addr, AcpiRsdpDescriptor *rsdp_table)
> +void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr,
> + AcpiRsdpDescriptor *rsdp_table)
> {
> - ACPI_READ_FIELD(rsdp_table->signature, addr);
> + ACPI_READ_FIELD(qts, rsdp_table->signature, addr);
> ACPI_ASSERT_CMP64(rsdp_table->signature, "RSD PTR ");
>
> - ACPI_READ_FIELD(rsdp_table->checksum, addr);
> - ACPI_READ_ARRAY(rsdp_table->oem_id, addr);
> - ACPI_READ_FIELD(rsdp_table->revision, addr);
> - ACPI_READ_FIELD(rsdp_table->rsdt_physical_address, addr);
> - ACPI_READ_FIELD(rsdp_table->length, addr);
> + ACPI_READ_FIELD(qts, rsdp_table->checksum, addr);
> + ACPI_READ_ARRAY(qts, rsdp_table->oem_id, addr);
> + ACPI_READ_FIELD(qts, rsdp_table->revision, addr);
> + ACPI_READ_FIELD(qts, rsdp_table->rsdt_physical_address, addr);
> + ACPI_READ_FIELD(qts, rsdp_table->length, addr);
> }
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index bde62bf1cf..75b29df493 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -77,7 +77,7 @@ static void free_test_data(test_data *data)
>
> static void test_acpi_rsdp_address(test_data *data)
> {
> - uint32_t off = acpi_find_rsdp_address();
> + uint32_t off = acpi_find_rsdp_address(global_qtest);
> g_assert_cmphex(off, <, 0x100000);
> data->rsdp_addr = off;
> }
> @@ -87,7 +87,7 @@ static void test_acpi_rsdp_table(test_data *data)
> AcpiRsdpDescriptor *rsdp_table = &data->rsdp_table;
> uint32_t addr = data->rsdp_addr;
>
> - acpi_parse_rsdp_table(addr, rsdp_table);
> + acpi_parse_rsdp_table(global_qtest, addr, rsdp_table);
>
> /* rsdp checksum is not for the whole table, but for the first 20 bytes
> */
> g_assert(!acpi_calc_checksum((uint8_t *)rsdp_table, 20));
> @@ -102,7 +102,7 @@ static void test_acpi_rsdt_table(test_data *data)
> uint8_t checksum;
>
> /* read the header */
> - ACPI_READ_TABLE_HEADER(rsdt_table, addr);
> + ACPI_READ_TABLE_HEADER(global_qtest, rsdt_table, addr);
> ACPI_ASSERT_CMP(rsdt_table->signature, "RSDT");
>
> /* compute the table entries in rsdt */
> @@ -112,7 +112,7 @@ static void test_acpi_rsdt_table(test_data *data)
>
> /* get the addresses of the tables pointed by rsdt */
> tables = g_new0(uint32_t, tables_nr);
> - ACPI_READ_ARRAY_PTR(tables, tables_nr, addr);
> + ACPI_READ_ARRAY_PTR(global_qtest, tables, tables_nr, addr);
>
> checksum = acpi_calc_checksum((uint8_t *)rsdt_table, rsdt_table->length)
> +
> acpi_calc_checksum((uint8_t *)tables,
> @@ -128,63 +128,64 @@ static void test_acpi_fadt_table(test_data *data)
> {
> AcpiFadtDescriptorRev3 *fadt_table = &data->fadt_table;
> uint32_t addr;
> + QTestState *qts = global_qtest;
>
> /* FADT table comes first */
> addr = data->rsdt_tables_addr[0];
> - ACPI_READ_TABLE_HEADER(fadt_table, addr);
> + ACPI_READ_TABLE_HEADER(qts, fadt_table, addr);
>
> - ACPI_READ_FIELD(fadt_table->firmware_ctrl, addr);
> - ACPI_READ_FIELD(fadt_table->dsdt, addr);
> - ACPI_READ_FIELD(fadt_table->model, addr);
> - ACPI_READ_FIELD(fadt_table->reserved1, addr);
> - ACPI_READ_FIELD(fadt_table->sci_int, addr);
> - ACPI_READ_FIELD(fadt_table->smi_cmd, addr);
> - ACPI_READ_FIELD(fadt_table->acpi_enable, addr);
> - ACPI_READ_FIELD(fadt_table->acpi_disable, addr);
> - ACPI_READ_FIELD(fadt_table->S4bios_req, addr);
> - ACPI_READ_FIELD(fadt_table->reserved2, addr);
> - ACPI_READ_FIELD(fadt_table->pm1a_evt_blk, addr);
> - ACPI_READ_FIELD(fadt_table->pm1b_evt_blk, addr);
> - ACPI_READ_FIELD(fadt_table->pm1a_cnt_blk, addr);
> - ACPI_READ_FIELD(fadt_table->pm1b_cnt_blk, addr);
> - ACPI_READ_FIELD(fadt_table->pm2_cnt_blk, addr);
> - ACPI_READ_FIELD(fadt_table->pm_tmr_blk, addr);
> - ACPI_READ_FIELD(fadt_table->gpe0_blk, addr);
> - ACPI_READ_FIELD(fadt_table->gpe1_blk, addr);
> - ACPI_READ_FIELD(fadt_table->pm1_evt_len, addr);
> - ACPI_READ_FIELD(fadt_table->pm1_cnt_len, addr);
> - ACPI_READ_FIELD(fadt_table->pm2_cnt_len, addr);
> - ACPI_READ_FIELD(fadt_table->pm_tmr_len, addr);
> - ACPI_READ_FIELD(fadt_table->gpe0_blk_len, addr);
> - ACPI_READ_FIELD(fadt_table->gpe1_blk_len, addr);
> - ACPI_READ_FIELD(fadt_table->gpe1_base, addr);
> - ACPI_READ_FIELD(fadt_table->reserved3, addr);
> - ACPI_READ_FIELD(fadt_table->plvl2_lat, addr);
> - ACPI_READ_FIELD(fadt_table->plvl3_lat, addr);
> - ACPI_READ_FIELD(fadt_table->flush_size, addr);
> - ACPI_READ_FIELD(fadt_table->flush_stride, addr);
> - ACPI_READ_FIELD(fadt_table->duty_offset, addr);
> - ACPI_READ_FIELD(fadt_table->duty_width, addr);
> - ACPI_READ_FIELD(fadt_table->day_alrm, addr);
> - ACPI_READ_FIELD(fadt_table->mon_alrm, addr);
> - ACPI_READ_FIELD(fadt_table->century, addr);
> - ACPI_READ_FIELD(fadt_table->boot_flags, addr);
> - ACPI_READ_FIELD(fadt_table->reserved, addr);
> - ACPI_READ_FIELD(fadt_table->flags, addr);
> - ACPI_READ_GENERIC_ADDRESS(fadt_table->reset_register, addr);
> - ACPI_READ_FIELD(fadt_table->reset_value, addr);
> - ACPI_READ_FIELD(fadt_table->arm_boot_flags, addr);
> - ACPI_READ_FIELD(fadt_table->minor_revision, addr);
> - ACPI_READ_FIELD(fadt_table->x_facs, addr);
> - ACPI_READ_FIELD(fadt_table->x_dsdt, addr);
> - ACPI_READ_GENERIC_ADDRESS(fadt_table->xpm1a_event_block, addr);
> - ACPI_READ_GENERIC_ADDRESS(fadt_table->xpm1b_event_block, addr);
> - ACPI_READ_GENERIC_ADDRESS(fadt_table->xpm1a_control_block, addr);
> - ACPI_READ_GENERIC_ADDRESS(fadt_table->xpm1b_control_block, addr);
> - ACPI_READ_GENERIC_ADDRESS(fadt_table->xpm2_control_block, addr);
> - ACPI_READ_GENERIC_ADDRESS(fadt_table->xpm_timer_block, addr);
> - ACPI_READ_GENERIC_ADDRESS(fadt_table->xgpe0_block, addr);
> - ACPI_READ_GENERIC_ADDRESS(fadt_table->xgpe1_block, addr);
> + ACPI_READ_FIELD(qts, fadt_table->firmware_ctrl, addr);
> + ACPI_READ_FIELD(qts, fadt_table->dsdt, addr);
> + ACPI_READ_FIELD(qts, fadt_table->model, addr);
> + ACPI_READ_FIELD(qts, fadt_table->reserved1, addr);
> + ACPI_READ_FIELD(qts, fadt_table->sci_int, addr);
> + ACPI_READ_FIELD(qts, fadt_table->smi_cmd, addr);
> + ACPI_READ_FIELD(qts, fadt_table->acpi_enable, addr);
> + ACPI_READ_FIELD(qts, fadt_table->acpi_disable, addr);
> + ACPI_READ_FIELD(qts, fadt_table->S4bios_req, addr);
> + ACPI_READ_FIELD(qts, fadt_table->reserved2, addr);
> + ACPI_READ_FIELD(qts, fadt_table->pm1a_evt_blk, addr);
> + ACPI_READ_FIELD(qts, fadt_table->pm1b_evt_blk, addr);
> + ACPI_READ_FIELD(qts, fadt_table->pm1a_cnt_blk, addr);
> + ACPI_READ_FIELD(qts, fadt_table->pm1b_cnt_blk, addr);
> + ACPI_READ_FIELD(qts, fadt_table->pm2_cnt_blk, addr);
> + ACPI_READ_FIELD(qts, fadt_table->pm_tmr_blk, addr);
> + ACPI_READ_FIELD(qts, fadt_table->gpe0_blk, addr);
> + ACPI_READ_FIELD(qts, fadt_table->gpe1_blk, addr);
> + ACPI_READ_FIELD(qts, fadt_table->pm1_evt_len, addr);
> + ACPI_READ_FIELD(qts, fadt_table->pm1_cnt_len, addr);
> + ACPI_READ_FIELD(qts, fadt_table->pm2_cnt_len, addr);
> + ACPI_READ_FIELD(qts, fadt_table->pm_tmr_len, addr);
> + ACPI_READ_FIELD(qts, fadt_table->gpe0_blk_len, addr);
> + ACPI_READ_FIELD(qts, fadt_table->gpe1_blk_len, addr);
> + ACPI_READ_FIELD(qts, fadt_table->gpe1_base, addr);
> + ACPI_READ_FIELD(qts, fadt_table->reserved3, addr);
> + ACPI_READ_FIELD(qts, fadt_table->plvl2_lat, addr);
> + ACPI_READ_FIELD(qts, fadt_table->plvl3_lat, addr);
> + ACPI_READ_FIELD(qts, fadt_table->flush_size, addr);
> + ACPI_READ_FIELD(qts, fadt_table->flush_stride, addr);
> + ACPI_READ_FIELD(qts, fadt_table->duty_offset, addr);
> + ACPI_READ_FIELD(qts, fadt_table->duty_width, addr);
> + ACPI_READ_FIELD(qts, fadt_table->day_alrm, addr);
> + ACPI_READ_FIELD(qts, fadt_table->mon_alrm, addr);
> + ACPI_READ_FIELD(qts, fadt_table->century, addr);
> + ACPI_READ_FIELD(qts, fadt_table->boot_flags, addr);
> + ACPI_READ_FIELD(qts, fadt_table->reserved, addr);
> + ACPI_READ_FIELD(qts, fadt_table->flags, addr);
> + ACPI_READ_GENERIC_ADDRESS(qts, fadt_table->reset_register, addr);
> + ACPI_READ_FIELD(qts, fadt_table->reset_value, addr);
> + ACPI_READ_FIELD(qts, fadt_table->arm_boot_flags, addr);
> + ACPI_READ_FIELD(qts, fadt_table->minor_revision, addr);
> + ACPI_READ_FIELD(qts, fadt_table->x_facs, addr);
> + ACPI_READ_FIELD(qts, fadt_table->x_dsdt, addr);
> + ACPI_READ_GENERIC_ADDRESS(qts, fadt_table->xpm1a_event_block, addr);
> + ACPI_READ_GENERIC_ADDRESS(qts, fadt_table->xpm1b_event_block, addr);
> + ACPI_READ_GENERIC_ADDRESS(qts, fadt_table->xpm1a_control_block, addr);
> + ACPI_READ_GENERIC_ADDRESS(qts, fadt_table->xpm1b_control_block, addr);
> + ACPI_READ_GENERIC_ADDRESS(qts, fadt_table->xpm2_control_block, addr);
> + ACPI_READ_GENERIC_ADDRESS(qts, fadt_table->xpm_timer_block, addr);
> + ACPI_READ_GENERIC_ADDRESS(qts, fadt_table->xgpe0_block, addr);
> + ACPI_READ_GENERIC_ADDRESS(qts, fadt_table->xgpe1_block, addr);
>
> ACPI_ASSERT_CMP(fadt_table->signature, "FACP");
> g_assert(!acpi_calc_checksum((uint8_t *)fadt_table, fadt_table->length));
> @@ -195,13 +196,13 @@ static void test_acpi_facs_table(test_data *data)
> AcpiFacsDescriptorRev1 *facs_table = &data->facs_table;
> uint32_t addr = data->fadt_table.firmware_ctrl;
>
> - ACPI_READ_FIELD(facs_table->signature, addr);
> - ACPI_READ_FIELD(facs_table->length, addr);
> - ACPI_READ_FIELD(facs_table->hardware_signature, addr);
> - ACPI_READ_FIELD(facs_table->firmware_waking_vector, addr);
> - ACPI_READ_FIELD(facs_table->global_lock, addr);
> - ACPI_READ_FIELD(facs_table->flags, addr);
> - ACPI_READ_ARRAY(facs_table->resverved3, addr);
> + ACPI_READ_FIELD(global_qtest, facs_table->signature, addr);
> + ACPI_READ_FIELD(global_qtest, facs_table->length, addr);
> + ACPI_READ_FIELD(global_qtest, facs_table->hardware_signature, addr);
> + ACPI_READ_FIELD(global_qtest, facs_table->firmware_waking_vector, addr);
> + ACPI_READ_FIELD(global_qtest, facs_table->global_lock, addr);
> + ACPI_READ_FIELD(global_qtest, facs_table->flags, addr);
> + ACPI_READ_ARRAY(global_qtest, facs_table->resverved3, addr);
>
> ACPI_ASSERT_CMP(facs_table->signature, "FACS");
> }
> @@ -210,11 +211,11 @@ static void test_dst_table(AcpiSdtTable *sdt_table,
> uint32_t addr)
> {
> uint8_t checksum;
>
> - ACPI_READ_TABLE_HEADER(&sdt_table->header, addr);
> + ACPI_READ_TABLE_HEADER(global_qtest, &sdt_table->header, addr);
>
> sdt_table->aml_len = sdt_table->header.length - sizeof(AcpiTableHeader);
> sdt_table->aml = g_malloc0(sdt_table->aml_len);
> - ACPI_READ_ARRAY_PTR(sdt_table->aml, sdt_table->aml_len, addr);
> + ACPI_READ_ARRAY_PTR(global_qtest, sdt_table->aml, sdt_table->aml_len,
> addr);
>
> checksum = acpi_calc_checksum((uint8_t *)sdt_table,
> sizeof(AcpiTableHeader)) +
> @@ -492,32 +493,32 @@ static bool smbios_ep_table_ok(test_data *data)
> struct smbios_21_entry_point *ep_table = &data->smbios_ep_table;
> uint32_t addr = data->smbios_ep_addr;
>
> - ACPI_READ_ARRAY(ep_table->anchor_string, addr);
> + ACPI_READ_ARRAY(global_qtest, ep_table->anchor_string, addr);
> if (memcmp(ep_table->anchor_string, "_SM_", 4)) {
> return false;
> }
> - ACPI_READ_FIELD(ep_table->checksum, addr);
> - ACPI_READ_FIELD(ep_table->length, addr);
> - ACPI_READ_FIELD(ep_table->smbios_major_version, addr);
> - ACPI_READ_FIELD(ep_table->smbios_minor_version, addr);
> - ACPI_READ_FIELD(ep_table->max_structure_size, addr);
> - ACPI_READ_FIELD(ep_table->entry_point_revision, addr);
> - ACPI_READ_ARRAY(ep_table->formatted_area, addr);
> - ACPI_READ_ARRAY(ep_table->intermediate_anchor_string, addr);
> + ACPI_READ_FIELD(global_qtest, ep_table->checksum, addr);
> + ACPI_READ_FIELD(global_qtest, ep_table->length, addr);
> + ACPI_READ_FIELD(global_qtest, ep_table->smbios_major_version, addr);
> + ACPI_READ_FIELD(global_qtest, ep_table->smbios_minor_version, addr);
> + ACPI_READ_FIELD(global_qtest, ep_table->max_structure_size, addr);
> + ACPI_READ_FIELD(global_qtest, ep_table->entry_point_revision, addr);
> + ACPI_READ_ARRAY(global_qtest, ep_table->formatted_area, addr);
> + ACPI_READ_ARRAY(global_qtest, ep_table->intermediate_anchor_string,
> addr);
> if (memcmp(ep_table->intermediate_anchor_string, "_DMI_", 5)) {
> return false;
> }
> - ACPI_READ_FIELD(ep_table->intermediate_checksum, addr);
> - ACPI_READ_FIELD(ep_table->structure_table_length, addr);
> + ACPI_READ_FIELD(global_qtest, ep_table->intermediate_checksum, addr);
> + ACPI_READ_FIELD(global_qtest, ep_table->structure_table_length, addr);
> if (ep_table->structure_table_length == 0) {
> return false;
> }
> - ACPI_READ_FIELD(ep_table->structure_table_address, addr);
> - ACPI_READ_FIELD(ep_table->number_of_structures, addr);
> + ACPI_READ_FIELD(global_qtest, ep_table->structure_table_address, addr);
> + ACPI_READ_FIELD(global_qtest, ep_table->number_of_structures, addr);
> if (ep_table->number_of_structures == 0) {
> return false;
> }
> - ACPI_READ_FIELD(ep_table->smbios_bcd_revision, addr);
> + ACPI_READ_FIELD(global_qtest, ep_table->smbios_bcd_revision, addr);
> if (acpi_calc_checksum((uint8_t *)ep_table, sizeof *ep_table) ||
> acpi_calc_checksum((uint8_t *)ep_table + 0x10,
> sizeof *ep_table - 0x10)) {
> diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c
> index 4bdc8a15e7..73473162d0 100644
> --- a/tests/vmgenid-test.c
> +++ b/tests/vmgenid-test.c
> @@ -50,15 +50,15 @@ static uint32_t acpi_find_vgia(void)
> boot_sector_test(global_qtest);
>
> /* Tables should be initialized now. */
> - rsdp_offset = acpi_find_rsdp_address();
> + rsdp_offset = acpi_find_rsdp_address(global_qtest);
>
> g_assert_cmphex(rsdp_offset, <, RSDP_ADDR_INVALID);
>
> - acpi_parse_rsdp_table(rsdp_offset, &rsdp_table);
> + acpi_parse_rsdp_table(global_qtest, rsdp_offset, &rsdp_table);
>
> rsdt = rsdp_table.rsdt_physical_address;
> /* read the header */
> - ACPI_READ_TABLE_HEADER(&rsdt_table, rsdt);
> + ACPI_READ_TABLE_HEADER(global_qtest, &rsdt_table, rsdt);
> ACPI_ASSERT_CMP(rsdt_table.signature, "RSDT");
>
> /* compute the table entries in rsdt */
> @@ -68,21 +68,21 @@ static uint32_t acpi_find_vgia(void)
>
> /* get the addresses of the tables pointed by rsdt */
> tables = g_new0(uint32_t, tables_nr);
> - ACPI_READ_ARRAY_PTR(tables, tables_nr, rsdt);
> + ACPI_READ_ARRAY_PTR(global_qtest, tables, tables_nr, rsdt);
>
> for (i = 0; i < tables_nr; i++) {
> - ACPI_READ_TABLE_HEADER(&ssdt_table, tables[i]);
> + ACPI_READ_TABLE_HEADER(global_qtest, &ssdt_table, tables[i]);
> if (!strncmp((char *)ssdt_table.oem_table_id, "VMGENID", 7)) {
> /* the first entry in the table should be VGIA
> * That's all we need
> */
> - ACPI_READ_FIELD(vgid_table.name_op, tables[i]);
> + ACPI_READ_FIELD(global_qtest, vgid_table.name_op, tables[i]);
> g_assert(vgid_table.name_op == 0x08); /* name */
> - ACPI_READ_ARRAY(vgid_table.vgia, tables[i]);
> + ACPI_READ_ARRAY(global_qtest, vgid_table.vgia, tables[i]);
> g_assert(memcmp(vgid_table.vgia, "VGIA", 4) == 0);
> - ACPI_READ_FIELD(vgid_table.val_op, tables[i]);
> + ACPI_READ_FIELD(global_qtest, vgid_table.val_op, tables[i]);
> g_assert(vgid_table.val_op == 0x0C); /* dword */
> - ACPI_READ_FIELD(vgid_table.vgia_val, tables[i]);
> + ACPI_READ_FIELD(global_qtest, vgid_table.vgia_val, tables[i]);
> /* The GUID is written at a fixed offset into the fw_cfg file
> * in order to implement the "OVMF SDT Header probe suppressor"
> * see docs/specs/vmgenid.txt for more details
> --
> 2.13.5
>
- Re: [Qemu-devel] [PATCH v6 22/29] tests/boot-sector: Drop dependence on global_qtest, (continued)
- [Qemu-devel] [PATCH v6 21/29] qmp-test: Drop dependence on global_qtest, Eric Blake, 2017/09/01
- [Qemu-devel] [PATCH v6 17/29] ahci-test: Drop dependence on global_qtest, Eric Blake, 2017/09/01
- [Qemu-devel] [PATCH v6 23/29] tests/acpi-utils: Drop dependence on global_qtest, Eric Blake, 2017/09/01
- [Qemu-devel] [PATCH v6 24/29] bios-tables-test: Drop dependence on global_qtest, Eric Blake, 2017/09/01
- [Qemu-devel] [PATCH v6 16/29] libqos: Use explicit QTestState for virtio operations, Eric Blake, 2017/09/01
- [Qemu-devel] [PATCH v6 27/29] libqtest: Make qtest_init() accept format string, Eric Blake, 2017/09/01