# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 8451c65671238604e2678a1f44c2f582ec6ebf96
# Parent 9ee811544c408f0d6ba2370bbd44125c99dd7237
Reverse accidental commits for changesets 8001 and 7996-7999.
The Mercurial Queues extensions suddenly looks a lot less useful than it first
seemed.
Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
diff -r 9ee811544c40 -r 8451c6567123
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Wed Nov 23
19:31:22 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Wed Nov 23
19:37:33 2005
@@ -155,8 +155,6 @@
(_list)[0] = (_list)[_id]; \
(unsigned short)_id; })
-#define DEBUG 1
-
#ifdef DEBUG
static char *be_state_name[] = {
[BEST_CLOSED] = "closed",
@@ -902,7 +900,7 @@
{
struct netfront_info *np = netdev_priv(dev);
np->user_state = UST_CLOSED;
- netif_stop_queue(dev);
+ netif_stop_queue(np->netdev);
return 0;
}
@@ -1165,6 +1163,8 @@
struct netfront_info *info = dev->data;
DPRINTK("netfront_closing: %s removed\n", dev->nodename);
+
+ close_netdev(info);
xenbus_switch_state(dev, NULL, XenbusStateClosed);
}
diff -r 9ee811544c40 -r 8451c6567123 tools/console/Makefile
--- a/tools/console/Makefile Wed Nov 23 19:31:22 2005
+++ b/tools/console/Makefile Wed Nov 23 19:37:33 2005
@@ -9,7 +9,7 @@
INSTALL_PROG = $(INSTALL) -m0755
INSTALL_DIR = $(INSTALL) -d -m0755
-CFLAGS += -Wall -Werror -ggdb3 -O0
+CFLAGS += -Wall -Werror -g3
CFLAGS += -I $(XEN_LIBXC)
CFLAGS += -I $(XEN_XENSTORE)
diff -r 9ee811544c40 -r 8451c6567123 tools/examples/block
--- a/tools/examples/block Wed Nov 23 19:31:22 2005
+++ b/tools/examples/block Wed Nov 23 19:37:33 2005
@@ -2,6 +2,12 @@
dir=$(dirname "$0")
. "$dir/block-common.sh"
+
+case "$command" in
+ online | offline)
+ exit 0
+ ;;
+esac
expand_dev() {
local dev
diff -r 9ee811544c40 -r 8451c6567123 tools/examples/block-common.sh
--- a/tools/examples/block-common.sh Wed Nov 23 19:31:22 2005
+++ b/tools/examples/block-common.sh Wed Nov 23 19:37:33 2005
@@ -21,7 +21,9 @@
findCommand "$@"
-if [ "$command" != "add" ] &&
+if [ "$command" != "online" ] &&
+ [ "$command" != "offline" ] &&
+ [ "$command" != "add" ] &&
[ "$command" != "remove" ]
then
log err "Invalid command: $command"
diff -r 9ee811544c40 -r 8451c6567123 tools/examples/block-enbd
--- a/tools/examples/block-enbd Wed Nov 23 19:31:22 2005
+++ b/tools/examples/block-enbd Wed Nov 23 19:37:33 2005
@@ -11,7 +11,7 @@
. "$dir/block-common.sh"
case "$command" in
- add)
+ bind)
for dev in /dev/nd*; do
if nbd-client $2:$3 $dev; then
write_dev $dev
@@ -20,7 +20,7 @@
done
exit 1
;;
- remove)
+ unbind)
nbd-client -d $2
exit 0
;;
diff -r 9ee811544c40 -r 8451c6567123 tools/examples/block-nbd
--- a/tools/examples/block-nbd Wed Nov 23 19:31:22 2005
+++ b/tools/examples/block-nbd Wed Nov 23 19:37:33 2005
@@ -11,7 +11,7 @@
. "$dir/block-common.sh"
case "$command" in
- add)
+ bind)
for dev in /dev/nbd*; do
if nbd-client $2 $3 $dev; then
write_dev $dev
@@ -20,7 +20,7 @@
done
exit 1
;;
- remove)
+ unbind)
nbd-client -d $2
exit 0
;;
diff -r 9ee811544c40 -r 8451c6567123 tools/examples/xend-config.sxp
--- a/tools/examples/xend-config.sxp Wed Nov 23 19:31:22 2005
+++ b/tools/examples/xend-config.sxp Wed Nov 23 19:37:33 2005
@@ -34,7 +34,7 @@
# Specifying 'localhost' prevents remote connections.
# Specifying the empty string '' (the default) allows all connections.
#(xend-address '')
-#(xend-address localhost)
+(xend-address localhost)
# Address xend should listen on for relocation-socket connections, if
# xend-relocation-server is set.
diff -r 9ee811544c40 -r 8451c6567123 tools/libxc/Makefile
--- a/tools/libxc/Makefile Wed Nov 23 19:31:22 2005
+++ b/tools/libxc/Makefile Wed Nov 23 19:37:33 2005
@@ -52,7 +52,7 @@
# Define this to make it possible to run valgrind on code linked with these
# libraries.
-CFLAGS += -DVALGRIND # -O0 -ggdb3
+#CFLAGS += -DVALGRIND -O0 -ggdb3
# Get gcc to generate the dependencies for us.
CFLAGS += -Wp,-MD,.$(@F).d
diff -r 9ee811544c40 -r 8451c6567123 tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c Wed Nov 23 19:31:22 2005
+++ b/tools/libxc/xc_linux_build.c Wed Nov 23 19:37:33 2005
@@ -480,7 +480,6 @@
#define _p(a) ((void *) (a))
-#if 0
printf("VIRTUAL MEMORY ARRANGEMENT:\n"
" Loaded kernel: %p->%p\n"
" Init. ramdisk: %p->%p\n"
@@ -501,7 +500,6 @@
_p(vstack_start), _p(vstack_end),
_p(dsi.v_start), _p(v_end));
printf(" ENTRY ADDRESS: %p\n", _p(dsi.v_kernentry));
-#endif
if ( ((v_end - dsi.v_start)>>PAGE_SHIFT) > nr_pages )
{
diff -r 9ee811544c40 -r 8451c6567123 tools/python/setup.py
--- a/tools/python/setup.py Wed Nov 23 19:31:22 2005
+++ b/tools/python/setup.py Wed Nov 23 19:37:33 2005
@@ -4,7 +4,7 @@
XEN_ROOT = "../.."
-extra_compile_args = [ "-fno-strict-aliasing", "-Wall", "-Werror", "-ggdb3",
"-O0" ]
+extra_compile_args = [ "-fno-strict-aliasing", "-Wall", "-Werror" ]
include_dirs = [ XEN_ROOT + "/tools/libxc",
diff -r 9ee811544c40 -r 8451c6567123 tools/python/xen/xend/XendLogging.py
--- a/tools/python/xen/xend/XendLogging.py Wed Nov 23 19:31:22 2005
+++ b/tools/python/xen/xend/XendLogging.py Wed Nov 23 19:37:33 2005
@@ -42,7 +42,7 @@
DEFAULT_BACKUP_COUNT = 5
STDERR_FORMAT = "[%(name)s] %(levelname)s (%(module)s:%(lineno)d) %(message)s"
-LOGFILE_FORMAT = "[%(asctime)s %(name)s %(thread)d] %(levelname)s
(%(module)s:%(lineno)d) %(message)s"
+LOGFILE_FORMAT = "[%(asctime)s %(name)s] %(levelname)s (%(module)s:%(lineno)d)
%(message)s"
DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
diff -r 9ee811544c40 -r 8451c6567123 tools/python/xen/xend/server/SrvDaemon.py
--- a/tools/python/xen/xend/server/SrvDaemon.py Wed Nov 23 19:31:22 2005
+++ b/tools/python/xen/xend/server/SrvDaemon.py Wed Nov 23 19:37:33 2005
@@ -8,9 +8,7 @@
import os
import signal
import sys
-import thread
import threading
-import time
import linecache
import pwd
import re
@@ -203,8 +201,6 @@
pass
def print_trace(self, string):
- self.tracefile.write(time.strftime("%Y-%m-%d %H:%M:%S "))
- self.tracefile.write("%10x" % thread.get_ident())
for i in range(self.traceindent):
ch = " "
if (i % 5):
diff -r 9ee811544c40 -r 8451c6567123 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile Wed Nov 23 19:31:22 2005
+++ b/tools/xenstore/Makefile Wed Nov 23 19:37:33 2005
@@ -12,7 +12,7 @@
# Make gcc generate dependencies.
BASECFLAGS += -Wp,-MD,.$(@F).d
PROG_DEP = .*.d
-BASECFLAGS+= -O0 -ggdb3 $(PROFILE)
+BASECFLAGS+= -O3 $(PROFILE)
#BASECFLAGS+= -I$(XEN_ROOT)/tools
BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc
BASECFLAGS+= -I.
diff -r 9ee811544c40 -r 8451c6567123 tools/xentrace/Makefile
--- a/tools/xentrace/Makefile Wed Nov 23 19:31:22 2005
+++ b/tools/xentrace/Makefile Wed Nov 23 19:37:33 2005
@@ -14,7 +14,7 @@
HDRS = $(wildcard *.h)
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
-BIN = xentrace tbctl setsize xenctx
+BIN = xentrace tbctl setsize
SCRIPTS = xentrace_format
MAN1 = $(wildcard *.1)
MAN8 = $(wildcard *.8)
diff -r 9ee811544c40 -r 8451c6567123 xen/Rules.mk
--- a/xen/Rules.mk Wed Nov 23 19:31:22 2005
+++ b/xen/Rules.mk Wed Nov 23 19:37:33 2005
@@ -2,8 +2,8 @@
# If you change any of these configuration options then you must
# 'make clean' before rebuilding.
#
-verbose ?= y
-debug ?= y
+verbose ?= n
+debug ?= n
perfc ?= n
perfc_arrays?= n
domu_debug ?= n
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home