From 3ebf8c6557eecad6b88a01457109d3e64a51401eebfef84d9911f732bc42f70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Wed, 11 Dec 2024 15:14:36 +0100
Subject: [PATCH] Sync from SUSE:SLFO:Main vhostmd revision
 f727423f492296c432f8014df66c96bd

---
 vhostmd-conf.patch | 26 +++++++++++++++++++++-----
 vhostmd.changes    |  8 ++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/vhostmd-conf.patch b/vhostmd-conf.patch
index 0246b3f..bb563ec 100644
--- a/vhostmd-conf.patch
+++ b/vhostmd-conf.patch
@@ -1,9 +1,16 @@
-Disable virtio transport in SUSE-provided config file
+SUSE-specific config file changes
 
-In SUSE distros, the default vhostmd config file has only enabled
-one transport - vbd. Comment the recently added virtio transport.
-Users can uncomment it and restart vhostmd if virtio transport is
-desired, similar to the xenstore transport.
+In SUSE distros, the default vhostmd config file has historically only
+enabled the vbd transport. Preserve the behavior by commenting the
+recently added virtio transport. Users can uncomment it and restart
+vhostmd if virtio transport is desired, similar to the xenstore transport.
+
+In SUSE enterprise distros, the 'Vendor' field in package information
+contains 'SUSE LLC <https://www.suse.com/>'. This field is used as the
+value for the 'VirtualizationVendor' metric. The URL contains special
+XML characters that need escaped. A simpler and perhaps better approach
+is to strip the URL and only provide the company name. (One could argue
+this hunk of the patch is upstream material.)
 
 Index: vhostmd-1.2/vhostmd.xml
 ===================================================================
@@ -18,3 +25,12 @@ Index: vhostmd-1.2/vhostmd.xml
        <!-- <transport>xenstore</transport> -->
      </globals>
      <metrics>
+@@ -53,7 +53,7 @@ the logical && operator must be replaced
+       <metric type="string" context="host">
+         <name>VirtualizationVendor</name>
+         <action>
+-	  rpm -q --qf '%{VENDOR}\n' -qf /etc/os-release
++	  rpm -q --qf '%{VENDOR}\n' -f /etc/os-release | sed -e 's/&lt;.*//' -e 's/ *$//'
+         </action>
+       </metric>
+       <metric type="string" context="host">
diff --git a/vhostmd.changes b/vhostmd.changes
index 78fe501..31878ca 100644
--- a/vhostmd.changes
+++ b/vhostmd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  6 00:25:00 UTC 2024 - James Fehlig <jfehlig@suse.com>
+
+- conf: Update the 'VirtualizationVendor' action to strip any
+  URLs that may follow the vendor name
+  Modified vhostmd-conf.patch
+  bsc#1230961
+
 -------------------------------------------------------------------
 Tue Oct  1 17:55:04 UTC 2024 - James Fehlig <jfehlig@suse.com>