From: Lukas Straub <lukasstraub2@web.de>
To: qemu-devel <qemu-devel@nongnu.org>
Cc: "Zhang Chen" <chen.zhang@intel.com>,
"Jason Wang" <jasowang@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Li Zhijian" <lizhijian@cn.fujitsu.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PATCH v3 2/6] chardev/char.c: Use qemu_co_sleep_ns if in coroutine
Date: Sun, 26 Apr 2020 23:18:47 +0200 [thread overview]
Message-ID: <be38e52e55c46e7de8ec23924e4f1a0071969f6f.1587935686.git.lukasstraub2@web.de> (raw)
In-Reply-To: <cover.1587935686.git.lukasstraub2@web.de>
[-- Attachment #1: Type: text/plain, Size: 1044 bytes --]
This will be needed in the next patch.
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>
---
chardev/char.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/chardev/char.c b/chardev/char.c
index e77564060d..5c8014199f 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.20.1
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-04-26 21:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-26 21:18 [PATCH v3 0/6] colo-compare bugfixes Lukas Straub
2020-04-26 21:18 ` [PATCH v3 1/6] net/colo-compare.c: Create event_bh with the right AioContext Lukas Straub
2020-04-26 21:18 ` Lukas Straub [this message]
2020-04-26 21:18 ` [PATCH v3 3/6] net/colo-compare.c: Fix deadlock in compare_chr_send Lukas Straub
2020-04-27 3:36 ` Zhang, Chen
2020-04-27 7:22 ` Lukas Straub
2020-04-29 5:37 ` Zhang, Chen
2020-04-29 7:51 ` Lukas Straub
2020-04-26 21:18 ` [PATCH v3 4/6] net/colo-compare.c: Only hexdump packets if tracing is enabled Lukas Straub
2020-04-27 3:37 ` Zhang, Chen
2020-04-26 21:19 ` [PATCH v3 5/6] net/colo-compare.c, softmmu/vl.c: Check that colo-compare is active Lukas Straub
2020-04-26 21:19 ` [PATCH v3 6/6] net/colo-compare.c: Correct ordering in complete and finalize Lukas Straub
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=be38e52e55c46e7de8ec23924e4f1a0071969f6f.1587935686.git.lukasstraub2@web.de \
--to=lukasstraub2@web.de \
--cc=chen.zhang@intel.com \
--cc=jasowang@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).