mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-28 23:45:20 +00:00
07c9d6601d
The QEMU command line arguments are very long and currently all written on a single line to /var/log/libvirt/qemu/$GUEST.log. This introduces logic to add line breaks after every env variable and "-" optional argument, and every positional argument. This will create a clearer log file, which will in turn present better in bug reports when people cut + paste from the log into a bug comment. An example log file entry now looks like this: 2018-12-14 12:57:03.677+0000: starting up libvirt version: 5.0.0, qemu version: 3.0.0qemu-3.0.0-1.fc29, kernel: 4.19.5-300.fc29.x86_64, hostname: localhost.localdomain LC_ALL=C \ PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin \ HOME=/home/berrange \ USER=berrange \ LOGNAME=berrange \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name guest=guest,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/home/berrange/.config/libvirt/qemu/lib/domain-33-guest/master-key.aes \ -machine pseries-2.10,accel=tcg,usb=off,dump-guest-core=off \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c8a74977-ab18-41d0-ae3b-4041c7fffbcd \ -display none \ -no-user-config \ -nodefaults \ -chardev socket,id=charmonitor,fd=23,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ -device qemu-xhci,id=usb,bus=pci.0,addr=0x1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on 2018-12-14 12:57:03.730+0000: shutting down, reason=failed Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
225 lines
7.5 KiB
C
225 lines
7.5 KiB
C
/*
|
|
* vircommand.h: Child command execution
|
|
*
|
|
* Copyright (C) 2010-2014 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#ifndef LIBVIRT_VIRCOMMAND_H
|
|
# define LIBVIRT_VIRCOMMAND_H
|
|
|
|
# include "internal.h"
|
|
# include "virbuffer.h"
|
|
# include "viralloc.h"
|
|
|
|
typedef struct _virCommand virCommand;
|
|
typedef virCommand *virCommandPtr;
|
|
|
|
/* This will execute in the context of the first child
|
|
* after fork() but before execve(). As such, it is unsafe to
|
|
* call any function that is not async-signal-safe. */
|
|
typedef int (*virExecHook)(void *data);
|
|
|
|
pid_t virFork(void) ATTRIBUTE_RETURN_CHECK;
|
|
|
|
int virRun(const char *const*argv, int *status) ATTRIBUTE_RETURN_CHECK;
|
|
|
|
virCommandPtr virCommandNew(const char *binary) ATTRIBUTE_NONNULL(1);
|
|
|
|
virCommandPtr virCommandNewArgs(const char *const*args) ATTRIBUTE_NONNULL(1);
|
|
|
|
virCommandPtr virCommandNewArgList(const char *binary, ...)
|
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL;
|
|
|
|
virCommandPtr virCommandNewVAList(const char *binary, va_list list)
|
|
ATTRIBUTE_NONNULL(1);
|
|
|
|
/* All error report from these setup APIs is
|
|
* delayed until the Run/RunAsync methods
|
|
*/
|
|
|
|
typedef enum {
|
|
/* Close the FD in the parent */
|
|
VIR_COMMAND_PASS_FD_CLOSE_PARENT = (1 << 0),
|
|
} virCommandPassFDFlags;
|
|
|
|
void virCommandPassFD(virCommandPtr cmd,
|
|
int fd,
|
|
unsigned int flags) ATTRIBUTE_NOINLINE;
|
|
|
|
void virCommandPassListenFDs(virCommandPtr cmd);
|
|
|
|
int virCommandPassFDGetFDIndex(virCommandPtr cmd,
|
|
int fd);
|
|
|
|
void virCommandSetPidFile(virCommandPtr cmd,
|
|
const char *pidfile) ATTRIBUTE_NONNULL(2);
|
|
|
|
gid_t virCommandGetGID(virCommandPtr cmd) ATTRIBUTE_NONNULL(1);
|
|
|
|
uid_t virCommandGetUID(virCommandPtr cmd) ATTRIBUTE_NONNULL(1);
|
|
|
|
void virCommandSetGID(virCommandPtr cmd, gid_t gid);
|
|
|
|
void virCommandSetUID(virCommandPtr cmd, uid_t uid);
|
|
|
|
void virCommandSetMaxMemLock(virCommandPtr cmd, unsigned long long bytes);
|
|
void virCommandSetMaxProcesses(virCommandPtr cmd, unsigned int procs);
|
|
void virCommandSetMaxFiles(virCommandPtr cmd, unsigned int files);
|
|
void virCommandSetMaxCoreSize(virCommandPtr cmd, unsigned long long bytes);
|
|
void virCommandSetUmask(virCommandPtr cmd, int umask);
|
|
|
|
void virCommandClearCaps(virCommandPtr cmd);
|
|
|
|
void virCommandAllowCap(virCommandPtr cmd,
|
|
int capability);
|
|
|
|
void virCommandSetSELinuxLabel(virCommandPtr cmd,
|
|
const char *label);
|
|
|
|
void virCommandSetAppArmorProfile(virCommandPtr cmd,
|
|
const char *profile);
|
|
|
|
void virCommandDaemonize(virCommandPtr cmd);
|
|
|
|
void virCommandNonblockingFDs(virCommandPtr cmd);
|
|
|
|
void virCommandRawStatus(virCommandPtr cmd);
|
|
|
|
void virCommandAddEnvFormat(virCommandPtr cmd, const char *format, ...)
|
|
ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3);
|
|
|
|
void virCommandAddEnvPair(virCommandPtr cmd,
|
|
const char *name,
|
|
const char *value) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandAddEnvString(virCommandPtr cmd,
|
|
const char *str) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandAddEnvBuffer(virCommandPtr cmd,
|
|
virBufferPtr buf);
|
|
|
|
void virCommandAddEnvPassBlockSUID(virCommandPtr cmd,
|
|
const char *name,
|
|
const char *defvalue) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandAddEnvPassAllowSUID(virCommandPtr cmd,
|
|
const char *name) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandAddEnvPassCommon(virCommandPtr cmd);
|
|
|
|
void virCommandAddArg(virCommandPtr cmd,
|
|
const char *val) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandAddArgBuffer(virCommandPtr cmd,
|
|
virBufferPtr buf);
|
|
|
|
void virCommandAddArgFormat(virCommandPtr cmd,
|
|
const char *format, ...)
|
|
ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3);
|
|
|
|
void virCommandAddArgPair(virCommandPtr cmd,
|
|
const char *name,
|
|
const char *val)
|
|
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
|
|
|
|
void virCommandAddArgSet(virCommandPtr cmd,
|
|
const char *const*vals) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandAddArgList(virCommandPtr cmd,
|
|
... /* const char *arg, ..., NULL */)
|
|
ATTRIBUTE_SENTINEL;
|
|
|
|
void virCommandSetWorkingDirectory(virCommandPtr cmd,
|
|
const char *pwd) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandSetInputBuffer(virCommandPtr cmd,
|
|
const char *inbuf) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandSetOutputBuffer(virCommandPtr cmd,
|
|
char **outbuf) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandSetErrorBuffer(virCommandPtr cmd,
|
|
char **errbuf) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandSetInputFD(virCommandPtr cmd,
|
|
int infd);
|
|
|
|
void virCommandSetOutputFD(virCommandPtr cmd,
|
|
int *outfd) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandSetErrorFD(virCommandPtr cmd,
|
|
int *errfd) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandSetPreExecHook(virCommandPtr cmd,
|
|
virExecHook hook,
|
|
void *opaque) ATTRIBUTE_NONNULL(2);
|
|
|
|
void virCommandWriteArgLog(virCommandPtr cmd,
|
|
int logfd);
|
|
|
|
char *virCommandToString(virCommandPtr cmd, bool linebreaks) ATTRIBUTE_RETURN_CHECK;
|
|
|
|
int virCommandExec(virCommandPtr cmd, gid_t *groups, int ngroups) ATTRIBUTE_RETURN_CHECK;
|
|
|
|
int virCommandRun(virCommandPtr cmd,
|
|
int *exitstatus) ATTRIBUTE_RETURN_CHECK;
|
|
|
|
int virCommandRunAsync(virCommandPtr cmd,
|
|
pid_t *pid) ATTRIBUTE_RETURN_CHECK;
|
|
|
|
int virCommandWait(virCommandPtr cmd,
|
|
int *exitstatus) ATTRIBUTE_RETURN_CHECK;
|
|
|
|
void virCommandRequireHandshake(virCommandPtr cmd);
|
|
|
|
int virCommandHandshakeWait(virCommandPtr cmd)
|
|
ATTRIBUTE_RETURN_CHECK;
|
|
|
|
int virCommandHandshakeNotify(virCommandPtr cmd)
|
|
ATTRIBUTE_RETURN_CHECK;
|
|
|
|
void virCommandAbort(virCommandPtr cmd);
|
|
|
|
void virCommandFree(virCommandPtr cmd);
|
|
|
|
void virCommandDoAsyncIO(virCommandPtr cmd);
|
|
|
|
typedef int (*virCommandRunRegexFunc)(char **const groups,
|
|
void *data);
|
|
typedef int (*virCommandRunNulFunc)(size_t n_tokens,
|
|
char **const groups,
|
|
void *data);
|
|
|
|
int virCommandRunRegex(virCommandPtr cmd,
|
|
int nregex,
|
|
const char **regex,
|
|
int *nvars,
|
|
virCommandRunRegexFunc func,
|
|
void *data,
|
|
const char *cmd_to_ignore,
|
|
int *exitstatus);
|
|
|
|
int virCommandRunNul(virCommandPtr cmd,
|
|
size_t n_columns,
|
|
virCommandRunNulFunc func,
|
|
void *data);
|
|
|
|
VIR_DEFINE_AUTOPTR_FUNC(virCommand, virCommandFree)
|
|
|
|
#endif /* LIBVIRT_VIRCOMMAND_H */
|