|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-4.1-testing] mini-os: stop compiler complaint about unused variables
# HG changeset patch
# User John McDermott <john.mcdermott@xxxxxxxxxxxx>
# Date 1329993341 0
# Node ID bc8f88be9e4b01d39724e568dde5644338cfde4b
# Parent 8435c27b34990831718a8f625e5addddee74d62b
mini-os: stop compiler complaint about unused variables
gcc (GCC) 4.6.2 20111027 (Red Hat 4.6.2-1) complains about unused
variables
in mini-os drivers
Signed-off-by: John McDermott <john.mcdermott@xxxxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
xen-unstable changeset: 24743:86f2630d62a9
xen-unstable date: Thu Feb 09 16:03:05 2012 +0000
minios: Remove unused variables warnings
s/DEBUG/printk/ in test_xenbus and all associated
do_*_test+xenbus_dbg_message
and always print the IRQ and MFN used by the xenbus on init.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Tested-by: John McDermott <john.mcdermott@xxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
xen-unstable changeset: 24844:c78636d15ac5
xen-unstable date: Mon Feb 20 18:48:32 2012 +0000
Backported-by: Keir Fraser <keir@xxxxxxx>
---
diff -r 8435c27b3499 -r bc8f88be9e4b extras/mini-os/blkfront.c
--- a/extras/mini-os/blkfront.c Thu Feb 23 10:34:14 2012 +0000
+++ b/extras/mini-os/blkfront.c Thu Feb 23 10:35:41 2012 +0000
@@ -171,6 +171,7 @@
abort_transaction:
free(err);
err = xenbus_transaction_end(xbt, 1, &retry);
+ printk("Abort transaction %s\n", message);
goto error;
done:
diff -r 8435c27b3499 -r bc8f88be9e4b extras/mini-os/console/xencons_ring.c
--- a/extras/mini-os/console/xencons_ring.c Thu Feb 23 10:34:14 2012 +0000
+++ b/extras/mini-os/console/xencons_ring.c Thu Feb 23 10:35:41 2012 +0000
@@ -317,6 +317,7 @@
abort_transaction:
free(err);
err = xenbus_transaction_end(xbt, 1, &retry);
+ printk("Abort transaction %s\n", message);
goto error;
done:
diff -r 8435c27b3499 -r bc8f88be9e4b extras/mini-os/fbfront.c
--- a/extras/mini-os/fbfront.c Thu Feb 23 10:34:14 2012 +0000
+++ b/extras/mini-os/fbfront.c Thu Feb 23 10:35:41 2012 +0000
@@ -142,6 +142,7 @@
abort_transaction:
free(err);
err = xenbus_transaction_end(xbt, 1, &retry);
+ printk("Abort transaction %s\n", message);
goto error;
done:
@@ -503,6 +504,7 @@
abort_transaction:
free(err);
err = xenbus_transaction_end(xbt, 1, &retry);
+ printk("Abort transaction %s\n", message);
goto error;
done:
diff -r 8435c27b3499 -r bc8f88be9e4b extras/mini-os/netfront.c
--- a/extras/mini-os/netfront.c Thu Feb 23 10:34:14 2012 +0000
+++ b/extras/mini-os/netfront.c Thu Feb 23 10:35:41 2012 +0000
@@ -421,6 +421,7 @@
abort_transaction:
free(err);
err = xenbus_transaction_end(xbt, 1, &retry);
+ printk("Abort transaction %s\n", message);
goto error;
done:
diff -r 8435c27b3499 -r bc8f88be9e4b extras/mini-os/pcifront.c
--- a/extras/mini-os/pcifront.c Thu Feb 23 10:34:14 2012 +0000
+++ b/extras/mini-os/pcifront.c Thu Feb 23 10:35:41 2012 +0000
@@ -222,6 +222,7 @@
abort_transaction:
free(err);
err = xenbus_transaction_end(xbt, 1, &retry);
+ printk("Abort transaction %s\n", message);
goto error;
done:
diff -r 8435c27b3499 -r bc8f88be9e4b extras/mini-os/xenbus/xenbus.c
--- a/extras/mini-os/xenbus/xenbus.c Thu Feb 23 10:34:14 2012 +0000
+++ b/extras/mini-os/xenbus/xenbus.c Thu Feb 23 10:35:41 2012 +0000
@@ -328,7 +328,6 @@
void init_xenbus(void)
{
int err;
- printk("Initialising xenbus\n");
DEBUG("init_xenbus called.\n");
xenstore_buf = mfn_to_virt(start_info.store_mfn);
create_thread("xenstore", xenbus_thread_func, NULL);
@@ -337,7 +336,8 @@
xenbus_evtchn_handler,
NULL);
unmask_evtchn(start_info.store_evtchn);
- DEBUG("xenbus on irq %d\n", err);
+ printk("xenbus initialised on irq %d mfn %#lx\n",
+ err, start_info.store_mfn);
}
void fini_xenbus(void)
@@ -478,7 +478,7 @@
struct xsd_sockmsg *reply;
reply = xenbus_msg_reply(XS_DEBUG, 0, req, ARRAY_SIZE(req));
- DEBUG("Got a reply, type %d, id %d, len %d.\n",
+ printk("Got a reply, type %d, id %d, len %d.\n",
reply->type, reply->req_id, reply->len);
}
@@ -752,16 +752,16 @@
char **dirs, *msg;
int x;
- DEBUG("ls %s...\n", pre);
+ printk("ls %s...\n", pre);
msg = xenbus_ls(XBT_NIL, pre, &dirs);
if (msg) {
- DEBUG("Error in xenbus ls: %s\n", msg);
+ printk("Error in xenbus ls: %s\n", msg);
free(msg);
return;
}
for (x = 0; dirs[x]; x++)
{
- DEBUG("ls %s[%d] -> %s\n", pre, x, dirs[x]);
+ printk("ls %s[%d] -> %s\n", pre, x, dirs[x]);
free(dirs[x]);
}
free(dirs);
@@ -770,68 +770,68 @@
static void do_read_test(const char *path)
{
char *res, *msg;
- DEBUG("Read %s...\n", path);
+ printk("Read %s...\n", path);
msg = xenbus_read(XBT_NIL, path, &res);
if (msg) {
- DEBUG("Error in xenbus read: %s\n", msg);
+ printk("Error in xenbus read: %s\n", msg);
free(msg);
return;
}
- DEBUG("Read %s -> %s.\n", path, res);
+ printk("Read %s -> %s.\n", path, res);
free(res);
}
static void do_write_test(const char *path, const char *val)
{
char *msg;
- DEBUG("Write %s to %s...\n", val, path);
+ printk("Write %s to %s...\n", val, path);
msg = xenbus_write(XBT_NIL, path, val);
if (msg) {
- DEBUG("Result %s\n", msg);
+ printk("Result %s\n", msg);
free(msg);
} else {
- DEBUG("Success.\n");
+ printk("Success.\n");
}
}
static void do_rm_test(const char *path)
{
char *msg;
- DEBUG("rm %s...\n", path);
+ printk("rm %s...\n", path);
msg = xenbus_rm(XBT_NIL, path);
if (msg) {
- DEBUG("Result %s\n", msg);
+ printk("Result %s\n", msg);
free(msg);
} else {
- DEBUG("Success.\n");
+ printk("Success.\n");
}
}
/* Simple testing thing */
void test_xenbus(void)
{
- DEBUG("Doing xenbus test.\n");
+ printk("Doing xenbus test.\n");
xenbus_debug_msg("Testing xenbus...\n");
- DEBUG("Doing ls test.\n");
+ printk("Doing ls test.\n");
do_ls_test("device");
do_ls_test("device/vif");
do_ls_test("device/vif/0");
- DEBUG("Doing read test.\n");
+ printk("Doing read test.\n");
do_read_test("device/vif/0/mac");
do_read_test("device/vif/0/backend");
- DEBUG("Doing write test.\n");
+ printk("Doing write test.\n");
do_write_test("device/vif/0/flibble", "flobble");
do_read_test("device/vif/0/flibble");
do_write_test("device/vif/0/flibble", "widget");
do_read_test("device/vif/0/flibble");
- DEBUG("Doing rm test.\n");
+ printk("Doing rm test.\n");
do_rm_test("device/vif/0/flibble");
do_read_test("device/vif/0/flibble");
- DEBUG("(Should have said ENOENT)\n");
+ printk("(Should have said ENOENT)\n");
}
/*
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |