Accepting request 894214 from home:vulyanov:branches:Virtualization

- Drop fix-virsh-domcapabilities-error.patch (bsc#1185119)

OBS-URL: https://build.opensuse.org/request/show/894214
OBS-URL: https://build.opensuse.org/package/show/Virtualization/kubevirt?expand=0&rev=53
This commit is contained in:
James Fehlig 2021-05-19 15:10:31 +00:00 committed by Git OBS Bridge
parent e2ea3745fa
commit feed7a9ad4
3 changed files with 6 additions and 29 deletions

View File

@ -1,27 +0,0 @@
Fix 'virsh domcapabilities' error
Calling `virsh domcapabilities ...` produces an error with some older
versions of libvirt:
error: failed to get emulator capabilities
error: invalid argument: unable to find any emulator to serve 'x86_64' architecture
The issue seems fixed if `virsh capabilites` is run first.
diff --git a/cmd/virt-launcher/node-labeller/node-labeller.sh b/cmd/virt-launcher/node-labeller/node-labeller.sh
index 8ea181963..55a920bdd 100755
--- a/cmd/virt-launcher/node-labeller/node-labeller.sh
+++ b/cmd/virt-launcher/node-labeller/node-labeller.sh
@@ -13,8 +13,10 @@ chmod o+rw /dev/kvm
libvirtd -d
+virsh capabilities > /dev/null
+
virsh domcapabilities --machine q35 --arch x86_64 --virttype kvm > /var/lib/kubevirt-node-labeller/virsh_domcapabilities.xml
cp -r /usr/share/libvirt/cpu_map /var/lib/kubevirt-node-labeller
-virsh domcapabilities --machine q35 --arch x86_64 --virttype kvm | virsh hypervisor-cpu-baseline --features /dev/stdin --machine q35 --arch x86_64 --virttype kvm > /var/lib/kubevirt-node-labeller/supported_features.xml
\ No newline at end of file
+virsh domcapabilities --machine q35 --arch x86_64 --virttype kvm | virsh hypervisor-cpu-baseline --features /dev/stdin --machine q35 --arch x86_64 --virttype kvm > /var/lib/kubevirt-node-labeller/supported_features.xml

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 18 05:15:45 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
- Drop fix-virsh-domcapabilities-error.patch (bsc#1185119)
-------------------------------------------------------------------
Mon May 17 09:02:36 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>

View File

@ -30,8 +30,7 @@ Source3: kubevirt_containers_meta.service
Source100: %{name}-rpmlintrc
Patch0: dont-build-virtctl-darwin.patch
Patch1: dont-use-bazel-in-build-manifests.patch
Patch2: fix-virsh-domcapabilities-error.patch
Patch3: fix-double-free-of-VirDomain.patch
Patch2: fix-double-free-of-VirDomain.patch
BuildRequires: glibc-devel-static
BuildRequires: golang-packaging
BuildRequires: pkgconfig