diff --git a/.gitignore b/.gitignore
index fdd102c..a19aaf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-SOURCES/processcsv.py.pod
 SOURCES/virt-top-1.0.8.tar.gz
diff --git a/.virt-top.metadata b/.virt-top.metadata
index 8f21eb1..3236ab6 100644
--- a/.virt-top.metadata
+++ b/.virt-top.metadata
@@ -1,2 +1 @@
-31254fa2ab496eb18f7112733e418ee3c24761b7 SOURCES/processcsv.py.pod
 97d524405e9ac7fa86ff4410c1f7e10811a70bd1 SOURCES/virt-top-1.0.8.tar.gz
diff --git a/SOURCES/virt-top-1.0.4-processcsv-documentation.patch b/SOURCES/0001-virt-top-1.0.4-processcsv-documentation.patch
similarity index 53%
rename from SOURCES/virt-top-1.0.4-processcsv-documentation.patch
rename to SOURCES/0001-virt-top-1.0.4-processcsv-documentation.patch
index 010e880..573afec 100644
--- a/SOURCES/virt-top-1.0.4-processcsv-documentation.patch
+++ b/SOURCES/0001-virt-top-1.0.4-processcsv-documentation.patch
@@ -1,6 +1,17 @@
---- virt-top-1.0.4.old/virt-top/virt-top.pod	2011-08-11 14:30:30.560493914 +0100
-+++ virt-top-1.0.4/virt-top/virt-top.pod	2011-08-11 14:34:00.934495607 +0100
-@@ -123,6 +123,22 @@
+From c3b7c8d964ec0306e5ef7996ee606494e0349d62 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 29 Nov 2022 08:13:30 +0000
+Subject: [PATCH 01/23] virt-top-1.0.4-processcsv-documentation
+
+---
+ virt-top/virt-top.pod | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/virt-top/virt-top.pod b/virt-top/virt-top.pod
+index 4d81608..7b5e0e4 100755
+--- a/virt-top/virt-top.pod
++++ b/virt-top/virt-top.pod
+@@ -129,6 +129,22 @@ I<output.csv.00>, I<output.csv.01> etc.
  
   virt-top --csv >(split -d -l 1000 - output.csv.)
  
@@ -23,3 +34,6 @@
  =item B<--no-csv-cpu>
  
  Disable domain CPU stats in CSV output.
+-- 
+2.31.1
+
diff --git a/SOURCES/0001-Disable-warning-about-immutable-strings-for-OCaml-4..patch b/SOURCES/0002-Disable-warning-about-immutable-strings-for-OCaml-4..patch
similarity index 90%
rename from SOURCES/0001-Disable-warning-about-immutable-strings-for-OCaml-4..patch
rename to SOURCES/0002-Disable-warning-about-immutable-strings-for-OCaml-4..patch
index 483b3cc..718d162 100644
--- a/SOURCES/0001-Disable-warning-about-immutable-strings-for-OCaml-4..patch
+++ b/SOURCES/0002-Disable-warning-about-immutable-strings-for-OCaml-4..patch
@@ -1,7 +1,7 @@
-From 0e47961395eec78b1ee9f6ae48520f1d95d84fdf Mon Sep 17 00:00:00 2001
+From 5790c2e4033fd81ef66331fe0f768989c10df6b2 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 2 Aug 2014 17:37:21 +0100
-Subject: [PATCH 01/20] Disable warning about immutable strings (for OCaml
+Subject: [PATCH 02/23] Disable warning about immutable strings (for OCaml
  4.02).
 
 ---
@@ -46,5 +46,5 @@ index 5aa0c35..98e6647 100755
  
  BYTE_TARGETS	:= virt-top
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0002-Move-upstream-translations-from-Tranifex-to-Zanata.patch b/SOURCES/0003-Move-upstream-translations-from-Tranifex-to-Zanata.patch
similarity index 97%
rename from SOURCES/0002-Move-upstream-translations-from-Tranifex-to-Zanata.patch
rename to SOURCES/0003-Move-upstream-translations-from-Tranifex-to-Zanata.patch
index 7ab5146..2e6f854 100644
--- a/SOURCES/0002-Move-upstream-translations-from-Tranifex-to-Zanata.patch
+++ b/SOURCES/0003-Move-upstream-translations-from-Tranifex-to-Zanata.patch
@@ -1,7 +1,7 @@
-From 6ea4275b0d9f6d40b8d4a35f78928e71d830d721 Mon Sep 17 00:00:00 2001
+From e2160973526c817bac050f3d7207d5c291b16177 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 21 Feb 2015 17:27:59 +0000
-Subject: [PATCH 02/20] Move upstream translations from Tranifex to Zanata.
+Subject: [PATCH 03/23] Move upstream translations from Tranifex to Zanata.
 
 This is at the request of the Fedora localization team.
 For further information see:
@@ -163,5 +163,5 @@ index 0000000..64810f9
 +
 +</config>
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0003-Update-translations-from-Zanata.patch b/SOURCES/0004-Update-translations-from-Zanata.patch
similarity index 99%
rename from SOURCES/0003-Update-translations-from-Zanata.patch
rename to SOURCES/0004-Update-translations-from-Zanata.patch
index ff268f5..e1b0238 100644
--- a/SOURCES/0003-Update-translations-from-Zanata.patch
+++ b/SOURCES/0004-Update-translations-from-Zanata.patch
@@ -1,7 +1,7 @@
-From defe5bdd4a32e0206a786d279e0f9cfc238e5e17 Mon Sep 17 00:00:00 2001
+From 4dccf59c9f74a1047f143e58e3762e7613f1f4f9 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 21 Feb 2015 17:29:16 +0000
-Subject: [PATCH 03/20] Update translations from Zanata.
+Subject: [PATCH 04/23] Update translations from Zanata.
 
 ---
  po/LINGUAS  |  12 +-
@@ -4184,5 +4184,5 @@ index 9729fc3..dcf0de0 100644
  #: ../virt-top/virt_top.ml:1506
  msgid "# %s virt-top configuration file\\n"
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0004-build-Add-g-flag-to-ocamlopt.patch b/SOURCES/0005-build-Add-g-flag-to-ocamlopt.patch
similarity index 82%
rename from SOURCES/0004-build-Add-g-flag-to-ocamlopt.patch
rename to SOURCES/0005-build-Add-g-flag-to-ocamlopt.patch
index bc83d1d..4a40b04 100644
--- a/SOURCES/0004-build-Add-g-flag-to-ocamlopt.patch
+++ b/SOURCES/0005-build-Add-g-flag-to-ocamlopt.patch
@@ -1,7 +1,7 @@
-From 4a2d0ccd91f07d0a2009e8553a29fcf4cf752ba3 Mon Sep 17 00:00:00 2001
+From da33ffc24105a414fba9c3e1b95d33efae7af9ad Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 4 Jan 2016 11:48:40 -0500
-Subject: [PATCH 04/20] build: Add -g flag to ocamlopt.
+Subject: [PATCH 05/23] build: Add -g flag to ocamlopt.
 
 Modern ocamlopt supports the -g flag fine (very old versions did not).
 ---
@@ -22,5 +22,5 @@ index 98e6647..e149b26 100755
  
  BYTE_TARGETS	:= virt-top
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0005-Rename-source-directory-and-files.patch b/SOURCES/0006-Rename-source-directory-and-files.patch
similarity index 99%
rename from SOURCES/0005-Rename-source-directory-and-files.patch
rename to SOURCES/0006-Rename-source-directory-and-files.patch
index 1e99fd6..e4b6720 100644
--- a/SOURCES/0005-Rename-source-directory-and-files.patch
+++ b/SOURCES/0006-Rename-source-directory-and-files.patch
@@ -1,7 +1,7 @@
-From b7c3ef13cbd9c9cd49005a32ffb70faf6f5bbe8c Mon Sep 17 00:00:00 2001
+From 649fc52c6728bb8b1788a5ae74d4002781a88fce Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 31 Oct 2016 12:01:40 +0000
-Subject: [PATCH 05/20] Rename source directory and files.
+Subject: [PATCH 06/23] Rename source directory and files.
 
 This renames the source directory from virt-top to src/ and removes
 the unnecessary virt_top_* prefix from many source files.
@@ -715,5 +715,5 @@ index 46099b7..0000000
 -virt_top_xml.cmo: virt_top_gettext.cmo virt_top.cmi
 -virt_top_xml.cmx: virt_top_gettext.cmx virt_top.cmx
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0006-Enable-same-warnings-as-libguestfs.patch b/SOURCES/0007-Enable-same-warnings-as-libguestfs.patch
similarity index 85%
rename from SOURCES/0006-Enable-same-warnings-as-libguestfs.patch
rename to SOURCES/0007-Enable-same-warnings-as-libguestfs.patch
index 599987b..7b00c9a 100644
--- a/SOURCES/0006-Enable-same-warnings-as-libguestfs.patch
+++ b/SOURCES/0007-Enable-same-warnings-as-libguestfs.patch
@@ -1,7 +1,7 @@
-From 5500a027ad231eb5bb16e36efee72b48cfac9528 Mon Sep 17 00:00:00 2001
+From be5e812ea7ea266e0d0ce1c126606c7bd04523c8 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 27 Mar 2017 12:21:48 +0100
-Subject: [PATCH 06/20] Enable same warnings as libguestfs.
+Subject: [PATCH 07/23] Enable same warnings as libguestfs.
 
 In particular 'warning 3' was still enabled before, meaning that the
 code would fail with newer OCaml compilers:
@@ -30,5 +30,5 @@ index d29f2e8..d744fd7 100755
  
  OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0007-Remove-x-executable-permission-on-several-source-fil.patch b/SOURCES/0008-Remove-x-executable-permission-on-several-source-fil.patch
similarity index 90%
rename from SOURCES/0007-Remove-x-executable-permission-on-several-source-fil.patch
rename to SOURCES/0008-Remove-x-executable-permission-on-several-source-fil.patch
index a51cd10..5ceb916 100644
--- a/SOURCES/0007-Remove-x-executable-permission-on-several-source-fil.patch
+++ b/SOURCES/0008-Remove-x-executable-permission-on-several-source-fil.patch
@@ -1,7 +1,7 @@
-From 8cd690d0b8a5343d8731145b95931ec7aaa2db35 Mon Sep 17 00:00:00 2001
+From 0d06cf9912262a28088377fb7b17682709752c6c Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 27 Mar 2017 12:25:19 +0100
-Subject: [PATCH 07/20] Remove +x (executable) permission on several source
+Subject: [PATCH 08/23] Remove +x (executable) permission on several source
  files.
 
 Not sure why it was there, but it was incorrect.
@@ -44,5 +44,5 @@ diff --git a/src/virt-top.pod b/src/virt-top.pod
 old mode 100755
 new mode 100644
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0008-Refresh-HACKING-file.patch b/SOURCES/0009-Refresh-HACKING-file.patch
similarity index 95%
rename from SOURCES/0008-Refresh-HACKING-file.patch
rename to SOURCES/0009-Refresh-HACKING-file.patch
index 5d2fa29..1b2666a 100644
--- a/SOURCES/0008-Refresh-HACKING-file.patch
+++ b/SOURCES/0009-Refresh-HACKING-file.patch
@@ -1,7 +1,7 @@
-From cc9f1f9d8f17e8ac5a6a73af830c132d916fd6e0 Mon Sep 17 00:00:00 2001
+From 2df154c93069ab97f38fbb8e290527f74ace5e62 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 27 Mar 2017 12:30:01 +0100
-Subject: [PATCH 08/20] Refresh HACKING file.
+Subject: [PATCH 09/23] Refresh HACKING file.
 
 Fixes commit b7c3ef13cbd9c9cd49005a32ffb70faf6f5bbe8c.
 ---
@@ -91,5 +91,5 @@ index bce40a9..3cd266b 100644
 -  virt-top.1
 -  virt-top.txt
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0009-Fix-po-POTFILES-for-new-location-of-source-files.patch b/SOURCES/0010-Fix-po-POTFILES-for-new-location-of-source-files.patch
similarity index 84%
rename from SOURCES/0009-Fix-po-POTFILES-for-new-location-of-source-files.patch
rename to SOURCES/0010-Fix-po-POTFILES-for-new-location-of-source-files.patch
index 402d03b..31b2f90 100644
--- a/SOURCES/0009-Fix-po-POTFILES-for-new-location-of-source-files.patch
+++ b/SOURCES/0010-Fix-po-POTFILES-for-new-location-of-source-files.patch
@@ -1,7 +1,7 @@
-From 1b4980da40000a34ec987f83824dd69454c4e8e4 Mon Sep 17 00:00:00 2001
+From 26f12ab7c3a984c6a80d88de32394aaabfde1094 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 27 Mar 2017 12:33:22 +0100
-Subject: [PATCH 09/20] Fix po/POTFILES for new location of source files.
+Subject: [PATCH 10/23] Fix po/POTFILES for new location of source files.
 
 Fixes commit b7c3ef13cbd9c9cd49005a32ffb70faf6f5bbe8c.
 ---
@@ -30,5 +30,5 @@ index 55bb82d..70d62d5 100644
 +../src/utils.ml
 +../src/version.ml
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0010-Update-PO-files.patch b/SOURCES/0011-Update-PO-files.patch
similarity index 99%
rename from SOURCES/0010-Update-PO-files.patch
rename to SOURCES/0011-Update-PO-files.patch
index 01ada1e..1f9f9fe 100644
--- a/SOURCES/0010-Update-PO-files.patch
+++ b/SOURCES/0011-Update-PO-files.patch
@@ -1,7 +1,7 @@
-From 0b6f6d45d50174e27f9a425f67bb1a6045a8e58c Mon Sep 17 00:00:00 2001
+From f8f62c7edbb952c0471f42a85c804f2d650d1f8e Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 27 Mar 2017 12:34:20 +0100
-Subject: [PATCH 10/20] Update PO files.
+Subject: [PATCH 11/23] Update PO files.
 
 ---
  po/as.po        | 227 +++++++++++++++++++++++++----------------------
@@ -14275,5 +14275,5 @@ index dcf0de0..4df1241 100644
  msgstr ""
 +
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0011-Remove-support-for-OCaml-Calendar-v1.patch b/SOURCES/0012-Remove-support-for-OCaml-Calendar-v1.patch
similarity index 97%
rename from SOURCES/0011-Remove-support-for-OCaml-Calendar-v1.patch
rename to SOURCES/0012-Remove-support-for-OCaml-Calendar-v1.patch
index 2e6a56c..8ad9f29 100644
--- a/SOURCES/0011-Remove-support-for-OCaml-Calendar-v1.patch
+++ b/SOURCES/0012-Remove-support-for-OCaml-Calendar-v1.patch
@@ -1,7 +1,7 @@
-From effd1ec5897a2cac6e897ae7bce72f6b1e617b90 Mon Sep 17 00:00:00 2001
+From 61ded220af5511b6c164123e612e5650af8e49be Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 27 Mar 2017 12:41:21 +0100
-Subject: [PATCH 11/20] Remove support for OCaml Calendar v1.
+Subject: [PATCH 12/23] Remove support for OCaml Calendar v1.
 
 Calendar v2 was released in 2008 (9 years ago!), thus remove support
 for v1.
@@ -199,5 +199,5 @@ index 2c459fe..0000000
 -   *)
 -  Calendar.to_unixfloat cal
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0012-src-Fix-some-comments-which-referred-to-the-old-file.patch b/SOURCES/0013-src-Fix-some-comments-which-referred-to-the-old-file.patch
similarity index 94%
rename from SOURCES/0012-src-Fix-some-comments-which-referred-to-the-old-file.patch
rename to SOURCES/0013-src-Fix-some-comments-which-referred-to-the-old-file.patch
index 5cb1dff..13a934f 100644
--- a/SOURCES/0012-src-Fix-some-comments-which-referred-to-the-old-file.patch
+++ b/SOURCES/0013-src-Fix-some-comments-which-referred-to-the-old-file.patch
@@ -1,7 +1,7 @@
-From 3e9ed9c0fe49c3d4e4a8e467d521f676769c485a Mon Sep 17 00:00:00 2001
+From b7a80d457904a3d677a14b7641b957c9760c03f9 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 27 Mar 2017 13:06:18 +0100
-Subject: [PATCH 12/20] src: Fix some comments which referred to the old
+Subject: [PATCH 13/23] src: Fix some comments which referred to the old
  filenames.
 
 Fixes commit b7c3ef13cbd9c9cd49005a32ffb70faf6f5bbe8c.
@@ -72,5 +72,5 @@ index 3ad0718..b0953dd 100644
  
  type setup =
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0013-Split-up-huge-Top-module-into-smaller-modules.patch b/SOURCES/0014-Split-up-huge-Top-module-into-smaller-modules.patch
similarity index 99%
rename from SOURCES/0013-Split-up-huge-Top-module-into-smaller-modules.patch
rename to SOURCES/0014-Split-up-huge-Top-module-into-smaller-modules.patch
index a4f5046..bf912c8 100644
--- a/SOURCES/0013-Split-up-huge-Top-module-into-smaller-modules.patch
+++ b/SOURCES/0014-Split-up-huge-Top-module-into-smaller-modules.patch
@@ -1,7 +1,7 @@
-From 90d14bc151e488972d33eefaac2242d9a6e07578 Mon Sep 17 00:00:00 2001
+From 127dfdfc52926f8a337fcc50eddb51cf4f64371f Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 27 Mar 2017 15:29:23 +0100
-Subject: [PATCH 13/20] Split up huge Top module into smaller modules.
+Subject: [PATCH 14/23] Split up huge Top module into smaller modules.
 
 This change is hopefully pure refactoring, splitting up the very large
 and highly interlinked module into more manageable modules with
@@ -3270,5 +3270,5 @@ index 5b71b31..6e81215 100644
 -val sum_interface_stats : interface_stats list -> interface_stats
 -val diff_interface_stats : interface_stats -> interface_stats -> interface_stats
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0014-Move-block_in_bytes-entirely-to-the-presentation-lay.patch b/SOURCES/0015-Move-block_in_bytes-entirely-to-the-presentation-lay.patch
similarity index 98%
rename from SOURCES/0014-Move-block_in_bytes-entirely-to-the-presentation-lay.patch
rename to SOURCES/0015-Move-block_in_bytes-entirely-to-the-presentation-lay.patch
index 949fd8e..04a355d 100644
--- a/SOURCES/0014-Move-block_in_bytes-entirely-to-the-presentation-lay.patch
+++ b/SOURCES/0015-Move-block_in_bytes-entirely-to-the-presentation-lay.patch
@@ -1,7 +1,7 @@
-From 431dbd98bad6e3635b4d0885bf33dd3e759ca35d Mon Sep 17 00:00:00 2001
+From 10660e29ea19a0e290e28afe0425f63afd0abd58 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 27 Mar 2017 21:22:52 +0100
-Subject: [PATCH 14/20] Move block_in_bytes entirely to the presentation layer.
+Subject: [PATCH 15/23] Move block_in_bytes entirely to the presentation layer.
 
 Simplifies and updates commit dbef8dd3bf00417e75a12c851b053e49c9e1a79e.
 ---
@@ -207,5 +207,5 @@ index 204f3b6..e2a93d6 100644
      (* Append to stream output file. *)
      if stream_mode then
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0015-Remove-unused-variable-is_calendar2.patch b/SOURCES/0016-Remove-unused-variable-is_calendar2.patch
similarity index 82%
rename from SOURCES/0015-Remove-unused-variable-is_calendar2.patch
rename to SOURCES/0016-Remove-unused-variable-is_calendar2.patch
index bb2d6eb..730c856 100644
--- a/SOURCES/0015-Remove-unused-variable-is_calendar2.patch
+++ b/SOURCES/0016-Remove-unused-variable-is_calendar2.patch
@@ -1,7 +1,7 @@
-From 4f3794d5718249238a74b614a6b486465bc4315d Mon Sep 17 00:00:00 2001
+From 9af3b4d4667bf96d8c36e440ea11c106ae53a43f Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 28 Mar 2017 13:09:54 +0100
-Subject: [PATCH 15/20] Remove unused variable is_calendar2.
+Subject: [PATCH 16/23] Remove unused variable is_calendar2.
 
 Fixes commit effd1ec5897a2cac6e897ae7bce72f6b1e617b90.
 ---
@@ -21,5 +21,5 @@ index 64f431e..6a13bef 100644
  
  OCAMLCPACKAGES	:= -package unix,extlib,curses,str,libvirt
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0016-Use-virConnectGetAllDomainStats-API-to-collect-domai.patch b/SOURCES/0017-Use-virConnectGetAllDomainStats-API-to-collect-domai.patch
similarity index 98%
rename from SOURCES/0016-Use-virConnectGetAllDomainStats-API-to-collect-domai.patch
rename to SOURCES/0017-Use-virConnectGetAllDomainStats-API-to-collect-domai.patch
index 943eb9a..ddc6002 100644
--- a/SOURCES/0016-Use-virConnectGetAllDomainStats-API-to-collect-domai.patch
+++ b/SOURCES/0017-Use-virConnectGetAllDomainStats-API-to-collect-domai.patch
@@ -1,7 +1,7 @@
-From c513d05fd4e85953701b1023bef71af62613cf79 Mon Sep 17 00:00:00 2001
+From 74971ed8c85400929714a7adff5b61c2ebe9fcee Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 28 Mar 2017 13:30:07 +0100
-Subject: [PATCH 16/20] Use virConnectGetAllDomainStats API to collect domain
+Subject: [PATCH 17/23] Use virConnectGetAllDomainStats API to collect domain
  stats (RHBZ#1422795).
 
 This is much faster than using the basic libvirt APIs to collect
@@ -339,5 +339,5 @@ index 6e81215..3c966f8 100644
   * If the config file is missing this returns an empty list.
   *)
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0017-chmod-x-COPYING-files.patch b/SOURCES/0018-chmod-x-COPYING-files.patch
similarity index 76%
rename from SOURCES/0017-chmod-x-COPYING-files.patch
rename to SOURCES/0018-chmod-x-COPYING-files.patch
index 9adf972..69168c0 100644
--- a/SOURCES/0017-chmod-x-COPYING-files.patch
+++ b/SOURCES/0018-chmod-x-COPYING-files.patch
@@ -1,7 +1,7 @@
-From 20c078bead38fd9e413660d4d8fdc3fd4f76edf7 Mon Sep 17 00:00:00 2001
+From df68ee432ef350962647f47ca65effbaf7262ebb Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 28 Mar 2017 14:36:07 +0100
-Subject: [PATCH 17/20] chmod -x COPYING* files.
+Subject: [PATCH 18/23] chmod -x COPYING* files.
 
 ---
  COPYING     | 0
@@ -17,5 +17,5 @@ diff --git a/COPYING.LIB b/COPYING.LIB
 old mode 100755
 new mode 100644
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0018-Fixes-for-safe-string-in-OCaml-4.06.patch b/SOURCES/0019-Fixes-for-safe-string-in-OCaml-4.06.patch
similarity index 88%
rename from SOURCES/0018-Fixes-for-safe-string-in-OCaml-4.06.patch
rename to SOURCES/0019-Fixes-for-safe-string-in-OCaml-4.06.patch
index 92d996e..0edbb6f 100644
--- a/SOURCES/0018-Fixes-for-safe-string-in-OCaml-4.06.patch
+++ b/SOURCES/0019-Fixes-for-safe-string-in-OCaml-4.06.patch
@@ -1,7 +1,7 @@
-From a58c90e04e5b54f8c6a67b09a93cfc33402cf398 Mon Sep 17 00:00:00 2001
+From 2d8ef8a4ca613ad291bc05a4e5ebdc11c3eae6b9 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 18 Nov 2017 12:01:34 +0000
-Subject: [PATCH 18/20] Fixes for -safe-string in OCaml 4.06.
+Subject: [PATCH 19/23] Fixes for -safe-string in OCaml 4.06.
 
 ---
  src/top.ml | 13 ++++++++-----
@@ -38,5 +38,5 @@ index e2a93d6..d4f7697 100644
  
  (* Main loop. *)
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0019-Link-with-fPIC-runtime.patch b/SOURCES/0020-Link-with-fPIC-runtime.patch
similarity index 85%
rename from SOURCES/0019-Link-with-fPIC-runtime.patch
rename to SOURCES/0020-Link-with-fPIC-runtime.patch
index 5f207ca..4003249 100644
--- a/SOURCES/0019-Link-with-fPIC-runtime.patch
+++ b/SOURCES/0020-Link-with-fPIC-runtime.patch
@@ -1,7 +1,7 @@
-From 18a751d8c26548bb090ff05e30ccda3092e3373b Mon Sep 17 00:00:00 2001
+From 2afed7fe878bee73fabab0b1f43aac269bdb3b6a Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 18 Nov 2017 12:01:49 +0000
-Subject: [PATCH 19/20] Link with -fPIC runtime.
+Subject: [PATCH 20/23] Link with -fPIC runtime.
 
 ---
  src/Makefile.in | 5 ++++-
@@ -28,5 +28,5 @@ index 6a13bef..03c6362 100644
  
  # Manual page.
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/0020-build-Pass-through-CFLAGS-and-LDFLAGS-to-ocaml-compi.patch b/SOURCES/0021-build-Pass-through-CFLAGS-and-LDFLAGS-to-ocaml-compi.patch
similarity index 91%
rename from SOURCES/0020-build-Pass-through-CFLAGS-and-LDFLAGS-to-ocaml-compi.patch
rename to SOURCES/0021-build-Pass-through-CFLAGS-and-LDFLAGS-to-ocaml-compi.patch
index e6b42bd..eb7f0de 100644
--- a/SOURCES/0020-build-Pass-through-CFLAGS-and-LDFLAGS-to-ocaml-compi.patch
+++ b/SOURCES/0021-build-Pass-through-CFLAGS-and-LDFLAGS-to-ocaml-compi.patch
@@ -1,7 +1,7 @@
-From 15f0601f39b2aa477e6f1f2558575f98b873a193 Mon Sep 17 00:00:00 2001
+From 4a69a323aee9d7ab913a8665cddbc63b98804be0 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 20 Sep 2018 13:47:34 +0100
-Subject: [PATCH 20/20] build: Pass through CFLAGS and LDFLAGS to ocaml
+Subject: [PATCH 21/23] build: Pass through CFLAGS and LDFLAGS to ocaml
  compiler (RHBZ#1630636).
 
 ---
@@ -54,5 +54,5 @@ index 03c6362..ba4eb1d 100644
  
  # Manual page.
 -- 
-2.19.0.rc0
+2.31.1
 
diff --git a/SOURCES/virt-top-aarch64.patch b/SOURCES/0022-Update-configure-for-aarch64-bz-926701.patch
similarity index 88%
rename from SOURCES/virt-top-aarch64.patch
rename to SOURCES/0022-Update-configure-for-aarch64-bz-926701.patch
index 0829ccf..216774e 100644
--- a/SOURCES/virt-top-aarch64.patch
+++ b/SOURCES/0022-Update-configure-for-aarch64-bz-926701.patch
@@ -1,6 +1,17 @@
-diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
---- virt-top-1.0.8/config.guess	2010-10-30 07:14:16.000000000 -0500
-+++ virt-top-1.0.8-aarch64/config.guess	2013-03-08 09:26:43.180421787 -0600
+From 1b30bcd831a6e1c3dd16c0e53379df228da3e87b Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 29 Nov 2022 08:14:20 +0000
+Subject: [PATCH 22/23] Update configure for aarch64 (bz #926701)
+
+---
+ config.guess | 585 +++++++++++++++++++++++++++------------------------
+ config.sub   | 327 +++++++++++++++++++++-------
+ 2 files changed, 560 insertions(+), 352 deletions(-)
+
+diff --git a/config.guess b/config.guess
+index 396482d..872b96a 100755
+--- a/config.guess
++++ b/config.guess
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -15,7 +26,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
-@@ -17,9 +17,7 @@
+@@ -17,9 +17,7 @@ timestamp='2006-07-02'
  # General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
@@ -26,7 +37,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -27,16 +25,16 @@
+@@ -27,16 +25,16 @@ timestamp='2006-07-02'
  # the same distribution terms that you use for the rest of that program.
  
  
@@ -48,7 +59,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  
  me=`echo "$0" | sed -e 's,.*/,,'`
  
-@@ -56,7 +54,8 @@
+@@ -56,7 +54,8 @@ version="\
  GNU config.guess ($timestamp)
  
  Originally written by Per Bothner.
@@ -58,7 +69,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
-@@ -144,7 +143,7 @@
+@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      *:NetBSD:*:*)
  	# NetBSD (nbsd) targets should (where applicable) match one or
@@ -67,7 +78,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
  	# switched to ELF, *-*-netbsd* would select the old
  	# object file format.  This provides both forward
-@@ -161,6 +160,7 @@
+@@ -161,6 +160,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  	    arm*) machine=arm-unknown ;;
  	    sh3el) machine=shl-unknown ;;
  	    sh3eb) machine=sh-unknown ;;
@@ -75,7 +86,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
-@@ -169,7 +169,7 @@
+@@ -169,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -84,7 +95,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  		then
  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  		    # Return netbsd for either.  FIX?
-@@ -179,7 +179,7 @@
+@@ -179,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  		fi
  		;;
  	    *)
@@ -93,7 +104,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  		;;
  	esac
  	# The OS release
-@@ -200,6 +200,10 @@
+@@ -200,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
  	echo "${machine}-${os}${release}"
  	exit ;;
@@ -104,7 +115,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      *:OpenBSD:*:*)
  	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
  	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-@@ -222,7 +226,7 @@
+@@ -222,7 +226,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
  		;;
  	*5.*)
@@ -113,7 +124,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  		;;
  	esac
  	# According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -268,7 +272,10 @@
+@@ -268,7 +272,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  	# A Xn.n version is an unreleased experimental baselevel.
  	# 1.2 uses "1.2" for uname -r.
  	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -125,7 +136,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      Alpha\ *:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# Should we change UNAME_MACHINE based on the output of uname instead
-@@ -294,12 +301,12 @@
+@@ -294,12 +301,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  	echo s390-ibm-zvmoe
  	exit ;;
      *:OS400:*:*)
@@ -140,7 +151,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	echo arm-unknown-riscos
  	exit ;;
      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-@@ -323,14 +330,33 @@
+@@ -323,14 +330,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  	case `/usr/bin/uname -p` in
  	    sparc) echo sparc-icl-nx7; exit ;;
  	esac ;;
@@ -176,7 +187,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	exit ;;
      sun4*:SunOS:6*:*)
  	# According to config.sub, this is the proper way to canonicalize
-@@ -374,23 +400,23 @@
+@@ -374,23 +400,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      # MiNT.  But MiNT is downward compatible to TOS, so this should
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
@@ -209,7 +220,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      m68k:machten:*:*)
  	echo m68k-apple-machten${UNAME_RELEASE}
  	exit ;;
-@@ -460,8 +486,8 @@
+@@ -460,8 +486,8 @@ EOF
  	echo m88k-motorola-sysv3
  	exit ;;
      AViiON:dgux:*:*)
@@ -220,7 +231,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
  	then
  	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -474,7 +500,7 @@
+@@ -474,7 +500,7 @@ EOF
  	else
  	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
@@ -229,7 +240,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
  	echo m88k-dolphin-sysv3
  	exit ;;
-@@ -531,7 +557,7 @@
+@@ -531,7 +557,7 @@ EOF
  		echo rs6000-ibm-aix3.2
  	fi
  	exit ;;
@@ -238,7 +249,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
-@@ -574,52 +600,52 @@
+@@ -574,52 +600,52 @@ EOF
  	    9000/[678][0-9][0-9])
  		if [ -x /usr/bin/getconf ]; then
  		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
@@ -272,14 +283,23 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
 -              #define _HPUX_SOURCE
 -              #include <stdlib.h>
 -              #include <unistd.h>
--
++		#define _HPUX_SOURCE
++		#include <stdlib.h>
++		#include <unistd.h>
+ 
 -              int main ()
 -              {
 -              #if defined(_SC_KERNEL_BITS)
 -                  long bits = sysconf(_SC_KERNEL_BITS);
 -              #endif
 -                  long cpu  = sysconf (_SC_CPU_VERSION);
--
++		int main ()
++		{
++		#if defined(_SC_KERNEL_BITS)
++		    long bits = sysconf(_SC_KERNEL_BITS);
++		#endif
++		    long cpu  = sysconf (_SC_CPU_VERSION);
+ 
 -                  switch (cpu)
 -              	{
 -              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
@@ -299,17 +319,6 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
 -              	}
 -                  exit (0);
 -              }
-+		#define _HPUX_SOURCE
-+		#include <stdlib.h>
-+		#include <unistd.h>
-+
-+		int main ()
-+		{
-+		#if defined(_SC_KERNEL_BITS)
-+		    long bits = sysconf(_SC_KERNEL_BITS);
-+		#endif
-+		    long cpu  = sysconf (_SC_CPU_VERSION);
-+
 +		    switch (cpu)
 +			{
 +			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
@@ -332,7 +341,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  EOF
  		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
  		    test -z "$HP_ARCH" && HP_ARCH=hppa
-@@ -639,7 +665,7 @@
+@@ -639,7 +665,7 @@ EOF
  	    # => hppa64-hp-hpux11.23
  
  	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -341,7 +350,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
-@@ -710,22 +736,22 @@
+@@ -710,22 +736,22 @@ EOF
  	exit ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
  	echo c1-convex-bsd
@@ -369,7 +378,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      CRAY*Y-MP:*:*:*)
  	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit ;;
-@@ -749,14 +775,14 @@
+@@ -749,14 +775,14 @@ EOF
  	exit ;;
      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -391,7 +400,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	exit ;;
      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-@@ -768,37 +794,51 @@
+@@ -768,37 +794,51 @@ EOF
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  	exit ;;
      *:FreeBSD:*:*)
@@ -456,7 +465,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -828,20 +868,68 @@
+@@ -828,85 +868,13 @@ EOF
      i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
  	exit ;;
@@ -464,75 +473,29 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
 +    aarch64:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
+-    avr32*:Linux:*:*)
 +    aarch64_be:Linux:*:*)
 +	UNAME_MACHINE=aarch64_be
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    alpha:Linux:*:*)
-+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+	esac
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit ;;
-+    arm*:Linux:*:*)
-+	eval $set_cc_for_build
-+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+	    | grep -q __ARM_EABI__
-+	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	else
-+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-+		| grep -q __ARM_PCS_VFP
-+	    then
-+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	    else
-+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-+	    fi
-+	fi
-+	exit ;;
-     avr32*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
-     cris:Linux:*:*)
+-    cris:Linux:*:*)
 -	echo cris-axis-linux-gnu
-+	echo ${UNAME_MACHINE}-axis-linux-gnu
- 	exit ;;
-     crisv32:Linux:*:*)
+-	exit ;;
+-    crisv32:Linux:*:*)
 -	echo crisv32-axis-linux-gnu
-+	echo ${UNAME_MACHINE}-axis-linux-gnu
- 	exit ;;
-     frv:Linux:*:*)
+-	exit ;;
+-    frv:Linux:*:*)
 -    	echo frv-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    hexagon:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    i*86:Linux:*:*)
-+	LIBC=gnu
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- 	exit ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -852,74 +940,33 @@
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
+-	exit ;;
+-    ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit ;;
+-    m32r*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit ;;
+-    m68*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit ;;
 -    mips:Linux:*:*)
 -	eval $set_cc_for_build
 -	sed 's/^	//' << EOF >$dummy.c
@@ -557,65 +520,134 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 -	;;
 -    mips64:Linux:*:*)
-+    mips:Linux:*:* | mips64:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#undef CPU
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
 -	#undef mips64
 -	#undef mips64el
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 -	CPU=mips64el
-+	CPU=${UNAME_MACHINE}el
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 -	CPU=mips64
-+	CPU=${UNAME_MACHINE}
- 	#else
- 	CPU=
- 	#endif
- 	#endif
- EOF
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
 -	    /^CPU/{
 -		s: ::g
 -		p
 -	    }'`"
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     or32:Linux:*:*)
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+-	;;
+-    or32:Linux:*:*)
 -	echo or32-unknown-linux-gnu
 -	exit ;;
 -    ppc:Linux:*:*)
 -	echo powerpc-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
+-	exit ;;
 -    ppc64:Linux:*:*)
 -	echo powerpc64-unknown-linux-gnu
-+    padre:Linux:*:*)
-+	echo sparc-unknown-linux-gnu
- 	exit ;;
--    alpha:Linux:*:*)
--	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
--	  EV5)   UNAME_MACHINE=alphaev5 ;;
--	  EV56)  UNAME_MACHINE=alphaev56 ;;
--	  PCA56) UNAME_MACHINE=alphapca56 ;;
--	  PCA57) UNAME_MACHINE=alphapca56 ;;
--	  EV6)   UNAME_MACHINE=alphaev6 ;;
--	  EV67)  UNAME_MACHINE=alphaev67 ;;
--	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
+@@ -916,11 +884,90 @@ EOF
+ 	  EV6)   UNAME_MACHINE=alphaev6 ;;
+ 	  EV67)  UNAME_MACHINE=alphaev67 ;;
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 -        esac
 -	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	esac
++	objdump --private-headers /bin/sh | grep -q ld.so.1
+ 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ 	exit ;;
++    arm*:Linux:*:*)
++	eval $set_cc_for_build
++	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++	    | grep -q __ARM_EABI__
++	then
++	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	else
++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++		| grep -q __ARM_PCS_VFP
++	    then
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	    else
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++	    fi
++	fi
++	exit ;;
++    avr32*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    cris:Linux:*:*)
++	echo ${UNAME_MACHINE}-axis-linux-gnu
++	exit ;;
++    crisv32:Linux:*:*)
++	echo ${UNAME_MACHINE}-axis-linux-gnu
++	exit ;;
++    frv:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    hexagon:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    i*86:Linux:*:*)
++	LIBC=gnu
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	exit ;;
++    ia64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    m32r*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    m68*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    mips:Linux:*:* | mips64:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef ${UNAME_MACHINE}
++	#undef ${UNAME_MACHINE}el
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=${UNAME_MACHINE}el
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=${UNAME_MACHINE}
++	#else
++	CPU=
++	#endif
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++	;;
++    or32:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    padre:Linux:*:*)
++	echo sparc-unknown-linux-gnu
++	exit ;;
 +    parisc64:Linux:*:* | hppa64:Linux:*:*)
 +	echo hppa64-unknown-linux-gnu
- 	exit ;;
++	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
-@@ -929,14 +976,17 @@
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -929,14 +976,17 @@ EOF
  	  *)    echo hppa-unknown-linux-gnu ;;
  	esac
  	exit ;;
@@ -636,7 +668,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	exit ;;
      sh*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -944,75 +994,18 @@
+@@ -944,75 +994,18 @@ EOF
      sparc:Linux:*:* | sparc64:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
@@ -719,7 +751,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
  	# earlier versions are messed up and put the nodename in both
-@@ -1020,11 +1013,11 @@
+@@ -1020,11 +1013,11 @@ EOF
  	echo i386-sequent-sysv4
  	exit ;;
      i*86:UNIX_SV:4.2MP:2.*)
@@ -735,7 +767,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
  	exit ;;
      i*86:OS/2:*:*)
-@@ -1041,7 +1034,7 @@
+@@ -1041,7 +1034,7 @@ EOF
      i*86:syllable:*:*)
  	echo ${UNAME_MACHINE}-pc-syllable
  	exit ;;
@@ -744,7 +776,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	echo i386-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      i*86:*DOS:*:*)
-@@ -1056,7 +1049,7 @@
+@@ -1056,7 +1049,7 @@ EOF
  	fi
  	exit ;;
      i*86:*:5:[678]*)
@@ -753,7 +785,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	case `/bin/uname -X | grep "^Machine"` in
  	    *486*)	     UNAME_MACHINE=i486 ;;
  	    *Pentium)	     UNAME_MACHINE=i586 ;;
-@@ -1084,10 +1077,13 @@
+@@ -1084,10 +1077,13 @@ EOF
  	exit ;;
      pc:*:*:*)
  	# Left here for compatibility:
@@ -771,7 +803,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
  	exit ;;
-@@ -1122,8 +1118,18 @@
+@@ -1122,8 +1118,18 @@ EOF
  	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
  	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
@@ -792,7 +824,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  	echo m68k-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
-@@ -1136,7 +1142,7 @@
+@@ -1136,7 +1142,7 @@ EOF
      rs6000:LynxOS:2.*:*)
  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
@@ -801,7 +833,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	echo powerpc-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      SM[BE]S:UNIX_SV:*:*)
-@@ -1156,10 +1162,10 @@
+@@ -1156,10 +1162,10 @@ EOF
  		echo ns32k-sni-sysv
  	fi
  	exit ;;
@@ -816,7 +848,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      *:UNIX_System_V:4*:FTX*)
  	# From Gerald Hewes <hewes@openmarket.com>.
  	# How about differentiating between stratus architectures? -djm
-@@ -1185,11 +1191,11 @@
+@@ -1185,11 +1191,11 @@ EOF
  	exit ;;
      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
  	if [ -d /usr/nec ]; then
@@ -831,7 +863,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
  	echo powerpc-be-beos
  	exit ;;
-@@ -1199,6 +1205,12 @@
+@@ -1199,6 +1205,12 @@ EOF
      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  	echo i586-pc-beos
  	exit ;;
@@ -844,7 +876,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
  	exit ;;
-@@ -1208,6 +1220,15 @@
+@@ -1208,6 +1220,15 @@ EOF
      SX-6:SUPER-UX:*:*)
  	echo sx6-nec-superux${UNAME_RELEASE}
  	exit ;;
@@ -860,7 +892,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
      Power*:Rhapsody:*:*)
  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
  	exit ;;
-@@ -1217,6 +1238,16 @@
+@@ -1217,6 +1238,16 @@ EOF
      *:Darwin:*:*)
  	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
  	case $UNAME_PROCESSOR in
@@ -877,7 +909,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	    unknown) UNAME_PROCESSOR=powerpc ;;
  	esac
  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-@@ -1232,7 +1263,10 @@
+@@ -1232,7 +1263,10 @@ EOF
      *:QNX:*:4*)
  	echo i386-pc-qnx
  	exit ;;
@@ -889,7 +921,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	echo nse-tandem-nsk${UNAME_RELEASE}
  	exit ;;
      NSR-?:NONSTOP_KERNEL:*:*)
-@@ -1277,13 +1311,13 @@
+@@ -1277,13 +1311,13 @@ EOF
  	echo pdp10-unknown-its
  	exit ;;
      SEI:*:*:SEIUX)
@@ -905,7 +937,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  	case "${UNAME_MACHINE}" in
  	    A*) echo alpha-dec-vms ; exit ;;
  	    I*) echo ia64-dec-vms ; exit ;;
-@@ -1298,11 +1332,14 @@
+@@ -1298,11 +1332,14 @@ EOF
      i*86:rdos:*:*)
  	echo ${UNAME_MACHINE}-pc-rdos
  	exit ;;
@@ -923,7 +955,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  eval $set_cc_for_build
  cat >$dummy.c <<EOF
  #ifdef _SEQUENT_
-@@ -1320,11 +1357,11 @@
+@@ -1320,11 +1357,11 @@ main ()
  #include <sys/param.h>
    printf ("m68k-sony-newsos%s\n",
  #ifdef NEWSOS4
@@ -938,7 +970,7 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  #endif
  #endif
  
-@@ -1458,9 +1495,9 @@
+@@ -1458,9 +1495,9 @@ This script, last modified $timestamp, has failed to recognize
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
@@ -950,9 +982,10 @@ diff -urN virt-top-1.0.8/config.guess virt-top-1.0.8-aarch64/config.guess
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
-diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
---- virt-top-1.0.8/config.sub	2010-10-30 07:14:16.000000000 -0500
-+++ virt-top-1.0.8-aarch64/config.sub	2013-03-08 09:26:43.217417530 -0600
+diff --git a/config.sub b/config.sub
+index fab0aa3..826e4c6 100755
+--- a/config.sub
++++ b/config.sub
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
@@ -967,7 +1000,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,9 +21,7 @@
+@@ -21,9 +21,7 @@ timestamp='2006-09-20'
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
@@ -978,7 +1011,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -32,13 +30,16 @@
+@@ -32,13 +30,16 @@ timestamp='2006-09-20'
  
  
  # Please send patches to <config-patches@gnu.org>.  Submit a context
@@ -996,7 +1029,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  # This file is supposed to be the same for all GNU packages
  # and recognize all the CPU types, system types and aliases
  # that are meaningful with *any* GNU software.
-@@ -72,7 +73,8 @@
+@@ -72,7 +73,8 @@ Report bugs and patches to <config-patches@gnu.org>."
  version="\
  GNU config.sub ($timestamp)
  
@@ -1006,7 +1039,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
-@@ -120,12 +122,18 @@
+@@ -120,12 +122,18 @@ esac
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
@@ -1027,7 +1060,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
    *)
      basic_machine=`echo $1 | sed 's/-[^-]*$//'`
      if [ $basic_machine != $1 ]
-@@ -148,10 +156,13 @@
+@@ -148,10 +156,13 @@ case $os in
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@@ -1042,7 +1075,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
  		basic_machine=$1
-@@ -166,10 +177,10 @@
+@@ -166,10 +177,10 @@ case $os in
  		os=-chorusos
  		basic_machine=$1
  		;;
@@ -1056,7 +1089,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	-hiux*)
  		os=-hiuxwe2
  		;;
-@@ -214,6 +225,12 @@
+@@ -214,6 +225,12 @@ case $os in
  	-isc*)
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
@@ -1069,7 +1102,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	-lynx*)
  		os=-lynxos
  		;;
-@@ -238,24 +255,32 @@
+@@ -238,24 +255,32 @@ case $basic_machine in
  	# Some are omitted here because they have special meanings below.
  	1750a | 580 \
  	| a29k \
@@ -1105,7 +1138,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	| mips64vr4100 | mips64vr4100el \
  	| mips64vr4300 | mips64vr4300el \
  	| mips64vr5000 | mips64vr5000el \
-@@ -268,29 +293,42 @@
+@@ -268,29 +293,42 @@ case $basic_machine in
  	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
@@ -1157,7 +1190,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  		basic_machine=$basic_machine-unknown
  		os=-none
  		;;
-@@ -300,6 +338,21 @@
+@@ -300,6 +338,21 @@ case $basic_machine in
  		basic_machine=mt-unknown
  		;;
  
@@ -1179,7 +1212,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
  	# (2) the word "unknown" tends to confuse beginning users.
-@@ -314,29 +367,37 @@
+@@ -314,29 +367,37 @@ case $basic_machine in
  	# Recognize the basic CPU types with company name.
  	580-* \
  	| a29k-* \
@@ -1221,7 +1254,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	| mips64vr4100-* | mips64vr4100el-* \
  	| mips64vr4300-* | mips64vr4300el-* \
  	| mips64vr5000-* | mips64vr5000el-* \
-@@ -351,27 +412,36 @@
+@@ -351,27 +412,36 @@ case $basic_machine in
  	| mmix-* \
  	| mt-* \
  	| msp430-* \
@@ -1267,7 +1300,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
-@@ -389,7 +459,7 @@
+@@ -389,7 +459,7 @@ case $basic_machine in
  		basic_machine=a29k-amd
  		os=-udi
  		;;
@@ -1276,7 +1309,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  		basic_machine=abacus-unknown
  		;;
  	adobe68k)
-@@ -435,6 +505,10 @@
+@@ -435,6 +505,10 @@ case $basic_machine in
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
@@ -1287,7 +1320,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
-@@ -443,10 +517,35 @@
+@@ -443,10 +517,35 @@ case $basic_machine in
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
@@ -1323,7 +1356,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
-@@ -475,8 +574,8 @@
+@@ -475,8 +574,8 @@ case $basic_machine in
  		basic_machine=craynv-cray
  		os=-unicosmp
  		;;
@@ -1334,7 +1367,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  		os=-elf
  		;;
  	crds | unos)
-@@ -514,6 +613,10 @@
+@@ -514,6 +613,10 @@ case $basic_machine in
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
@@ -1345,7 +1378,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	djgpp)
  		basic_machine=i586-pc
  		os=-msdosdjgpp
-@@ -629,7 +732,6 @@
+@@ -629,7 +732,6 @@ case $basic_machine in
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
  		;;
@@ -1353,7 +1386,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	i*86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
-@@ -668,6 +770,14 @@
+@@ -668,6 +770,14 @@ case $basic_machine in
  		basic_machine=m68k-isi
  		os=-sysv
  		;;
@@ -1368,7 +1401,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	m88k-omron*)
  		basic_machine=m88k-omron
  		;;
-@@ -679,10 +789,21 @@
+@@ -679,10 +789,21 @@ case $basic_machine in
  		basic_machine=ns32k-utek
  		os=-sysv
  		;;
@@ -1390,7 +1423,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
-@@ -711,10 +832,18 @@
+@@ -711,10 +832,18 @@ case $basic_machine in
  	ms1-*)
  		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
  		;;
@@ -1409,7 +1442,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	ncr3000)
  		basic_machine=i486-ncr
  		os=-sysv4
-@@ -779,6 +908,12 @@
+@@ -779,6 +908,12 @@ case $basic_machine in
  	np1)
  		basic_machine=np1-gould
  		;;
@@ -1422,7 +1455,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	nsr-tandem)
  		basic_machine=nsr-tandem
  		;;
-@@ -809,6 +944,14 @@
+@@ -809,6 +944,14 @@ case $basic_machine in
  		basic_machine=i860-intel
  		os=-osf
  		;;
@@ -1437,7 +1470,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	pbd)
  		basic_machine=sparc-tti
  		;;
-@@ -853,9 +996,10 @@
+@@ -853,9 +996,10 @@ case $basic_machine in
  		;;
  	power)	basic_machine=power-ibm
  		;;
@@ -1450,7 +1483,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  		;;
  	ppcle | powerpclittle | ppc-le | powerpc-little)
  		basic_machine=powerpcle-unknown
-@@ -925,6 +1069,9 @@
+@@ -925,6 +1069,9 @@ case $basic_machine in
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
@@ -1460,7 +1493,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	sh64)
  		basic_machine=sh64-unknown
  		;;
-@@ -946,6 +1093,9 @@
+@@ -946,6 +1093,9 @@ case $basic_machine in
  		basic_machine=i860-stratus
  		os=-sysv4
  		;;
@@ -1470,7 +1503,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	sun2)
  		basic_machine=m68000-sun
  		;;
-@@ -1002,17 +1152,9 @@
+@@ -1002,17 +1152,9 @@ case $basic_machine in
  		basic_machine=t90-cray
  		os=-unicos
  		;;
@@ -1491,7 +1524,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  		;;
  	tx39)
  		basic_machine=mipstx39-unknown
-@@ -1081,6 +1223,9 @@
+@@ -1081,6 +1223,9 @@ case $basic_machine in
  	xps | xps100)
  		basic_machine=xps100-honeywell
  		;;
@@ -1501,7 +1534,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	ymp)
  		basic_machine=ymp-cray
  		os=-unicos
-@@ -1089,6 +1234,10 @@
+@@ -1089,6 +1234,10 @@ case $basic_machine in
  		basic_machine=z8k-unknown
  		os=-sim
  		;;
@@ -1512,7 +1545,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	none)
  		basic_machine=none-none
  		os=-none
-@@ -1127,7 +1276,7 @@
+@@ -1127,7 +1276,7 @@ case $basic_machine in
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -1521,7 +1554,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  		basic_machine=sh-unknown
  		;;
  	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-@@ -1174,9 +1323,12 @@
+@@ -1174,9 +1323,12 @@ esac
  if [ x"$os" != x"" ]
  then
  case $os in
@@ -1536,7 +1569,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  		;;
-@@ -1197,21 +1349,23 @@
+@@ -1197,21 +1349,23 @@ case $os in
  	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -1567,7 +1600,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	      | -uxpv* | -beos* | -mpeix* | -udk* \
  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-@@ -1219,7 +1373,7 @@
+@@ -1219,7 +1373,7 @@ case $os in
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
@@ -1576,7 +1609,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
-@@ -1258,7 +1412,7 @@
+@@ -1258,7 +1412,7 @@ case $os in
  	-opened*)
  		os=-openedition
  		;;
@@ -1585,7 +1618,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  		os=-os400
  		;;
  	-wince*)
-@@ -1307,7 +1461,7 @@
+@@ -1307,7 +1461,7 @@ case $os in
  	-sinix*)
  		os=-sysv4
  		;;
@@ -1594,7 +1627,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  		os=-tpf
  		;;
  	-triton*)
-@@ -1349,6 +1503,11 @@
+@@ -1349,6 +1503,11 @@ case $os in
  	-zvmoe)
  		os=-zvmoe
  		;;
@@ -1606,7 +1639,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	-none)
  		;;
  	*)
-@@ -1371,10 +1530,10 @@
+@@ -1371,10 +1530,10 @@ else
  # system, and we'll never get to this point.
  
  case $basic_machine in
@@ -1619,7 +1652,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  		os=-elf
  		;;
  	*-acorn)
-@@ -1386,8 +1545,20 @@
+@@ -1386,8 +1545,20 @@ case $basic_machine in
  	arm*-semi)
  		os=-aout
  		;;
@@ -1642,7 +1675,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  		;;
  	# This must come before the *-dec entry.
  	pdp10-*)
-@@ -1407,13 +1578,13 @@
+@@ -1407,13 +1578,13 @@ case $basic_machine in
  		;;
  	m68000-sun)
  		os=-sunos3
@@ -1659,7 +1692,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  	mips*-cisco)
  		os=-elf
  		;;
-@@ -1438,7 +1609,7 @@
+@@ -1438,7 +1609,7 @@ case $basic_machine in
  	*-ibm)
  		os=-aix
  		;;
@@ -1668,7 +1701,7 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  		os=-mmixware
  		;;
  	*-wec)
-@@ -1543,7 +1714,7 @@
+@@ -1543,7 +1714,7 @@ case $basic_machine in
  			-sunos*)
  				vendor=sun
  				;;
@@ -1677,3 +1710,6 @@ diff -urN virt-top-1.0.8/config.sub virt-top-1.0.8-aarch64/config.sub
  				vendor=ibm
  				;;
  			-beos*)
+-- 
+2.31.1
+
diff --git a/SOURCES/0023-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch b/SOURCES/0023-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
new file mode 100644
index 0000000..4f13ed6
--- /dev/null
+++ b/SOURCES/0023-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
@@ -0,0 +1,40 @@
+From eaf468caac06e4b43fafbacc6e70fa5f80ea3051 Mon Sep 17 00:00:00 2001
+From: Yuya Higashi <higashi.yuya@fujitsu.com>
+Date: Tue, 15 Nov 2022 13:56:21 +0900
+Subject: [PATCH 23/23] virt-top: fix to explicitly disconnect from libvirtd
+
+To prevent libvirtd from printing virNetSocketReadWire I/O errors when
+the virt-top command exits, explicitly disconnect from libvirtd.
+
+Signed-off-by: Yuya Higashi <higashi.yuya@fujitsu.com>
+(cherry picked from commit 4b15ee2440b0e70e3c1eb5e164ded493e2d8f0c8)
+---
+ src/top.ml | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/top.ml b/src/top.ml
+index d4f7697..35f10b7 100644
+--- a/src/top.ml
++++ b/src/top.ml
+@@ -313,7 +313,7 @@ let get_string maxlen =
+   )
+ 
+ (* Main loop. *)
+-let rec main_loop ((_, batch_mode, script_mode, csv_enabled, stream_mode, _, _, _)
++let rec main_loop ((conn, batch_mode, script_mode, csv_enabled, stream_mode, _, _, _)
+ 		     as setup) =
+   let csv_flags = !csv_cpu, !csv_mem, !csv_block, !csv_net in
+ 
+@@ -379,7 +379,8 @@ let rec main_loop ((_, batch_mode, script_mode, csv_enabled, stream_mode, _, _,
+       if not !quit || !end_time <> None then
+ 	millisleep delay
+     )
+-  done
++  done;
++  C.close conn
+ 
+ and get_key_press setup delay =
+   (* Read the next key, waiting up to 'delay' milliseconds. *)
+-- 
+2.31.1
+
diff --git a/SOURCES/processcsv.py.pod b/SOURCES/processcsv.py.pod
new file mode 100644
index 0000000..8c8893d
--- /dev/null
+++ b/SOURCES/processcsv.py.pod
@@ -0,0 +1,64 @@
+=head1 NAME
+
+processcsv.py - process virt-top CSV files
+
+=head1 SUMMARY
+
+ virt-top --csv data.csv
+ processcsv.py < data.csv
+
+=head1 DESCRIPTION
+
+virt-top is a L<top(1)>-like utility for showing stats of virtualized
+domains.
+
+processcsv.py is a simple Python script that post-processes the output
+of C<virt-top --csv>.
+
+It is used like this:
+
+ virt-top --csv data.csv
+ processcsv.py < data.csv
+
+The second command will B<overwrite> the following files in the
+current directory:
+
+=over 4
+
+=item C<global.csv>
+
+This contains the global (host) statistics columns from the CSV file.
+
+=item C<domainI<NN>.csv> (multiple files)
+
+For each libvirt domain ID I<NN>, a file is created containing
+the per-domain statistics from the CSV file.
+
+=back
+
+=head1 SEE ALSO
+
+L<virt-top(1)>
+
+=head1 AUTHORS
+
+Richard W.M. Jones <rjones @ redhat . com>
+
+=head1 COPYRIGHT
+
+(C) Copyright 2007-2012 Red Hat Inc., Richard W.M. Jones
+http://libvirt.org/
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/SPECS/virt-top.spec b/SPECS/virt-top.spec
index ed9082a..0a33428 100644
--- a/SPECS/virt-top.spec
+++ b/SPECS/virt-top.spec
@@ -3,7 +3,7 @@
 
 Name:           virt-top
 Version:        1.0.8
-Release:        32%{?dist}
+Release:        37%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -14,32 +14,31 @@ Source0:        http://people.redhat.com/~rjones/virt-top/files/%{name}-%{versio
 Source1:        processcsv.py
 Source2:        processcsv.py.pod
 
-Patch0:         virt-top-1.0.4-processcsv-documentation.patch
-
-# All upstream patches since 1.0.8.
-Patch0001:      0001-Disable-warning-about-immutable-strings-for-OCaml-4..patch
-Patch0002:      0002-Move-upstream-translations-from-Tranifex-to-Zanata.patch
-Patch0003:      0003-Update-translations-from-Zanata.patch
-Patch0004:      0004-build-Add-g-flag-to-ocamlopt.patch
-Patch0005:      0005-Rename-source-directory-and-files.patch
-Patch0006:      0006-Enable-same-warnings-as-libguestfs.patch
-Patch0007:      0007-Remove-x-executable-permission-on-several-source-fil.patch
-Patch0008:      0008-Refresh-HACKING-file.patch
-Patch0009:      0009-Fix-po-POTFILES-for-new-location-of-source-files.patch
-Patch0010:      0010-Update-PO-files.patch
-Patch0011:      0011-Remove-support-for-OCaml-Calendar-v1.patch
-Patch0012:      0012-src-Fix-some-comments-which-referred-to-the-old-file.patch
-Patch0013:      0013-Split-up-huge-Top-module-into-smaller-modules.patch
-Patch0014:      0014-Move-block_in_bytes-entirely-to-the-presentation-lay.patch
-Patch0015:      0015-Remove-unused-variable-is_calendar2.patch
-Patch0016:      0016-Use-virConnectGetAllDomainStats-API-to-collect-domai.patch
-Patch0017:      0017-chmod-x-COPYING-files.patch
-Patch0018:      0018-Fixes-for-safe-string-in-OCaml-4.06.patch
-Patch0019:      0019-Link-with-fPIC-runtime.patch
-Patch0020:      0020-build-Pass-through-CFLAGS-and-LDFLAGS-to-ocaml-compi.patch
-
-# Update configure for aarch64 (bz #926701)
-Patch9999:      virt-top-aarch64.patch
+# Patches are stored here:
+# http://git.annexia.org/?p=virt-top.git;a=shortlog;h=refs/heads/rhel-8.8
+Patch0001:      0001-virt-top-1.0.4-processcsv-documentation.patch
+Patch0002:      0002-Disable-warning-about-immutable-strings-for-OCaml-4..patch
+Patch0003:      0003-Move-upstream-translations-from-Tranifex-to-Zanata.patch
+Patch0004:      0004-Update-translations-from-Zanata.patch
+Patch0005:      0005-build-Add-g-flag-to-ocamlopt.patch
+Patch0006:      0006-Rename-source-directory-and-files.patch
+Patch0007:      0007-Enable-same-warnings-as-libguestfs.patch
+Patch0008:      0008-Remove-x-executable-permission-on-several-source-fil.patch
+Patch0009:      0009-Refresh-HACKING-file.patch
+Patch0010:      0010-Fix-po-POTFILES-for-new-location-of-source-files.patch
+Patch0011:      0011-Update-PO-files.patch
+Patch0012:      0012-Remove-support-for-OCaml-Calendar-v1.patch
+Patch0013:      0013-src-Fix-some-comments-which-referred-to-the-old-file.patch
+Patch0014:      0014-Split-up-huge-Top-module-into-smaller-modules.patch
+Patch0015:      0015-Move-block_in_bytes-entirely-to-the-presentation-lay.patch
+Patch0016:      0016-Remove-unused-variable-is_calendar2.patch
+Patch0017:      0017-Use-virConnectGetAllDomainStats-API-to-collect-domai.patch
+Patch0018:      0018-chmod-x-COPYING-files.patch
+Patch0019:      0019-Fixes-for-safe-string-in-OCaml-4.06.patch
+Patch0020:      0020-Link-with-fPIC-runtime.patch
+Patch0021:      0021-build-Pass-through-CFLAGS-and-LDFLAGS-to-ocaml-compi.patch
+Patch0022:      0022-Update-configure-for-aarch64-bz-926701.patch
+Patch0023:      0023-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
 
 # The patches touch configure.ac:
 BuildRequires:  autoconf
@@ -83,10 +82,9 @@ different virtualization systems.
 %setup -q
 
 %if 0%{?rhel} >= 6
-%patch0 -p1
+%patch0001 -p1
 %endif
 
-%patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
 %patch0004 -p1
@@ -106,9 +104,10 @@ different virtualization systems.
 %patch0018 -p1
 %patch0019 -p1
 %patch0020 -p1
+%patch0021 -p1
+%patch0022 -p1
+%patch0023 -p1
 
-# Update configure for aarch64 (bz #926701)
-%patch9999 -p1
 autoconf
 
 
@@ -166,6 +165,26 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* Tue Nov 29 2022 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-37
+- Fix "Input/output error" in journal
+  resolves: rhbz#2149139
+- Store the patches in an upstream branch in git.
+
+* Thu Jul 04 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-36
+- Try installing KVM
+  related: rhbz#1682780
+
+* Thu Jul 04 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-35
+- Try starting libvirtd
+  related: rhbz#1682780
+
+* Wed Jul 03 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-34
+- Build and rebuild to rerun gating tests.
+  related: rhbz#1682780
+
+* Thu Mar 21 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-33
+- Add gating tests resolves: rhbz#1682780
+
 * Tue Oct 16 2018 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-32
 - Add upstream patch to pass CFLAGS/LDFLAGS to final binary
   resolves: rhbz#1630636