* [PATCH] tests/qtest/boot-sector: Check that the guest did not panic
@ 2021-02-12 11:31 Thomas Huth
2021-02-12 13:18 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Huth @ 2021-02-12 11:31 UTC (permalink / raw)
To: qemu-devel, Laurent Vivier, Peter Maydell; +Cc: Paolo Bonzini, Michael Tsirkin
The s390-ccw bios code panics if it can not boot successfully. In
this case, it does not make sense that we wait the full 600 seconds
for the boot sector test to finish and can signal the failure
immediately, thus let's check the status of the guest with the
"query-status" QMP command here, too.
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/boot-sector.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c
index 24df5c4734..ea8f264661 100644
--- a/tests/qtest/boot-sector.c
+++ b/tests/qtest/boot-sector.c
@@ -138,6 +138,7 @@ void boot_sector_test(QTestState *qts)
uint8_t signature_low;
uint8_t signature_high;
uint16_t signature;
+ QDict *qrsp, *qret;
int i;
/* Wait at most 600 seconds (test is slow with TCI and --enable-debug) */
@@ -155,6 +156,14 @@ void boot_sector_test(QTestState *qts)
if (signature == SIGNATURE) {
break;
}
+
+ /* check that guest is still in "running" state and did not panic */
+ qrsp = qtest_qmp(qts, "{ 'execute': 'query-status' }");
+ qret = qdict_get_qdict(qrsp, "return");
+ g_assert_nonnull(qret);
+ g_assert_cmpstr(qdict_get_try_str(qret, "status"), ==, "running");
+ qobject_unref(qrsp);
+
g_usleep(TEST_DELAY);
}
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/qtest/boot-sector: Check that the guest did not panic
2021-02-12 11:31 [PATCH] tests/qtest/boot-sector: Check that the guest did not panic Thomas Huth
@ 2021-02-12 13:18 ` Philippe Mathieu-Daudé
2021-02-12 13:59 ` Thomas Huth
2021-02-15 19:17 ` John Snow
0 siblings, 2 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-02-12 13:18 UTC (permalink / raw)
To: Thomas Huth, Cleber Rosa, John Snow, Willian Rampazzo
Cc: Peter Maydell, Paolo Bonzini, qemu-devel, Laurent Vivier,
Michael Tsirkin
On 2/12/21 12:31 PM, Thomas Huth wrote:
> The s390-ccw bios code panics if it can not boot successfully. In
> this case, it does not make sense that we wait the full 600 seconds
> for the boot sector test to finish and can signal the failure
> immediately, thus let's check the status of the guest with the
> "query-status" QMP command here, too.
>
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/qtest/boot-sector.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c
> index 24df5c4734..ea8f264661 100644
> --- a/tests/qtest/boot-sector.c
> +++ b/tests/qtest/boot-sector.c
> @@ -138,6 +138,7 @@ void boot_sector_test(QTestState *qts)
> uint8_t signature_low;
> uint8_t signature_high;
> uint16_t signature;
> + QDict *qrsp, *qret;
> int i;
>
> /* Wait at most 600 seconds (test is slow with TCI and --enable-debug) */
> @@ -155,6 +156,14 @@ void boot_sector_test(QTestState *qts)
> if (signature == SIGNATURE) {
> break;
> }
> +
> + /* check that guest is still in "running" state and did not panic */
> + qrsp = qtest_qmp(qts, "{ 'execute': 'query-status' }");
> + qret = qdict_get_qdict(qrsp, "return");
> + g_assert_nonnull(qret);
> + g_assert_cmpstr(qdict_get_try_str(qret, "status"), ==, "running");
Interesting idea. Does it make sense to have a similar (optional?) check
done in QEMUMachine? This could benefit integration tests, quicker exit
on failure.
> + qobject_unref(qrsp);
> +
> g_usleep(TEST_DELAY);
> }
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/qtest/boot-sector: Check that the guest did not panic
2021-02-12 13:18 ` Philippe Mathieu-Daudé
@ 2021-02-12 13:59 ` Thomas Huth
2021-02-15 19:17 ` John Snow
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Huth @ 2021-02-12 13:59 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Cleber Rosa, John Snow, Willian Rampazzo
Cc: Laurent Vivier, Peter Maydell, Michael Tsirkin, qemu-devel,
Paolo Bonzini
On 12/02/2021 14.18, Philippe Mathieu-Daudé wrote:
> On 2/12/21 12:31 PM, Thomas Huth wrote:
>> The s390-ccw bios code panics if it can not boot successfully. In
>> this case, it does not make sense that we wait the full 600 seconds
>> for the boot sector test to finish and can signal the failure
>> immediately, thus let's check the status of the guest with the
>> "query-status" QMP command here, too.
>>
>> Reported-by: Peter Maydell <peter.maydell@linaro.org>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> tests/qtest/boot-sector.c | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c
>> index 24df5c4734..ea8f264661 100644
>> --- a/tests/qtest/boot-sector.c
>> +++ b/tests/qtest/boot-sector.c
>> @@ -138,6 +138,7 @@ void boot_sector_test(QTestState *qts)
>> uint8_t signature_low;
>> uint8_t signature_high;
>> uint16_t signature;
>> + QDict *qrsp, *qret;
>> int i;
>>
>> /* Wait at most 600 seconds (test is slow with TCI and --enable-debug) */
>> @@ -155,6 +156,14 @@ void boot_sector_test(QTestState *qts)
>> if (signature == SIGNATURE) {
>> break;
>> }
>> +
>> + /* check that guest is still in "running" state and did not panic */
>> + qrsp = qtest_qmp(qts, "{ 'execute': 'query-status' }");
>> + qret = qdict_get_qdict(qrsp, "return");
>> + g_assert_nonnull(qret);
>> + g_assert_cmpstr(qdict_get_try_str(qret, "status"), ==, "running");
>
> Interesting idea. Does it make sense to have a similar (optional?) check
> done in QEMUMachine? This could benefit integration tests, quicker exit
> on failure.
Well, it only makes sense in cases where the guest is causing a panic event.
That's what the s390 ccw bios is doing, but other firmwares do *not* panic
in case they cannot boot the guest.
It might be also useful for the acceptance tests if they can trigger a panic
event, but I think we already check for the "Kernel panic" in the console
output in most cases, so I guess that's enough already?
Thomas
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/qtest/boot-sector: Check that the guest did not panic
2021-02-12 13:18 ` Philippe Mathieu-Daudé
2021-02-12 13:59 ` Thomas Huth
@ 2021-02-15 19:17 ` John Snow
1 sibling, 0 replies; 4+ messages in thread
From: John Snow @ 2021-02-15 19:17 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Thomas Huth, Cleber Rosa, Willian Rampazzo
Cc: Peter Maydell, Paolo Bonzini, qemu-devel, Laurent Vivier,
Michael Tsirkin
On 2/12/21 8:18 AM, Philippe Mathieu-Daudé wrote:
> Interesting idea. Does it make sense to have a similar (optional?) check
> done in QEMUMachine? This could benefit integration tests, quicker exit
> on failure.
>
That might be the wrong layer to do it in. I am trying to keep
QEMUMachine be the mechanisms, not the policy. Not all QEMUMachine
instances even have a QMP socket, either.
Having shared code (somewhere) that allows you to do stuff like issue a
query status every sec to do a more pro-active heartbeat check on-demand
is probably a good idea, though:
e.g.
vm = QEMUManagedMachine(...)
with vm.start_heartbeat() as heartbeat:
... do things prone to failure here ...
...
...
# as of here, the heartbeat has been stopped
It might be worth looking into creating a "value-added" version of
QEMUMachine that offers stuff like this, in a manner similar to how
iotests has its own extended versions of the QEMUMachine to offer
test-specific behavior.
(Patches welcome!)
--js
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-15 19:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-12 11:31 [PATCH] tests/qtest/boot-sector: Check that the guest did not panic Thomas Huth
2021-02-12 13:18 ` Philippe Mathieu-Daudé
2021-02-12 13:59 ` Thomas Huth
2021-02-15 19:17 ` John Snow
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.