yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-qtest-Don-t-reset-on-qtest-chardev-connect.patch

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