|
 |
79b470 |
From 4a3d416229ddf600ff985f9a90e3feb669548690 Mon Sep 17 00:00:00 2001
|
|
|
79b470 |
Message-Id: <4a3d416229ddf600ff985f9a90e3feb669548690@dist-git>
|
|
|
79b470 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
79b470 |
Date: Wed, 7 Oct 2020 18:45:36 +0200
|
|
|
79b470 |
Subject: [PATCH] qemuBuildMachineCommandLine: Drop needless check
|
|
|
79b470 |
MIME-Version: 1.0
|
|
|
79b470 |
Content-Type: text/plain; charset=UTF-8
|
|
|
79b470 |
Content-Transfer-Encoding: 8bit
|
|
|
79b470 |
|
|
|
79b470 |
The machine can not be NULL at this point -
|
|
|
79b470 |
qemuDomainDefPostParse() makes sure it isn't.
|
|
|
79b470 |
|
|
|
79b470 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
79b470 |
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
|
79b470 |
(cherry picked from commit fe43b3a5a5532377f7de40e77ca9ffde5aa2ca7e)
|
|
|
79b470 |
|
|
|
79b470 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518
|
|
|
79b470 |
|
|
|
79b470 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
79b470 |
Message-Id: <4a0c05b78ac65e598b919acdb66d24a19fcf6251.1602087923.git.mprivozn@redhat.com>
|
|
|
79b470 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
79b470 |
---
|
|
|
79b470 |
src/qemu/qemu_command.c | 7 -------
|
|
|
79b470 |
1 file changed, 7 deletions(-)
|
|
|
79b470 |
|
|
|
79b470 |
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
|
79b470 |
index 8c4f7a015f..1a573c2817 100644
|
|
|
79b470 |
--- a/src/qemu/qemu_command.c
|
|
|
79b470 |
+++ b/src/qemu/qemu_command.c
|
|
|
79b470 |
@@ -6977,13 +6977,6 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
|
|
|
79b470 |
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
|
|
|
79b470 |
size_t i;
|
|
|
79b470 |
|
|
|
79b470 |
- /* This should *never* be NULL, since we always provide
|
|
|
79b470 |
- * a machine in the capabilities data for QEMU. So this
|
|
|
79b470 |
- * check is just here as a safety in case the unexpected
|
|
|
79b470 |
- * happens */
|
|
|
79b470 |
- if (!def->os.machine)
|
|
|
79b470 |
- return 0;
|
|
|
79b470 |
-
|
|
|
79b470 |
virCommandAddArg(cmd, "-machine");
|
|
|
79b470 |
virBufferAdd(&buf, def->os.machine, -1);
|
|
|
79b470 |
|
|
|
79b470 |
--
|
|
|
79b470 |
2.29.2
|
|
|
79b470 |
|