[COMMIT master] Merge branch 'upstream-merge'

From: Avi Kivity a...@redhat.com * upstream-merge: (170 commits) Drop redundant pci_get_bus_devfn() declaration Fix old-style function definitions in kvm specific code Adjust pre_save()/post_load() vmstate callbacks to upstream usage Rename pci_create_noinit() to pci_create() Fix

[COMMIT master] Re-enable -Werror for kvm

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/configure b/configure index 6589dba..8866258 100755 --- a/configure +++ b/configure @@ -1833,8 +1833,6 @@ if test -z $werror ; then else werror=no fi -# disable default werror for kvm -

[COMMIT master] test: vmexit: inl from pmtimer

From: Marcelo Tosatti mtosa...@redhat.com Add inl(ACPI_PMTIMER_PORT) test. Signed-off-by: Marcelo Tosatti mtosa...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/kvm/user/test/x86/vmexit.c b/kvm/user/test/x86/vmexit.c index 5455919..c3a01e0 100644 ---

[COMMIT master] test: add on_cpu_async

From: Marcelo Tosatti mtosa...@redhat.com Non-wait version of on_cpu. Signed-off-by: Marcelo Tosatti mtosa...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/kvm/user/test/lib/x86/smp.c b/kvm/user/test/lib/x86/smp.c index 9eface5..241f755 100644 ---

[COMMIT master] Merge commit '1e7fbc6d3cfcffe1d490ab8851e712c6e98fa771'

From: Avi Kivity a...@redhat.com * commit '1e7fbc6d3cfcffe1d490ab8851e712c6e98fa771': x86: fix miss merge Signed-off-by: Avi Kivity a...@redhat.com -- To unsubscribe from this list: send the line unsubscribe kvm-commits in the body of a message to majord...@vger.kernel.org More majordomo info

[COMMIT master] Revert qemu/pci: reset device registers on bus reset

From: Avi Kivity a...@redhat.com This reverts commit c0b1905b285800cfd1a797347efeac8338bfa655. It breaks Windows XP install autotest - Windows seems to drop to lose hibernate support with this patch. Signed-off-by: Avi Kivity a...@redhat.com diff --git a/hw/pci.c b/hw/pci.c index

[COMMIT master] Update souce link

From: Jan Kiszka jan.kis...@siemens.com This references KVM from stable 2.6.31. Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/linux-2.6 b/linux-2.6 index 46c6cf6..abb015a 16 --- a/linux-2.6 +++ b/linux-2.6 @@ -1 +1 @@

[COMMIT master] x86: Pick up local arch trace headers

From: Jan Kiszka jan.kis...@siemens.com This unbreaks 2.6.31 builds but also ensures that we always use the most recent ones. Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/include/arch/x86/kvm b/include/arch/x86/kvm new file

[COMMIT master] kvm_vma_kernel_pagesize support

From: Jan Kiszka jan.kis...@siemens.com It was broken for !CONFIG_HUGETLB_PAGE and for kernel 2.6.31. Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/external-module-compat-comm.h b/external-module-compat-comm.h index

[COMMIT master] Fix warning in sync

From: Zachary Amsden zams...@redhat.com Patch is self-explanatory Signed-off-by: Zachary Amsden zams...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/sync b/sync index b09f629..0bbd488 100755 --- a/sync +++ b/sync @@ -97,6 +97,9 @@ def __hack(data):

[COMMIT master] Fix arch include for KVM trace headers

From: Jan Kiszka jan.kis...@siemens.com Make sure recursive KVM trace header including works by adding the arch source directory to the search path. This is at least required for non-split kernel trees, but play safe and add it to both. Signed-off-by: Jan Kiszka jan.kis...@siemens.com

[COMMIT master] ifdef out change_pte assignment

From: Marcelo Tosatti mtosa...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/sync b/sync index 539a3f0..b09f629 100755 --- a/sync +++ b/sync @@ -95,6 +95,8 @@ def __hack(data): line = '' if match(r'#include linux\/types.h'): line =

[COMMIT master] x86: Remove zombie kvm_trace from build

From: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/x86/Kbuild b/x86/Kbuild index 0ccbeec..3499593 100644 --- a/x86/Kbuild +++ b/x86/Kbuild @@ -7,9 +7,6 @@ kvm-objs := kvm_main.o x86.o mmu.o

Re: [COMMIT master] ksm support

On 10/06/2009 09:21 PM, Anthony Liguori wrote: Avi Kivity wrote: From: Izik Eidus iei...@redhat.com Call madvise(MADV_MERGEABLE) on the memory allocations to allow the kernel to merge them. Signed-off-by: Izik Eidus iei...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com Any reason to

Re: [COMMIT master] ksm support

Avi Kivity wrote: On 10/06/2009 09:21 PM, Anthony Liguori wrote: Avi Kivity wrote: From: Izik Eidus iei...@redhat.com Call madvise(MADV_MERGEABLE) on the memory allocations to allow the kernel to merge them. Signed-off-by: Izik Eidus iei...@redhat.com Signed-off-by: Avi Kivity