| #
63e3555e |
| 10-Jan-2013 |
Andreas Färber <andreas.faerber@web.de> |
Merge branch 'master' of git://git.qemu.org/qemu into prep-up
Conflicts:
hw/Makefile.objs
hw/ppc_prep.c
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
|
| #
34daffa0 |
| 02-Jan-2013 |
Anthony Liguori <aliguori@us.ibm.com> |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
qemu-kvm/pci-assign: 64 bits bar emulation
target-i386: Enabling IA32_TSC_ADJUST for QEMU KVM
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
qemu-kvm/pci-assign: 64 bits bar emulation
target-i386: Enabling IA32_TSC_ADJUST for QEMU KVM guest VMs
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
show more ...
|
| #
a97ff30e |
| 02-Jan-2013 |
Anthony Liguori <aliguori@us.ibm.com> |
Merge remote-tracking branch 'kraxel/seabios-a810e4e' into staging
* kraxel/seabios-a810e4e:
Update seabios to a810e4e72a0d42c7bc04eda57382f8e019add901
Signed-off-by: Anthony
Merge remote-tracking branch 'kraxel/seabios-a810e4e' into staging
* kraxel/seabios-a810e4e:
Update seabios to a810e4e72a0d42c7bc04eda57382f8e019add901
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
show more ...
|
| #
501a7ce7 |
| 22-Dec-2012 |
Andreas Färber <afaerber@suse.de> |
Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu
Adapt header include paths.
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
| #
27dd7730 |
| 19-Dec-2012 |
Anthony Liguori <aliguori@us.ibm.com> |
Merge remote-tracking branch 'bonzini/header-dirs' into staging
* bonzini/header-dirs: (45 commits)
janitor: move remaining public headers to include/
hw: move executable format
Merge remote-tracking branch 'bonzini/header-dirs' into staging
* bonzini/header-dirs: (45 commits)
janitor: move remaining public headers to include/
hw: move executable format header files to hw/
fpu: move public header file to include/fpu
softmmu: move remaining include files to include/ subdirectories
softmmu: move include files to include/sysemu/
misc: move include files to include/qemu/
qom: move include files to include/qom/
migration: move include files to include/migration/
monitor: move include files to include/monitor/
exec: move include files to include/exec/
block: move include files to include/block/
qapi: move include files to include/qobject/
janitor: add guards to headers
qapi: make struct Visitor opaque
qapi: remove qapi/qapi-types-core.h
qapi: move inclusions of qemu-common.h from headers to .c files
ui: move files to ui/ and include/ui/
qemu-ga: move qemu-ga files to qga/
net: reorganize headers
net: move net.c to net/
...
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
show more ...
|
| #
28ecbaee |
| 28-Nov-2012 |
Paolo Bonzini <pbonzini@redhat.com> |
ui: move files to ui/ and include/ui/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|