Merge commit '91011d4f3b7c311a42b842f6682ac64a2372d2b7' into upstream-merge

* commit '91011d4f3b7c311a42b842f6682ac64a2372d2b7':
  pci: Fix function pci_default_write_config
  mips: fix CPU reset
  Fix PPC crash
  ARM MPCore tweaks
  Realview/EB procid hacks
  pci: fix the conversion of config field from array to pointer
  qemu_system_reset: we need to call it before loadvm/migration
  fdc: fix vmstate variable passed
  vnc: improve capslock handling.
  e1000 fix: read access to some registers is missing.
  Fix 32-bit overflow in parallels image support
  kvm ppc: Remove unused label
  kvm: Move KVM mp_state accessors to i386-specific code
  virtio-blk: Pass read errors to the guest
  savevm: Delete existing snapshots in all images
  Fix incoming migration
  fix type in CFLAGS name

Conflicts:
	hw/pci.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 0 insertions, 3 deletions

diff --git a/kvm.h b/kvm.h
index aff0715f6..35c8e85f0 100644
--- a/kvm.h
+++ b/kvm.h
@@ -77,9 +77,6 @@ int kvm_vm_ioctl(KVMState *s, int type, ...);
 
 int kvm_vcpu_ioctl(CPUState *env, int type, ...);
 
-int kvm_get_mp_state(CPUState *env);
-int kvm_put_mp_state(CPUState *env);
-
 /* Arch specific hooks */
 
 int kvm_arch_post_run(CPUState *env, struct kvm_run *run);