Age | Commit message (Collapse) | Author | Files | Lines |
|
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
Conflicts:
qemu/Makefile
qemu/Makefile.target
qemu/block-raw-posix.c
qemu/configure
qemu/cutils.c
qemu/dyngen.c
qemu/hw/cirrus_vga.c
qemu/hw/e1000.c
qemu/hw/pci.c
qemu/hw/vga.c
qemu/osdep.c
qemu/pc-bios/Makefile
qemu/qemu-common.h
qemu/target-ppc/helper.c
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
When kvm-userspace is build with a different kernel version than the
running kernel the depmod at the end will fail. This patch fixed the
problem.
Signed-off-by: Maik Hentsche <maik.hentsche@amd.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
Conflicts:
qemu/block.c
qemu/configure
qemu/cpu-exec.c
qemu/exec.c
qemu/hw/acpi.c
qemu/hw/pc.c
qemu/monitor.c
qemu/target-i386/cpu.h
qemu/target-i386/helper.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
libkvm/Makefile uses $(AR), but it's not defined by the top-level configure.
The problem is that when cross-compiling for a 64-bit target on a 32-bit host,
32-bit ar will be used and the 64-bit code will fail to link.
user/Makefile has the same problem, and even uses plain "ar".
Add AR to configure and user/configure, and use it in the Makefiles.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
Export PROCESSOR in config.mak, and call user/configure with the --processor
option.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
Use case/esac instead of multiple if/fi tests, allowing us to use wildcards.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
configurations
KVM as is assumes that the kernel obj dir and the kernel source dir are
at the same location. This is true for most self-built vanilla kernels,
but some distributions split these up (e.g. SUSE).
To keep compatible and have users have a good experience on building KVM
on any distribution, this patch attempts to rebuild the logic from the
kernel Makefile as closely as possible. With it I successfully built KVM
on a current SUSE system.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
If the host kernel has CONFIG_KVM_TRACE defined but the external module
does not, we get a mixed build and the modules won't load. Fix by defining
a new, independent EXT_CONFIG_KVM_TRACE and overriding the host kernel's
version according to that.
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
When implementing --with-kvm-trace, I supposed make would never enter
the 'kernel' directory when compiling with --with-patched-kernel. I was
wrong and broke --with-patched-kernel.
Change configure to always generate config.kbuild on the kernel
directory. Otherwise make will explode on 'make header-sync', that runs
even when --with-patched-kernel was used.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
/configure --with-kvm-trace will set a CONFIG_KVM_TRACE option on a
kernel/config.kbuild file. This file can be included from the Kbuild
files to get kvm-specific CONFIG_* definitions.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
complement ff5396cfeacf74ad9611a35e882ff100b10126aci, removing
the warning printed by ./configure --help which recommended
at configure time against using gcc4 as it wasn't supported by
dyngen.
Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
KVM always configures QEMU to only build the required targets. Recently,
target-i386 converted to TCG completely which means it no longer needs GCC-3.
ia64 and PowerPC have never needed GCC-3 AFAIK so let's disable the gcc check
in QEMU's configure and build with GCC4.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
The cross tools are named blah-gcc, not blah-cc, so they are currently
broken with the default configuration.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
Otherwise, it picks up a random kernel directory and misbuilds.
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
This is a relic of the big userspace refactoring, but today libkvm does
should not include settings from the test suite. This patch resolves this
and removes the overwriting of setting from the main config.mak with test
suite settings.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
now that the headers are always synced for patched-kernel builds, we can
avoid using the regular kernel headers.
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
This patch adds libfdt to allow for modification of device tree entries into
the KVM userspace tree.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
This patch attempts to clean up the interactions between KVM and QEMU. Sorry
for such a big patch, but I don't think there's a better way to approach this
such that it's still bisect friendly. I think this is most of what's needed to
get basic KVM support into QEMU though.
Right now, there's a mix of #ifdef USE_KVM, if (kvm_allowed), and various
extern declarations. It's all pretty fugly and there's a lot of mistakes due
to it.
The following patch eliminates almost all uses of #ifdef USE_KVM by introducing
a kvm_enabled() macro. If USE_KVM is set, this macro evaluates to kvm_allowed.
If USE_KVM isn't set, the macro evaluates to 0.
Since GCC eliminates if (0) blocks, this is just as good as using #ifdef. By
making sure that we never call into libkvm directly from QEMU, we can also just
not link qemu-kvm when USE_KVM isn't set instead of having the entire file
wrapped in a USE_KVM.
We also change the --enable-kvm configure option to --disable-kvm since KVM is
enabled by default.
I've tested this patch on x86 with 32-bit and 64-bit Linux guests and a 32-bit
Windows guest. I've also tested with USE_KVM not set. Jerone has also
verified that it doesn't PPC. My apologies if it breaks ia64 but I have no
way of testing that.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
Add qemu option to tell qemu to compile ppcemb-softmmu, if ARCH=powerpc is
used.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
This reverts commit 86d1a737fc444373f94d465fbc7d0aa5f712c068, which causes
build failures.
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
Create an "asm" symlink from libkvm into the kernel source directory.
This allows one to use kernel trees built with the O= option.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
Prevent qemu's configure usage to be printed if an invalid option is
passed to it, allowing kvm's configure to trap those errors and print
the usage instead
Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
uses qemu to generate a hopefully complete usage in case of error
Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
This reverts commit 0d354fe9d8eaee1b3abc9dee7824021edb9f4976, for qemu
configure passthrough.
Conflicts:
configure (keep --disable-gcc-check usage)
Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
This reverts commit d3bcc58f74b29df8496933c441640d9c739ba674, for qemu
configure passthrough.
Conflicts:
configure (remove hardcoded alsa flag but keep qemu_opts)
Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
This reverts commit 49f7f1a96dce9d059d2d51d450c9d4bdd529c8fd, for qemu
configure passthrough.
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
Move libkvm into its own directory. No functional changes.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
Qemu is interpreting --cross-prefix & cpu as one argument. This of
course yeilds an error. This fixes the error.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
Add a --disable-vnc-tls option so that support for TLS authentication
for the VNC server can be conditionally disabled.
This makes the dependency to gnutls added by the new qemu conditional and
explicit.
Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
Add an --enable-alsa option to conditionally add support for alsa so that
QEMU_AUDIO_DRV=alsa is supported.
This makes the dependency to alsa conditional and explicit.
Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
This patch takes feedback from Anthony Liguouri.
- remove --cc option added in v4 of patch (keep old behavior)
- do not specify cc= everytime on the qemu configuration line, this
allows qemu to autodetect gcc 3.x
This simplifies the patch more. While preserving behavior.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
|
|
To execute the ifdef X86_64 blocks on both sides
|
|
config.mak is a Makefile, not a bash script, and thus won't strip
the quotes.
Thanks to Muli for noticing that I applied the wrong patch.
|
|
From: Muli Ben-Yehuda <muli@il.ibm.com>
|
|
this breaks the .rpm, but is more correct.
|
|
needed for the modified bios
|
|
For some distributions, the installed (default) gcc version is 3.4 while
the compat-gcc version is 3.2 (or older). In those cases prefer the
more recent gcc.
|
|
|
|
|
|
allows sound on host.
|
|
|
|
|
|
3582, 3582-5)
|