Extract PKG_ABI from mutated string

Author: palash-gandhi

debian/rules.d/0-common-vars.mk

@@ -206,7 +206,7 @@ kmake = make ARCH=$(build_arch) \
 	KERNELRELEASE=$(abi_release)-$* \
 	CONFIG_DEBUG_SECTION_MISMATCH=y \
 	KBUILD_BUILD_VERSION="$(uploadnum)" \
-	CFLAGS_MODULE="-DPKG_ABI=$(abinum)" \
+	CFLAGS_MODULE='-DPKG_ABI=\"$(abinum)\"' \
 	PYTHON=$(PYTHON)
 ifneq ($(LOCAL_ENV_CC),)
 kmake += CC="$(LOCAL_ENV_CC)" DISTCC_HOSTS="$(LOCAL_ENV_DISTCC_HOSTS)"

include/asm-generic/mshyperv.h

@@ -17,6 +17,7 @@
 #ifndef _ASM_GENERIC_MSHYPERV_H
 #define _ASM_GENERIC_MSHYPERV_H
 
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/atomic.h>
 #include <linux/bitops.h>
@@ -156,7 +157,7 @@ static inline u64 hv_do_rep_hypercall(u16 code, u16 rep_count, u16 varhead_size,
  * Preserve the ability to 'make deb-pkg' since PKG_ABI is provided
  * by the Ubuntu build rules.
  */
-#define PKG_ABI 0
+#define PKG_ABI "0"
 #endif
 
 /* Generate the guest OS identifier as described in the Hyper-V TLFS */
@@ -166,7 +167,15 @@ static inline u64 hv_generate_guest_id(u64 kernel_version)
 
 	guest_id = (((u64)HV_LINUX_VENDOR_ID) << 48);
 	guest_id |= (kernel_version << 16);
-	guest_id |= PKG_ABI;
+	/*
+	 * Delphix mutates the ABI number by appending a date and the commit hash. Strip it.
+	 */
+	char *token;
+	char *pkg_abi_str = PKG_ABI;
+	token = strsep(&pkg_abi_str, "-");
+	unsigned long abi_number = simple_strtoul(token, NULL, 10);
+	guest_id |= (abi_number << 8);
+
 
 	return guest_id;
 }