Commit b39cded8 authored by Sumit Garg's avatar Sumit Garg Committed by Daniel Thompson
Browse files

kdb: Rename struct defcmd_set to struct kdb_macro 



Rename struct defcmd_set to struct kdb_macro as that sounds more
appropriate given its purpose.

Suggested-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarSumit Garg <sumit.garg@linaro.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20210712134620.276667-2-sumit.garg@linaro.org


Signed-off-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
parent 95f7f154

kernel/debug/kdb/kdb_main.c

+20 −20
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static void kdb_cmderror(int diag) 
 * Returns:

 *	zero for success, a kdb diagnostic if error

 */

struct defcmd_set {

struct kdb_macro {

	int count;

	bool usable;

	char *name;
@@ -662,8 +662,8 @@ struct defcmd_set { 
	char *help;

	char **command;

};

static struct defcmd_set *defcmd_set;

static int defcmd_set_count;

static struct kdb_macro *kdb_macro;

static int kdb_macro_count;

static bool defcmd_in_progress;



/* Forward references */
@@ -671,7 +671,7 @@ static int kdb_exec_defcmd(int argc, const char **argv); 


static int kdb_defcmd2(const char *cmdstr, const char *argv0)

{

	struct defcmd_set *s = defcmd_set + defcmd_set_count - 1;

	struct kdb_macro *s = kdb_macro + kdb_macro_count - 1;

	char **save_command = s->command;

	if (strcmp(argv0, "endefcmd") == 0) {

		defcmd_in_progress = false;
@@ -704,7 +704,7 @@ static int kdb_defcmd2(const char *cmdstr, const char *argv0) 


static int kdb_defcmd(int argc, const char **argv)

{

	struct defcmd_set *save_defcmd_set = defcmd_set, *s;

	struct kdb_macro *save_kdb_macro = kdb_macro, *s;

	if (defcmd_in_progress) {

		kdb_printf("kdb: nested defcmd detected, assuming missing "

			   "endefcmd\n");
@@ -712,7 +712,7 @@ static int kdb_defcmd(int argc, const char **argv) 
	}

	if (argc == 0) {

		int i;

		for (s = defcmd_set; s < defcmd_set + defcmd_set_count; ++s) {

		for (s = kdb_macro; s < kdb_macro + kdb_macro_count; ++s) {

			kdb_printf("defcmd %s \"%s\" \"%s\"\n", s->name,

				   s->usage, s->help);

			for (i = 0; i < s->count; ++i)
@@ -727,13 +727,13 @@ static int kdb_defcmd(int argc, const char **argv) 
		kdb_printf("Command only available during kdb_init()\n");

		return KDB_NOTIMP;

	}

	defcmd_set = kmalloc_array(defcmd_set_count + 1, sizeof(*defcmd_set),

	kdb_macro = kmalloc_array(kdb_macro_count + 1, sizeof(*kdb_macro),

				  GFP_KDB);

	if (!defcmd_set)

	if (!kdb_macro)

		goto fail_defcmd;

	memcpy(defcmd_set, save_defcmd_set,

	       defcmd_set_count * sizeof(*defcmd_set));

	s = defcmd_set + defcmd_set_count;

	memcpy(kdb_macro, save_kdb_macro,

	       kdb_macro_count * sizeof(*kdb_macro));

	s = kdb_macro + kdb_macro_count;

	memset(s, 0, sizeof(*s));

	s->usable = true;

	s->name = kdb_strdup(argv[1], GFP_KDB);
@@ -753,19 +753,19 @@ static int kdb_defcmd(int argc, const char **argv) 
		strcpy(s->help, argv[3]+1);

		s->help[strlen(s->help)-1] = '\0';

	}

	++defcmd_set_count;

	++kdb_macro_count;

	defcmd_in_progress = true;

	kfree(save_defcmd_set);

	kfree(save_kdb_macro);

	return 0;

fail_help:

	kfree(s->usage);

fail_usage:

	kfree(s->name);

fail_name:

	kfree(defcmd_set);

	kfree(kdb_macro);

fail_defcmd:

	kdb_printf("Could not allocate new defcmd_set entry for %s\n", argv[1]);

	defcmd_set = save_defcmd_set;

	kdb_printf("Could not allocate new kdb_macro entry for %s\n", argv[1]);

	kdb_macro = save_kdb_macro;

	return KDB_NOTIMP;

}
@@ -781,14 +781,14 @@ static int kdb_defcmd(int argc, const char **argv) 
static int kdb_exec_defcmd(int argc, const char **argv)

{

	int i, ret;

	struct defcmd_set *s;

	struct kdb_macro *s;

	if (argc != 0)

		return KDB_ARGCOUNT;

	for (s = defcmd_set, i = 0; i < defcmd_set_count; ++i, ++s) {

	for (s = kdb_macro, i = 0; i < kdb_macro_count; ++i, ++s) {

		if (strcmp(s->name, argv[0]) == 0)

			break;

	}

	if (i == defcmd_set_count) {

	if (i == kdb_macro_count) {

		kdb_printf("kdb_exec_defcmd: could not find commands for %s\n",

			   argv[0]);

		return KDB_NOTIMP;