gbe_bin_generater: fix two bugs.

The pci id detecting method is broken on some system.
And the gen pci id parsing in gbe_bin_generater is incorrect when
the pci id has a-f hex digit.

v2:
Add VGA to filter out some nonVGA devices.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>

diff --git a/backend/src/gbe_bin_generater.cpp b/backend/src/gbe_bin_generater.cpp
index 50020b5..898e2f2 100644 (file)
--- a/backend/src/gbe_bin_generater.cpp
+++ b/backend/src/gbe_bin_generater.cpp
@@ -34,6 +34,7 @@
 #include <vector>
 #include <algorithm>
 #include <stdlib.h>
+#include <iostream>
 #include <stdio.h>
 
 #include "backend/program.h"
@@ -46,7 +47,7 @@ using namespace std;
 #define FILE_BUILD_FAILED 3
 #define FILE_SERIALIZATION_FAILED 4
 
-static int gen_pci_id = 0;
+static uint32_t gen_pci_id = 0;
 
 class program_build_instance {
 
@@ -296,7 +297,9 @@ int main (int argc, const char **argv)
                 return 1;
             }
 
-            gen_pci_id = (s[0] - '0') << 12 | (s[1] - '0') << 8 | (s[2] - '0') << 4 | (s[3] - '0');
+            std::stringstream str(s);
+            str >> std::hex >> gen_pci_id;
+
             used_index[optind-1] = 1;
             // We must set the image base index here, as we invoke the backend in a non-standard way.
             gbe_set_image_base_index(3);

diff --git a/src/GetGenID.sh b/src/GetGenID.sh
index 3114bd8..f8cb0a7 100755 (executable)
--- a/src/GetGenID.sh
+++ b/src/GetGenID.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-lspci -nn | grep "Gen .* Graphics" -i  | grep "\[8086:.*\]" -o | awk -F : '{print $2}' | awk -F ] '{print $1}'
+lspci -nn | grep "VGA.*Gen.*\[8086:" -i  | grep "\[8086:.*\]" -o | awk -F : '{print $2}' | awk -F ] '{print $1}'