From: Zhang Chen <chen.zhang@intel.com >
To: Jason Wang <jasowang@redhat.com>
Cc: Zhang Chen <chen.zhang@intel.com>,
Lukas Straub <lukasstraub2@web.de>,
qemu-dev <qemu-devel@nongnu.org>,
Zhang Chen <zhangckid@gmail.com>
Subject: [PATCH V2 2/7] chardev/char.c: Use qemu_co_sleep_ns if in coroutine
Date: Fri, 22 May 2020 15:53:52 +0800 [thread overview]
Message-ID: <20200522075357.19883-3-chen.zhang@intel.com> (raw)
In-Reply-To: <20200522075357.19883-1-chen.zhang@intel.com>
From: Lukas Straub <lukasstraub2@web.de>
This will be needed in the next patch so compare_chr_send can be
converted to a coroutine.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
---
chardev/char.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/chardev/char.c b/chardev/char.c
index ea06c5ff4d..e3051295ac 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -38,6 +38,7 @@
#include "qemu/module.h"
#include "qemu/option.h"
#include "qemu/id.h"
+#include "qemu/coroutine.h"
#include "chardev/char-mux.h"
@@ -119,7 +120,11 @@ static int qemu_chr_write_buffer(Chardev *s,
retry:
res = cc->chr_write(s, buf + *offset, len - *offset);
if (res < 0 && errno == EAGAIN && write_all) {
- g_usleep(100);
+ if (qemu_in_coroutine()) {
+ qemu_co_sleep_ns(QEMU_CLOCK_REALTIME, 100000);
+ } else {
+ g_usleep(100);
+ }
goto retry;
}
--
2.17.1
next prev parent reply other threads:[~2020-05-22 8:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 7:53 [PATCH V2 0/7] Latest COLO tree queued patches Zhang Chen
2020-05-22 7:53 ` [PATCH V2 1/7] net/colo-compare.c: Create event_bh with the right AioContext Zhang Chen
2020-05-22 7:53 ` Zhang Chen [this message]
2020-05-22 7:53 ` [PATCH V2 3/7] net/colo-compare.c: Fix deadlock in compare_chr_send Zhang Chen
2020-05-22 7:53 ` [PATCH V2 4/7] net/colo-compare.c: Only hexdump packets if tracing is enabled Zhang Chen
2020-05-22 7:53 ` [PATCH V2 5/7] net/colo-compare.c: Check that colo-compare is active Zhang Chen
2020-05-22 7:53 ` [PATCH V2 6/7] net/colo-compare.c: Correct ordering in complete and finalize Zhang Chen
2020-05-22 7:53 ` [PATCH V2 7/7] colo-compare: Fix memory leak in packet_enqueue() Zhang Chen
2020-05-25 2:46 ` [PATCH V2 0/7] Latest COLO tree queued patches Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200522075357.19883-3-chen.zhang@intel.com \
--to=chen.zhang@intel.com \
--cc=jasowang@redhat.com \
--cc=lukasstraub2@web.de \
--cc=qemu-devel@nongnu.org \
--cc=zhangckid@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).