rpms/virt-top
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebuild against ocaml-libvirt 0.6.1.5.

Browse Source
This commit is contained in:
Richard W.M. Jones 2019-08-21 17:05:58 +01:00
parent 2cb15432da
commit e6e2204bb8
2 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-libvirt-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch Normal file
View File

@ -0,0 +1,40 @@
From 24a461715d5bce47f63cb0097606fc336230589f Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Wed, 21 Aug 2019 17:24:47 +0200
Subject: [PATCH] libvirt: Handle VIR_DOMAIN_PMSUSPENDED state.
Fixes FTBFS with ocaml-libvirt 0.6.1.5.
RWMJ: Added documentation and changed the letter to 'M'.
---
src/screen.ml | 1 +
src/virt-top.pod | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/src/screen.ml b/src/screen.ml
index 0d847a2..8a66ba6 100644
--- a/src/screen.ml
+++ b/src/screen.ml
@@ -50,3 +50,4 @@ let show_state = function
| D.InfoShutdown -> 'D'
| D.InfoShutoff -> 'O'
| D.InfoCrashed -> 'X'
+ | D.InfoPMSuspended -> 'M'
diff --git a/src/virt-top.pod b/src/virt-top.pod
index 4d81608..76ad3f9 100644
--- a/src/virt-top.pod
+++ b/src/virt-top.pod
@@ -492,6 +492,10 @@ Shutdown.
Crashed.
+=item B<M>
+
+Suspended by guest power management.
+
=back
=item B<TIME>
--
2.22.0

14
virt-top.spec
View File

@ -3,7 +3,7 @@
Name: virt-top
Version: 1.0.9
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Utility like top(1) for displaying virtualization stats
License: GPLv2+
@ -16,6 +16,9 @@ Source2: processcsv.py.pod
Patch0: virt-top-1.0.4-processcsv-documentation.patch
# Upstream patch to fix FTBFS with ocaml libvirt 0.6.1.5.
Patch1: 0001-libvirt-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch
BuildRequires: ocaml >= 3.10.2
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-findlib-devel
@ -25,9 +28,7 @@ BuildRequires: ocaml-extlib-devel
BuildRequires: ocaml-xml-light-devel
BuildRequires: ocaml-csv-devel
BuildRequires: ocaml-calendar-devel
# Need support for virDomainGetCPUStats (fixed in 0.6.1.2)
# and virConnectGetAllDomainStats (post-0.6.1.4).
BuildRequires: ocaml-libvirt-devel >= 0.6.1.4-15
BuildRequires: ocaml-libvirt-devel >= 0.6.1.5
# Tortuous list of BRs for gettext.
BuildRequires: ocaml-gettext-devel >= 0.3.3
@ -58,6 +59,8 @@ different virtualization systems.
%patch0 -p1
%endif
%patch1 -p1
%build
%configure
@ -113,6 +116,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
%changelog
* Wed Aug 21 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-2
- Rebuild against ocaml-libvirt 0.6.1.5.
* Tue Aug 20 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-1
- New upstream version 1.0.9.
- Remove patches which are upstream and aarch64 build fix.