Commit a4f90923 authored by Peter Xu's avatar Peter Xu Committed by Eric Blake
Browse files

Revert "monitor: enable IO thread for (qmp & !mux) typed" 



This reverts commit 3fd2457d.

Enabling OOB caused several iotests failures; due to the imminent
2.12 release, the safest action is to disable OOB for now.  If
other patches fix the issues that iotests exposed, it may be turned
back on in time for the release, otherwise it will be 2.13 material;
either way, the framework changes not reverted now do not hurt if
they remain as part of the 2.12 release.

Additionally, revert the tests in the patch 02130314 ("qmp: introduce
QMPCapability", 2018-03-19), as both parts must be reverted at once
to keep 'make check' passing.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20180323140821.28957-2-peterx@redhat.com>
Tested-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
[eblake: reorder/squash commits, enhance commit message]
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent cc797607

monitor.c

+1 −4
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include "net/slirp.h"

#include "chardev/char-fe.h"

#include "chardev/char-io.h"

#include "chardev/char-mux.h"

#include "ui/qemu-spice.h"

#include "sysemu/numa.h"

#include "monitor/monitor.h"
@@ -4537,10 +4536,8 @@ static void monitor_qmp_setup_handlers_bh(void *opaque) 
void monitor_init(Chardev *chr, int flags)

{

    Monitor *mon = g_malloc(sizeof(*mon));

    /* Enable IOThread for QMPs that are not using MUX chardev backends. */

    bool use_io_thr = (!CHARDEV_IS_MUX(chr)) && (flags & MONITOR_USE_CONTROL);



    monitor_data_init(mon, false, use_io_thr);

    monitor_data_init(mon, false, false);



    qemu_chr_fe_init(&mon->chr, chr, &error_abort);

    mon->flags = flags;

tests/qmp-test.c

+1 −9
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ static void test_qmp_protocol(void) 
    QDict *resp, *q, *ret;

    QList *capabilities;

    QTestState *qts;

    const QListEntry *entry;

    QString *qstr;



    qts = qtest_init_without_qmp_handshake(common_args);
@@ -91,13 +89,7 @@ static void test_qmp_protocol(void) 
    g_assert(q);

    test_version(qdict_get(q, "version"));

    capabilities = qdict_get_qlist(q, "capabilities");

    g_assert(capabilities);

    entry = qlist_first(capabilities);

    g_assert(entry);

    qstr = qobject_to(QString, entry->value);

    g_assert(qstr);

    g_assert_cmpstr(qstring_get_str(qstr), ==, "oob");

    QDECREF(resp);

    g_assert(capabilities && qlist_empty(capabilities));



    /* Test valid command before handshake */

    resp = qtest_qmp(qts, "{ 'execute': 'query-version' }");