multiboot: Fix module loading and setting of mmap.

Signed-off-by: NAdam Lackorzynski <adam@os.inf.tu-dresden.de>
Acked-by: NAlexander Graf <agraf@suse.de>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

hw/pc.c

@@ -666,7 +666,7 @@ static int load_multiboot(void *fw_cfg,
 
             /* append module data at the end of last module */
             mb_kernel_data = qemu_realloc(mb_kernel_data,
-                                          mh_load_addr - mb_mod_end);
+                                          mb_mod_end - mh_load_addr);
             load_image(initrd_filename,
                        mb_kernel_data + mb_mod_start - mh_load_addr);
 

pc-bios/optionrom/multiboot.S

@@ -62,6 +62,9 @@ run_multiboot:
 	add		%eax, %ebx
 	movl		%ebx, %gs:GS_GDT_DESC + 2
 
+	xor		%eax, %eax
+	mov		%eax, %es
+
 	/* Read the bootinfo struct into RAM */
 	read_fw_blob(FW_CFG_INITRD)
 
@@ -71,7 +74,7 @@ run_multiboot:
 	mov		%ax, %fs
 
 	/* ES = mmap_addr */
-	mov		%eax, %fs:0x48
+	mov 		%fs:48, %eax
 	shr		$4, %eax
 	mov		%ax, %es