|
 |
99cbc7 |
From cc4e45e8bcb2d141bbf2ddc14e0fef8c234662df Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <cc4e45e8bcb2d141bbf2ddc14e0fef8c234662df@dist-git>
|
|
|
99cbc7 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
99cbc7 |
Date: Fri, 5 Apr 2019 10:57:43 +0200
|
|
|
99cbc7 |
Subject: [PATCH] qemu: Don't check for /dev/kvm presence
|
|
|
99cbc7 |
|
|
|
99cbc7 |
The file being present doesn't necessarily mean anything these
|
|
|
99cbc7 |
days, as it's created independently of whether the kvm module
|
|
|
99cbc7 |
has been loaded[1]; moreover, we're already gathering all the
|
|
|
99cbc7 |
information we need through QMP, so poking the filesystem at
|
|
|
99cbc7 |
all is entirely unnecessary.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
[1] https://github.com/systemd/systemd/commit/d35d6249d5a7ed3228
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit 2f8b91ee74ff617aba322d034119427cad977af9)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
https://bugzilla.redhat.com/show_bug.cgi?id=1628469
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
99cbc7 |
Message-Id: <20190405085744.8179-7-abologna@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
src/qemu/qemu_capabilities.c | 5 ++---
|
|
|
99cbc7 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
99cbc7 |
index 6386f206b8..8819452ff6 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_capabilities.c
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
99cbc7 |
@@ -832,9 +832,8 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
|
|
|
99cbc7 |
if (!binary)
|
|
|
99cbc7 |
return 0;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
- if (virFileExists("/dev/kvm") &&
|
|
|
99cbc7 |
- (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM) ||
|
|
|
99cbc7 |
- kvmbin))
|
|
|
99cbc7 |
+ if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM) ||
|
|
|
99cbc7 |
+ kvmbin)
|
|
|
99cbc7 |
haskvm = true;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
if (virQEMUCapsGetMachineTypesCaps(qemubinCaps, &nmachines, &machines) < 0)
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.21.0
|
|
|
99cbc7 |
|