[Xen-changelog] [xen-unstable] Merge

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Tim Deegan <tim@xxxxxxx>
# Date 1332412005 0
# Node ID 8180cb3895af71d090fa82d66b012f1f65029055
# Parent  4347c2a26913b02e84c337a7969d8c4b33ab96ba
# Parent  6bf50858c3c5e2cc1e863336628111e00cbf09fc
Merge
---


diff -r 4347c2a26913 -r 8180cb3895af .hgignore
--- a/.hgignore Thu Mar 22 10:23:28 2012 +0000
+++ b/.hgignore Thu Mar 22 10:26:45 2012 +0000
@@ -289,6 +289,8 @@
 ^tools/xm-test/lib/XmTestLib/config.py$
 ^tools/xm-test/lib/XmTestReport/xmtest.py$
 ^tools/xm-test/tests/.*\.test$
+^tools/firmware/ovmf-remote
+^tools/firmware/ovmf$
 ^tools/qemu-xen-traditional-dir-remote
 ^tools/qemu-xen-traditional-dir$
 ^tools/qemu-xen-dir-remote
diff -r 4347c2a26913 -r 8180cb3895af Config.mk
--- a/Config.mk Thu Mar 22 10:23:28 2012 +0000
+++ b/Config.mk Thu Mar 22 10:26:45 2012 +0000
@@ -191,12 +191,15 @@
 endif
 
 ifeq ($(GIT_HTTP),y)
+OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git
 QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git
 SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git
 else
+OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git
 QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 endif
+OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871
 QEMU_UPSTREAM_REVISION ?= master
 SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2
 # Sun Mar 11 09:27:07 2012 -0400
@@ -204,7 +207,7 @@
 
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
-CONFIG_OVMF ?= n
+CONFIG_OVMF ?= $(CONFIG_Linux)
 CONFIG_ROMBIOS ?= y
 CONFIG_SEABIOS ?= y
 
diff -r 4347c2a26913 -r 8180cb3895af docs/misc/xen-command-line.markdown
--- a/docs/misc/xen-command-line.markdown       Thu Mar 22 10:23:28 2012 +0000
+++ b/docs/misc/xen-command-line.markdown       Thu Mar 22 10:26:45 2012 +0000
@@ -8,7 +8,7 @@
 
 Most parameters take the form `option=value`.  Different options on the 
command line should be space delimited.
 
-### Boolean
+### Boolean (`<boolean>`)
 
 All boolean option may be explicitly enabled using a `value` of
 > `yes`, `on`, `true`, `enable` or `1`
@@ -29,11 +29,11 @@
 Enable synchronous console mode
 > `sync_console`
 
-### Integer
+### Integer (`<integer>`)
 
 An integer parameter will default to decimal and may be prefixed with a `-` 
for negative numbers.  Alternativly, a hexidecimal number may be used by 
prefixing the number with `0x`, or an octal number may be used if a leading `0` 
is present.
 
-### Size
+### Size (`<size>`)
 
 A size parameter may be any integer, with a size suffix
 
@@ -96,7 +96,7 @@
 ### ats
 ### availmem
 ### badpage
-> `= List of [ <integer> | <ingeter>-<integer> ]`
+> `= List of [ <integer> | <integer>-<integer> ]`
 
 Specify that certain pages, or certain ranges of pages contain bad bytes and 
should not be used.  For example, if your memory tester says that byte 
`0x12345678` is bad, you would place `badpage=0x12345` on Xen's command line.
 
@@ -219,13 +219,22 @@
 Specify the total size for dom0.
 
 ### dom0\_mem (x86)
-> `= List of ( min:<value> | max: <value> | <value> )`
+> `= List of ( min:<size> | max:<size> | <size> )`
 
-each `<value>` is a size parameter.  If the size is positive, it represents an 
absolute value.  If the size is negative, the size specified is subtracted from 
the total available memory.
+Set the amount of memory for the initial domain (dom0). If a size is
+positive, it represents an absolute value.  If a size is negative, the
+size specified is subtracted from the total available memory.
 
-* `min:<value>` specifies the minimum amount of memory allocated to dom0.
-* `max:<value>` specifies the maximum amount of memory allocated to dom0.
-* `<value>` specified the exact amount of memory allocated to dom0.
+* `min:<size>` specifies the minimum amount of memory allocated to dom0.
+* `max:<size>` specifies the maximum amount of memory allocated to dom0.
+* `<size>` specified the exact amount of memory allocated to dom0.
+
+`max:<size>` also sets the maximum reservation (the maximum amount of
+memory dom0 can balloon up to).  If this is omitted then the maximum
+reservation is unlimited.
+
+For example, to set dom0's memory to 512 MB but no more than 1 GB use
+`dom0_mem=512M,max:1G`.
 
 ### dom0\_shadow
 ### dom0\_vcpus\_pin
diff -r 4347c2a26913 -r 8180cb3895af tools/firmware/Makefile
--- a/tools/firmware/Makefile   Thu Mar 22 10:23:28 2012 +0000
+++ b/tools/firmware/Makefile   Thu Mar 22 10:26:45 2012 +0000
@@ -6,12 +6,17 @@
 INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR)
 
 SUBDIRS-y :=
+SUBDIRS-$(CONFIG_OVMF) += ovmf
 SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
 SUBDIRS-$(CONFIG_ROMBIOS) += rombios
 SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
 SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
 SUBDIRS-y += hvmloader
 
+ovmf:
+       GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) 
$(OVMF_UPSTREAM_REVISION) ovmf
+       cp ovmf-makefile ovmf/Makefile;
+
 seabios-dir:
        GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) 
$(SEABIOS_UPSTREAM_TAG) seabios-dir
        cp seabios-config seabios-dir/.config;
@@ -44,9 +49,35 @@
 subdir-distclean-etherboot: .phony
        $(MAKE) -C etherboot distclean
 
+subdir-distclean-ovmf: .phony
+       rm -rf ovmf ovmf-remote
+
 subdir-distclean-seabios-dir: .phony
        rm -rf seabios-dir seabios-dir-remote
 
+.PHONY: ovmf-find
+ovmf-find:
+       if test -d $(OVMF_UPSTREAM_URL) ; then \
+                      mkdir -p ovmf; \
+        else \
+                export GIT=$(GIT); \
+                $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) 
$(OVMF_UPSTREAM_REVISION) ovmf ; \
+        fi
+
+.PHONY: ovmf-force-update
+ovmf-force-update:
+       set -ex; \
+       if [ "$(OVMF_UPSTREAM_REVISION)" ]; then \
+               cd ovmf-remote; \
+               $(GIT) fetch origin; \
+               $(GIT) reset --hard $(OVMF_UPSTREAM_REVISION); \
+       fi
+
+subdir-clean-ovmf:
+       set -e; if test -d ovmf/.; then \
+               $(MAKE) -C ovmf clean; \
+       fi
+
 .PHONY: seabios-dir-force-update
 seabios-dir-force-update:
        set -ex; \
diff -r 4347c2a26913 -r 8180cb3895af tools/firmware/ovmf-makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/firmware/ovmf-makefile      Thu Mar 22 10:26:45 2012 +0000
@@ -0,0 +1,17 @@
+# OVMF building system is not ready yet to run in parallel.
+# Force it to be serial in order to exploit parallelism for neighbors.
+
+.NOTPARALLEL:
+MAKEFLAGS  += -j1
+
+.PHONY: all
+all: ovmf.bin
+
+.PHONY: ovmf.bin
+ovmf.bin:
+       OvmfPkg/build.sh -a X64
+       cp Build/OvmfX64/DEBUG_GCC44/FV/OVMF.fd ovmf.bin
+
+.PHONY: clean
+clean:
+       rm -rf ovmf.bin Build/*

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