|
 |
99cbc7 |
From 5c8790b9bad2d9bf9c37db8eaae1f8764ed41214 Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <5c8790b9bad2d9bf9c37db8eaae1f8764ed41214@dist-git>
|
|
|
99cbc7 |
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
|
99cbc7 |
Date: Fri, 6 Jul 2018 15:46:58 +0100
|
|
|
99cbc7 |
Subject: [PATCH] qemu: don't use chardev FD passing with standalone args
|
|
|
99cbc7 |
MIME-Version: 1.0
|
|
|
99cbc7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
99cbc7 |
Content-Transfer-Encoding: 8bit
|
|
|
99cbc7 |
|
|
|
99cbc7 |
https://bugzilla.redhat.com/show_bug.cgi?id=1598281
|
|
|
99cbc7 |
|
|
|
99cbc7 |
When using domxml-to-native, we must generate CLI args that can be used
|
|
|
99cbc7 |
in a standalone scenario. This means no FD passing can be used. To
|
|
|
99cbc7 |
achieve this we must clear the QEMU_CAPS_CHARDEV_FD_PASS capability bit.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Reviewed-by: John Ferlan <jferlan@redhat.com>
|
|
|
99cbc7 |
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit 7ac08cc929dc512e8682fbfcc5d33518058f20e4)
|
|
|
99cbc7 |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
src/qemu/qemu_process.c | 5 +++++
|
|
|
99cbc7 |
src/qemu/qemu_process.h | 2 ++
|
|
|
99cbc7 |
2 files changed, 7 insertions(+)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
|
99cbc7 |
index ac32dafcbe..40d35cbe6b 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_process.c
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_process.c
|
|
|
99cbc7 |
@@ -5124,6 +5124,9 @@ qemuProcessInit(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
vm->def->os.machine)))
|
|
|
99cbc7 |
goto cleanup;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
+ if (flags & VIR_QEMU_PROCESS_START_STANDALONE)
|
|
|
99cbc7 |
+ virQEMUCapsClear(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS);
|
|
|
99cbc7 |
+
|
|
|
99cbc7 |
if (qemuDomainUpdateCPU(vm, updatedCPU, &origCPU) < 0)
|
|
|
99cbc7 |
goto cleanup;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
@@ -6632,6 +6635,8 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
|
|
|
99cbc7 |
flags |= VIR_QEMU_PROCESS_START_PRETEND;
|
|
|
99cbc7 |
flags |= VIR_QEMU_PROCESS_START_NEW;
|
|
|
99cbc7 |
+ if (standalone)
|
|
|
99cbc7 |
+ flags |= VIR_QEMU_PROCESS_START_STANDALONE;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
if (qemuProcessInit(driver, vm, NULL, QEMU_ASYNC_JOB_NONE,
|
|
|
99cbc7 |
!!migrateURI, flags) < 0)
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
|
|
|
99cbc7 |
index 531c2a0cc7..07ce3a9915 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_process.h
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_process.h
|
|
|
99cbc7 |
@@ -81,6 +81,8 @@ typedef enum {
|
|
|
99cbc7 |
VIR_QEMU_PROCESS_START_PRETEND = 1 << 3,
|
|
|
99cbc7 |
VIR_QEMU_PROCESS_START_NEW = 1 << 4, /* internal, new VM is starting */
|
|
|
99cbc7 |
VIR_QEMU_PROCESS_START_GEN_VMID = 1 << 5, /* Generate a new VMID */
|
|
|
99cbc7 |
+ VIR_QEMU_PROCESS_START_STANDALONE = 1 << 6, /* Require CLI args to be usable standalone,
|
|
|
99cbc7 |
+ ie no FD passing and the like */
|
|
|
99cbc7 |
} qemuProcessStartFlags;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
int qemuProcessStart(virConnectPtr conn,
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.18.0
|
|
|
99cbc7 |
|