WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] Merge bk://xen.bkbits.net/xeno-unstable.bk

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] Merge bk://xen.bkbits.net/xeno-unstable.bk
From: BitKeeper Bot <riel@xxxxxxxxxxx>
Date: Tue, 10 May 2005 22:58:27 +0000
Delivery-date: Wed, 11 May 2005 07:03:41 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: Xen Development List <xen-devel@xxxxxxxxxxxxxxxxxxx>
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
ChangeSet 1.1435, 2005/05/10 15:58:27-07:00, xen-ia64.adm@xxxxxxxxxx

        Merge bk://xen.bkbits.net/xeno-unstable.bk
        into  bkbits.net:/repos/x/xen-ia64/xeno-unstable-ia64.bk



 arch/ia64/domain.c        |   16 ++++------------
 arch/ia64/xenmisc.c       |   31 ++-----------------------------
 include/asm-ia64/config.h |    8 --------
 3 files changed, 6 insertions(+), 49 deletions(-)


diff -Nru a/xen/arch/ia64/domain.c b/xen/arch/ia64/domain.c
--- a/xen/arch/ia64/domain.c    2005-05-11 03:04:14 -04:00
+++ b/xen/arch/ia64/domain.c    2005-05-11 03:04:14 -04:00
@@ -621,14 +621,12 @@
        unsigned long pkern_entry;
        unsigned long pkern_end;
 
-       extern void physdev_init_dom0(struct domain *);
-
 //printf("construct_dom0: starting\n");
        /* Sanity! */
 #ifndef CLONE_DOMAIN0
        if ( d != dom0 ) 
            BUG();
-       if ( test_bit(DF_CONSTRUCTED, &d->d_flags) ) 
+       if ( test_bit(DF_CONSTRUCTED, &d->flags) ) 
            BUG();
 #endif
 
@@ -755,13 +753,7 @@
 #endif
        console_endboot(strstr(cmdline, "tty0") != NULL);
 
-       /* DOM0 gets access to everything. */
-#ifdef CLONE_DOMAIN0
-if (d == dom0)
-#endif
-       physdev_init_dom0(d);
-
-       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
@@ -791,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);
@@ -824,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/xenmisc.c b/xen/arch/ia64/xenmisc.c
--- a/xen/arch/ia64/xenmisc.c   2005-05-11 03:04:14 -04:00
+++ b/xen/arch/ia64/xenmisc.c   2005-05-11 03:04:14 -04:00
@@ -158,33 +158,6 @@
 }
 
 ///////////////////////////////
-// from common/physdev.c
-///////////////////////////////
-void
-physdev_init_dom0(struct domain *d)
-{
-}
-
-int
-physdev_pci_access_modify(domid_t id, int bus, int dev, int func, int enable)
-{
-       return -EINVAL;
-}
-
-void physdev_modify_ioport_access_range(struct domain *d, int enable,
-       int port, int num)
-{
-       printk("physdev_modify_ioport_access_range not implemented\n");
-       dummy();
-}
-
-void physdev_destroy_state(struct domain *d)
-{
-       printk("physdev_destroy_state not implemented\n");
-       dummy();
-}
-
-///////////////////////////////
 // called from arch/ia64/head.S
 ///////////////////////////////
 
@@ -275,7 +248,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);
@@ -305,7 +278,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/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h     2005-05-11 03:04:14 -04:00
+++ b/xen/include/asm-ia64/config.h     2005-05-11 03:04:14 -04:00
@@ -31,10 +31,6 @@
 
 #define touch_nmi_watchdog()
 // from linux/include/linux/types.h
-#define BITS_TO_LONGS(bits) \
-       (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG)
-#define DECLARE_BITMAP(name,bits) \
-       unsigned long name[BITS_TO_LONGS(bits)]
 #define CLEAR_BITMAP(name,bits) \
        memset(name, 0, BITS_TO_LONGS(bits)*sizeof(unsigned long))
 
@@ -57,7 +53,6 @@
 //#define __kernel
 //#define __safe
 #define __force
-#define __iomem
 #define __chk_user_ptr(x) (void)0
 //#define __chk_io_ptr(x) (void)0
 //#define __builtin_warning(x, y...) (1)
@@ -76,9 +71,6 @@
 //#define NR_CPUS 16
 //#define CONFIG_NR_CPUS 16
 #define barrier() __asm__ __volatile__("": : :"memory")
-
-// linux/include/spinlock.h
-#define DEFINE_SPINLOCK(x) spinlock_t x = SPIN_LOCK_UNLOCKED
 
 ///////////////////////////////////////////////////////////////
 // xen/include/asm/config.h

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

<Prev in Thread] Current Thread [Next in Thread>