From 9073c46c9c431ec0e83987a5781163ca7b1f7ea7 Mon Sep 17 00:00:00 2001
From: Denis Shienkov <denis.shienkov@gmail.com>
Date: Mon, 18 Nov 2019 19:19:40 +0300
Subject: [PATCH] BareMetal: Don't create default GDB server provider

... if a BareMetalDevice doesn't have any configured
provider yet.

Reason is that a 'Default GDB' provider does not means
that it is default. It just means, that this provider
can be attached to the remote running GDB server (it is
equivalent of "Attach to Running Debug Server").

Besides, in future, it is makes sense to remove this
provider at all as it is useless.

Change-Id: I2c5c59595dc7d724ac6e05177bbc6ae85cf67e2e
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/baremetal/baremetaldevice.cpp | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp
index 5cda21c2298..f36fec84569 100644
--- a/src/plugins/baremetal/baremetaldevice.cpp
+++ b/src/plugins/baremetal/baremetaldevice.cpp
@@ -29,13 +29,10 @@
 #include "baremetaldeviceconfigurationwidget.h"
 #include "baremetaldeviceconfigurationwizard.h"
 #include "debugserverprovidermanager.h"
-
-// TODO: Remove mention about GDB server providers from this file!
-#include "debugservers/gdb/defaultgdbserverprovider.h"
+#include "idebugserverprovider.h"
 
 #include <coreplugin/id.h>
 
-#include <ssh/sshconnection.h>
 #include <utils/qtcassert.h>
 
 #include <QCoreApplication>
@@ -112,18 +109,11 @@ void BareMetalDevice::fromMap(const QVariantMap &map)
         if (IDebugServerProvider *provider =
                 DebugServerProviderManager::findByDisplayName(name)) {
             providerId = provider->id();
-        } else {
-            const QSsh::SshConnectionParameters sshParams = sshParameters();
-            const auto newProvider = new DefaultGdbServerProvider;
-            newProvider->setChannel(sshParams.url);
-            newProvider->setDisplayName(name);
-            if (DebugServerProviderManager::registerProvider(newProvider))
-                providerId = newProvider->id();
-            else
-                delete newProvider;
+            setDebugServerProviderId(providerId);
         }
+    } else {
+        setDebugServerProviderId(providerId);
     }
-    setDebugServerProviderId(providerId);
 }
 
 QVariantMap BareMetalDevice::toMap() const