[Qemu-commits] [qemu/qemu] 0779ca: Initialize IA32_FEATURE_CONTROL MSR in reset and m...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0779caeb1a17f4d3ed14e2925b36ba09b084fb7b
      
https://github.com/qemu/qemu/commit/0779caeb1a17f4d3ed14e2925b36ba09b084fb7b
  Author: Arthur Chunqi Li <address@hidden>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M target-i386/cpu.h
    M target-i386/kvm.c
    M target-i386/machine.c

  Log Message:
  -----------
  Initialize IA32_FEATURE_CONTROL MSR in reset and migration

The recent KVM patch adds IA32_FEATURE_CONTROL support. QEMU needs
to clear this MSR when reset vCPU and keep the value of it when
migration. This patch add this feature.

Signed-off-by: Arthur Chunqi Li <address@hidden>
Signed-off-by: Gleb Natapov <address@hidden>


  Commit: e4a09c9637f13a744ad7e2bc5223df05ac582c0d
      
https://github.com/qemu/qemu/commit/e4a09c9637f13a744ad7e2bc5223df05ac582c0d
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Changed paths:
    M target-i386/cpu.h

  Log Message:
  -----------
  target-i386: remove tabs from target-i386/cpu.h

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 0d89436786b02a9e7d561c4d7dc4982e4a2739db
      
https://github.com/qemu/qemu/commit/0d89436786b02a9e7d561c4d7dc4982e4a2739db
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Changed paths:
    M target-i386/cpu.h
    M target-i386/kvm.c
    M target-i386/machine.c

  Log Message:
  -----------
  kvm: migrate vPMU state

Reviewed-by: Gleb Natapov <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: ca916d3729564d0eb3c2374a96903f7e8aced8a7
      
https://github.com/qemu/qemu/commit/ca916d3729564d0eb3c2374a96903f7e8aced8a7
  Author: Vincenzo Maffione <address@hidden>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Changed paths:
    M hw/misc/vfio.c
    M hw/virtio/virtio-pci.c
    M include/sysemu/kvm.h
    M kvm-all.c

  Log Message:
  -----------
  kvm: add KVM_IRQFD_FLAG_RESAMPLE support

Added an EventNotifier* parameter to
kvm-all.c:kvm_irqchip_add_irqfd_notifier(), in order to give KVM
another eventfd to be used as "resamplefd". See the documentation
in the linux kernel sources in Documentation/virtual/kvm/api.txt
(section 4.75) for more details.
When the added parameter is passed NULL, the behaviour of the
function is unchanged with respect to the previous versions.

Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Vincenzo Maffione <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: df67696e97d3edd0cb1683bf2eb3b3236bd9a5ed
      
https://github.com/qemu/qemu/commit/df67696e97d3edd0cb1683bf2eb3b3236bd9a5ed
  Author: Liu Jinsong <address@hidden>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M target-i386/kvm.c

  Log Message:
  -----------
  kvm: x86: fix setting IA32_FEATURE_CONTROL with nested VMX disabled

This patch is to fix the bug https://bugs.launchpad.net/qemu-kvm/+bug/1207623

IA32_FEATURE_CONTROL is pointless if not expose VMX or SMX bits to
cpuid.1.ecx of vcpu. Current qemu-kvm will error return when kvm_put_msrs
or kvm_get_msrs.

Signed-off-by: Liu Jinsong <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 354678c5ce162649906e4e1be2859f3df372668f
      
https://github.com/qemu/qemu/commit/354678c5ce162649906e4e1be2859f3df372668f
  Author: Jan Kiszka <address@hidden>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M kvm-all.c

  Log Message:
  -----------
  kvm: Simplify kvm_handle_io

Now that cpu_in/out is just a wrapper around address_space_rw, we can
also call the latter directly. As host endianness == guest endianness,
there is no need for the memory access helpers st*_p/ld*_p as well.

Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7dc52526850849e8e0fe56ced809d0798481a2f6
      
https://github.com/qemu/qemu/commit/7dc52526850849e8e0fe56ced809d0798481a2f6
  Author: Marcelo Tosatti <address@hidden>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M kvm-all.c

  Log Message:
  -----------
  kvm-all.c: max_cpus should not exceed KVM vcpu limit

maxcpus, which specifies the maximum number of hotpluggable CPUs,
should not exceed KVM's vcpu limit.

Signed-off-by: Marcelo Tosatti <address@hidden>
[Reword message. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7477cd3897082d2650d520a4e9aa7f8affa3dd5d
      
https://github.com/qemu/qemu/commit/7477cd3897082d2650d520a4e9aa7f8affa3dd5d
  Author: Marcelo Tosatti <address@hidden>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M target-i386/kvm.c

  Log Message:
  -----------
  kvm: i386: fix LAPIC TSC deadline timer save/restore

The configuration of the timer represented by MSR_IA32_TSCDEADLINE depends on:

- APIC LVT Timer register.
- TSC value.

Change the order to respect the dependency.

Signed-off-by: Marcelo Tosatti <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: c0b4cc1f9f4df9d7459dc778e64f00a4e781fd88
      
https://github.com/qemu/qemu/commit/c0b4cc1f9f4df9d7459dc778e64f00a4e781fd88
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  pc: cleanup 1.4 compat support

Make 1.4 compat code call the 1.6 one, reducing
code duplication. Add comment explaining why we can't
make 1.4 call 1.5 as usual.

Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>


  Commit: 0851c9f75ccb0baf28f5bf901b9ffe3c91fcf969
      
https://github.com/qemu/qemu/commit/0851c9f75ccb0baf28f5bf901b9ffe3c91fcf969
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  arch_init: align MR size to target page size

Migration code assumes that each MR is a multiple of TARGET_PAGE_SIZE:
MR size is divided by TARGET_PAGE_SIZE, so if it isn't migration
never completes.
But this isn't really required for regions set up with
memory_region_init_ram, since that calls qemu_ram_alloc
which aligns size up using TARGET_PAGE_ALIGN.

Align MR size up to full target page sizes, this way
migration completes even if we create a RAM MR
which is not a full target page size.

Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>


  Commit: 04920fc0faa4760f9c4fc0e73b992b768099be70
      
https://github.com/qemu/qemu/commit/04920fc0faa4760f9c4fc0e73b992b768099be70
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M hw/core/loader.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/loader.h

  Log Message:
  -----------
  loader: store FW CFG ROM files in RAM

ROM files that are put in FW CFG are copied to guest ram, by BIOS, but
they are not backed by RAM so they don't get migrated.

Each time we change two bytes in such a ROM this breaks cross-version
migration: since we can migrate after BIOS has read the first byte but
before it has read the second one, getting an inconsistent state.

Future-proof this by creating, for each such ROM,
an MR serving as the backing store.
This MR is never mapped into guest memory, but it's registered
as RAM so it's migrated with the guest.

Naturally, this only helps for -M 1.7 and up, older machine types
will still have the cross-version migration bug.
Luckily the race window for the problem to trigger is very small,
which is also likely why we didn't notice the cross-version
migration bug in testing yet.

Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>


  Commit: 4b38e989b43e84c485f676f2039f21b15da439fe
      
https://github.com/qemu/qemu/commit/4b38e989b43e84c485f676f2039f21b15da439fe
  Author: Alex Williamson <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M docs/q35-chipset.cfg

  Log Message:
  -----------
  q35: Add PCIe switch to example q35 configuration

Signed-off-by: Alex Williamson <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 6b63ef4d0f225810b74281e6689a4d5695860c08
      
https://github.com/qemu/qemu/commit/6b63ef4d0f225810b74281e6689a4d5695860c08
  Author: Markus Armbruster <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c

  Log Message:
  -----------
  sun4: Don't prematurely explode QEMUMachineInitArgs

Don't explode QEMUMachineInitArgs before passing it to
sun4m_hw_init(), sun4uv_init().

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: ee87e32f830b4e22c02038de963bb9f72b55896f
      
https://github.com/qemu/qemu/commit/ee87e32f830b4e22c02038de963bb9f72b55896f
  Author: Markus Armbruster <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M hw/ppc/e500plat.c
    M hw/ppc/mpc8544ds.c

  Log Message:
  -----------
  ppc: Don't explode QEMUMachineInitArgs into local variables needlessly

Don't explode when the variable is used just once, and never changed.

Signed-off-by: Markus Armbruster <address@hidden>
Acked-by: Alexander Graf <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 92238367450d26eced103736ae555997ea3162c2
      
https://github.com/qemu/qemu/commit/92238367450d26eced103736ae555997ea3162c2
  Author: Markus Armbruster <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M hw/ppc/e500.c
    M hw/ppc/e500.h
    M hw/ppc/e500plat.c
    M hw/ppc/mpc8544ds.c

  Log Message:
  -----------
  ppc: Don't duplicate QEMUMachineInitArgs in PPCE500Params

Pass on the generic arguments unadulterated, and the machine-specific
ones as separate argument.

Signed-off-by: Markus Armbruster <address@hidden>
Acked-by: Alexander Graf <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 5650f5f48bfe2a684138505aae008dc4440202f1
      
https://github.com/qemu/qemu/commit/5650f5f48bfe2a684138505aae008dc4440202f1
  Author: Markus Armbruster <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  pc: Don't prematurely explode QEMUMachineInitArgs

Don't explode QEMUMachineInitArgs before passing it to pc_init1().

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 3b6fb9cab2e64804cdab5a61d1298ffd8b8dff85
      
https://github.com/qemu/qemu/commit/3b6fb9cab2e64804cdab5a61d1298ffd8b8dff85
  Author: Markus Armbruster <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  pc: Don't explode QEMUMachineInitArgs into local variables needlessly

Don't explode when the variable is used just a few times, and never
changed.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 43a52ce65736adf9def7c2a9e5ba409814eb5dae
      
https://github.com/qemu/qemu/commit/43a52ce65736adf9def7c2a9e5ba409814eb5dae
  Author: Eduardo Habkost <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  pc: Kill pc_init_pci_1_0()

The pc_init_pci_1_2()/pc_init_pci_1_0() split was made on commit
6fd028f64f662c801fd5a54d0e3a1d2baeee93ea, in preparation for commit
9953f8822cc316eec9962f0a2858c3439a80adec. The latter was reverted, so there's
no reason to keep two separate functions that do exactly the same, anymore.

Signed-off-by: Eduardo Habkost <address@hidden>
Cc: Markus Armbruster <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 89b439f3136644b07c2e25bb4ceeb9466ae23fe5
      
https://github.com/qemu/qemu/commit/89b439f3136644b07c2e25bb4ceeb9466ae23fe5
  Author: Eduardo Habkost <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  pc: Create pc_compat_*() functions

Making the older compat functions call the newer compat functions at the
beginning allows the older functions undo what's done by newer compat
functions. e.g.: pc_compat_1_4() will be able to call pc_compat_1_5()
and then set has_pvpanic=false.

Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 396f79f45ea75bd1c421522f29b4f91d490df7cc
      
https://github.com/qemu/qemu/commit/396f79f45ea75bd1c421522f29b4f91d490df7cc
  Author: Eduardo Habkost <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  pc: pc_compat_1_4() now can call pc_compat_1_5()

It just needs to set has_pvpanic=false after calling it. This way, it
won't be a special case anymore.

Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 1e0995561959645e218bb5e4afb6ad3d47b33396
      
https://github.com/qemu/qemu/commit/1e0995561959645e218bb5e4afb6ad3d47b33396
  Author: Eduardo Habkost <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  pc_piix: Kill pc_init1() memory region args

All callers always use the same values (get_system_memory(),
get_system_io()), so the parameters are pointless.

If one day we decide to eliminate get_system_memory() and
get_system_io(), we will be able to do that more easily by adding the
values to struct QEMUMachineInitArgs.

Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 867c47cbba5d5ff8f27cc22634f30da56d09c2c4
      
https://github.com/qemu/qemu/commit/867c47cbba5d5ff8f27cc22634f30da56d09c2c4
  Author: Wei Yang <address@hidden>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

  Changed paths:
    M hw/i386/kvm/pci-assign.c

  Log Message:
  -----------
  kvm: shorten the parameter list for get_real_device()

get_real_device() has 5 parameters with the last 4 is contained in the first
structure.

This patch removes the last 4 parameters and directly use them from the first
parameter.

Acked-by: Alex Williamson <address@hidden>
Signed-off-by: Wei Yang <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 1ae2757c6c4525c9b42f408c86818f843bad7418
      
https://github.com/qemu/qemu/commit/1ae2757c6c4525c9b42f408c86818f843bad7418
  Author: yinyin <address@hidden>
  Date:   2013-08-25 (Sun, 25 Aug 2013)

  Changed paths:
    M hw/virtio/virtio.c

  Log Message:
  -----------
  virtio: virtqueue_get_avail_bytes: fix desc_pa when loop over the indirect 
descriptor table

virtqueue_get_avail_bytes: when found a indirect desc, we need loop over it.
     /* loop over the indirect descriptor table */
     indirect = 1;
     max = vring_desc_len(desc_pa, i) / sizeof(VRingDesc);
     num_bufs = i = 0;
     desc_pa = vring_desc_addr(desc_pa, i);
But, It init i to 0, then use i to update desc_pa. so we will always get:
desc_pa = vring_desc_addr(desc_pa, 0);
the last two line should swap.

Cc: address@hidden
Signed-off-by: Yin Yin <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 7e75e33e7886314490305f181065b8b4ec916a8a
      
https://github.com/qemu/qemu/commit/7e75e33e7886314490305f181065b8b4ec916a8a
  Author: Stefan Weil <address@hidden>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  w32: Fix broken out-of-tree builds (missing version.o)

Commit 0b516ef0dfad9a7b34c675c98e8ec92ab4d38466 added version.o to all
executables, but broke out-of-tree builds: for those builds the pattern
rule %.o: %.rc from rules.mak does not match, so version.o was no longer
built.

Adding explicit build rules fixes this.

Reported-by: Michael Roth <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
Tested-by: Michael Roth <address@hidden>


  Commit: 487cddb2bf3f429953dc5b3252d2a3b83d7200c5
      
https://github.com/qemu/qemu/commit/487cddb2bf3f429953dc5b3252d2a3b83d7200c5
  Author: Stefan Weil <address@hidden>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M version.rc

  Log Message:
  -----------
  w32: Add an icon resource

The QEMU mascot which was already used for the NSIS installer
is now used for all QEMU executables.

Signed-off-by: Stefan Weil <address@hidden>


  Commit: 92f1623663a8797e68a043ec401a740746439f29
      
https://github.com/qemu/qemu/commit/92f1623663a8797e68a043ec401a740746439f29
  Author: Stefan Weil <address@hidden>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  gtk: Remove unused include statements which are not portable

These include files don't exist for MinGW and are not needed for Linux
(and hopefully for other hosts as well), so remove them.

Signed-off-by: Stefan Weil <address@hidden>


  Commit: 821c808bd1863efc2c1e977800ae77db633a185c
      
https://github.com/qemu/qemu/commit/821c808bd1863efc2c1e977800ae77db633a185c
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-08-28 (Wed, 28 Aug 2013)

  Changed paths:
    M kvm-stub.c

  Log Message:
  -----------
  kvm-stub: fix compilation

Non-KVM targets fail compilation on the uq/master branch.
Fix the prototype of kvm_irqchip_add_irqfd_notifier to match
the one in kvm-all.c.

Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gleb Natapov <address@hidden>


  Commit: 3e998a778846de4ea24188278f18e4191a56412e
      
https://github.com/qemu/qemu/commit/3e998a778846de4ea24188278f18e4191a56412e
  Author: Anthony Liguori <address@hidden>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M arch_init.c
    M docs/q35-chipset.cfg
    M hw/core/loader.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/ppc/e500.c
    M hw/ppc/e500.h
    M hw/ppc/e500plat.c
    M hw/ppc/mpc8544ds.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c
    M hw/virtio/virtio.c
    M include/hw/loader.h

  Log Message:
  -----------
  Merge remote-tracking branch 'mst/tags/for_anthony' into stable-1.5

pc,pci,virtio fixes and cleanups

This includes pc and pci cleanups, future-proofing of ROM files,
and a virtio bugfix correcting splice on virtio console.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Mon 26 Aug 2013 01:34:20 AM CDT using RSA key ID D28D5469
# gpg: Can't check signature: public key not found

# By Markus Armbruster (5) and others
# Via Michael S. Tsirkin
* mst/tags/for_anthony:
  virtio: virtqueue_get_avail_bytes: fix desc_pa when loop over the indirect 
descriptor table
  pc_piix: Kill pc_init1() memory region args
  pc: pc_compat_1_4() now can call pc_compat_1_5()
  pc: Create pc_compat_*() functions
  pc: Kill pc_init_pci_1_0()
  pc: Don't explode QEMUMachineInitArgs into local variables needlessly
  pc: Don't prematurely explode QEMUMachineInitArgs
  ppc: Don't duplicate QEMUMachineInitArgs in PPCE500Params
  ppc: Don't explode QEMUMachineInitArgs into local variables needlessly
  sun4: Don't prematurely explode QEMUMachineInitArgs
  q35: Add PCIe switch to example q35 configuration
  loader: store FW CFG ROM files in RAM
  arch_init: align MR size to target page size
  pc: cleanup 1.4 compat support

Message-id: address@hidden


  Commit: e560992f21437380857ae490c907810d99459df5
      
https://github.com/qemu/qemu/commit/e560992f21437380857ae490c907810d99459df5
  Author: Anthony Liguori <address@hidden>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M Makefile
    M ui/gtk.c
    M version.rc

  Log Message:
  -----------
  Merge remote-tracking branch 'sweil/mingw' into stable-1.5

# By Stefan Weil
# Via Stefan Weil
* sweil/mingw:
  gtk: Remove unused include statements which are not portable
  w32: Add an icon resource
  w32: Fix broken out-of-tree builds (missing version.o)

Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: b5d54bd42158b90b239bb6ce9c13072eb3a53fd2
      
https://github.com/qemu/qemu/commit/b5d54bd42158b90b239bb6ce9c13072eb3a53fd2
  Author: Anthony Liguori <address@hidden>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M hw/i386/kvm/pci-assign.c
    M hw/misc/vfio.c
    M hw/virtio/virtio-pci.c
    M include/sysemu/kvm.h
    M kvm-all.c
    M kvm-stub.c
    M target-i386/cpu.h
    M target-i386/kvm.c
    M target-i386/machine.c

  Log Message:
  -----------
  Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5

* qemu-kvm/uq/master:
  kvm-stub: fix compilation
  kvm: shorten the parameter list for get_real_device()
  kvm: i386: fix LAPIC TSC deadline timer save/restore
  kvm-all.c: max_cpus should not exceed KVM vcpu limit
  kvm: Simplify kvm_handle_io
  kvm: x86: fix setting IA32_FEATURE_CONTROL with nested VMX disabled
  kvm: add KVM_IRQFD_FLAG_RESAMPLE support
  kvm: migrate vPMU state
  target-i386: remove tabs from target-i386/cpu.h
  Initialize IA32_FEATURE_CONTROL MSR in reset and migration

Conflicts:
        target-i386/cpu.h
        target-i386/kvm.c

aliguori: fixup trivial conflicts due to whitespace and added cpu
    argument

Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/584950fd4e4d...b5d54bd42158