From feed7a9ad456ea7de636230043607402828b3d91aee42d4ef1732a700a07a4f7 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Wed, 19 May 2021 15:10:31 +0000 Subject: [PATCH] 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 --- fix-virsh-domcapabilities-error.patch | 27 --------------------------- kubevirt.changes | 5 +++++ kubevirt.spec | 3 +-- 3 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 fix-virsh-domcapabilities-error.patch diff --git a/fix-virsh-domcapabilities-error.patch b/fix-virsh-domcapabilities-error.patch deleted file mode 100644 index fe697d4..0000000 --- a/fix-virsh-domcapabilities-error.patch +++ /dev/null @@ -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 diff --git a/kubevirt.changes b/kubevirt.changes index ffc80c0..1793a0b 100644 --- a/kubevirt.changes +++ b/kubevirt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 18 05:15:45 UTC 2021 - Vasily Ulyanov + +- Drop fix-virsh-domcapabilities-error.patch (bsc#1185119) + ------------------------------------------------------------------- Mon May 17 09:02:36 UTC 2021 - Vasily Ulyanov diff --git a/kubevirt.spec b/kubevirt.spec index 038d5c6..301ccac 100644 --- a/kubevirt.spec +++ b/kubevirt.spec @@ -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