[COMMIT master] slirp: Fix default netmask to 255.255.255.0

From: Jan Kiszka jan.kis...@siemens.com This got broken between a13a4126c8 and c92ef6a22d: old slirp code used 255.255.255.0. Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/net.c b/net.c index 19e00e0..a34f1d3 100644 --- a/net.c +++

[COMMIT master] Revert support colon in filenames

From: Avi Kivity a...@redhat.com This reverts commit 707c0dbc97cddfe8d2441b8259c6c526d99f2dd8. It was reverted from upstream as well. Conflicts: block.c Signed-off-by: Avi Kivity a...@redhat.com diff --git a/block.c b/block.c index ddd055c..cefbe77 100644 --- a/block.c +++ b/block.c

[COMMIT master] slirp: Fix default netmask to 255.255.255.0

From: Jan Kiszka jan.kis...@siemens.com This got broken between a13a4126c8 and c92ef6a22d: old slirp code used 255.255.255.0. Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/net.c b/net.c index 19e00e0..a34f1d3 100644 --- a/net.c +++

[COMMIT master] slirp: Fix default netmask to 255.255.255.0

From: Jan Kiszka jan.kis...@siemens.com This got broken between a13a4126c8 and c92ef6a22d: old slirp code used 255.255.255.0. Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/net.c b/net.c index 19e00e0..a34f1d3 100644 --- a/net.c +++

[COMMIT master] slirp: Fix default netmask to 255.255.255.0

From: Jan Kiszka jan.kis...@siemens.com This got broken between a13a4126c8 and c92ef6a22d: old slirp code used 255.255.255.0. Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/net.c b/net.c index 19e00e0..a34f1d3 100644 --- a/net.c +++

[COMMIT master] slirp: Fix default netmask to 255.255.255.0

From: Jan Kiszka jan.kis...@siemens.com This got broken between a13a4126c8 and c92ef6a22d: old slirp code used 255.255.255.0. Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/net.c b/net.c index 19e00e0..a34f1d3 100644 --- a/net.c +++

[COMMIT master] slirp: Fix default netmask to 255.255.255.0

From: Jan Kiszka jan.kis...@siemens.com This got broken between a13a4126c8 and c92ef6a22d: old slirp code used 255.255.255.0. Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/net.c b/net.c index 19e00e0..a34f1d3 100644 --- a/net.c +++

[COMMIT master] Select irq0-irq2 override based on kernel gsi routing availability

From: Beth Kon e...@us.ibm.com If the kernel does not support gsi routing, we cannot do the irq0-irq2 override, so disable it in that case. Signed-off-by: Beth Kon e...@us.ibm.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/hw/ioapic.c b/hw/ioapic.c index 8a16a5b..efd418d 100644 ---

[COMMIT master] bios: allow qemu to configure irq0-inti2 override

From: Beth Kon e...@us.ibm.com Win2k8 expects the HPET interrupt on inti2, regardless of whether an override exists in the BIOS. And the HPET spec states that in legacy mode, timer interrupt is on inti2. The irq0-inti2 override will always be used unless the kernel cannot do irq routing (i.e.,

[COMMIT master] HPET support with kvm

From: Beth Kon e...@us.ibm.com The big change here is handling of enabling/disabling of hpet legacy mode. When hpet enters legacy mode, the spec says that the pit stops generating interrupts. In practice, we want to stop the pit periodic timer from running because it is wasteful in a virtual

[COMMIT master] Remove leftover kvm_callbacks structure definition

From: Glauber Costa glom...@redhat.com Signed-off-by: Glauber Costa glom...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/libkvm-all.h b/libkvm-all.h index a4193ad..f36d3c3 100644 --- a/libkvm-all.h +++ b/libkvm-all.h @@ -105,7 +105,6 @@ int handle_io_window(kvm_context_t

[COMMIT master] Update source link

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/linux-2.6 b/linux-2.6 index be5ef0d..ce0c990 16 --- a/linux-2.6 +++ b/linux-2.6 @@ -1 +1 @@ -Subproject commit be5ef0d26ae68aa6825630cdfc2d0f93a36e3ac1 +Subproject commit

[COMMIT master] KVM: Always report x2apic as supported feature

From: Gleb Natapov g...@redhat.com We emulate x2apic in software, so host support is not required. Signed-off-by: Gleb Natapov g...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index e3d9040..dfb0e37 100644 --- a/arch/x86/kvm/x86.c

[COMMIT master] KVM: add module parameters documentation

From: Andre Przywara andre.przyw...@amd.com Signed-off-by: Andre Przywara andre.przyw...@amd.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index d77fbd8..8ca488d 100644 ---

[COMMIT master] KVM: PIT support for HPET legacy mode

From: Beth Kon e...@us.ibm.com When kvm is in hpet_legacy_mode, the hpet is providing the timer interrupt and the pit should not be. So in legacy mode, the pit timer is destroyed, but the *state* of the pit is maintained. So if kvm or the guest tries to modify the state of the pit, this

[COMMIT master] KVM: MMU: Fix MMU_DEBUG compile breakage

From: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 231d880..7162651 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1786,8 +1786,8 @@ static

[COMMIT master] KVM: ia64: Fix locking around kvm_set_irq()

From: Gleb Natapov g...@redhat.com kvm_set_irq() uses irq_lock now. Signed-off-by: Gleb Natapov g...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 8054d7b..d7aa6bb 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++

[COMMIT master] KVM: Move kvm_cpu_get_interrupt() declaration to x86 code

From: Gleb Natapov g...@redhat.com It is implemented only by x86. Signed-off-by: Gleb Natapov g...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 30b625d..3f4f00a 100644 ---

[COMMIT master] KVM: Reduce runnability interface with arch support code

From: Gleb Natapov g...@redhat.com Remove kvm_cpu_has_interrupt() and kvm_arch_interrupt_allowed() from interface between general code and arch code. kvm_arch_vcpu_runnable() checks for interrupts instead. Signed-off-by: Gleb Natapov g...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com

[COMMIT master] Merge branch 'upstream-merge'

From: Avi Kivity a...@redhat.com * upstream-merge: (73 commits) target-mips: remove useless code in gen_st_cond() Fix MIPS SC Sparc64: convert ebus to qdev sparc64: trap handling corrections Sparc32: convert eccmemctl to qdev sparc64: fix helper_st_asi little endian case typo