Index: contrib/qemu/build-from-scratch.sh
===================================================================
--- contrib/qemu/build-from-scratch.sh	(revision 741b2fb1909363f2ca0ec5f58957ea347df82946)
+++ contrib/qemu/build-from-scratch.sh	(revision 38097a43374a7a1317712a204482adbbca1bda8e)
@@ -29,5 +29,5 @@
 #
 
-VERSION=2.6.0
+VERSION=2.7.0
 BASENAME=qemu-${VERSION}
 BASENAME_MASTER=qemu-master
@@ -36,5 +36,5 @@
 URL=http://wiki.qemu-project.org/download/${TARBALL}
 REPO=git://git.qemu.org/qemu.git
-MD5="ca3f70b43f093e33e9e014f144067f13"
+MD5="08d4d06d1cb598efecd796137f4844ab"
 
 if [ "$1" == "--master" ]; then
@@ -53,4 +53,5 @@
 	tar xvfj ${TARBALL}
 	cd ${SOURCEDIR}
+	patch -p 1 <../integratorcm_init_memsz.patch
 fi
 
Index: contrib/qemu/integratorcm_init_memsz.patch
===================================================================
--- contrib/qemu/integratorcm_init_memsz.patch	(revision 38097a43374a7a1317712a204482adbbca1bda8e)
+++ contrib/qemu/integratorcm_init_memsz.patch	(revision 38097a43374a7a1317712a204482adbbca1bda8e)
@@ -0,0 +1,30 @@
+diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
+index 96dc150..3d88369 100644
+--- a/hw/arm/integratorcp.c
++++ b/hw/arm/integratorcp.c
+@@ -247,7 +247,9 @@ static void integratorcm_init(Object *obj)
+ {
+     IntegratorCMState *s = INTEGRATOR_CM(obj);
+     SysBusDevice *dev = SYS_BUS_DEVICE(obj);
++    MachineState *machine = MACHINE(qdev_get_machine());
+ 
++    s->memsz = machine->ram_size >> 20;
+     s->cm_osc = 0x01000048;
+     /* ??? What should the high bits of this value be?  */
+     s->cm_auxosc = 0x0007feff;
+@@ -574,7 +576,6 @@ static void integratorcp_init(MachineState *machine)
+     memory_region_add_subregion(address_space_mem, 0x80000000, ram_alias);
+ 
+     dev = qdev_create(NULL, TYPE_INTEGRATOR_CM);
+-    qdev_prop_set_uint32(dev, "memsz", ram_size >> 20);
+     qdev_init_nofail(dev);
+     sysbus_mmio_map((SysBusDevice *)dev, 0, 0x10000000);
+ 
+@@ -624,7 +625,6 @@ static void integratorcp_machine_init(MachineClass *mc)
+ DEFINE_MACHINE("integratorcp", integratorcp_machine_init)
+ 
+ static Property core_properties[] = {
+-    DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0),
+     DEFINE_PROP_END_OF_LIST(),
+ };
+