From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:60061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGZP-0007SO-Gy for qemu-devel@nongnu.org; Thu, 02 May 2019 14:36:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGZO-0003rU-FG for qemu-devel@nongnu.org; Thu, 02 May 2019 14:36:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61174) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMGZO-0003qy-1z for qemu-devel@nongnu.org; Thu, 02 May 2019 14:36:34 -0400 References: <1556808723-226478-1-git-send-email-imammedo@redhat.com> <1556808723-226478-12-git-send-email-imammedo@redhat.com> From: Laszlo Ersek Message-ID: <370545b5-66fb-ed49-bd96-e270dcbdd56b@redhat.com> Date: Thu, 2 May 2019 20:36:21 +0200 MIME-Version: 1.0 In-Reply-To: <1556808723-226478-12-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 11/15] tests: acpi: allow to override default accelerator List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov , qemu-devel@nongnu.org Cc: Andrew Jones , Ben Warren , "Michael S. Tsirkin" , linuxarm@huawei.com, Shameer Kolothum , Shannon Zhao , Gonglei , Wei Yang , xuwei5@huawei.com, xuwei5@hisilicon.com, =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= On 05/02/19 16:51, Igor Mammedov wrote: > By default test cases were run with 'kvm:tcg' accelerators to speed up > tests execution. While it works for x86, were change of accelerator > doesn't affect ACPI tables, the approach doesn't works for ARM usecase > though. > > In arm/virt case, KVM mode requires using 'host' cpu model, which > isn't available in TCG mode. That could be worked around with 'max' > cpu model, which works both for KVM and TCG. However in KVM mode it > is necessary to specify matching GIC version, which also could use > 'max' value to automatically pick GIC version suitable for host's CPU. > Depending on host cpu type, different GIC versions would be used, > which in turn leads to different ACPI tables (APIC) generated. > As result while comparing with reference blobs, test would fail if > host's GIC version won't match the version on the host where > reference blobs where generated. > > Let's keep testing simple for now and allow ARM tests run in TCG only > mode. To do so introduce 'accel' parameter in test configuration, so > test case could override default "kvm:tcg" with accelerator of choice. > > Signed-off-by: Igor Mammedov > --- > tests/bios-tables-test.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c > index 8302ffc..39c1e24 100644 > --- a/tests/bios-tables-test.c > +++ b/tests/bios-tables-test.c > @@ -24,6 +24,7 @@ > #define ACPI_REBUILD_EXPECTED_AML "TEST_ACPI_REBUILD_AML" > > typedef struct { > + const char *accel; > const char *machine; > const char *variant; > const char *uefi_fl1; > @@ -532,8 +533,8 @@ static void test_acpi_one(const char *params, test_data *data) > args = g_strdup_printf("-machine %s,accel=%s -nodefaults -nographic " > "-drive if=pflash,format=raw,file=%s,readonly " > "-drive if=pflash,format=raw,file=%s,snapshot=on -cdrom %s %s", > - data->machine, "kvm:tcg", data->uefi_fl1, data->uefi_fl2, > - data->cd, params ? params : ""); > + data->machine, data->accel ? data->accel : "kvm:tcg", > + data->uefi_fl1, data->uefi_fl2, data->cd, params ? params : ""); > > } else { > /* Disable kernel irqchip to be able to override apic irq0. */ > @@ -541,7 +542,8 @@ static void test_acpi_one(const char *params, test_data *data) > "-net none -display none %s " > "-drive id=hd0,if=none,file=%s,format=raw " > "-device ide-hd,drive=hd0 ", > - data->machine, "kvm:tcg", params ? params : "", disk); > + data->machine, data->accel ? data->accel : "kvm:tcg", > + params ? params : "", disk); > } > > data->qts = qtest_init(args); > Reviewed-by: Laszlo Ersek