This reverts the flag addition parts of:
commit ed5aa85f371aebb0103e712f9a103d011ab9ae43
Now that we format the file descriptor only if one was opened
earlier, the flag is unused.
Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
src/qemu/qemu_command.c | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 54a1a299e2..7719cdc032 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5051,7 +5051,6 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev)
enum {
QEMU_BUILD_CHARDEV_TCP_NOWAIT = (1 << 0),
QEMU_BUILD_CHARDEV_FILE_LOGD = (1 << 1),
- QEMU_BUILD_CHARDEV_UNIX_FD_PASS = (1 << 2),
};
/* This function outputs a -chardev command line option which describes only the
@@ -5494,8 +5493,7 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManager,
qemuDomainObjPrivatePtr priv)
{
char *chrdev;
- unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
- QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
+ unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
if (priv->chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
@@ -5630,8 +5628,7 @@ qemuBuildRNGBackendChrdevStr(virLogManagerPtr logManager,
char **chr,
bool chardevStdioLogd)
{
- unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
- QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
+ unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
*chr = NULL;
@@ -8708,8 +8705,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager,
virBuffer opt = VIR_BUFFER_INITIALIZER;
const char *database;
const char *contAlias = NULL;
- unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
- QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
+ unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
@@ -8945,8 +8941,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager,
virBuffer buf = VIR_BUFFER_INITIALIZER;
char *devstr = NULL;
int rc;
- unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
- QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
+ unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
@@ -9117,8 +9112,7 @@ qemuBuildSerialCommandLine(virLogManagerPtr logManager,
{
size_t i;
bool havespice = false;
- unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
- QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
+ unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
@@ -9181,8 +9175,7 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logManager,
bool chardevStdioLogd)
{
size_t i;
- unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
- QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
+ unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
@@ -9219,8 +9212,7 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
bool chardevStdioLogd)
{
size_t i;
- unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
- QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
+ unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
@@ -9277,8 +9269,7 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager,
bool chardevStdioLogd)
{
size_t i;
- unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
- QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
+ unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
@@ -9451,8 +9442,7 @@ qemuBuildRedirdevCommandLine(virLogManagerPtr logManager,
bool chardevStdioLogd)
{
size_t i;
- unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
- QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
+ unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
if (chardevStdioLogd)
cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
--
2.16.4
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
