Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/vhostmd.git#24499ef94d58ab33840e102b3c33a4908148c888

vhostmd.conf

@@ -80,10 +80,15 @@ way.
       <!-- must be between [128 KB, 256 MB] in size -->
       <size unit="k">256</size>
     </disk>
+    <virtio>
+      <max_channels>1024</max_channels>
+      <expiration_time>15</expiration_time>
+    </virtio>
     <update_period>60</update_period>
     <path>/bin:/sbin:/usr/bin:/usr/sbin:/usr/share/vhostmd/scripts</path>
     <transport>vbd</transport>
     <!-- <transport>xenstore</transport> -->
+    <transport>virtio</transport>
   </globals>
   <metrics>
     <metric type="string" context="host">
@@ -97,8 +102,7 @@ way.
     <metric type="string" context="host">
       <name>VirtualizationVendor</name>
       <action>
-        rpm -qi libvirt| grep Vendor:   \
-          | awk '{ print substr($0, index($0, $5)); }' | sort -u
+        rpm -q --queryformat "%{VENDOR}\n" libvirt | sort -u
       </action>
     </metric>
     <!-- SAP "CIM"  -->

vhostmd.spec

@@ -3,7 +3,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       1.1
-Release:       6%{?dist}
+Release:       7%{?dist}
 License:       GPLv2+
 
 URL:           https://github.com/vhostmd/vhostmd
@@ -163,6 +163,9 @@ exit 0
 
 
 %changelog
+* Tue Feb 09 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1-7
+- Unify vhostmd.conf with RHEL 8.4 (RHBZ#1924966).
+
 * Thu Feb 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1-6
 - Increase release so > RHEL 8 (RHBZ#1924966).
 - Unify spec files between RHEL and Fedora.