From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
To: qemu-devel@nongnu.org
Cc: den@virtuozzo.com, michael.roth@amd.com, kkostiuk@redhat.com,
marcandre.lureau@gmail.com
Subject: [PATCH 3/6] qga: Let run_command() work without input data
Date: Wed, 25 Oct 2023 16:00:55 +0200 [thread overview]
Message-ID: <20231025140058.113376-4-alexander.ivanov@virtuozzo.com> (raw)
In-Reply-To: <20231025140058.113376-1-alexander.ivanov@virtuozzo.com>
run_command() has in_str argument that specifies the input string.
Let it be NULL if there is no input.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
qga/commands-posix.c | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index e7b82aaf37..461b4d7bb6 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -2122,16 +2122,22 @@ static void run_command(const char *argv[], const char *in_str, Error **errp)
int in_len, status;
int datafd[2] = { -1, -1 };
- if (!g_unix_open_pipe(datafd, FD_CLOEXEC, NULL)) {
- error_setg(errp, "cannot create pipe FDs");
- goto out;
+ if (in_str) {
+ if (!g_unix_open_pipe(datafd, FD_CLOEXEC, NULL)) {
+ error_setg(errp, "cannot create pipe FDs");
+ goto out;
+ }
}
pid = fork();
if (pid == 0) {
- close(datafd[1]);
setsid();
- dup2(datafd[0], 0);
+ if (in_str) {
+ close(datafd[1]);
+ dup2(datafd[0], 0);
+ } else {
+ reopen_fd_to_null(0);
+ }
reopen_fd_to_null(1);
reopen_fd_to_null(2);
@@ -2141,17 +2147,20 @@ static void run_command(const char *argv[], const char *in_str, Error **errp)
error_setg_errno(errp, errno, "failed to create child process");
goto out;
}
- close(datafd[0]);
- datafd[0] = -1;
- in_len = strlen(in_str);
+ if (in_str) {
+ close(datafd[0]);
+ datafd[0] = -1;
- if (qemu_write_full(datafd[1], in_str, in_len) != in_len) {
- error_setg_errno(errp, errno, "cannot write new account password");
- goto out;
+ in_len = strlen(in_str);
+ if (qemu_write_full(datafd[1], in_str, in_len) != in_len) {
+ error_setg_errno(errp, errno, "cannot write new account password");
+ goto out;
+ }
+
+ close(datafd[1]);
+ datafd[1] = -1;
}
- close(datafd[1]);
- datafd[1] = -1;
ga_wait_child(pid, &status, &local_err);
if (local_err) {
--
2.34.1
next prev parent reply other threads:[~2023-10-25 14:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-25 14:00 [PATCH 0/6] qga: Assorted patches, let us discuss Alexander Ivanov
2023-10-25 14:00 ` [PATCH 1/6] qga: Add process termination functionality Alexander Ivanov
2023-10-26 8:24 ` Konstantin Kostiuk
2023-10-25 14:00 ` [PATCH 2/6] qga: Move command execution code to a separate function Alexander Ivanov
2023-10-26 8:28 ` Konstantin Kostiuk
2023-10-25 14:00 ` Alexander Ivanov [this message]
2023-10-25 14:00 ` [PATCH 4/6] qga: Add user creation functionality Alexander Ivanov
2023-10-25 14:00 ` [PATCH 5/6] qga: Add timeout for fsfreeze Alexander Ivanov
2023-10-26 9:16 ` Konstantin Kostiuk
2023-10-30 16:32 ` Alexander Ivanov
2023-10-30 17:37 ` Konstantin Kostiuk
2023-10-25 14:00 ` [PATCH 6/6] qga: Cancel async snapshot before abort Alexander Ivanov
2023-10-26 8:47 ` Konstantin Kostiuk
2023-10-26 9:17 ` Konstantin Kostiuk
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=20231025140058.113376-4-alexander.ivanov@virtuozzo.com \
--to=alexander.ivanov@virtuozzo.com \
--cc=den@virtuozzo.com \
--cc=kkostiuk@redhat.com \
--cc=marcandre.lureau@gmail.com \
--cc=michael.roth@amd.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).