# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxxx
# Node ID 5aaebfc580a64555d621eed2fdecda730df873f1
# Parent 0f2fa123585181cc56c04d6d240ba268867c7bbc
# Parent 77f397603f71be1c57a0a998dcbd772b2b6b745c
manual merge
diff -r 0f2fa1235851 -r 5aaebfc580a6 tools/examples/xmexample.vmx
--- a/tools/examples/xmexample.vmx Fri Jul 1 10:52:07 2005
+++ b/tools/examples/xmexample.vmx Fri Jul 1 10:55:46 2005
@@ -89,10 +89,10 @@
# New stuff
-device_model = '/usr/bin/qemu-dm'
+device_model = '/usr/lib/xen/bin/qemu-dm'
# Advanced users only. Don't touch if you don't know what you're doing
-memmap = '/etc/xen/mem-map.sxp'
+memmap = '/usr/lib/xen/boot/mem-map.sxp'
#-----------------------------------------------------------------------------
# Disk image for
diff -r 0f2fa1235851 -r 5aaebfc580a6 xen/Makefile
--- a/xen/Makefile Fri Jul 1 10:52:07 2005
+++ b/xen/Makefile Fri Jul 1 10:55:46 2005
@@ -97,7 +97,7 @@
-e 's/@@version@@/$(XEN_VERSION)/g' \
-e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
-e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
- -e 's!@@changeset@@!$(shell bk changes -nd':D: :T: :REV: :MD5KEY:'
-r+ 2>/dev/null || echo information unavailable)!g' \
+ -e 's!@@changeset@@!$(shell (hg tip | awk
'/changeset/{CS=$$2};{FS="date:[ ]+"}/date/{D=$$2}; END {print D, CS}')
2>/dev/null || echo information unavailable)!g' \
< include/xen/compile.h.in > $@.new
@cat include/xen/banner.h >> $@.new
@mv -f $@.new $@
diff -r 0f2fa1235851 -r 5aaebfc580a6 tools/ioemu/target-i386-dm/Makefile
--- a/tools/ioemu/target-i386-dm/Makefile Fri Jul 1 10:52:07 2005
+++ b/tools/ioemu/target-i386-dm/Makefile Fri Jul 1 10:55:46 2005
@@ -3,12 +3,11 @@
include config.mak
override TARGET_ARCH=i386
-#assume we directly put qemu code in tools/, same level as bochs dm(ioemu)
-XEN_PATH=../../..
+INSTALL_DIR := $(DESTDIR)/usr/lib/xen/bin
TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
-DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_PATH)/xen/include/public
-DEFINES+= -I$(XEN_PATH)/tools/libxc
+DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_ROOT)/xen/include/public
+DEFINES+= -I$(XEN_ROOT)/tools/libxc
ifdef CONFIG_USER_ONLY
VPATH+=:$(SRC_PATH)/linux-user
DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
@@ -32,7 +31,7 @@
endif
QEMU_SYSTEM=qemu-dm
-PROGS=$(QEMU_SYSTEM)
+PROGS=$(QEMU_SYSTEM) $(QEMU_SYSTEM).debug
ifdef CONFIG_USER_ONLY
PROGS=$(QEMU_USER)
@@ -383,12 +382,11 @@
rm -rf *.o *.a *~ $(PROGS) gen-op.h opc.h op.h nwfpe slirp
qemu-vgaram-bin
install: all
- if [ ! -d $(DESTDIR)$(bindir) ];then mkdir -p $(DESTDIR)$(bindir);fi
+ if [ ! -d $(INSTALL_DIR) ];then mkdir -p $(INSTALL_DIR);fi
if [ ! -d $(DESTDIR)$(configdir) ];then mkdir -p
$(DESTDIR)$(configdir);fi
ifneq ($(PROGS),)
- install -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
-endif
- install -m 755 qemu-dm.debug "$(DESTDIR)$(bindir)"
+ install -m 755 -s $(PROGS) "$(INSTALL_DIR)"
+endif
install -m 755 qemu-ifup "$(DESTDIR)$(configdir)"
gunzip -c qemu-vgaram-bin.gz >qemu-vgaram-bin
install -m 755 qemu-vgaram-bin "$(DESTDIR)$(configdir)"
diff -r 0f2fa1235851 -r 5aaebfc580a6 tools/examples/Makefile
--- a/tools/examples/Makefile Fri Jul 1 10:52:07 2005
+++ b/tools/examples/Makefile Fri Jul 1 10:55:46 2005
@@ -13,8 +13,6 @@
XEN_CONFIGS += xmexample1
XEN_CONFIGS += xmexample2
XEN_CONFIGS += xmexample.vmx
-XEN_CONFIGS += mem-map.sxp
-XEN_CONFIGS += bochsrc
# Xen script dir and scripts to go there.
XEN_SCRIPT_DIR = /etc/xen/scripts
@@ -23,10 +21,13 @@
XEN_SCRIPTS += block-file
XEN_SCRIPTS += block-enbd
+XEN_BOOT_DIR = /usr/lib/xen/boot
+XEN_BOOT = mem-map.sxp
+
all:
build:
-install: all install-initd install-configs install-scripts
+install: all install-initd install-configs install-scripts install-boot
install-initd:
[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
@@ -51,4 +52,12 @@
$(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
done
+install-boot:
+ [ -d $(DESTDIR)$(XEN_BOOT_DIR) ] || \
+ $(INSTALL_DIR) $(DESTDIR)$(XEN_BOOT_DIR)
+ for i in $(XEN_BOOT); \
+ do [ -a $(DESTDIR)$(XEN_BOOT_DIR)/$$i ] || \
+ $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_BOOT_DIR); \
+ done
+
clean:
diff -r 0f2fa1235851 -r 5aaebfc580a6 tools/examples/bochsrc
--- a/tools/examples/bochsrc Fri Jul 1 10:52:07 2005
+++ /dev/null Fri Jul 1 10:55:46 2005
@@ -1,20 +0,0 @@
-#megs: 32
-#romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
-#vgaromimage: $BXSHARE/VGABIOS-lgpl-latest
-floppya: 1_44=a.img, status=inserted
-floppyb: 1_44=b.img, status=inserted
-# if you don't use absolute paths below, bochs looks under the cwd of xend,
-# which is usually "/"
-#ata0-master: type=disk, path=/var/images/min-el3-i386.img, cylinders=800,
heads=4, spt=32
-i440fxsupport: enabled=1
-ne2k: ioaddr=0x300, irq=9, mac=b0:c4:22:01:00:00, ethmod=linux, ethdev=eth0
-ata0-master: type=disk, path=/var/images/1g-el3-i386.img, mode=flat,
cylinders=2048, heads=16, spt=63
-boot: c
-
-log: /tmp/bochsout.txt
-#debug: action=report
-info: action=report
-error: action=report
-panic: action=ask
-
-mouse: enabled=0
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home