aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2013-06-26 15:52:12 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-07-18 13:27:46 -0500
commitba646ff6a3149f416424122c628e798be4957997 (patch)
tree7967dc875adc24c365830c0de395cf5aa1387bdf
parent1d9358e686125c125b52529fa68baf36aa2d0d09 (diff)
downloadqemu-arm-ba646ff6a3149f416424122c628e798be4957997.tar.gz
qtest: Don't reset on qtest chardev connect
libqtest's qtest_init() connecting to the qtest socket triggers reset. This was coded in the hope we could use the same QEMU process for multiple tests that way. Never used. Injects an extra reset even when it's not used, and that can mess up tests such as the one of -boot once I'm about to add. Drop it. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-id: 1372254743-15808-2-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--qtest.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/qtest.c b/qtest.c
index 07a96120dc..74f1842c1e 100644
--- a/qtest.c
+++ b/qtest.c
@@ -472,7 +472,12 @@ static void qtest_event(void *opaque, int event)
switch (event) {
case CHR_EVENT_OPENED:
- qemu_system_reset(false);
+ /*
+ * We used to call qemu_system_reset() here, hoping we could
+ * use the same process for multiple tests that way. Never
+ * used. Injects an extra reset even when it's not used, and
+ * that can mess up tests, e.g. -boot once.
+ */
for (i = 0; i < ARRAY_SIZE(irq_levels); i++) {
irq_levels[i] = 0;
}