X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdisable_events.c;h=7e84f798a57f746598a8723a02329b7bf13390f8;hp=9ab8bf0b2972f244a4e9223105e7543b0c8025cf;hb=3ecec76a3cd1eb6b301d03895ab425976ba28dee;hpb=6c1c0768320135c6936c371b09731851b508c023

diff --git a/src/bin/lttng/commands/disable_events.c b/src/bin/lttng/commands/disable_events.c
index 9ab8bf0b2..7e84f798a 100644
--- a/src/bin/lttng/commands/disable_events.c
+++ b/src/bin/lttng/commands/disable_events.c
@@ -185,9 +185,8 @@ static int disable_events(char *session_name)
 	} else if (opt_python) {
 		dom.type = LTTNG_DOMAIN_PYTHON;
 	} else {
-		print_missing_domain();
-		ret = CMD_ERROR;
-		goto error;
+		/* Checked by the caller. */
+		assert(0);
 	}
 
 	channel_name = opt_channel_name;
@@ -222,6 +221,9 @@ static int disable_events(char *session_name)
 	}
 
 	memset(&event, 0, sizeof(event));
+	/* Set default loglevel to any/unknown */
+	event.loglevel = -1;
+
 	switch (opt_event_type) {
 	case LTTNG_EVENT_SYSCALL:
 		event.type = LTTNG_EVENT_SYSCALL;
@@ -374,6 +376,13 @@ int cmd_disable_events(int argc, const char **argv)
 		}
 	}
 
+	ret = print_missing_or_multiple_domains(
+		opt_kernel + opt_userspace + opt_jul + opt_log4j + opt_python);
+	if (ret) {
+		ret = CMD_ERROR;
+		goto end;
+	}
+
 	opt_event_list = (char*) poptGetArg(pc);
 	if (opt_event_list == NULL && opt_disable_all == 0) {
 		ERR("Missing event name(s).\n");