Revision b8203e1e
| b/Makefile.am | ||
|---|---|---|
| 1089 | 1089 |
echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \ |
| 1090 | 1090 |
echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \ |
| 1091 | 1091 |
echo "XEN_INITRD = '$(XEN_INITRD)'"; \ |
| 1092 |
echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \ |
|
| 1092 | 1093 |
echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \ |
| 1093 | 1094 |
echo "ENABLE_FILE_STORAGE = $(ENABLE_FILE_STORAGE)"; \ |
| 1094 | 1095 |
echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \ |
| b/configure.ac | ||
|---|---|---|
| 83 | 83 |
# --with-xen-kernel=... |
| 84 | 84 |
AC_ARG_WITH([xen-kernel], |
| 85 | 85 |
[AS_HELP_STRING([--with-xen-kernel=PATH], |
| 86 |
[DomU kernel image for Xen hypervisor (default is /boot/vmlinuz-2.6-xenU)]
|
|
| 86 |
[DomU kernel image for Xen hypervisor (default is /boot/vmlinuz-3-xenU)]
|
|
| 87 | 87 |
)], |
| 88 | 88 |
[xen_kernel="$withval"], |
| 89 |
[xen_kernel="/boot/vmlinuz-2.6-xenU"])
|
|
| 89 |
[xen_kernel="/boot/vmlinuz-3-xenU"])
|
|
| 90 | 90 |
AC_SUBST(XEN_KERNEL, $xen_kernel) |
| 91 | 91 |
|
| 92 | 92 |
# --with-xen-initrd=... |
| 93 | 93 |
AC_ARG_WITH([xen-initrd], |
| 94 | 94 |
[AS_HELP_STRING([--with-xen-initrd=PATH], |
| 95 |
[DomU initrd image for Xen hypervisor (default is /boot/initrd-2.6-xenU)]
|
|
| 95 |
[DomU initrd image for Xen hypervisor (default is /boot/initrd-3-xenU)]
|
|
| 96 | 96 |
)], |
| 97 | 97 |
[xen_initrd="$withval"], |
| 98 |
[xen_initrd="/boot/initrd-2.6-xenU"])
|
|
| 98 |
[xen_initrd="/boot/initrd-3-xenU"])
|
|
| 99 | 99 |
AC_SUBST(XEN_INITRD, $xen_initrd) |
| 100 | 100 |
|
| 101 |
# --with-kvm-kernel=... |
|
| 102 |
AC_ARG_WITH([kvm-kernel], |
|
| 103 |
[AS_HELP_STRING([--with-kvm-kernel=PATH], |
|
| 104 |
[Guest kernel image for KVM hypervisor (default is /boot/vmlinuz-3-kvmU)] |
|
| 105 |
)], |
|
| 106 |
[kvm_kernel="$withval"], |
|
| 107 |
[kvm_kernel="/boot/vmlinuz-3-kvmU"]) |
|
| 108 |
AC_SUBST(KVM_KERNEL, $kvm_kernel) |
|
| 109 |
|
|
| 101 | 110 |
# --with-file-storage-dir=... |
| 102 | 111 |
AC_ARG_WITH([file-storage-dir], |
| 103 | 112 |
[AS_HELP_STRING([--with-file-storage-dir=PATH], |
| b/lib/constants.py | ||
|---|---|---|
| 280 | 280 |
XEN_CMD = "xm" |
| 281 | 281 |
|
| 282 | 282 |
KVM_PATH = _autoconf.KVM_PATH |
| 283 |
KVM_KERNEL = _autoconf.KVM_KERNEL |
|
| 283 | 284 |
SOCAT_PATH = _autoconf.SOCAT_PATH |
| 284 | 285 |
SOCAT_USE_ESCAPE = _autoconf.SOCAT_USE_ESCAPE |
| 285 | 286 |
SOCAT_USE_COMPRESS = _autoconf.SOCAT_USE_COMPRESS |
| ... | ... | |
| 1758 | 1759 |
HV_CPU_MASK: CPU_PINNING_ALL, |
| 1759 | 1760 |
}, |
| 1760 | 1761 |
HT_KVM: {
|
| 1761 |
HV_KERNEL_PATH: "/boot/vmlinuz-2.6-kvmU",
|
|
| 1762 |
HV_KERNEL_PATH: KVM_KERNEL,
|
|
| 1762 | 1763 |
HV_INITRD_PATH: "", |
| 1763 | 1764 |
HV_KERNEL_ARGS: "ro", |
| 1764 | 1765 |
HV_ROOT_PATH: "/dev/vda1", |
Also available in: Unified diff