1 files changed, 8 insertions, 3 deletions

diff --git a/daemon/CapturedXML.cpp b/daemon/CapturedXML.cpp
index 30c4c44..cf79b72 100644
--- a/daemon/CapturedXML.cpp
+++ b/daemon/CapturedXML.cpp
@@ -1,16 +1,18 @@
 /**
- * Copyright (C) ARM Limited 2010-2013. All rights reserved.
+ * Copyright (C) ARM Limited 2010-2014. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
 
+#include "CapturedXML.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <dirent.h>
+
 #include "SessionData.h"
-#include "CapturedXML.h"
 #include "Logging.h"
 #include "OlyUtility.h"
 
@@ -30,6 +32,9 @@ mxml_node_t* CapturedXML::getTree(bool includeTime) {
 
         captured = mxmlNewElement(xml, "captured");
         mxmlElementSetAttr(captured, "version", "1");
+        if (gSessionData->perf.isSetup()) {
+          mxmlElementSetAttr(captured, "type", "Perf");
+        }
         mxmlElementSetAttrf(captured, "protocol", "%d", PROTOCOL_VERSION);
         if (includeTime) { // Send the following only after the capture is complete
                 if (time(NULL) > 1267000000) { // If the time is reasonable (after Feb 23, 2010)
@@ -41,7 +46,7 @@ mxml_node_t* CapturedXML::getTree(bool includeTime) {
         mxmlElementSetAttr(target, "name", gSessionData->mCoreName);
         mxmlElementSetAttrf(target, "sample_rate", "%d", gSessionData->mSampleRate);
         mxmlElementSetAttrf(target, "cores", "%d", gSessionData->mCores);
-        mxmlElementSetAttrf(target, "cpuid", "0x%x", gSessionData->mCpuId);
+        mxmlElementSetAttrf(target, "cpuid", "0x%x", gSessionData->mMaxCpuId);
 
         if (!gSessionData->mOneShot && (gSessionData->mSampleRate > 0)) {
                 mxmlElementSetAttr(target, "supports_live", "yes");