summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/meta-intel.inc7
-rw-r--r--conf/machine/include/qemu-intel.inc16
-rw-r--r--conf/machine/include/qemuboot-intel.inc20
3 files changed, 43 insertions, 0 deletions
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index fd0a792..21587fb 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -36,3 +36,10 @@ EFI_PROVIDER ?= "rmc-boot"
36 36
37# Add general MACHINEOVERRIDE for meta-intel 37# Add general MACHINEOVERRIDE for meta-intel
38MACHINEOVERRIDES =. "intel-x86-common:" 38MACHINEOVERRIDES =. "intel-x86-common:"
39
40# Definition of (more or less) suitable virtual machines.
41require conf/machine/include/qemuboot-intel.inc
42
43# Ensure that the extra tools needed by qemu are built when building images
44# and tweak machine definition to make the result more usable under qemu.
45require conf/machine/include/qemu-intel.inc
diff --git a/conf/machine/include/qemu-intel.inc b/conf/machine/include/qemu-intel.inc
new file mode 100644
index 0000000..db8b2b3
--- /dev/null
+++ b/conf/machine/include/qemu-intel.inc
@@ -0,0 +1,16 @@
1# Similar to meta/conf/machine/include/qemu.inc but influences the
2# distro content (in particular the kernel) less than qemu.inc.
3
4# Ensure that qemu gets built when building images.
5EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
6
7# runqemu uses virtio, so we have to enable the corresponding
8# kernel drivers.
9KERNEL_FEATURES += "cfg/virtio.scc"
10
11# Other useful extensions which are not enabled by default:
12# rng-tools to take advantage of qemu's virtio-rng-pci device.
13# MACHINE_EXTRA_RRECOMMENDS += "rng-tools"
14
15# Creates the necessary .qemuboot.conf file for each image.
16IMAGE_CLASSES += "qemuboot"
diff --git a/conf/machine/include/qemuboot-intel.inc b/conf/machine/include/qemuboot-intel.inc
new file mode 100644
index 0000000..82a72ac
--- /dev/null
+++ b/conf/machine/include/qemuboot-intel.inc
@@ -0,0 +1,20 @@
1# For runqemu
2IMAGE_CLASSES += "qemuboot"
3QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386"
4QB_CPU_intel-core2-32 = "-cpu coreduo"
5QB_CPU_KVM_intel-core2-32 = "-cpu kvm32"
6
7QB_SYSTEM_NAME_intel-corei7-64 = "qemu-system-x86_64"
8QB_CPU_intel-corei7-64 = "-cpu Nehalem"
9QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64"
10
11QB_SYSTEM_NAME_intel-quark = "qemu-system-i386"
12QB_CPU_intel-quark = "-cpu coreduo"
13QB_CPU_KVM_intel-quark = "-cpu kvm32"
14
15QB_AUDIO_DRV = "alsa"
16QB_AUDIO_OPT = "-soundhw ac97,es1370"
17QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1"
18# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
19QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
20QB_SLIRP_OPT = "-net nic,model=e1000 -net user,hostfwd=tcp::2222-:22"