[Spice-commits] server/tests

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Apr 16 09:12:17 UTC 2020


 server/tests/test-display-base.c |   12 ------------
 server/tests/test-display-base.h |    1 -
 2 files changed, 13 deletions(-)

New commits:
commit 2f130edfdd760aef1cef0694d537fa5419b5a350
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon Mar 16 02:50:19 2020 +0000

    test-display-base: Remove only written "qxl_worker" from Test
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/tests/test-display-base.c b/server/tests/test-display-base.c
index 49e99343..c47bcfc0 100644
--- a/server/tests/test-display-base.c
+++ b/server/tests/test-display-base.c
@@ -427,16 +427,7 @@ static void attache_worker(QXLInstance *qin, QXLWorker *_qxl_worker)
 {
     Test *test = SPICE_CONTAINEROF(qin, Test, qxl_instance);
 
-    if (test->qxl_worker) {
-        if (test->qxl_worker != _qxl_worker)
-            printf("%s ignored, %p is set, ignoring new %p\n", __func__,
-                   test->qxl_worker, _qxl_worker);
-        else
-            printf("%s ignored, redundant\n", __func__);
-        return;
-    }
     printf("%s\n", __func__);
-    test->qxl_worker = _qxl_worker;
     spice_qxl_add_memslot(&test->qxl_instance, &slot);
     create_primary_surface(test, DEFAULT_WIDTH, DEFAULT_HEIGHT);
     spice_server_vm_start(test->server);
@@ -516,9 +507,6 @@ static int get_command(SPICE_GNUC_UNUSED QXLInstance *qin,
 static void produce_command(Test *test)
 {
     Command *command;
-    QXLWorker *qxl_worker = test->qxl_worker;
-
-    spice_assert(qxl_worker);
 
     if (test->has_secondary)
         test->target_surface = 1;
diff --git a/server/tests/test-display-base.h b/server/tests/test-display-base.h
index 1a4f20c5..849c861a 100644
--- a/server/tests/test-display-base.h
+++ b/server/tests/test-display-base.h
@@ -100,7 +100,6 @@ struct Test {
     SpiceServer *server;
 
     QXLInstance qxl_instance;
-    QXLWorker *qxl_worker;
 
     uint8_t primary_surface[MAX_HEIGHT * MAX_WIDTH * 4];
     int primary_height;


More information about the Spice-commits mailing list