| Message ID | 20180323140821.28957-2-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for-2.12,1/4] Revert "monitor: enable IO thread for (qmp & !mux) typed" | expand |
On 03/23/2018 09:08 AM, Peter Xu wrote: > This reverts commit 3fd2457d18edf5736f713dfe1ada9c87a9badab1. > > Signed-off-by: Peter Xu <peterx@redhat.com> Not fatal to taking this patch as-is, but it's always nice to include a rationale when reverting, something along the lines of: It turns out that enabling OOB caused several iotests to break; disabling OOB is the fastest and safest approach for reducing the risk of a broken release, while working on the fixes for the problems uncovered. (Probably similar comments will be needed on the remaining patches...)
On Fri, Mar 23, 2018 at 10:49:31AM -0500, Eric Blake wrote: > On 03/23/2018 09:08 AM, Peter Xu wrote: > > This reverts commit 3fd2457d18edf5736f713dfe1ada9c87a9badab1. > > > > Signed-off-by: Peter Xu <peterx@redhat.com> > > Not fatal to taking this patch as-is, but it's always nice to include a > rationale when reverting, something along the lines of: > > It turns out that enabling OOB caused several iotests to break; disabling > OOB is the fastest and safest approach for reducing the risk of a broken > release, while working on the fixes for the problems uncovered. > > (Probably similar comments will be needed on the remaining patches...) Yes. I saw the pull, thanks for adding those info into commit messages.
diff --git a/monitor.c b/monitor.c index 6ccd2fc089..77f4c41cfa 100644 --- a/monitor.c +++ b/monitor.c @@ -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;
This reverts commit 3fd2457d18edf5736f713dfe1ada9c87a9badab1. Signed-off-by: Peter Xu <peterx@redhat.com> --- monitor.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)