From 17c5ef7ab05d856a2c2502fe1f7bd7db48697687 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 7 Jul 2017 10:51:47 -0700 Subject: [PATCH] bdev/gpt: fix UUID/GUID typo These are UEFI-style GUIDs in little endian byte order, not standard UUIDs. Change-Id: I4d61afa2901830c784c24a5e039bba1d98f32e62 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/368609 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Ziye Yang --- lib/bdev/gpt/gpt.h | 2 +- lib/bdev/gpt/vbdev_gpt.c | 2 +- scripts/autotest_common.sh | 2 +- test/lib/bdev/blockdev.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bdev/gpt/gpt.h b/lib/bdev/gpt/gpt.h index 54aa35dfa..093e43ddf 100644 --- a/lib/bdev/gpt/gpt.h +++ b/lib/bdev/gpt/gpt.h @@ -43,7 +43,7 @@ #define SPDK_GPT_PART_TYPE_GUID SPDK_GPT_GUID(0x7c5222bd, 0x8f5d, 0x4087, 0x9c00, 0xbf9843c7b58c) #define SPDK_GPT_BUFFER_SIZE 32768 /* 32KB */ -#define SPDK_GPT_UUID_EQUAL(x,y) (memcmp(x, y, sizeof(struct spdk_gpt_guid)) == 0) +#define SPDK_GPT_GUID_EQUAL(x,y) (memcmp(x, y, sizeof(struct spdk_gpt_guid)) == 0) struct spdk_gpt { unsigned char *buf; diff --git a/lib/bdev/gpt/vbdev_gpt.c b/lib/bdev/gpt/vbdev_gpt.c index dc087d88a..effa692c2 100644 --- a/lib/bdev/gpt/vbdev_gpt.c +++ b/lib/bdev/gpt/vbdev_gpt.c @@ -330,7 +330,7 @@ vbdev_gpt_create_bdevs(struct spdk_gpt_bdev *gpt_bdev) uint64_t lba_start = from_le64(&p->starting_lba); uint64_t lba_end = from_le64(&p->ending_lba); - if (!SPDK_GPT_UUID_EQUAL(&gpt->partitions[i].part_type_guid, + if (!SPDK_GPT_GUID_EQUAL(&gpt->partitions[i].part_type_guid, &SPDK_GPT_PART_TYPE_GUID) || lba_start == 0) { continue; diff --git a/scripts/autotest_common.sh b/scripts/autotest_common.sh index b698fd0ca..24c2cf8b0 100755 --- a/scripts/autotest_common.sh +++ b/scripts/autotest_common.sh @@ -32,7 +32,7 @@ config_params='--enable-debug --enable-werror' export UBSAN_OPTIONS='halt_on_error=1:print_stacktrace=1:abort_on_error=1' -export SPDK_GPT_UUID=`grep SPDK_GPT_PART_TYPE_GUID $rootdir/lib/bdev/gpt/gpt.h \ +export SPDK_GPT_GUID=`grep SPDK_GPT_PART_TYPE_GUID $rootdir/lib/bdev/gpt/gpt.h \ | awk -F "(" '{ print $2}' | sed 's/)//g' \ | awk -F ", " '{ print $1 "-" $2 "-" $3 "-" $4 "-" $5}' | sed 's/0x//g'` diff --git a/test/lib/bdev/blockdev.sh b/test/lib/bdev/blockdev.sh index b992c5f7e..20eb7ba7a 100755 --- a/test/lib/bdev/blockdev.sh +++ b/test/lib/bdev/blockdev.sh @@ -33,8 +33,8 @@ if [ $(uname -s) = Linux ] && [ -f /usr/sbin/sgdisk ]; then if [ -e /dev/nbd0 ]; then parted -s /dev/nbd0 mklabel gpt mkpart primary '0%' '50%' mkpart primary '50%' '100%' # change the partition type GUID to SPDK GUID value - /usr/sbin/sgdisk -t 1:$SPDK_GPT_UUID /dev/nbd0 - /usr/sbin/sgdisk -t 2:$SPDK_GPT_UUID /dev/nbd0 + /usr/sbin/sgdisk -t 1:$SPDK_GPT_GUID /dev/nbd0 + /usr/sbin/sgdisk -t 2:$SPDK_GPT_GUID /dev/nbd0 fi killprocess $nbd_pid fi