Peter Maydell b8a173b25c Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging ...

* remotes/ehabkost/tags/x86-pull-request:
  target-i386: Move APIC ID compatibility code to pc.c
  target-i386: Require APIC ID to be explicitly set before CPU realize
  target-i386: Set APIC ID using cpu_index on CONFIG_USER
  linux-user: Check for cpu_init() errors
  target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id
  target-i386: Simplify error handling on cpu_x86_init_user()
  target-i386: Eliminate cpu_init() function
  target-i386: Rename cpu_x86_init() to cpu_x86_init_user()
  target-i386: Move topology.h to include/hw/i386
  target-i386: Eliminate unnecessary get_cpuid_vendor() function
  target-i386: Simplify listflags() function

Conflicts:
	target-i386/cpu.c

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

2015-03-02 14:25:48 +00:00

..

9pfs

rcu: introduce RCU-enabled QLIST

2015-02-16 17:30:19 +01:00

acpi

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

2015-01-27 13:17:30 +00:00

alpha

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging

2015-03-02 13:20:43 +00:00

arm

error: Use error_report_err() where appropriate

2015-02-18 10:51:09 +01:00

audio

sb16: fix interrupt acknowledgement

2015-01-22 11:04:18 +01:00

block

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-18' into staging

2015-02-26 07:01:08 +00:00

bt

…

char

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging

2015-03-02 13:20:43 +00:00

core

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging

2015-03-02 13:20:43 +00:00

cpu

icc_bus: fix typo ICC_BRIGDE -> ICC_BRIDGE

2014-11-03 19:51:56 +03:00

cris

hw: Convert from BlockDriverState to BlockBackend, mostly

2014-10-20 14:02:25 +02:00

display

isa: remove isa_mem_base variable

2015-02-13 14:09:28 +00:00

dma

vmstate: accept QEMUTimer in VMSTATE_TIMER*, add VMSTATE_TIMER_PTR*

2015-01-26 12:22:44 +01:00

gpio

PPC: Add MPC8XXX gpio controller

2014-11-04 23:26:12 +01:00

i2c

Fix debug print warning

2014-09-02 22:38:16 +04:00

i386

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging

2015-03-02 14:25:48 +00:00

ide

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging

2015-03-02 13:20:43 +00:00

input

Add trace to ps2.c.

2015-02-10 09:27:20 +03:00

intc

hmp: Name HMP info handler functions hmp_info_SUBCOMMAND()

2015-02-18 11:58:50 +01:00

ipack

…

isa

isa: remove isa_mem_base variable

2015-02-13 14:09:28 +00:00

lm32

acpi-build: make ROMs RAM blocks resizeable

2015-01-08 13:17:55 +02:00

m68k

hw/core/loader: implement address translation in uimage loader

2014-11-03 00:59:10 +03:00

mem

numa: Move NUMA declarations from sysemu.h to numa.h

2015-02-23 15:39:27 -03:00

microblaze

hw/core/loader: implement address translation in uimage loader

2014-11-03 00:59:10 +03:00

mips

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging

2015-03-02 13:20:43 +00:00

misc

hw: misc, add educational driver

2015-01-26 12:26:55 +01:00

moxie

memory: add parameter errp to memory_region_init_ram

2014-09-09 13:41:43 +02:00

net

etsec: Replace qdev_init() by qdev_init_nofail()

2015-02-24 00:19:05 +01:00

nvram

fw_cfg: fix endianness in fw_cfg_data_mem_read() / _write()

2015-01-16 11:54:30 +00:00

openrisc

hw/core/loader: implement address translation in uimage loader

2014-11-03 00:59:10 +03:00

pci

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-18' into staging

2015-02-26 07:01:08 +00:00

pci-bridge

pci: split shpc_cleanup and shpc_free

2015-02-16 17:30:14 +01:00

pci-host

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

2015-02-24 13:58:18 +00:00

pcmcia

hmp: Remove "info pcmcia"

2014-10-24 12:19:11 +01:00

ppc

Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into staging

2015-03-02 12:13:45 +00:00

s390x

s390x/pci: Rework memory access in zpci instruction

2015-02-18 09:37:15 +01:00

scsi

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-18' into staging

2015-02-26 07:01:08 +00:00

sd

vmstate: accept QEMUTimer in VMSTATE_TIMER*, add VMSTATE_TIMER_PTR*

2015-01-26 12:22:44 +01:00

sh4

r2d: Don't use legacy -usbdevice support for setting up board

2015-02-18 10:53:10 +01:00

sparc

hmp: Name HMP info handler functions hmp_info_SUBCOMMAND()

2015-02-18 11:58:50 +01:00

sparc64

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging

2015-03-02 13:20:43 +00:00

ssi

…

timer

fix mc146818rtc wrong subsection name to avoid vmstate_subsection_load() fail

2015-02-05 17:16:14 +01:00

tpm

Drop superfluous conditionals around g_strdup()

2014-12-10 11:30:55 +03:00

tricore

target-tricore: check return value before using it

2014-11-02 10:04:34 +03:00

unicore32

memory: add parameter errp to memory_region_init_ram

2014-09-09 13:41:43 +02:00

usb

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-18' into staging

2015-02-26 07:01:08 +00:00

vfio

vfio: Fix debug message compile error

2015-02-10 10:25:44 -07:00

virtio

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

2015-02-24 13:58:18 +00:00

watchdog

vmstate: accept QEMUTimer in VMSTATE_TIMER*, add VMSTATE_TIMER_PTR*

2015-01-26 12:22:44 +01:00

xen

xen-pt: Fix PCI devices re-attach failed

2015-01-13 11:49:46 +00:00

xenpv

hw: Convert from BlockDriverState to BlockBackend, mostly

2014-10-20 14:02:25 +02:00

xtensa

hw/xtensa/xtfpga: treat uImage load address as virtual

2014-11-03 01:00:37 +03:00

Makefile.objs

vfio: move hw/misc/vfio.c to hw/vfio/pci.c Move vfio.h into include/hw/vfio

2014-12-19 15:24:06 -07:00