OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qga: remove need for QEMU atomic.h

Browse Source 
Since the introduction of guest-exec in/out/err redirections in commit
a1853dca74 ("qga: guest-exec simple stdin/stdout/stderr redirection"),
some execution state variables are handled with atomic ops. However,
there are no threads involved in this code (and glib sources are
dispatched in the same thread), and no other obvious reason to use them.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220420132624.2439741-40-marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-04-20 17:26:22 +04:00
parent 1fbf2665e6
commit c267d750d8
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qga/commands.c
View File

@ -18,7 +18,6 @@
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qemu/base64.h" #include "qemu/base64.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/atomic.h"
#include "commands-common.h" #include "commands-common.h"
/* Maximum captured guest-exec out_data/err_data - 16MB */ /* Maximum captured guest-exec out_data/err_data - 16MB */
@ -162,13 +161,12 @@ GuestExecStatus *qmp_guest_exec_status(int64_t pid, Error **errp)
ges = g_new0(GuestExecStatus, 1); ges = g_new0(GuestExecStatus, 1);
bool finished = qatomic_mb_read(&gei->finished); bool finished = gei->finished;
/* need to wait till output channels are closed /* need to wait till output channels are closed
* to be sure we captured all output at this point */ * to be sure we captured all output at this point */
if (gei->has_output) { if (gei->has_output) {
finished = finished && qatomic_mb_read(&gei->out.closed); finished &= gei->out.closed && gei->err.closed;
finished = finished && qatomic_mb_read(&gei->err.closed);
} }
ges->exited = finished; ges->exited = finished;
@ -270,7 +268,7 @@ static void guest_exec_child_watch(GPid pid, gint status, gpointer data)
(int32_t)gpid_to_int64(pid), (uint32_t)status); (int32_t)gpid_to_int64(pid), (uint32_t)status);
gei->status = status; gei->status = status;
qatomic_mb_set(&gei->finished, true); gei->finished = true;
g_spawn_close_pid(pid); g_spawn_close_pid(pid);
} }
@ -326,7 +324,7 @@ static gboolean guest_exec_input_watch(GIOChannel *ch,
done: done:
g_io_channel_shutdown(ch, true, NULL); g_io_channel_shutdown(ch, true, NULL);
g_io_channel_unref(ch); g_io_channel_unref(ch);
qatomic_mb_set(&p->closed, true); p->closed = true;
g_free(p->data); g_free(p->data);
return false; return false;
@ -380,7 +378,7 @@ static gboolean guest_exec_output_watch(GIOChannel *ch,
close: close:
g_io_channel_shutdown(ch, true, NULL); g_io_channel_shutdown(ch, true, NULL);
g_io_channel_unref(ch); g_io_channel_unref(ch);
qatomic_mb_set(&p->closed, true); p->closed = true;
return false; return false;
} }