/ - Diff - qemu - Greek Research and Technology Network's projects

Revision 41b4bef6

             *ret_data = qobject_from_jsonf("{ 'enabled': false }");
         } else {
             QList *clist;
             VncState *client;
             clist = qlist_new();
             if (vnc_display->clients) {
                 VncState *client = vnc_display->clients;
                 while (client) {
                     if (client->info) {
                         /* incref so that it's not freed by upper layers */
                         qobject_incref(client->info);
                         qlist_append_obj(clist, client->info);
+                    }
                     client = client->next;
             QTAILQ_FOREACH(client, &vnc_display->clients, next) {
                 if (client->info) {
                     /* incref so that it's not freed by upper layers */
                     qobject_incref(client->info);
                     qlist_append_obj(clist, client->info);
+                }
+            }
-...
+    {
         int size_changed;
         VncDisplay *vd = ds->opaque;
         VncState *vs = vd->clients;
         VncState *vs;
         /* server surface */
         if (!vd->server)
-...
         *(vd->guest.ds) = *(ds->surface);
         memset(vd->guest.dirty, 0xFF, sizeof(vd->guest.dirty));
         while (vs != NULL) {
         QTAILQ_FOREACH(vs, &vd->clients, next) {
             vnc_colordepth(vs);
             if (size_changed) {
                 if (vs->csock != -1 && vnc_has_feature(vs, VNC_FEATURE_RESIZE)) {
-...
+                }
+            }
             memset(vs->dirty, 0xFF, sizeof(vs->dirty));
             vs = vs->next;
+        }
+    }
-...
         int cmp_bytes;
         vnc_refresh_server_surface(vd);
         for (vs = vd->clients; vs != NULL; vs = vn) {
             vn = vs->next;
         QTAILQ_FOREACH_SAFE(vs, &vd->clients, next, vn) {
             if (vnc_has_feature(vs, VNC_FEATURE_COPYRECT)) {
                 vs->force_update = 1;
                 vnc_update_client(vs, 1);
-...
                 if (memcmp(src_row, dst_row, cmp_bytes) == 0)
                     continue;
                 memmove(dst_row, src_row, cmp_bytes);
                 vs = vd->clients;
                 while (vs != NULL) {
                     if (!vnc_has_feature(vs, VNC_FEATURE_COPYRECT))
                 QTAILQ_FOREACH(vs, &vd->clients, next) {
                     if (!vnc_has_feature(vs, VNC_FEATURE_COPYRECT)) {
                         vnc_set_bit(vs->dirty[y], ((x + dst_x) / 16));
                     vs = vs->next;
+                    }
+                }
+            }
             src_row += pitch - w * depth;
-...
             y += inc;
+        }
         for (vs = vd->clients; vs != NULL; vs = vs->next) {
             if (vnc_has_feature(vs, VNC_FEATURE_COPYRECT))
         QTAILQ_FOREACH(vs, &vd->clients, next) {
             if (vnc_has_feature(vs, VNC_FEATURE_COPYRECT)) {
                 vnc_copy(vs, src_x, src_y, dst_x, dst_y, w, h);
+            }
+        }
+    }
-...
     #endif /* CONFIG_VNC_SASL */
         audio_del(vs);
         VncState *p, *parent = NULL;
         for (p = vs->vd->clients; p != NULL; p = p->next) {
             if (p == vs) {
                 if (parent)
                     parent->next = p->next;
                 else
                     vs->vd->clients = p->next;
                 break;
+            }
             parent = p;
+        }
         if (!vs->vd->clients)
         QTAILQ_REMOVE(&vs->vd->clients, vs, next);
         if (QTAILQ_EMPTY(&vs->vd->clients)) {
             dcl->idle = 1;
+        }
         vnc_remove_timer(vs->vd);
         qemu_free(vs);
-...
         uint8_t *server_row;
         int cmp_bytes;
         uint32_t width_mask[VNC_DIRTY_WORDS];
         VncState *vs = NULL;
         VncState *vs;
         int has_dirty = 0;
         /*
-...
                     if (memcmp(server_ptr, guest_ptr, cmp_bytes) == 0)
                         continue;
                     memcpy(server_ptr, guest_ptr, cmp_bytes);
                     vs = vd->clients;
                     while (vs != NULL) {
                     QTAILQ_FOREACH(vs, &vd->clients, next) {
                         vnc_set_bit(vs->dirty[y], (x / 16));
                         vs = vs->next;
+                    }
                     has_dirty++;
+                }
-...
     static void vnc_refresh(void *opaque)
+    {
         VncDisplay *vd = opaque;
         VncState *vs = NULL, *vn = NULL;
         int has_dirty = 0, rects = 0;
         VncState *vs, *vn;
         int has_dirty, rects = 0;
         vga_hw_update();
         has_dirty = vnc_refresh_server_surface(vd);
         vs = vd->clients;
         while (vs != NULL) {
             vn = vs->next;
         QTAILQ_FOREACH_SAFE(vs, &vd->clients, next, vn) {
             rects += vnc_update_client(vs, has_dirty);
             /* vs might be free()ed here */
             vs = vn;
+        }
         /* vd->timer could be NULL now if the last client disconnected,
          * in this case don't update the timer */
-...
     static void vnc_init_timer(VncDisplay *vd)
+    {
         vd->timer_interval = VNC_REFRESH_INTERVAL_BASE;
         if (vd->timer == NULL && vd->clients != NULL) {
         if (vd->timer == NULL && !QTAILQ_EMPTY(&vd->clients)) {
             vd->timer = qemu_new_timer(rt_clock, vnc_refresh, vd);
             vnc_refresh(vd);
+        }
-...
     static void vnc_remove_timer(VncDisplay *vd)
+    {
         if (vd->timer != NULL && vd->clients == NULL) {
         if (vd->timer != NULL && QTAILQ_EMPTY(&vd->clients)) {
             qemu_del_timer(vd->timer);
             qemu_free_timer(vd->timer);
             vd->timer = NULL;
-...
         vs->as.fmt = AUD_FMT_S16;
         vs->as.endianness = 0;
         vs->next = vd->clients;
         vd->clients = vs;
         QTAILQ_INSERT_HEAD(&vd->clients, vs, next);
         vga_hw_update();
-...
         vs->lsock = -1;
         vs->ds = ds;
         QTAILQ_INIT(&vs->clients);
         if (keyboard_layout)
             vs->kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout);

     #define __QEMU_VNC_H
     #include "qemu-common.h"
     #include "qemu-queue.h"
     #include "console.h"
     #include "monitor.h"
     #include "audio/audio.h"
-...
     struct VncDisplay
+    {
         QTAILQ_HEAD(, VncState) clients;
         QEMUTimer *timer;
         int timer_interval;
         int lsock;
         DisplayState *ds;
         VncState *clients;
         kbd_layout_t *kbd_layout;
         struct VncSurface guest;   /* guest visible surface (aka ds->surface) */
-...
         Buffer zlib_tmp;
         z_stream zlib_stream[4];
         VncState *next;
         QTAILQ_ENTRY(VncState) next;
     };

Also available in: Unified diff

Archipelago » qemu

Revision 41b4bef6