[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v7 24/38] tests/acpi-utils: Drop dependence on g
From: |
Thomas Huth |
Subject: |
Re: [Qemu-devel] [PATCH v7 24/38] tests/acpi-utils: Drop dependence on global_qtest |
Date: |
Tue, 12 Sep 2017 11:26:25 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 |
On 11.09.2017 19:20, 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.
>
> bios-tables-test no longer depends on global_qtest, now that it
> passes explicit state through the testsuite data; an assert
> proves this fact (although we will get rid of it later, once
> global_qtest is gone).
>
> Signed-off-by: Eric Blake <address@hidden>
[...]
> diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c
> index 0ea98b86d7..970c6274fd 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
>
I'd maybe use a local "QTestState *qts = global_qtest;" at the beginning
of this function instead, and then use "qts" instead of "global_qtest in
this function ... then we have to only touch one line later instead of
changing all lines with "global_qtest" again.
Any way:
Reviewed-by: Thomas Huth <address@hidden>
- [Qemu-devel] [PATCH v7 22/38] qmp-test: Drop dependence on global_qtest, (continued)
- [Qemu-devel] [PATCH v7 22/38] qmp-test: Drop dependence on global_qtest, Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 19/38] ivshmem-test: Drop dependence on global_qtest, Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 18/38] ahci-test: Drop dependence on global_qtest, Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 17/38] libqos: Use explicit QTestState for remaining libqos operations, Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 23/38] tests/boot-sector: Drop dependence on global_qtest, Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 24/38] tests/acpi-utils: Drop dependence on global_qtest, Eric Blake, 2017/09/11
- Re: [Qemu-devel] [PATCH v7 24/38] tests/acpi-utils: Drop dependence on global_qtest,
Thomas Huth <=
- [Qemu-devel] [PATCH v7 25/38] wdt_ib700-test: Drop dependence on global_qtest, Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 27/38] libqtest: Swap order of qtest_init() and qtest_start(), Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 30/38] qtest: Avoid passing raw strings through hmp(), Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 26/38] libqtest: Merge qtest_end() into qtest_quit(), Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 28/38] libqtest: Add qtest_[v]startf(), Eric Blake, 2017/09/11