cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From a90030205cdd1c640537ddd5353a900291243746 Mon Sep 17 00:00:00 2001
218e99
Message-Id: <a90030205cdd1c640537ddd5353a900291243746.1383564115.git.minovotn@redhat.com>
218e99
In-Reply-To: <5575e0aec51f40ebec46e98ec085cda053283aba.1383564115.git.minovotn@redhat.com>
218e99
References: <5575e0aec51f40ebec46e98ec085cda053283aba.1383564115.git.minovotn@redhat.com>
218e99
From: Markus Armbruster <armbru@redhat.com>
218e99
Date: Fri, 27 Sep 2013 13:31:19 +0200
218e99
Subject: [PATCH 09/14] qtest: Don't reset on qtest chardev connect
218e99
218e99
RH-Author: Markus Armbruster <armbru@redhat.com>
218e99
Message-id: <1380288680-26645-10-git-send-email-armbru@redhat.com>
218e99
Patchwork-id: 54565
218e99
O-Subject: [PATCH 7.0 qemu-kvm 09/10] qtest: Don't reset on qtest chardev connect
218e99
Bugzilla: 997817
218e99
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
218e99
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
218e99
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
218e99
218e99
From: Markus Armbruster <armbru@redhat.com>
218e99
218e99
libqtest's qtest_init() connecting to the qtest socket triggers reset.
218e99
This was coded in the hope we could use the same QEMU process for
218e99
multiple tests that way.  Never used.  Injects an extra reset even
218e99
when it's not used, and that can mess up tests such as the one of
218e99
-boot once I'm about to add.  Drop it.
218e99
218e99
Signed-off-by: Markus Armbruster <armbru@redhat.com>
218e99
Message-id: 1372254743-15808-2-git-send-email-armbru@redhat.com
218e99
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
218e99
(cherry picked from commit ba646ff6a3149f416424122c628e798be4957997)
218e99
---
218e99
 qtest.c | 7 ++++++-
218e99
 1 file changed, 6 insertions(+), 1 deletion(-)
218e99
218e99
Signed-off-by: Michal Novotny <minovotn@redhat.com>
218e99
---
218e99
 qtest.c | 7 ++++++-
218e99
 1 file changed, 6 insertions(+), 1 deletion(-)
218e99
218e99
diff --git a/qtest.c b/qtest.c
218e99
index 07a9612..74f1842 100644
218e99
--- a/qtest.c
218e99
+++ b/qtest.c
218e99
@@ -472,7 +472,12 @@ static void qtest_event(void *opaque, int event)
218e99
 
218e99
     switch (event) {
218e99
     case CHR_EVENT_OPENED:
218e99
-        qemu_system_reset(false);
218e99
+        /*
218e99
+         * We used to call qemu_system_reset() here, hoping we could
218e99
+         * use the same process for multiple tests that way.  Never
218e99
+         * used.  Injects an extra reset even when it's not used, and
218e99
+         * that can mess up tests, e.g. -boot once.
218e99
+         */
218e99
         for (i = 0; i < ARRAY_SIZE(irq_levels); i++) {
218e99
             irq_levels[i] = 0;
218e99
         }
218e99
-- 
218e99
1.7.11.7
218e99