From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Mon, 14 Sep 2009 12:20:07 +0000 (+0200)
Subject: ESX cleanup of CPU model strings
X-Git-Tag: v0.7.1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d513acdd547880e253387f6fff959a9cf18f57f2;p=thirdparty%2Flibvirt.git

ESX cleanup of CPU model strings

* src/esx/esx_driver.c: also strip (C) and (TM) from the CPU model
  strings
---

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index f91d48dc90..07afc10492 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -744,9 +744,12 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo)
                 if (STRPREFIX (ptr, "  ")) {
                     memmove(ptr, ptr + 1, strlen (ptr + 1) + 1);
                     continue;
-                } else if (STRPREFIX (ptr, "(R)")) {
+                } else if (STRPREFIX(ptr, "(R)") || STRPREFIX(ptr, "(C)")) {
                     memmove(ptr, ptr + 3, strlen (ptr + 3) + 1);
                     continue;
+                } else if (STRPREFIX(ptr, "(TM)")) {
+                    memmove(ptr, ptr + 4, strlen(ptr + 4) + 1);
+                    continue;
                 }
 
                 ++ptr;