[PATCH 1/3] Make to round memory to next page

[PATCH 1/3] Make to round memory to next page

[Anthony Liguori]

In general, the BIOS, VGA BIOS, and option ROMs are not required to be multiple
of page sizes.  This means that phys_ram_size may not be a multiple of page.
Address this at the kvm_create() level to make things simplier for future
callers.

Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

diff --git a/user/kvmctl.c b/user/kvmctl.c
index 846aac9..035ff43 100644
--- a/user/kvmctl.c
+++ b/user/kvmctl.c
@@ -40,6 +40,7 @@
 static int kvm_abi = EXPECTED_KVM_API_VERSION;
 
 #define PAGE_SIZE 4096ul
+#define PAGE_MASK (~(PAGE_SIZE - 1))
 
 /* FIXME: share this number with kvm */
 /* FIXME: or dynamically alloc/realloc regions */
@@ -232,11 +233,12 @@ int kvm_create_vcpu(kvm_context_t kvm, int slot)
 	return 0;
 }
 
-int kvm_create(kvm_context_t kvm, unsigned long memory, void **vm_mem)
+int kvm_create(kvm_context_t kvm, unsigned long phys_mem_bytes, void **vm_mem)
 {
 	unsigned long dosmem = 0xa0000;
 	unsigned long exmem = 0xc0000;
 	unsigned long pcimem = 0xf0000000;
+	unsigned long memory = (phys_mem_bytes + PAGE_SIZE - 1) & PAGE_MASK;
 	int fd = kvm->fd;
 	int zfd;
 	int r;

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/

[PATCH 2/3] Fix option ROM loading

[Anthony Liguori]

Make sure to copy the option ROMs into physical memory so they're visible to
KVM guests.  With the older BIOS, this allows -boot n to work although the CVS
BIOS does not work.

Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index a5c08bc..f2917ca 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -585,6 +585,11 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size, int boot_device,
 	}
 	cpu_register_physical_memory(0xd0000 + option_rom_offset,
 				     size, offset | IO_MEM_ROM);
+
+	if (kvm_allowed)
+		memcpy(phys_ram_base + 0xd0000 + option_rom_offset,
+		       phys_ram_base + offset, size);
+
 	option_rom_offset += size + 2047;
 	option_rom_offset -= (option_rom_offset % 2048);
     }

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/

[PATCH] Fix network boot with newer BIOS

[Anthony Liguori]

This patch is in QEMU CVS and allows network boot to work with newer BIOSes.
It was originally written by Bernhard Kauer and committed (and modified) by
Thiemo Seufer.

Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index f2917ca..d3b8786 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -214,6 +214,9 @@ static void cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, int boo
     case 'd':
         rtc_set_memory(s, 0x3d, 0x03); /* CD-ROM boot */
         break;
+    case 'n':
+        rtc_set_memory(s, 0x3d, 0x04); /* Expansion ROM boot */
+        break;
     }
 
     /* floppy type */
diff --git a/qemu/vl.c b/qemu/vl.c
index fcc899b..d67b12f 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -7521,7 +7521,6 @@ int main(int argc, char **argv)
 	    fprintf(stderr, "No valid PXE rom found for network device\n");
 	    exit(1);
 	}
-	boot_device = 'c'; /* to prevent confusion by the BIOS */
     }
 #endif
 

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/

Re: [PATCH 3/3] Fix network boot with newer BIOS

[Anthony Liguori]

Sorry, this should be 3/3.

Regards,

Anthony Liguori

On Wed, 2007-09-05 at 10:35 -0500, Anthony Liguori wrote:
> This patch is in QEMU CVS and allows network boot to work with newer BIOSes.
> It was originally written by Bernhard Kauer and committed (and modified) by
> Thiemo Seufer.
> 
> Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> 
> diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
> index f2917ca..d3b8786 100644
> --- a/qemu/hw/pc.c
> +++ b/qemu/hw/pc.c
> @@ -214,6 +214,9 @@ static void cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, int boo
>      case 'd':
>          rtc_set_memory(s, 0x3d, 0x03); /* CD-ROM boot */
>          break;
> +    case 'n':
> +        rtc_set_memory(s, 0x3d, 0x04); /* Expansion ROM boot */
> +        break;
>      }
> 
>      /* floppy type */
> diff --git a/qemu/vl.c b/qemu/vl.c
> index fcc899b..d67b12f 100644
> --- a/qemu/vl.c
> +++ b/qemu/vl.c
> @@ -7521,7 +7521,6 @@ int main(int argc, char **argv)
>  	    fprintf(stderr, "No valid PXE rom found for network device\n");
>  	    exit(1);
>  	}
> -	boot_device = 'c'; /* to prevent confusion by the BIOS */
>      }
>  #endif
> 


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/

Re: [PATCH 1/3] Make to round memory to next page

[Avi Kivity]

Anthony Liguori wrote:
> In general, the BIOS, VGA BIOS, and option ROMs are not required to be multiple
> of page sizes.  This means that phys_ram_size may not be a multiple of page.
> Address this at the kvm_create() level to make things simplier for future
> callers.
>
>   

Applied all three, thanks.

-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/