[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 34/51] tests/qtest: bios-tables-test: Adapt the case for win3
From: |
Bin Meng |
Subject: |
Re: [PATCH 34/51] tests/qtest: bios-tables-test: Adapt the case for win32 |
Date: |
Fri, 26 Aug 2022 18:38:58 +0800 |
On Wed, Aug 24, 2022 at 8:42 PM Ani Sinha <ani@anisinha.ca> wrote:
>
>
>
> On Wed, 24 Aug 2022, Bin Meng wrote:
>
> > From: Bin Meng <bin.meng@windriver.com>
> >
> > Single quotes in the arguments (oem_id='CRASH ') are not removed in
> > the Windows environment before it is passed to the QEMU executable.
> > The space in the argument causes the "-acpitable" option parser to
> > think that all of its parameters are done, hence it complains:
> >
> > '-acpitable' requires one of 'data' or 'file'
> >
> > Change to use double quotes which works fine on all platforms.
> >
> > Also /dev/null does not work on win32, and nul should be used.
> >
> > Signed-off-by: Bin Meng <bin.meng@windriver.com>
> > ---
> >
> > tests/qtest/bios-tables-test.c | 12 +++++++++---
> > 1 file changed, 9 insertions(+), 3 deletions(-)
> >
> > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> > index 36783966b0..0148ce388c 100644
> > --- a/tests/qtest/bios-tables-test.c
> > +++ b/tests/qtest/bios-tables-test.c
> > @@ -1615,6 +1615,12 @@ static void test_acpi_virt_viot(void)
> > free_test_data(&data);
> > }
> >
> > +#ifndef _WIN32
> > +# define DEV_NULL "/dev/null"
> > +#else
> > +# define DEV_NULL "nul"
> > +#endif
> > +
> > static void test_acpi_q35_slic(void)
> > {
> > test_data data = {
> > @@ -1622,9 +1628,9 @@ static void test_acpi_q35_slic(void)
> > .variant = ".slic",
> > };
> >
> > - test_acpi_one("-acpitable sig=SLIC,oem_id='CRASH ',oem_table_id='ME',"
> > - "oem_rev=00002210,asl_compiler_id='qemu',"
> > - "asl_compiler_rev=00000000,data=/dev/null",
> > + test_acpi_one("-acpitable sig=SLIC,oem_id=\"CRASH \",oem_table_id=ME,"
> > + "oem_rev=00002210,asl_compiler_id=qemu,"
>
> ME and qemu should be surrounded by quotes. They are string arguments.
> https://www.qemu.org/docs/master/interop/qemu-qmp-ref.html?highlight=oem_table_id
>
The doc also says sig is a string, but the original code does not
surround it by quotes.
The parameter is of string type by default, so there is no need to
surround it by quotes unless it contains some special characters.
Regards,
Bin
- Re: [PATCH 27/51] tests/qtest: Use send/recv for socket communication, (continued)
- [PATCH 28/51] tests/qtest: libqtest: Exclude the *_fds APIs for win32, Bin Meng, 2022/08/24
- [PATCH 29/51] tests/qtest: libqtest: Install signal handler via signal(), Bin Meng, 2022/08/24
- [PATCH 30/51] tests: Skip iotests and qtest when '--without-default-devices', Bin Meng, 2022/08/24
- [PATCH 31/51] tests/qtest: Support libqtest to build and run on Windows, Bin Meng, 2022/08/24
- [PATCH 32/51] tests/qtest: Fix ERROR_SHARING_VIOLATION for win32, Bin Meng, 2022/08/24
- [PATCH 34/51] tests/qtest: bios-tables-test: Adapt the case for win32, Bin Meng, 2022/08/24
- [PATCH 39/51] tests/qtest: virtio-net-failover: Disable migration tests for win32, Bin Meng, 2022/08/24
- [PATCH 43/51] tests/qtest: npcm7xx_emc-test: Skip running test_{tx, rx} on win32, Bin Meng, 2022/08/24
- [PATCH 33/51] tests/qtest: {ahci, ide}-test: Use relative path for temporary files, Bin Meng, 2022/08/24
- [PATCH 38/51] tests/qtest: {ahci,ide}-test: Open file in binary mode, Bin Meng, 2022/08/24
- [PATCH 35/51] tests/qtest: device-plug-test: Reverse the usage of double/single quotes, Bin Meng, 2022/08/24
- [PATCH 37/51] tests/qtest: migration-test: Disable IO redirection for win32, Bin Meng, 2022/08/24