These calls seem to have been added for debugging for a very specific
purpose. At the very least, they should have been using g_debug() rather
than spice_printerr(). This commit removes these.
---
server/char-device.c | 1 -
server/inputs-channel.c | 2 --
server/main-channel-client.c | 13 -------------
server/main-channel.c | 4 ----
server/red-channel-client.c | 1 -
server/red-client.c | 2 --
server/red-qxl.c | 4 ----
server/smartcard.c | 1 -
server/spicevmc.c | 1 -
9 files changed, 29 deletions(-)
diff --git a/server/char-device.c b/server/char-device.c
index aef6e887f..2b34e4020 100644
--- a/server/char-device.c
+++ b/server/char-device.c
@@ -216,7 +216,6 @@ static void red_char_device_client_free(RedCharDevice *dev,
static void red_char_device_handle_client_overflow(RedCharDeviceClient *dev_client)
{
RedCharDevice *dev = dev_client->dev;
- spice_printerr("dev %p client %p ", dev, dev_client);
red_char_device_remove_client(dev, dev_client->client);
}
diff --git a/server/inputs-channel.c b/server/inputs-channel.c
index d465f7d35..3f6fae812 100644
--- a/server/inputs-channel.c
+++ b/server/inputs-channel.c
@@ -455,7 +455,6 @@ static void inputs_connect(RedChannel *channel, RedClient *client,
"keyboard channel is insecure");
}
- spice_printerr("inputs channel client create");
rcc = inputs_channel_client_create(channel, client, stream, caps);
if (!rcc) {
return;
@@ -654,7 +653,6 @@ int inputs_channel_has_tablet(InputsChannel *inputs)
void inputs_channel_detach_tablet(InputsChannel *inputs, SpiceTabletInstance *tablet)
{
- spice_printerr("");
if (tablet != NULL && tablet == inputs->tablet) {
spice_tablet_state_free(tablet->st);
tablet->st = NULL;
diff --git a/server/main-channel-client.c b/server/main-channel-client.c
index 7c0977cc9..6617f1393 100644
--- a/server/main-channel-client.c
+++ b/server/main-channel-client.c
@@ -202,7 +202,6 @@ main_channel_client_release_msg_rcv_buf(RedChannelClient *rcc,
static void main_channel_client_on_disconnect(RedChannelClient *rcc)
{
RedsState *reds = red_channel_get_server(red_channel_client_get_channel(rcc));
- spice_printerr("rcc=%p", rcc);
main_dispatcher_client_disconnect(reds_get_main_dispatcher(reds),
red_channel_client_get_client(rcc));
}
@@ -471,8 +470,6 @@ void main_channel_client_handle_migrate_connected(MainChannelClient *mcc,
int success,
int seamless)
{
- RedClient *client = red_channel_client_get_client(RED_CHANNEL_CLIENT(mcc));
- spice_printerr("client %p connected: %d seamless %d", client, success, seamless);
if (mcc->priv->mig_wait_connect) {
RedChannel *channel = red_channel_client_get_channel(RED_CHANNEL_CLIENT(mcc));
MainChannel *main_channel = MAIN_CHANNEL(channel);
@@ -482,7 +479,6 @@ void main_channel_client_handle_migrate_connected(MainChannelClient *mcc,
main_channel_on_migrate_connected(main_channel, success, seamless);
} else {
if (success) {
- spice_printerr("client %p MIGRATE_CANCEL", client);
red_channel_client_pipe_add_empty_msg(RED_CHANNEL_CLIENT(mcc),
SPICE_MSG_MAIN_MIGRATE_CANCEL);
}
@@ -580,8 +576,6 @@ void main_channel_client_handle_migrate_end(MainChannelClient *mcc)
void main_channel_client_migrate_cancel_wait(MainChannelClient *mcc)
{
if (mcc->priv->mig_wait_connect) {
- spice_printerr("client %p cancel wait connect",
- red_channel_client_get_client(RED_CHANNEL_CLIENT(mcc)));
mcc->priv->mig_wait_connect = FALSE;
mcc->priv->mig_connect_ok = FALSE;
}
@@ -610,23 +604,19 @@ gboolean main_channel_client_migrate_src_complete(MainChannelClient *mcc,
{
gboolean ret = FALSE;
RedChannelClient *rcc = RED_CHANNEL_CLIENT(mcc);
- RedClient *client = red_channel_client_get_client(rcc);
bool semi_seamless_support = red_channel_client_test_remote_cap(rcc,
SPICE_MAIN_CAP_SEMI_SEAMLESS_MIGRATE);
if (semi_seamless_support && mcc->priv->mig_connect_ok) {
if (success) {
- spice_printerr("client %p MIGRATE_END", client);
red_channel_client_pipe_add_empty_msg(rcc,
SPICE_MSG_MAIN_MIGRATE_END);
ret = TRUE;
} else {
- spice_printerr("client %p MIGRATE_CANCEL", client);
red_channel_client_pipe_add_empty_msg(rcc,
SPICE_MSG_MAIN_MIGRATE_CANCEL);
}
} else {
if (success) {
- spice_printerr("client %p SWITCH_HOST", client);
red_channel_client_pipe_add_type(rcc,
RED_PIPE_ITEM_TYPE_MAIN_MIGRATE_SWITCH_HOST);
}
@@ -691,7 +681,6 @@ gboolean main_channel_client_connect_semi_seamless(MainChannelClient *mcc)
SPICE_MAIN_CAP_SEMI_SEAMLESS_MIGRATE)) {
RedClient *client = red_channel_client_get_client(rcc);
if (red_client_during_migrate_at_target(client)) {
- spice_printerr("client %p: wait till previous migration completes", client);
mcc->priv->mig_wait_prev_complete = TRUE;
mcc->priv->mig_wait_prev_try_seamless = FALSE;
} else {
@@ -712,7 +701,6 @@ void main_channel_client_connect_seamless(MainChannelClient *mcc)
spice_assert(red_channel_client_test_remote_cap(rcc,
SPICE_MAIN_CAP_SEAMLESS_MIGRATE));
if (red_client_during_migrate_at_target(client)) {
- spice_printerr("client %p: wait till previous migration completes", client);
mcc->priv->mig_wait_prev_complete = TRUE;
mcc->priv->mig_wait_prev_try_seamless = TRUE;
} else {
@@ -919,7 +907,6 @@ static void main_channel_marshall_migrate_switch(SpiceMarshaller *m, RedChannelC
MainChannel *main_ch;
const RedsMigSpice *mig_target;
- spice_printerr("");
red_channel_client_init_send_data(rcc, SPICE_MSG_MAIN_MIGRATE_SWITCH_HOST);
main_ch = MAIN_CHANNEL(channel);
mig_target = main_channel_get_migration_target(main_ch);
diff --git a/server/main-channel.c b/server/main-channel.c
index 283958351..4afc9b0e3 100644
--- a/server/main-channel.c
+++ b/server/main-channel.c
@@ -172,7 +172,6 @@ static bool main_channel_handle_message(RedChannelClient *rcc, uint16_t type,
case SPICE_MSGC_MAIN_AGENT_START: {
SpiceMsgcMainAgentStart *tokens;
- spice_printerr("agent start");
tokens = (SpiceMsgcMainAgentStart *)message;
reds_on_main_agent_start(reds, mcc, tokens->num_tokens);
break;
@@ -241,7 +240,6 @@ MainChannelClient *main_channel_link(MainChannel *channel, RedClient *client,
// TODO - migration - I removed it from channel creation, now put it
// into usage somewhere (not an issue until we return migration to it's
// former glory)
- spice_printerr("add main channel client");
mcc = main_channel_client_create(channel, client, stream, connection_id, caps);
return mcc;
}
@@ -368,8 +366,6 @@ int main_channel_migrate_src_complete(MainChannel *main_chan, int success)
int semi_seamless_count = 0;
RedChannelClient *rcc;
- spice_printerr("");
-
if (!red_channel_get_clients(RED_CHANNEL(main_chan))) {
spice_printerr("no peer connected");
return 0;
diff --git a/server/red-channel-client.c b/server/red-channel-client.c
index 5d256eca2..63b3b5b43 100644
--- a/server/red-channel-client.c
+++ b/server/red-channel-client.c
@@ -1722,7 +1722,6 @@ void red_channel_client_disconnect(RedChannelClient *rcc)
if (!red_channel_client_is_connected(rcc)) {
return;
}
- red_channel_printerr(channel, "rcc=%p", rcc);
red_channel_client_pipe_clear(rcc);
if (rcc->priv->stream->watch) {
core->watch_remove(core, rcc->priv->stream->watch);
diff --git a/server/red-client.c b/server/red-client.c
index ddfc5400d..7d14bd19c 100644
--- a/server/red-client.c
+++ b/server/red-client.c
@@ -175,7 +175,6 @@ void red_client_migrate(RedClient *client)
RedChannelClient *rcc;
RedChannel *channel;
- spice_printerr("migrate client with #channels %d", g_list_length(client->channels));
if (!pthread_equal(pthread_self(), client->thread_id)) {
spice_warning("client->thread_id (0x%lx) != pthread_self (0x%lx)."
"If one of the threads is != io-thread && != vcpu-thread,"
@@ -194,7 +193,6 @@ void red_client_destroy(RedClient *client)
{
RedChannelClient *rcc;
- spice_printerr("destroy client %p with #channels=%d", client, g_list_length(client->channels));
if (!pthread_equal(pthread_self(), client->thread_id)) {
spice_warning("client->thread_id (0x%lx) != pthread_self (0x%lx)."
"If one of the threads is != io-thread && != vcpu-thread,"
diff --git a/server/red-qxl.c b/server/red-qxl.c
index 730b9f3d9..ac7b10a17 100644
--- a/server/red-qxl.c
+++ b/server/red-qxl.c
@@ -99,7 +99,6 @@ static void red_qxl_disconnect_display_peer(RedChannelClient *rcc)
dispatcher = (Dispatcher *)g_object_get_data(G_OBJECT(channel), "dispatcher");
- spice_printerr("");
payload.rcc = rcc;
// TODO: we turned it to be sync, due to client_destroy . Should we support async? - for this we will need ref count
@@ -130,7 +129,6 @@ static void red_qxl_set_cursor_peer(RedChannel *channel, RedClient *client, RedS
{
RedWorkerMessageCursorConnect payload = {0,};
Dispatcher *dispatcher = (Dispatcher *)g_object_get_data(G_OBJECT(channel), "dispatcher");
- spice_printerr("");
// get a reference potentially the main channel can be destroyed in
// the main thread causing RedClient to be destroyed before using it
payload.client = g_object_ref(client);
@@ -150,7 +148,6 @@ static void red_qxl_disconnect_cursor_peer(RedChannelClient *rcc)
RedChannel *channel = red_channel_client_get_channel(rcc);
dispatcher = (Dispatcher *)g_object_get_data(G_OBJECT(channel), "dispatcher");
- spice_printerr("");
payload.rcc = rcc;
dispatcher_send_message(dispatcher,
@@ -601,7 +598,6 @@ static void red_qxl_loadvm_commands(QXLState *qxl_state,
{
RedWorkerMessageLoadvmCommands payload;
- spice_printerr("");
payload.count = count;
payload.ext = ext;
dispatcher_send_message(qxl_state->dispatcher,
diff --git a/server/smartcard.c b/server/smartcard.c
index effa3de1b..e9cb32e03 100644
--- a/server/smartcard.c
+++ b/server/smartcard.c
@@ -198,7 +198,6 @@ static void smartcard_remove_client(RedCharDevice *self, RedClient *client)
RedCharDeviceSmartcard *dev = RED_CHAR_DEVICE_SMARTCARD(self);
RedChannelClient *rcc = RED_CHANNEL_CLIENT(dev->priv->scc);
- spice_printerr("smartcard dev %p, client %p", dev, client);
spice_assert(dev->priv->scc &&
red_channel_client_get_client(rcc) == client);
red_channel_client_shutdown(rcc);
diff --git a/server/spicevmc.c b/server/spicevmc.c
index 379aa51a1..5ff564a37 100644
--- a/server/spicevmc.c
+++ b/server/spicevmc.c
@@ -433,7 +433,6 @@ static void spicevmc_char_dev_remove_client(RedCharDevice *self,
RedCharDeviceSpiceVmc *vmc = RED_CHAR_DEVICE_SPICEVMC(self);
RedVmcChannel *channel = RED_VMC_CHANNEL(vmc->channel);
- spice_printerr("vmc channel %p, client %p", channel, client);
spice_assert(channel->rcc &&
red_channel_client_get_client(channel->rcc) == client);
--
2.17.1
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel