|
|
fce154 |
From da9c55f936266b1fb5d4ee55d25ccfcb70e14ef3 Mon Sep 17 00:00:00 2001
|
|
|
fce154 |
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
|
|
|
fce154 |
Date: Mon, 1 Sep 2014 15:06:54 +0200
|
|
|
fce154 |
Subject: [PATCH] Fix -Wunused-function
|
|
|
fce154 |
|
|
|
fce154 |
(cherry picked from commit 93b4f4050c57bd851292e4cee884888cee56fc31)
|
|
|
fce154 |
---
|
|
|
fce154 |
server/tests/test_display_base.c | 22 -----------------
|
|
|
fce154 |
server/tests/test_vdagent.c | 51 ----------------------------------------
|
|
|
fce154 |
2 files changed, 73 deletions(-)
|
|
|
fce154 |
|
|
|
fce154 |
diff --git a/server/tests/test_display_base.c b/server/tests/test_display_base.c
|
|
|
fce154 |
index bfe9991..36b4fc1 100644
|
|
|
fce154 |
--- a/server/tests/test_display_base.c
|
|
|
fce154 |
+++ b/server/tests/test_display_base.c
|
|
|
fce154 |
@@ -795,28 +795,6 @@ void test_add_display_interface(Test* test)
|
|
|
fce154 |
spice_server_add_interface(test->server, &test->qxl_instance.base);
|
|
|
fce154 |
}
|
|
|
fce154 |
|
|
|
fce154 |
-static int vmc_write(SPICE_GNUC_UNUSED SpiceCharDeviceInstance *sin,
|
|
|
fce154 |
- SPICE_GNUC_UNUSED const uint8_t *buf,
|
|
|
fce154 |
- int len)
|
|
|
fce154 |
-{
|
|
|
fce154 |
- printf("%s: %d\n", __func__, len);
|
|
|
fce154 |
- return len;
|
|
|
fce154 |
-}
|
|
|
fce154 |
-
|
|
|
fce154 |
-static int vmc_read(SPICE_GNUC_UNUSED SpiceCharDeviceInstance *sin,
|
|
|
fce154 |
- SPICE_GNUC_UNUSED uint8_t *buf,
|
|
|
fce154 |
- int len)
|
|
|
fce154 |
-{
|
|
|
fce154 |
- printf("%s: %d\n", __func__, len);
|
|
|
fce154 |
- return 0;
|
|
|
fce154 |
-}
|
|
|
fce154 |
-
|
|
|
fce154 |
-static void vmc_state(SPICE_GNUC_UNUSED SpiceCharDeviceInstance *sin,
|
|
|
fce154 |
- int connected)
|
|
|
fce154 |
-{
|
|
|
fce154 |
- printf("%s: %d\n", __func__, connected);
|
|
|
fce154 |
-}
|
|
|
fce154 |
-
|
|
|
fce154 |
static SpiceBaseInterface base = {
|
|
|
fce154 |
.type = SPICE_INTERFACE_CHAR_DEVICE,
|
|
|
fce154 |
.description = "test spice virtual channel char device",
|
|
|
fce154 |
diff --git a/server/tests/test_vdagent.c b/server/tests/test_vdagent.c
|
|
|
fce154 |
index 191ad05..22153b6 100644
|
|
|
fce154 |
--- a/server/tests/test_vdagent.c
|
|
|
fce154 |
+++ b/server/tests/test_vdagent.c
|
|
|
fce154 |
@@ -28,57 +28,6 @@ void pinger(SPICE_GNUC_UNUSED void *opaque)
|
|
|
fce154 |
core->timer_start(ping_timer, ping_ms);
|
|
|
fce154 |
}
|
|
|
fce154 |
|
|
|
fce154 |
-
|
|
|
fce154 |
-static int vmc_write(SPICE_GNUC_UNUSED SpiceCharDeviceInstance *sin,
|
|
|
fce154 |
- SPICE_GNUC_UNUSED const uint8_t *buf,
|
|
|
fce154 |
- int len)
|
|
|
fce154 |
-{
|
|
|
fce154 |
- return len;
|
|
|
fce154 |
-}
|
|
|
fce154 |
-
|
|
|
fce154 |
-static int vmc_read(SPICE_GNUC_UNUSED SpiceCharDeviceInstance *sin,
|
|
|
fce154 |
- uint8_t *buf,
|
|
|
fce154 |
- int len)
|
|
|
fce154 |
-{
|
|
|
fce154 |
- static uint8_t c = 0;
|
|
|
fce154 |
- static uint8_t message[2048];
|
|
|
fce154 |
- static unsigned pos = 0;
|
|
|
fce154 |
- static unsigned message_size;
|
|
|
fce154 |
- int ret;
|
|
|
fce154 |
-
|
|
|
fce154 |
- if (pos == 0) {
|
|
|
fce154 |
- VDIChunkHeader *hdr = (VDIChunkHeader *)message;
|
|
|
fce154 |
- VDAgentMessage *msg = (VDAgentMessage *)&hdr[1];
|
|
|
fce154 |
- uint8_t *p = message;
|
|
|
fce154 |
- int size = sizeof(message);
|
|
|
fce154 |
- message_size = size;
|
|
|
fce154 |
- /* fill in message */
|
|
|
fce154 |
- hdr->port = VDP_SERVER_PORT;
|
|
|
fce154 |
- hdr->size = message_size - sizeof(VDIChunkHeader);
|
|
|
fce154 |
- msg->protocol = VD_AGENT_PROTOCOL;
|
|
|
fce154 |
- msg->type = VD_AGENT_END_MESSAGE;
|
|
|
fce154 |
- msg->opaque = 0;
|
|
|
fce154 |
- msg->size = message_size - sizeof(VDIChunkHeader) - sizeof(VDAgentMessage);
|
|
|
fce154 |
- size -= sizeof(VDIChunkHeader) + sizeof(VDAgentMessage);
|
|
|
fce154 |
- p += sizeof(VDIChunkHeader) + sizeof(VDAgentMessage);
|
|
|
fce154 |
- for (; size; --size, ++p, ++c)
|
|
|
fce154 |
- *p = c;
|
|
|
fce154 |
- }
|
|
|
fce154 |
- ret = MIN(message_size - pos, len);
|
|
|
fce154 |
- memcpy(buf, &message[pos], ret);
|
|
|
fce154 |
- pos += ret;
|
|
|
fce154 |
- if (pos == message_size) {
|
|
|
fce154 |
- pos = 0;
|
|
|
fce154 |
- }
|
|
|
fce154 |
- //printf("vmc_read %d (ret %d)\n", len, ret);
|
|
|
fce154 |
- return ret;
|
|
|
fce154 |
-}
|
|
|
fce154 |
-
|
|
|
fce154 |
-static void vmc_state(SPICE_GNUC_UNUSED SpiceCharDeviceInstance *sin,
|
|
|
fce154 |
- SPICE_GNUC_UNUSED int connected)
|
|
|
fce154 |
-{
|
|
|
fce154 |
-}
|
|
|
fce154 |
-
|
|
|
fce154 |
static SpiceBaseInterface base = {
|
|
|
fce154 |
.type = SPICE_INTERFACE_CHAR_DEVICE,
|
|
|
fce154 |
.description = "test spice virtual channel char device",
|