From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Fri, 15 Feb 2008 14:32:40 +0000 (+0000)
Subject: Fix some more LIST_ => QEMU_LIST_...
X-Git-Tag: xen-3.3.0-rc1~249
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c97c7b6de9fe3075f9f2fd4af31b6402431d4425;p=qemu-xen-3.4-testing.git

Fix some more LIST_ => QEMU_LIST_...
---

diff --git a/monitor.c b/monitor.c
index 025025b7..63d9fad0 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1200,7 +1200,7 @@ static void do_info_profile(void)
 #endif
 
 /* Capture support */
-static LIST_HEAD (capture_list_head, CaptureState) capture_head;
+static QEMU_LIST_HEAD (capture_list_head, CaptureState) capture_head;
 
 static void do_info_capture (void)
 {
@@ -1221,7 +1221,7 @@ static void do_stop_capture (int n)
     for (s = capture_head.lh_first, i = 0; s; s = s->entries.le_next, ++i) {
         if (i == n) {
             s->ops.destroy (s->opaque);
-            LIST_REMOVE (s, entries);
+            QEMU_LIST_REMOVE (s, entries);
             qemu_free (s);
             return;
         }
@@ -1253,7 +1253,7 @@ static void do_wav_capture (const char *path,
         term_printf ("Faied to add wave capture\n");
         qemu_free (s);
     }
-    LIST_INSERT_HEAD (&capture_head, s, entries);
+    QEMU_LIST_INSERT_HEAD (&capture_head, s, entries);
 }
 #endif
 
diff --git a/vl.c b/vl.c
index 50129a34..1bc49e1c 100644
--- a/vl.c
+++ b/vl.c
@@ -7195,10 +7195,10 @@ static void gui_update(void *opaque)
 struct vm_change_state_entry {
     VMChangeStateHandler *cb;
     void *opaque;
-    LIST_ENTRY (vm_change_state_entry) entries;
+    QEMU_LIST_ENTRY (vm_change_state_entry) entries;
 };
 
-static LIST_HEAD(vm_change_state_head, vm_change_state_entry) vm_change_state_head;
+static QEMU_LIST_HEAD(vm_change_state_head, vm_change_state_entry) vm_change_state_head;
 
 VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,
                                                      void *opaque)
@@ -7211,13 +7211,13 @@ VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,
 
     e->cb = cb;
     e->opaque = opaque;
-    LIST_INSERT_HEAD(&vm_change_state_head, e, entries);
+    QEMU_LIST_INSERT_HEAD(&vm_change_state_head, e, entries);
     return e;
 }
 
 void qemu_del_vm_change_state_handler(VMChangeStateEntry *e)
 {
-    LIST_REMOVE (e, entries);
+    QEMU_LIST_REMOVE (e, entries);
     qemu_free (e);
 }
 
@@ -8198,7 +8198,7 @@ int main(int argc, char **argv)
     const char *pid_file = NULL;
     VLANState *vlan;
 
-    LIST_INIT (&vm_change_state_head);
+    QEMU_LIST_INIT (&vm_change_state_head);
 #ifndef _WIN32
     {
         struct sigaction act;