diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-15 11:05:37 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-15 11:05:37 +0000 |
| commit | d41e0bed7ba7bad87b4e0cedf5580f29ee1a311f (patch) | |
| tree | a4938c61da8e61ef30c9e0ac4a199e23ade81561 /hw/pci-bridge/pci_bridge_dev.c | |
| parent | 9828f9b6c84009ecb07796202317297bdbb8c0ef (diff) | |
| parent | 492a4c94be8853aa378a5dd8a1f8e3181754aabd (diff) | |
| download | qemu-d41e0bed7ba7bad87b4e0cedf5580f29ee1a311f.tar.gz | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
X86 fixes
# gpg: Signature made Mon 14 Mar 2016 20:26:25 GMT using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
* remotes/ehabkost/tags/x86-pull-request:
kvm: Remove x2apic feature from CPU model when kernel_irqchip is off
hyperv: cpu hotplug fix with HyperV enabled
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/pci-bridge/pci_bridge_dev.c')
0 files changed, 0 insertions, 0 deletions