[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] Field-name cleanups.



ChangeSet 1.1458, 2005/05/08 13:06:10+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Field-name cleanups.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 arch/ia64/domain.c         |    8 ++--
 arch/ia64/idle0_task.c     |    2 -
 arch/ia64/xenmisc.c        |    4 +-
 arch/ia64/xensetup.c       |    2 -
 arch/x86/dom0_ops.c        |    2 -
 arch/x86/domain.c          |   16 ++++----
 arch/x86/domain_build.c    |    4 +-
 arch/x86/i387.c            |    6 +--
 arch/x86/idle0_task.c      |    2 -
 arch/x86/mm.c              |   12 +++---
 arch/x86/physdev.c         |    2 -
 arch/x86/setup.c           |    2 -
 arch/x86/shadow.c          |    2 -
 arch/x86/smpboot.c         |    2 -
 arch/x86/traps.c           |   14 +++----
 common/dom0_ops.c          |   20 +++++-----
 common/domain.c            |   34 ++++++++---------
 common/event_channel.c     |    2 -
 common/keyhandler.c        |    8 ++--
 common/page_alloc.c        |    6 +--
 common/sched_bvt.c         |   68 +++++++++++++++++-----------------
 common/schedule.c          |   51 +++++++++++++------------
 include/asm-x86/config.h   |    4 +-
 include/asm-x86/debugger.h |    2 -
 include/asm-x86/i387.h     |    2 -
 include/xen/event.h        |    2 -
 include/xen/sched.h        |   89 +++++++++++++++++++++++----------------------
 27 files changed, 187 insertions(+), 181 deletions(-)


diff -Nru a/xen/arch/ia64/domain.c b/xen/arch/ia64/domain.c
--- a/xen/arch/ia64/domain.c    2005-05-08 09:04:03 -04:00
+++ b/xen/arch/ia64/domain.c    2005-05-08 09:04:03 -04:00
@@ -626,7 +626,7 @@
 #ifndef CLONE_DOMAIN0
        if ( d != dom0 ) 
            BUG();
-       if ( test_bit(DF_CONSTRUCTED, &d->d_flags) ) 
+       if ( test_bit(DF_CONSTRUCTED, &d->flags) ) 
            BUG();
 #endif
 
@@ -753,7 +753,7 @@
 #endif
        console_endboot(strstr(cmdline, "tty0") != NULL);
 
-       set_bit(DF_CONSTRUCTED, &d->d_flags);
+       set_bit(DF_CONSTRUCTED, &d->flags);
 
        new_thread(ed, pkern_entry, 0, 0);
        // FIXME: Hack for keyboard input
@@ -783,7 +783,7 @@
        unsigned long pkern_entry;
 
 #ifndef DOMU_AUTO_RESTART
-       if ( test_bit(DF_CONSTRUCTED, &d->d_flags) ) BUG();
+       if ( test_bit(DF_CONSTRUCTED, &d->flags) ) BUG();
 #endif
 
        printk("*** LOADING DOMAIN %d ***\n",d->id);
@@ -816,7 +816,7 @@
        loaddomainelfimage(d,image_start);
        printk("loaddomainelfimage returns\n");
 
-       set_bit(DF_CONSTRUCTED, &d->d_flags);
+       set_bit(DF_CONSTRUCTED, &d->flags);
 
        printk("calling new_thread, entry=%p\n",pkern_entry);
 #ifdef DOMU_AUTO_RESTART
diff -Nru a/xen/arch/ia64/idle0_task.c b/xen/arch/ia64/idle0_task.c
--- a/xen/arch/ia64/idle0_task.c        2005-05-08 09:04:03 -04:00
+++ b/xen/arch/ia64/idle0_task.c        2005-05-08 09:04:03 -04:00
@@ -22,7 +22,7 @@
 #define IDLE0_DOMAIN(_t)             \
 {                                    \
     id:          IDLE_DOMAIN_ID,     \
-    d_flags:     1<<DF_IDLETASK,     \
+    flags:     1<<DF_IDLETASK,       \
     refcnt:      ATOMIC_INIT(1)      \
 }
 
diff -Nru a/xen/arch/ia64/xenmisc.c b/xen/arch/ia64/xenmisc.c
--- a/xen/arch/ia64/xenmisc.c   2005-05-08 09:04:02 -04:00
+++ b/xen/arch/ia64/xenmisc.c   2005-05-08 09:04:02 -04:00
@@ -240,7 +240,7 @@
 if (!cnt[id]--) { printk("%x",id); cnt[id] = 50; }
 if (!i--) { printk("+",id); cnt[id] = 100; }
 }
-       clear_bit(EDF_RUNNING, &prev->ed_flags);
+       clear_bit(EDF_RUNNING, &prev->flags);
        //if (!is_idle_task(next->domain) )
                //send_guest_virq(next, VIRQ_TIMER);
        load_region_regs(current);
@@ -270,7 +270,7 @@
        printf(buf);
        if (regs) show_registers(regs);
        domain_pause_by_systemcontroller(current->domain);
-       set_bit(DF_CRASHED, ed->domain->d_flags);
+       set_bit(DF_CRASHED, ed->domain->flags);
        if (ed->domain->id == 0) {
                int i = 1000000000L;
                // if domain0 crashes, just periodically print out panic
diff -Nru a/xen/arch/ia64/xensetup.c b/xen/arch/ia64/xensetup.c
--- a/xen/arch/ia64/xensetup.c  2005-05-08 09:04:03 -04:00
+++ b/xen/arch/ia64/xensetup.c  2005-05-08 09:04:03 -04:00
@@ -267,7 +267,7 @@
     if ( dom0 == NULL )
         panic("Error creating domain 0\n");
 
-    set_bit(DF_PRIVILEGED, &dom0->d_flags);
+    set_bit(DF_PRIVILEGED, &dom0->flags);
 
     /*
      * We're going to setup domain0 using the module(s) that we stashed safely
diff -Nru a/xen/arch/x86/dom0_ops.c b/xen/arch/x86/dom0_ops.c
--- a/xen/arch/x86/dom0_ops.c   2005-05-08 09:04:03 -04:00
+++ b/xen/arch/x86/dom0_ops.c   2005-05-08 09:04:03 -04:00
@@ -397,7 +397,7 @@
 #endif
 
     c->flags = 0;
-    if ( test_bit(EDF_DONEFPUINIT, &ed->ed_flags) )
+    if ( test_bit(EDF_DONEFPUINIT, &ed->flags) )
         c->flags |= VGCF_I387_VALID;
     if ( KERNEL_MODE(ed, &ed->arch.guest_context.user_regs) )
         c->flags |= VGCF_IN_KERNEL;
diff -Nru a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c     2005-05-08 09:04:03 -04:00
+++ b/xen/arch/x86/domain.c     2005-05-08 09:04:03 -04:00
@@ -252,7 +252,7 @@
 
         d->shared_info = (void *)alloc_xenheap_page();
         memset(d->shared_info, 0, PAGE_SIZE);
-        ed->vcpu_info = &d->shared_info->vcpu_data[ed->eid];
+        ed->vcpu_info = &d->shared_info->vcpu_data[ed->id];
         SHARE_PFN_WITH_DOMAIN(virt_to_page(d->shared_info), d);
         machine_to_phys_mapping[virt_to_phys(d->shared_info) >> 
                                PAGE_SHIFT] = INVALID_M2P_ENTRY;
@@ -294,7 +294,7 @@
     struct domain *d = ed->domain;
     ed->arch.schedule_tail = d->exec_domain[0]->arch.schedule_tail;
     ed->arch.perdomain_ptes = 
-        d->arch.mm_perdomain_pt + (ed->eid << PDPT_VCPU_SHIFT);
+        d->arch.mm_perdomain_pt + (ed->id << PDPT_VCPU_SHIFT);
     ed->arch.flags = TF_kernel_mode;
 }
 
@@ -397,9 +397,9 @@
                 return -EINVAL;
     }
 
-    clear_bit(EDF_DONEFPUINIT, &ed->ed_flags);
+    clear_bit(EDF_DONEFPUINIT, &ed->flags);
     if ( c->flags & VGCF_I387_VALID )
-        set_bit(EDF_DONEFPUINIT, &ed->ed_flags);
+        set_bit(EDF_DONEFPUINIT, &ed->flags);
 
     ed->arch.flags &= ~TF_kernel_mode;
     if ( c->flags & VGCF_IN_KERNEL )
@@ -415,7 +415,7 @@
     if ( !IS_PRIV(d) )
         ed->arch.guest_context.user_regs.eflags &= 0xffffcfff;
 
-    if ( test_bit(EDF_DONEINIT, &ed->ed_flags) )
+    if ( test_bit(EDF_DONEINIT, &ed->flags) )
         return 0;
 
     if ( (rc = (int)set_fast_trap(ed, c->fast_trap_idx)) != 0 )
@@ -426,7 +426,7 @@
     for ( i = 0; i < 8; i++ )
         (void)set_debugreg(ed, i, c->debugreg[i]);
 
-    if ( ed->eid == 0 )
+    if ( ed->id == 0 )
         d->vm_assist = c->vm_assist;
 
     phys_basetab = c->pt_base;
@@ -478,7 +478,7 @@
     update_pagetables(ed);
     
     /* Don't redo final setup */
-    set_bit(EDF_DONEINIT, &ed->ed_flags);
+    set_bit(EDF_DONEINIT, &ed->flags);
 
     return 0;
 }
@@ -796,7 +796,7 @@
      * 'prev' (after this point, a dying domain's info structure may be freed
      * without warning). 
      */
-    clear_bit(EDF_RUNNING, &prev->ed_flags);
+    clear_bit(EDF_RUNNING, &prev->flags);
 
     schedule_tail(next);
     BUG();
diff -Nru a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c       2005-05-08 09:04:03 -04:00
+++ b/xen/arch/x86/domain_build.c       2005-05-08 09:04:03 -04:00
@@ -114,7 +114,7 @@
     /* Sanity! */
     if ( d->id != 0 ) 
         BUG();
-    if ( test_bit(DF_CONSTRUCTED, &d->d_flags) ) 
+    if ( test_bit(DF_CONSTRUCTED, &d->flags) ) 
         BUG();
 
     memset(&dsi, 0, sizeof(struct domain_setup_info));
@@ -540,7 +540,7 @@
     /* DOM0 gets access to everything. */
     physdev_init_dom0(d);
 
-    set_bit(DF_CONSTRUCTED, &d->d_flags);
+    set_bit(DF_CONSTRUCTED, &d->flags);
 
     new_thread(ed, dsi.v_kernentry, vstack_end, vstartinfo_start);
 
diff -Nru a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c
--- a/xen/arch/x86/i387.c       2005-05-08 09:04:03 -04:00
+++ b/xen/arch/x86/i387.c       2005-05-08 09:04:03 -04:00
@@ -18,7 +18,7 @@
     __asm__ __volatile__ ( "fninit" );
     if ( cpu_has_xmm )
         load_mxcsr(0x1f80);
-    set_bit(EDF_DONEFPUINIT, &current->ed_flags);
+    set_bit(EDF_DONEFPUINIT, &current->flags);
 }
 
 void save_init_fpu(struct exec_domain *tsk)
@@ -28,7 +28,7 @@
      * This causes us to set the real flag, so we'll need
      * to temporarily clear it while saving f-p state.
      */
-    if ( test_bit(EDF_GUEST_STTS, &tsk->ed_flags) )
+    if ( test_bit(EDF_GUEST_STTS, &tsk->flags) )
         clts();
 
     if ( cpu_has_fxsr )
@@ -40,7 +40,7 @@
             "fnsave %0 ; fwait"
             : "=m" (tsk->arch.guest_context.fpu_ctxt) );
 
-    clear_bit(EDF_USEDFPU, &tsk->ed_flags);
+    clear_bit(EDF_USEDFPU, &tsk->flags);
     stts();
 }
 
diff -Nru a/xen/arch/x86/idle0_task.c b/xen/arch/x86/idle0_task.c
--- a/xen/arch/x86/idle0_task.c 2005-05-08 09:04:03 -04:00
+++ b/xen/arch/x86/idle0_task.c 2005-05-08 09:04:03 -04:00
@@ -5,7 +5,7 @@
 
 struct domain idle0_domain = {
     id:          IDLE_DOMAIN_ID,
-    d_flags:     1<<DF_IDLETASK,
+    flags:       1<<DF_IDLETASK,
     refcnt:      ATOMIC_INIT(1)
 };
 
diff -Nru a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c 2005-05-08 09:04:03 -04:00
+++ b/xen/arch/x86/mm.c 2005-05-08 09:04:03 -04:00
@@ -1142,7 +1142,7 @@
          * See domain.c:relinquish_list().
          */
         ASSERT((x & PGT_validated) || 
-               test_bit(DF_DYING, &page_get_owner(page)->d_flags));
+               test_bit(DF_DYING, &page_get_owner(page)->flags));
 
         if ( unlikely((nx & PGT_count_mask) == 0) )
         {
@@ -1691,13 +1691,13 @@
              * it is dying. 
              */
             ASSERT(e->tot_pages <= e->max_pages);
-            if ( unlikely(test_bit(DF_DYING, &e->d_flags)) ||
+            if ( unlikely(test_bit(DF_DYING, &e->flags)) ||
                  unlikely(e->tot_pages == e->max_pages) ||
                  unlikely(IS_XEN_HEAP_FRAME(page)) )
             {
                 MEM_LOG("Transferee has no reservation headroom (%d,%d), or "

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.