maybe pxeboot doesnt work in kvm-28

Hi

I cant get pxeboot to work in kvm-28. I built kvm-28 on ubuntu 7.04 (feisty) and everything has worked great. But when testing pxeboot with:

/usr/local/kvm/bin/qemu -net nic,vlan=0 -net tap,vlan=0,script=/etc/qemu-ifup2,ifname=foo kvm-stuff/etch.qcow2.img -boot n

It doesnt work. It boots c instead. But with -no-kvm it works and also a separate qemu works without trouble. I can file a bug, but it would be great if some more can test pxe first to confirm the behaviour.

I use pxelinux 3.51 against a debian server (sarge).

qemu-ifup2:

#!/bin/sh
sudo /sbin/ifconfig $1 0.0.0.0 promisc up
sudo /usr/sbin/brctl addif br0 $1

Standard qemu networking with bridge.

regards

//Peter

While QEMU can remap portions of physical ram to a higher address in phys_ram_base, KVM requires that the memory be present where it would be in physical memory. Make sure to copy the option ROMs to the right space in physical memory when KVM is enabled.

Signed-off-by Anthony Liguori <aliguori-r/[email protected]>

qemu/hw/pc.c +2 -2

index eda49cf..a6e4ea1 100644
@@ -558,14 +558,20 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
 
     option_rom_offset = 0;
     for (i = 0; i < nb_option_roms; i++) {
-	int offset = bios_offset + bios_size + option_rom_offset;
+	int offset = bios_size + option_rom_offset;
 	int size;
 
-	size = load_image(option_rom[i], phys_ram_base + offset);
+	size = load_image(option_rom[i], phys_ram_base + bios_offset + offset);
 	if ((size + option_rom_offset) > 0x10000) {
 	    fprintf(stderr, "Too many option ROMS\n");
 	    exit(1);

Quoted 31 lines · Anthony Liguori

While QEMU can remap portions of physical ram to a higher address in phys_ram_base, KVM requires that the memory be present where it would be in
physical memory. Make sure to copy the option ROMs to the right space in
physical memory when KVM is enabled.

Signed-off-by Anthony Liguori <aliguori-r/[email protected]>

qemu/hw/pc.c +5 -2

index eda49cf..a6e4ea1 100644
@@ -558,14 +558,20 @@ static void pc_init1(int ram_size, int 
 vga_ram_size, int boot_device,
          option_rom_offset = 0;
     for (i = 0; i < nb_option_roms; i++) {
-    int offset = bios_offset + bios_size + option_rom_offset;
+    int offset = bios_size + option_rom_offset;
     int size;
 
-    size = load_image(option_rom[i], phys_ram_base + offset);
+    size = load_image(option_rom[i], phys_ram_base + bios_offset + 
 offset);
     if ((size + option_rom_offset) > 0x10000) {
         fprintf(stderr, "Too many option ROMS\n");
         exit(1);
     }
+
+    if (kvm_allowed)
+        memcpy(phys_ram_base + 0xc0000 + offset,

qemu/hw/pc.c static void pc_init1(int ram_size, int vga_ram_size, int boot_device, · line 576

Quoted 6 lines

qemu/hw/pc.c +3 -0

+           phys_ram_base + bios_offset + offset,
+           size);
+
     cpu_register_physical_memory(0xd0000 + option_rom_offset,
                      size, offset | IO_MEM_ROM);

#ifdef USE_KVM is needed here.

Quoted 3 lines

Quoted 1 line

#ifdef USE_KVM is needed here.

I thought a patch was recently submitted that made kvm_allowed not depend on USE_KVM?

If not, do you have a problem with one?