rpms/xen/devel xen-hvm-kernel-boot-nonrelocatable.patch, NONE, 1.1.2.1 xen-hvm-kernel-boot-relocatable.patch, NONE, 1.1.2.1 xen-hvm-kernel-boot-xend.patch, NONE, 1.1.2.1 xen-smx.patch, NONE, 1.1.2.1 xen.spec, 1.194.2.10, 1.194.2.11
Daniel P. Berrange (berrange)
fedora-extras-commits at redhat.com
Tue Dec 18 17:15:05 UTC 2007
Author: berrange
Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28390
Modified Files:
Tag: private-berrange-xen-unstable
xen.spec
Added Files:
Tag: private-berrange-xen-unstable
xen-hvm-kernel-boot-nonrelocatable.patch
xen-hvm-kernel-boot-relocatable.patch
xen-hvm-kernel-boot-xend.patch xen-smx.patch
Log Message:
Fix booting on CPUS without SMX. Add direct kernel boot for HVM
xen-hvm-kernel-boot-nonrelocatable.patch:
--- NEW FILE xen-hvm-kernel-boot-nonrelocatable.patch ---
diff -r f5607a660419 tools/ioemu/hw/pc.c
--- a/tools/ioemu/hw/pc.c Mon Nov 05 09:20:52 2007 -0500
+++ b/tools/ioemu/hw/pc.c Mon Nov 05 09:28:17 2007 -0500
@@ -418,6 +418,73 @@ static void generate_bootsect(uint32_t g
}
+/*
+ * We have a non-relocatable kernel loaded at some address like src=0x200000
+ * which is cnt=1234567 bytes in length
+ *
+ * Before we run this kernel though, we need to move it to dst=0x100000
+ *
+ * So we put the following snippet of asm at addr=0x200000+kernel_size
+ * which basically does memmove(0x10000, 0x20000, cnt). code32_start in
+ * the realmode header is set to addr=0x20000+kenrel_size, so that it runs
+ * our little helper. The last thing our helper does is jump to the final
+ * address 0x10000
+ *
+ * Except this code below rarely works. We're overwriting something important
+ * somewhere or getting some register setup wrong. Who knows. The general
+ * idea seems to work - we sometimes partially boot at least. Mere matter of
+ * fixing the bugs.....
+ */
+static void setup_relocator(target_phys_addr_t addr, size_t dst, size_t src, size_t cnt)
+{
+ target_phys_addr_t stack = addr + 0x500;
+#define buf buf2
+ uint8_t buf1[] = {
+ /* 0: */ 0xfa, /* cli */
+ /* 1: */ 0xfc, /* cld */
+ /* 2: */ 0x8c, 0xc8, /* movl %cs,%eax */
+ /* 4: */ 0x8e, 0xd8, /* movl %eax,%ds */
+ /* 6: */ 0x8e, 0xc0, /* movl %eax,%es */
+ /* 8: */ 0x8b, 0x35, (src&0xff),((src>>8)&0xff),((src>>16)&0xff),((src>>24)&0xff), /* movl $src,%esi */
+ /* e: */ 0x8b, 0x3d, (dst&0xff),((dst>>8)&0xff),((dst>>16)&0xff),((dst>>24)&0xff), /* movl $dst,%edi */
+ /* 14: */ 0x8b, 0x0d, (cnt&0xff),((cnt>>8)&0xff),((cnt>>16)&0xff),((cnt>>24)&0xff), /* movl $cnt,%eci */
+ /* 1a: */ 0xf3, 0xa4, /* rep movsb %ds:(%esi),%es:(%edi) */
+ /* 1c: */ 0xe8,(dst&0xff),((dst>>8)&0xff),((dst>>16)&0xff),((dst>>24)&0xff), /* call $dst */
+ };
+ uint8_t buf2[] = {
+ 0xfa,
+
+ 0xbc, (stack&0xff),((stack>>8)&0xff),((stack>>16)&0xff),((stack>>24)&0xff), /* mov $stack,%esp */
+ /* 0: */ 0x55, /* push %ebp */
+ /* 1: */ 0x89, 0xe5, /* mov %esp,%ebp */
+ /* 3: */ 0x83, 0xec, 0x18, /* sub $0x18,%esp */
+ /* 6: */ 0xc7, 0x45, 0xfc, (src&0xff),((src>>8)&0xff),((src>>16)&0xff),((src>>24)&0xff), /* movl $0x12345678,0xfffffffc(%ebp) */
+ /* d: */ 0xc7, 0x45, 0xf8, (dst&0xff),((dst>>8)&0xff),((dst>>16)&0xff),((dst>>24)&0xff), /* movl $0xabcdef12,0xfffffff8(%ebp) */
+ /* 14: */ 0xc7, 0x45, 0xf4, (cnt&0xff),((cnt>>8)&0xff),((cnt>>16)&0xff),((cnt>>24)&0xff), /* movl $0xa1b2c3d4,0xfffffff4(%ebp) */
+ /* 1b: */ 0xc7, 0x45, 0xfc, 0x00, 0x00, 0x00, 0x00, /* movl $0x0,0xfffffffc(%ebp) */
+ /* 22: */ 0xeb, 0x1d, /* jmp 41 <relocate+0x41> */
+ /* 24: */ 0x8b, 0x45, 0xf4, /* mov 0xfffffff4(%ebp),%eax */
+ /* 27: */ 0x89, 0xc2, /* mov %eax,%edx */
+ /* 29: */ 0x8b, 0x45, 0xfc, /* mov 0xfffffffc(%ebp),%eax */
+ /* 2c: */ 0x8d, 0x0c, 0x02, /* lea (%edx,%eax,1),%ecx */
+ /* 2f: */ 0x8b, 0x45, 0xf8, /* mov 0xfffffff8(%ebp),%eax */
+ /* 32: */ 0x89, 0xc2, /* mov %eax,%edx */
+ /* 34: */ 0x8b, 0x45, 0xfc, /* mov 0xfffffffc(%ebp),%eax */
+ /* 37: */ 0x8d, 0x04, 0x02, /* lea (%edx,%eax,1),%eax */
+ /* 3a: */ 0x8a, 0x00, /* mov (%eax),%al */
+ /* 3c: */ 0x88, 0x01, /* mov %al,(%ecx) */
+ /* 3e: */ 0xff, 0x45, 0xfc, /* incl 0xfffffffc(%ebp) */
+ /* 41: */ 0x8b, 0x45, 0xf0, /* mov 0xfffffff0(%ebp),%eax */
+ /* 44: */ 0x39, 0x45, 0xfc, /* cmp %eax,0xfffffffc(%ebp) */
+ /* 49: */ 0x8b, 0x45, 0xf4, /* mov 0xfffffff4(%ebp),%eax */
+ /* 4c: */ 0xff, 0xd0, /* call *%eax */
+
+ };
+ fprintf(stderr, "Setting up %#zx byte helper at %#zx to move %#zx bytes from %#zx to %#zx\n", sizeof(buf), addr, cnt, src, dst);
+ cpu_physical_memory_rw(addr, buf, sizeof(buf), 1);
+}
+
+
static long get_file_size(FILE *f)
{
long where, size;
@@ -597,8 +664,16 @@ static void load_linux(const char *kerne
stl_p(header+0x214, reloc_prot_addr);
fprintf(stderr, "qemu: kernel is relocatable\n");
} else {
- fprintf(stderr, "qemu: unable to load non-relocatable kernel\n");
- exit(1);
+ /* Setup a helper which moves kernel back to
+ * its expected addr after firmware has got out
+ * of the way. We put a helper at reloc_prot_addr+kernel_size.
+ * It moves kernel from reloc_prot_addr to prot_addr and
+ * then jumps to prot_addr. Yes this is sick.
+ */
+ setup_relocator(reloc_prot_addr+kernel_size, prot_addr, reloc_prot_addr, kernel_size);
+ stl_p(header+0x214, reloc_prot_addr+kernel_size);
+ fprintf(stderr, "qemu: kernel needs helper at %#zx to relocate from %#zx to %#zx\n",
+ reloc_prot_addr+kernel_size, reloc_prot_addr, prot_addr);
}
}
xen-hvm-kernel-boot-relocatable.patch:
--- NEW FILE xen-hvm-kernel-boot-relocatable.patch ---
diff -rup xen-unstable-16606.orig/tools/ioemu/hw/pc.c xen-unstable-16606.new/tools/ioemu/hw/pc.c
--- xen-unstable-16606.orig/tools/ioemu/hw/pc.c 2007-12-17 17:52:29.000000000 -0500
+++ xen-unstable-16606.new/tools/ioemu/hw/pc.c 2007-12-17 17:53:51.000000000 -0500
@@ -31,10 +31,8 @@
#define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
#define LINUX_BOOT_FILENAME "linux_boot.bin"
-#define KERNEL_LOAD_ADDR 0x00100000
-#define INITRD_LOAD_ADDR 0x00600000
-#define KERNEL_PARAMS_ADDR 0x00090000
-#define KERNEL_CMDLINE_ADDR 0x00099000
+/* Leave a chunk of memory at the top of RAM for the BIOS ACPI tables. */
+#define ACPI_DATA_SIZE 0x10000
static fdctrl_t *floppy_controller;
static RTCState *rtc_state;
@@ -363,36 +361,271 @@ void bochs_bios_init(void)
register_ioport_write(0x503, 1, 1, bochs_bios_write, NULL);
}
+/* Generate an initial boot sector which sets state and jump to
+ a specified vector */
+static void generate_bootsect(uint32_t gpr[8], uint16_t segs[6], uint16_t ip)
+{
+ uint8_t bootsect[512], *p;
+ int i;
+
+ if (bs_table[0] == NULL) {
+ fprintf(stderr, "A disk image must be given for 'hda' when booting "
+ "a Linux kernel\n");
+ exit(1);
+ }
+
+ memset(bootsect, 0, sizeof(bootsect));
+
+ /* Copy the MSDOS partition table if possible */
+ bdrv_read(bs_table[0], 0, bootsect, 1);
+
+ /* Make sure we have a partition signature */
+ bootsect[510] = 0x55;
+ bootsect[511] = 0xaa;
+
+ /* Actual code */
+ p = bootsect;
+ *p++ = 0xfa; /* CLI */
+ *p++ = 0xfc; /* CLD */
+
+ for (i = 0; i < 6; i++) {
+ if (i == 1) /* Skip CS */
+ continue;
-int load_kernel(const char *filename, uint8_t *addr,
- uint8_t *real_addr)
+ *p++ = 0xb8; /* MOV AX,imm16 */
+ *p++ = segs[i];
+ *p++ = segs[i] >> 8;
+ *p++ = 0x8e; /* MOV <seg>,AX */
+ *p++ = 0xc0 + (i << 3);
+ }
+
+ for (i = 0; i < 8; i++) {
+ *p++ = 0x66; /* 32-bit operand size */
+ *p++ = 0xb8 + i; /* MOV <reg>,imm32 */
+ *p++ = gpr[i];
+ *p++ = gpr[i] >> 8;
+ *p++ = gpr[i] >> 16;
+ *p++ = gpr[i] >> 24;
+ }
+
+ *p++ = 0xea; /* JMP FAR */
+ *p++ = ip; /* IP */
+ *p++ = ip >> 8;
+ *p++ = segs[1]; /* CS */
+ *p++ = segs[1] >> 8;
+
+ bdrv_set_boot_sector(bs_table[0], bootsect, sizeof(bootsect));
+}
+
+
+static long get_file_size(FILE *f)
{
- int fd, size;
- int setup_sects;
+ long where, size;
+
+ /* XXX: on Unix systems, using fstat() probably makes more sense */
+
+ where = ftell(f);
+ fseek(f, 0, SEEK_END);
+ size = ftell(f);
+ fseek(f, where, SEEK_SET);
- fd = open(filename, O_RDONLY | O_BINARY);
- if (fd < 0)
- return -1;
-
- /* load 16 bit code */
- if (read(fd, real_addr, 512) != 512)
- goto fail;
- setup_sects = real_addr[0x1F1];
- if (!setup_sects)
- setup_sects = 4;
- if (read(fd, real_addr + 512, setup_sects * 512) !=
- setup_sects * 512)
- goto fail;
-
- /* load 32 bit code */
- size = read(fd, addr, 16 * 1024 * 1024);
- if (size < 0)
- goto fail;
- close(fd);
return size;
- fail:
- close(fd);
- return -1;
+}
+
+static int fread2guest(target_phys_addr_t dst_addr, size_t nbytes, FILE *f)
+{
+ size_t offset = 0;
+ while (nbytes) {
+ uint8_t buf[4096];
+ size_t count = nbytes > sizeof(buf) ? sizeof(buf) : nbytes;
+ if (fread(buf, 1, count, f) != count)
+ return -1;
+
+ cpu_physical_memory_rw(dst_addr+offset, buf, count, 1);
+ offset += count;
+ nbytes -= count;
+ }
+ return 0;
+}
+
+static void load_linux(const char *kernel_filename,
+ const char *initrd_filename,
+ const char *kernel_cmdline)
+{
+ uint16_t protocol;
+ uint32_t gpr[8];
+ uint16_t seg[6];
+ uint16_t real_seg;
+ int setup_size, kernel_size, initrd_size, cmdline_size;
+ uint32_t initrd_max;
+ uint8_t header[1024];
+ target_phys_addr_t real_addr, reloc_prot_addr, prot_addr, cmdline_addr, initrd_addr;
+ size_t ncmdline;
+ FILE *f, *fi;
+
+ /* Align to 16 bytes as a paranoia measure */
+ cmdline_size = (strlen(kernel_cmdline)+16) & ~15;
+
+ /* load the kernel header */
+ f = fopen(kernel_filename, "rb");
+ if (!f || !(kernel_size = get_file_size(f)) ||
+ fread(header, 1, 1024, f) != 1024) {
+ fprintf(stderr, "qemu: could not load kernel '%s'\n",
+ kernel_filename);
+ exit(1);
+ }
+
+ /* kernel protocol version */
+ fprintf(stderr, "header magic: %#x\n", ldl_p(header+0x202));
+ if (ldl_p(header+0x202) == 0x53726448)
+ protocol = lduw_p(header+0x206);
+ else
+ protocol = 0;
+ fprintf(stderr, "header protocol: %x\n", protocol);
+ if (protocol < 0x200 || !(header[0x211] & 0x01)) {
+ /* Low kernel */
+ real_addr = 0x90000;
+ cmdline_addr = 0x9a000 - cmdline_size;
+ prot_addr = 0x10000;
+ reloc_prot_addr = prot_addr;
+ } else if (protocol < 0x202) {
+ /* High but ancient kernel */
+ real_addr = 0x90000;
+ cmdline_addr = 0x9a000 - cmdline_size;
+ prot_addr = 0x100000;
+ reloc_prot_addr = 0x200000;
+ } else {
+ /* High and recent kernel */
+ real_addr = 0x10000;
+ cmdline_addr = 0x20000;
+ prot_addr = 0x100000;
+ reloc_prot_addr = 0x200000;
+ }
+
+ fprintf(stderr,
+ "qemu: real_addr = %#zx\n"
+ "qemu: cmdline_addr = %#zx\n"
+ "qemu: prot_addr = %#zx\n",
+ real_addr,
+ cmdline_addr,
+ prot_addr);
+
+ /* highest address for loading the initrd */
+ if (protocol >= 0x203)
+ initrd_max = ldl_p(header+0x22c);
+ else
+ initrd_max = 0x37ffffff;
+
+ if (initrd_max >= ram_size-ACPI_DATA_SIZE)
+ initrd_max = ram_size-ACPI_DATA_SIZE-1;
+
+
+ /* kernel command line */
+ ncmdline = strlen(kernel_cmdline);
+ if (ncmdline > 4095) {
+ ncmdline = 4095;
+ ((uint8_t*)kernel_cmdline)[4095] = '\0';
+ }
+ fprintf(stderr, "qemu: kernel_cmdline: %#zx ('%s')\n", ncmdline, kernel_cmdline);
+ cpu_physical_memory_rw(cmdline_addr, (uint8_t*)kernel_cmdline, ncmdline+1, 1);
+
+ if (protocol >= 0x202) {
+ stl_p(header+0x228, cmdline_addr);
+ } else {
+ stw_p(header+0x20, 0xA33F);
+ stw_p(header+0x22, cmdline_addr-real_addr);
+ }
+
+ /* loader type */
+ /* High nybble = B reserved for Qemu; low nybble is revision number.
+ If this code is substantially changed, you may want to consider
+ incrementing the revision. */
+ if (protocol >= 0x200)
+ header[0x210] = 0xB0;
+
+ /* heap */
+ if (protocol >= 0x201) {
+ header[0x211] |= 0x80; /* CAN_USE_HEAP */
+ stw_p(header+0x224, cmdline_addr-real_addr-0x200);
+ }
+
+ /* load initrd */
+ if (initrd_filename) {
+ if (protocol < 0x200) {
+ fprintf(stderr, "qemu: linux kernel too old to load a ram disk\n");
+ exit(1);
+ }
+
+ fi = fopen(initrd_filename, "rb");
+ if (!fi) {
+ fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
+ initrd_filename);
+ exit(1);
+ }
+
+ initrd_size = get_file_size(fi);
+ initrd_addr = ((initrd_max-initrd_size) & ~4095);
+
+ fprintf(stderr, "qemu: loading initrd (%#x bytes) at %#zx\n",
+ initrd_size, initrd_addr);
+
+ if (fread2guest(initrd_addr, initrd_size, fi) < 0) {
+ fprintf(stderr, "qemu: read error on initial ram disk '%s'\n",
+ initrd_filename);
+ exit(1);
+ }
+ fclose(fi);
+
+ stl_p(header+0x218, initrd_addr);
+ stl_p(header+0x21c, initrd_size);
+ }
+
+
+ setup_size = header[0x1f1];
+ if (setup_size == 0)
+ setup_size = 4;
+
+ setup_size = (setup_size+1)*512;
+ kernel_size -= setup_size; /* Size of protected-mode code */
+
+ /* Urgh, Xen's HVM firmware lives at 0x100000, but that's also the
+ * address Linux wants to start life at prior to relocatable support
+ */
+ if (prot_addr != reloc_prot_addr) {
+ if (protocol > 0x205 && (header[0x234] & 1)) {
+ /* Relocatable automatically */
+ stl_p(header+0x214, reloc_prot_addr);
+ fprintf(stderr, "qemu: kernel is relocatable\n");
+ } else {
+ fprintf(stderr, "qemu: unable to load non-relocatable kernel\n");
+ exit(1);
+ }
+ }
+
+
+ fprintf(stderr, "qemu: loading kernel real mode (%#x bytes) at %#zx\n",
+ setup_size-1024, real_addr);
+ fprintf(stderr, "qemu: loading kernel protected mode (%#x bytes) at %#zx\n",
+ kernel_size, reloc_prot_addr);
+
+ /* store the finalized header and load the rest of the kernel */
+ cpu_physical_memory_rw(real_addr, header, 1024, 1);
+ if (fread2guest(real_addr+1024, setup_size-1024, f) < 0 ||
+ fread2guest(reloc_prot_addr, kernel_size, f) < 0) {
+ fprintf(stderr, "qemu: loading kernel protected mode (%#x bytes) at %#zx\n",
+ kernel_size, reloc_prot_addr);
+ exit(1);
+ }
+ fclose(f);
+
+ /* generate bootsector to set up the initial register state */
+ real_seg = (real_addr) >> 4;
+ seg[0] = seg[2] = seg[3] = seg[4] = seg[4] = real_seg;
+ seg[1] = real_seg+0x20; /* CS */
+ memset(gpr, 0, sizeof gpr);
+ gpr[4] = cmdline_addr-real_addr-16; /* SP (-16 is paranoia) */
+
+ generate_bootsect(gpr, seg, 0);
}
static void main_cpu_reset(void *opaque)
@@ -577,63 +810,8 @@ static void pc_init1(uint64_t ram_size,
bochs_bios_init();
-#ifndef CONFIG_DM
- if (linux_boot) {
- uint8_t bootsect[512];
- uint8_t old_bootsect[512];
-
- if (bs_table[0] == NULL) {
- fprintf(stderr, "A disk image must be given for 'hda' when booting a Linux kernel\n");
- exit(1);
- }
- snprintf(buf, sizeof(buf), "%s/%s", bios_dir, LINUX_BOOT_FILENAME);
- ret = load_image(buf, bootsect);
- if (ret != sizeof(bootsect)) {
- fprintf(stderr, "qemu: could not load linux boot sector '%s'\n",
- buf);
- exit(1);
- }
-
- if (bdrv_read(bs_table[0], 0, old_bootsect, 1) >= 0) {
- /* copy the MSDOS partition table */
- memcpy(bootsect + 0x1be, old_bootsect + 0x1be, 0x40);
- }
-
- bdrv_set_boot_sector(bs_table[0], bootsect, sizeof(bootsect));
-
- /* now we can load the kernel */
- ret = load_kernel(kernel_filename,
- phys_ram_base + KERNEL_LOAD_ADDR,
- phys_ram_base + KERNEL_PARAMS_ADDR);
- if (ret < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
- kernel_filename);
- exit(1);
- }
-
- /* load initrd */
- initrd_size = 0;
- if (initrd_filename) {
- initrd_size = load_image(initrd_filename, phys_ram_base + INITRD_LOAD_ADDR);
- if (initrd_size < 0) {
- fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
- initrd_filename);
- exit(1);
- }
- }
- if (initrd_size > 0) {
- stl_raw(phys_ram_base + KERNEL_PARAMS_ADDR + 0x218, INITRD_LOAD_ADDR);
- stl_raw(phys_ram_base + KERNEL_PARAMS_ADDR + 0x21c, initrd_size);
- }
- pstrcpy(phys_ram_base + KERNEL_CMDLINE_ADDR, 4096,
- kernel_cmdline);
- stw_raw(phys_ram_base + KERNEL_PARAMS_ADDR + 0x20, 0xA33F);
- stw_raw(phys_ram_base + KERNEL_PARAMS_ADDR + 0x22,
- KERNEL_CMDLINE_ADDR - KERNEL_PARAMS_ADDR);
- /* loader type */
- stw_raw(phys_ram_base + KERNEL_PARAMS_ADDR + 0x210, 0x01);
- }
-#endif /* !CONFIG_DM */
+ if (linux_boot)
+ load_linux(kernel_filename, initrd_filename, kernel_cmdline);
if (pci_enabled) {
pci_bus = i440fx_init(&i440fx_state);
xen-hvm-kernel-boot-xend.patch:
--- NEW FILE xen-hvm-kernel-boot-xend.patch ---
diff -rup xen-unstable-16606.orig/tools/python/xen/xend/image.py xen-unstable-16606.new/tools/python/xen/xend/image.py
--- xen-unstable-16606.orig/tools/python/xen/xend/image.py 2007-12-17 17:52:29.000000000 -0500
+++ xen-unstable-16606.new/tools/python/xen/xend/image.py 2007-12-17 18:17:31.000000000 -0500
@@ -127,7 +127,7 @@ class ImageHandler:
"""
# Set params and call buildDomain().
- if not os.path.isfile(self.kernel):
+ if self.kernel and not os.path.isfile(self.kernel):
raise VmError('Kernel image does not exist: %s' % self.kernel)
if self.ramdisk and not os.path.isfile(self.ramdisk):
raise VmError('Kernel ramdisk does not exist: %s' % self.ramdisk)
@@ -187,6 +187,10 @@ class ImageHandler:
def parseDeviceModelArgs(self, vmConfig):
ret = ["-domain-name", str(self.vm.info['name_label'])]
+ # Tell QEMU how large the guest's memory allocation is
+ # to help it when loading the initrd (if neccessary)
+ ret += ["-m", str(self.getRequiredInitialReservation() / 1024)]
+
# Find RFB console device, and if it exists, make QEMU enable
# the VNC console.
if int(vmConfig['platform'].get('nographic', 0)) != 0:
@@ -410,8 +414,7 @@ class HVMImageHandler(ImageHandler):
def configure(self, vmConfig):
ImageHandler.configure(self, vmConfig)
- if not self.kernel:
- self.kernel = '/usr/lib/xen/boot/hvmloader'
+ self.loader = vmConfig['platform'].get('loader')
info = xc.xeninfo()
if 'hvm' not in info['xen_caps']:
@@ -434,6 +437,17 @@ class HVMImageHandler(ImageHandler):
ret = ImageHandler.parseDeviceModelArgs(self, vmConfig)
ret = ret + ['-vcpus', str(self.vm.getVCpuCount())]
+ if self.kernel and self.kernel != "/usr/lib/xen/boot/hvmloader":
+ log.debug("kernel = %s", self.kernel)
+ ret = ret + ['-kernel', self.kernel]
+ if self.ramdisk:
+ log.debug("ramdisk = %s", self.ramdisk)
+ ret = ret + ['-initrd', self.ramdisk]
+ if self.cmdline:
+ log.debug("cmdline = %s", self.cmdline)
+ ret = ret + ['-append', self.cmdline]
+
+
dmargs = [ 'boot', 'fda', 'fdb', 'soundhw',
'localtime', 'serial', 'stdvga', 'isa',
'acpi', 'usb', 'usbdevice', 'pci' ]
@@ -509,7 +523,7 @@ class HVMImageHandler(ImageHandler):
mem_mb = self.getRequiredInitialReservation() / 1024
log.debug("domid = %d", self.vm.getDomid())
- log.debug("image = %s", self.kernel)
+ log.debug("image = %s", self.loader)
log.debug("store_evtchn = %d", store_evtchn)
log.debug("memsize = %d", mem_mb)
log.debug("vcpus = %d", self.vm.getVCpuCount())
@@ -517,7 +531,7 @@ class HVMImageHandler(ImageHandler):
log.debug("apic = %d", self.apic)
rc = xc.hvm_build(domid = self.vm.getDomid(),
- image = self.kernel,
+ image = self.loader,
memsize = mem_mb,
vcpus = self.vm.getVCpuCount(),
acpi = self.acpi,
diff -rup xen-unstable-16606.orig/tools/python/xen/xend/XendConfig.py xen-unstable-16606.new/tools/python/xen/xend/XendConfig.py
--- xen-unstable-16606.orig/tools/python/xen/xend/XendConfig.py 2007-12-17 17:52:29.000000000 -0500
+++ xen-unstable-16606.new/tools/python/xen/xend/XendConfig.py 2007-12-17 18:26:30.000000000 -0500
@@ -124,7 +124,7 @@ XENAPI_CFG_TO_LEGACY_CFG = {
LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(XENAPI_CFG_TO_LEGACY_CFG)
# Platform configuration keys.
-XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'display',
+XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'loader', 'display',
'fda', 'fdb', 'keymap', 'isa', 'localtime', 'monitor',
'nographic', 'pae', 'rtc_timeoffset', 'serial', 'sdl',
'soundhw','stdvga', 'usb', 'usbdevice', 'vnc',
@@ -402,6 +402,17 @@ class XendConfig(dict):
self['platform']['device_model'] = xen.util.auxbin.pathTo("qemu-dm")
if self.is_hvm():
+ if 'loader' not in self['platform']:
+ log.debug("No loader present")
+ # Old configs may have hvmloder set as PV_kernel param,
+ # so lets migrate them....
+ if self['PV_kernel'] == "/usr/lib/xen/boot/hvmloader":
+ self['platform']['loader'] = self['PV_kernel']
+ log.debug("Loader copied from kernel %s" % str(self['platform']['loader']))
+ else:
+ self['platform']['loader'] = "/usr/lib/xen/boot/hvmloader"
+ log.debug("Loader %s" % str(self['platform']['loader']))
+
# Compatibility hack, can go away soon.
if 'soundhw' not in self['platform'] and \
self['platform'].get('enable_audio'):
diff -rup xen-unstable-16606.orig/tools/python/xen/xm/create.py xen-unstable-16606.new/tools/python/xen/xm/create.py
--- xen-unstable-16606.orig/tools/python/xen/xm/create.py 2007-12-17 17:52:29.000000000 -0500
+++ xen-unstable-16606.new/tools/python/xen/xm/create.py 2007-12-17 18:28:06.000000000 -0500
@@ -158,6 +158,10 @@ gopts.var('ramdisk', val='FILE',
fn=set_value, default='',
use="Path to ramdisk.")
+gopts.var('loader', val='FILE',
+ fn=set_value, default='',
+ use="Path to HVM firmware.")
+
gopts.var('features', val='FEATURES',
fn=set_value, default='',
use="Features to enable in guest kernel")
@@ -552,6 +556,8 @@ def configure_image(vals):
config_image.append([ 'kernel', os.path.abspath(vals.kernel) ])
if vals.ramdisk:
config_image.append([ 'ramdisk', os.path.abspath(vals.ramdisk) ])
+ if vals.loader:
+ config_image.append([ 'loader', os.path.abspath(vals.loader) ])
if vals.cmdline_ip:
cmdline_ip = strip('ip=', vals.cmdline_ip)
config_image.append(['ip', cmdline_ip])
xen-smx.patch:
--- NEW FILE xen-smx.patch ---
--- xen-unstable-16606.orig/xen/arch/x86/hvm/vmx/vmcs.c 2007-12-13 04:31:03.000000000 -0500
+++ xen-unstable-16606/xen/arch/x86/hvm/vmx/vmcs.c 2007-12-17 20:21:43.000000000 -0500
@@ -265,8 +265,7 @@ int vmx_cpu_up(void)
if ( eax & IA32_FEATURE_CONTROL_MSR_LOCK )
{
- if ( !(eax & (IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_OUTSIDE_SMX |
- IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_INSIDE_SMX)) )
+ if ( !(eax & (IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_OUTSIDE_SMX)))
{
printk("CPU%d: VMX disabled by BIOS.\n", cpu);
return 0;
@@ -275,8 +274,7 @@ int vmx_cpu_up(void)
else
{
eax = (IA32_FEATURE_CONTROL_MSR_LOCK |
- IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_OUTSIDE_SMX |
- IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_INSIDE_SMX);
+ IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_OUTSIDE_SMX);
wrmsr(IA32_FEATURE_CONTROL_MSR, eax, 0);
}
Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.194.2.10
retrieving revision 1.194.2.11
diff -u -r1.194.2.10 -r1.194.2.11
--- xen.spec 14 Dec 2007 22:31:12 -0000 1.194.2.10
+++ xen.spec 18 Dec 2007 17:14:31 -0000 1.194.2.11
@@ -14,7 +14,7 @@
# The version that the dev tree will become when released
%define base_version 3.2.0
-%define base_release 2
+%define base_release 8
# The changeset synced to
%define changeset 16606
@@ -64,6 +64,10 @@
Patch1: xen-initscript.patch
Patch3: xen-compile-fixes.patch
Patch4: xen-network-unmanaged.patch
+Patch5: xen-hvm-kernel-boot-xend.patch
+Patch6: xen-hvm-kernel-boot-relocatable.patch
+Patch7: xen-hvm-kernel-boot-nonrelocatable.patch
+Patch8: xen-smx.patch
Patch13: xen-dumpdir.patch
Patch36: xen-qemu-bootmenu.patch
@@ -149,7 +153,11 @@
%setup -q -n %{directory_tag}
%patch1 -p1 -b .init
%patch3 -p1 -b .compile
-#patch4 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
%patch13 -p1
%patch36 -p1
More information about the fedora-extras-commits
mailing list