|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] mini-os: tidied up code
commit ec0326f41f3efafc2c46c4c881051a3a31649556
Author: Karim Raslan <karim.allah.ahmed@xxxxxxxxx>
AuthorDate: Wed Jun 11 11:30:14 2014 +0100
Commit: Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Jun 12 11:01:18 2014 +0100
mini-os: tidied up code
Signed-off-by: Karim Allah Ahmed <karim.allah.ahmed@xxxxxxxxx>
[talex5@xxxxxxxxx: separated from big ARM commit]
Acked-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
[talex5@xxxxxxxxx: use __func__ in DEBUG macro]
[talex5@xxxxxxxxx: drop text about "xm create"]
Signed-off-by: Thomas Leonard <talex5@xxxxxxxxx>
---
extras/mini-os/README | 4 +-
extras/mini-os/arch/x86/time.c | 2 +-
extras/mini-os/console/console.c | 2 +-
extras/mini-os/events.c | 3 +-
extras/mini-os/gntmap.c | 35 ++++++++++++---------------
extras/mini-os/include/x86/arch_spinlock.h | 2 +-
extras/mini-os/sched.c | 3 ++
extras/mini-os/xenbus/xenbus.c | 2 +-
8 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/extras/mini-os/README b/extras/mini-os/README
index 710a303..7960314 100644
--- a/extras/mini-os/README
+++ b/extras/mini-os/README
@@ -25,8 +25,8 @@ This includes:
- to build it with much better libc support, see the stubdom/ directory
-- to start it do the following in domain0 (assuming xend is running)
- # xm create domain_config
+- to start it do the following in domain0
+ # xl create -c domain_config
This starts the kernel and prints out a bunch of stuff and then once every
second the system time.
diff --git a/extras/mini-os/arch/x86/time.c b/extras/mini-os/arch/x86/time.c
index 89bc382..2c8d033 100644
--- a/extras/mini-os/arch/x86/time.c
+++ b/extras/mini-os/arch/x86/time.c
@@ -212,7 +212,7 @@ void block_domain(s_time_t until)
/*
- * Just a dummy
+ * Just a dummy
*/
static void timer_handler(evtchn_port_t ev, struct pt_regs *regs, void *ign)
{
diff --git a/extras/mini-os/console/console.c b/extras/mini-os/console/console.c
index 380f53c..5538bd4 100644
--- a/extras/mini-os/console/console.c
+++ b/extras/mini-os/console/console.c
@@ -124,7 +124,7 @@ void print(int direct, const char *fmt, va_list args)
static char buf[1024];
(void)vsnprintf(buf, sizeof(buf), fmt, args);
-
+
if(direct)
{
(void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(buf), buf);
diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c
index 036b84b..2da9b01 100644
--- a/extras/mini-os/events.c
+++ b/extras/mini-os/events.c
@@ -138,7 +138,8 @@ evtchn_port_t bind_virq(uint32_t virq, evtchn_handler_t
handler, void *data)
op.virq = virq;
op.vcpu = smp_processor_id();
- if ( (rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq, &op)) != 0 )
+ rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq, &op);
+ if (rc != 0)
{
printk("Failed to bind virtual IRQ %d with rc=%d\n", virq, rc);
return -1;
diff --git a/extras/mini-os/gntmap.c b/extras/mini-os/gntmap.c
index 22ed450..f6ab3ad 100644
--- a/extras/mini-os/gntmap.c
+++ b/extras/mini-os/gntmap.c
@@ -38,6 +38,15 @@
#include <inttypes.h>
#include <mini-os/gntmap.h>
+//#define GNTMAP_DEBUG
+#ifdef GNTMAP_DEBUG
+#define DEBUG(_f, _a...) \
+ printk("MINI_OS(gntmap.c:%d): %s" _f "\n", __LINE__, __func__, ## _a)
+#else
+#define DEBUG(_f, _a...) ((void)0)
+#endif
+
+
#define DEFAULT_MAX_GRANTS 128
struct gntmap_entry {
@@ -61,10 +70,8 @@ gntmap_find_free_entry(struct gntmap *map)
return &map->entries[i];
}
-#ifdef GNTMAP_DEBUG
- printk("gntmap_find_free_entry(map=%p): all %d entries full\n",
+ DEBUG("(map=%p): all %d entries full",
map, map->nentries);
-#endif
return NULL;
}
@@ -83,9 +90,7 @@ gntmap_find_entry(struct gntmap *map, unsigned long addr)
int
gntmap_set_max_grants(struct gntmap *map, int count)
{
-#ifdef GNTMAP_DEBUG
- printk("gntmap_set_max_grants(map=%p, count=%d)\n", map, count);
-#endif
+ DEBUG("(map=%p, count=%d)", map, count);
if (map->nentries != 0)
return -EBUSY;
@@ -157,10 +162,8 @@ gntmap_munmap(struct gntmap *map, unsigned long
start_address, int count)
int i, rc;
struct gntmap_entry *ent;
-#ifdef GNTMAP_DEBUG
- printk("gntmap_munmap(map=%p, start_address=%lx, count=%d)\n",
+ DEBUG("(map=%p, start_address=%lx, count=%d)",
map, start_address, count);
-#endif
for (i = 0; i < count; i++) {
ent = gntmap_find_entry(map, start_address + PAGE_SIZE * i);
@@ -189,14 +192,12 @@ gntmap_map_grant_refs(struct gntmap *map,
struct gntmap_entry *ent;
int i;
-#ifdef GNTMAP_DEBUG
- printk("gntmap_map_grant_refs(map=%p, count=%" PRIu32 ", "
+ DEBUG("(map=%p, count=%" PRIu32 ", "
"domids=%p [%" PRIu32 "...], domids_stride=%d, "
- "refs=%p [%" PRIu32 "...], writable=%d)\n",
+ "refs=%p [%" PRIu32 "...], writable=%d)",
map, count,
domids, domids == NULL ? 0 : domids[0], domids_stride,
refs, refs == NULL ? 0 : refs[0], writable);
-#endif
(void) gntmap_set_max_grants(map, DEFAULT_MAX_GRANTS);
@@ -224,9 +225,7 @@ gntmap_map_grant_refs(struct gntmap *map,
void
gntmap_init(struct gntmap *map)
{
-#ifdef GNTMAP_DEBUG
- printk("gntmap_init(map=%p)\n", map);
-#endif
+ DEBUG("(map=%p)", map);
map->nentries = 0;
map->entries = NULL;
}
@@ -237,9 +236,7 @@ gntmap_fini(struct gntmap *map)
struct gntmap_entry *ent;
int i;
-#ifdef GNTMAP_DEBUG
- printk("gntmap_fini(map=%p)\n", map);
-#endif
+ DEBUG("(map=%p)", map);
for (i = 0; i < map->nentries; i++) {
ent = &map->entries[i];
diff --git a/extras/mini-os/include/x86/arch_spinlock.h
b/extras/mini-os/include/x86/arch_spinlock.h
index c08b6f1..59f7b63 100644
--- a/extras/mini-os/include/x86/arch_spinlock.h
+++ b/extras/mini-os/include/x86/arch_spinlock.h
@@ -61,7 +61,7 @@
static inline void _raw_spin_unlock(spinlock_t *lock)
{
- char oldval = 1;
+ char oldval = ARCH_SPIN_LOCK_UNLOCKED;
__asm__ __volatile__(
spin_unlock_string
);
diff --git a/extras/mini-os/sched.c b/extras/mini-os/sched.c
index 5ac5c1c..174945e 100644
--- a/extras/mini-os/sched.c
+++ b/extras/mini-os/sched.c
@@ -85,6 +85,7 @@ void schedule(void)
printk("Must not call schedule() from a callback\n");
BUG();
}
+
if (flags) {
printk("Must not call schedule() with IRQs disabled\n");
BUG();
@@ -188,6 +189,8 @@ struct _reent *__getreent(void)
}
}
#endif
+#else
+#error Not implemented yet
#endif
return _reent;
}
diff --git a/extras/mini-os/xenbus/xenbus.c b/extras/mini-os/xenbus/xenbus.c
index c5d9b02..934f23b 100644
--- a/extras/mini-os/xenbus/xenbus.c
+++ b/extras/mini-os/xenbus/xenbus.c
@@ -276,7 +276,7 @@ static void xenbus_evtchn_handler(evtchn_port_t port,
struct pt_regs *regs,
}
static int nr_live_reqs;
-static spinlock_t req_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(req_lock);
static DECLARE_WAIT_QUEUE_HEAD(req_wq);
/* Release a xenbus identifier */
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |