qemu-e2k/hw
Anthony Liguori ec9466ff2e Merge remote-tracking branch 'afaerber/qom-cpu' into staging
* afaerber/qom-cpu: (37 commits)
  kvm: Pass CPUState to kvm_on_sigbus_vcpu()
  cpu: Unconditionalize CPUState fields
  target-m68k: Use type_register() instead of type_register_static()
  target-unicore32: Use type_register() instead of type_register_static()
  target-openrisc: Use type_register() instead of type_register_static()
  target-unicore32: Catch attempt to instantiate abstract type in cpu_init()
  target-openrisc: Catch attempt to instantiate abstract type in cpu_init()
  target-m68k: Catch attempt to instantiate abstract type in cpu_init()
  target-arm: Catch attempt to instantiate abstract type in cpu_init()
  target-alpha: Catch attempt to instantiate abstract type in cpu_init()
  qom: Introduce object_class_is_abstract()
  target-unicore32: Detect attempt to instantiate non-CPU type in cpu_init()
  target-openrisc: Detect attempt to instantiate non-CPU type in cpu_init()
  target-m68k: Detect attempt to instantiate non-CPU type in cpu_init()
  target-alpha: Detect attempt to instantiate non-CPU type in cpu_init()
  target-arm: Detect attempt to instantiate non-CPU type in cpu_init()
  cpu: Add model resolution support to CPUClass
  target-i386: Remove setting tsc-frequency from x86_def_t
  target-i386: Set custom features/properties without intermediate x86_def_t
  target-i386: Remove vendor_override field from CPUX86State
  ...

Conflicts:
	tests/Makefile

Resolved simple conflict caused by lack of context in Makefile

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-01-28 14:48:03 -06:00
..
9pfs
alpha
arm
cris
dataplane
i386
ide Merge remote-tracking branch 'kwolf/for-anthony' into staging 2013-01-28 14:46:45 -06:00
kvm
lm32
m68k
microblaze
mips
openrisc target-or32: Add a IIS dummy board 2012-07-27 21:13:02 +00:00
pci build: remove extra-obj-y 2013-01-26 13:15:37 +00:00
ppc fw_cfg: Remove FW_CFG_MAX_CPUS from fw_cfg_init() 2013-01-27 14:34:27 +01:00
s390x
sh4
sparc build: move obj-TARGET-y variables to nested Makefile.objs 2012-06-07 07:17:36 +02:00
sparc64
unicore32 unicore32-softmmu: Add puv3 soc/board support 2012-08-11 09:36:59 +00:00
usb usb: add usb-bot device (scsi bulk-only transport). 2013-01-22 11:09:54 +01:00
xtensa
9p.h
a9mpcore.c
a15mpcore.c
ac97.c
acpi_ich9.c
acpi_ich9.h
acpi_piix4.c
acpi.c
acpi.h
adb.c adb: QOM'ify ADB devices 2013-01-25 22:02:55 +01:00
adb.h cuda: Move ADB bus into CUDA state 2013-01-25 22:02:55 +01:00
adlib.c
ads7846.c
alpha_dp264.c
alpha_pci.c
alpha_sys.h
alpha_typhoon.c
an5206.c
apb_pci.c
apb_pci.h
apic_common.c
apic_internal.h
apic-msidef.h
apic.c
apic.h
apm.c
apm.h
applesmc.c
arm11mpcore.c
arm_boot.c hw/arm_boot: Align device tree to 4KB boundary, not page 2013-01-26 13:28:16 +00:00
arm_gic_common.c
arm_gic_internal.h
arm_gic.c
arm_l2x0.c
arm_mptimer.c
arm_pic.c
arm_sysctl.c hw/arm_sysctl.c: Add missing 'break' statements 2013-01-26 13:20:43 +00:00
arm_timer.c
arm-misc.h
armv7m_nvic.c
armv7m.c
audiodev.h
axis_dev88.c sysbus: Drop sysbus_from_qdev() cast macro 2013-01-21 13:52:24 -06:00
baum.c
baum.h
bitbang_i2c.c
bitbang_i2c.h
blizzard_template.h
blizzard.c
block-common.c
block-common.h
boards.h
bonito.c
bt-hci-csr.c
bt-hci.c
bt-hid.c
bt-l2cap.c
bt-sdp.c
bt.c
bt.h
cadence_gem.c
cadence_ttc.c Make all static TypeInfos const 2013-01-10 15:11:53 -06:00
cadence_uart.c
cbus.c softmmu: move include files to include/sysemu/ 2012-12-19 08:32:45 +01:00
ccid-card-emulated.c
ccid-card-passthru.c
ccid.h
cdrom.c
cirrus_vga_rop2.h
cirrus_vga_rop.h
cirrus_vga_template.h
cirrus_vga.c
collie.c
cris_pic_cpu.c
cris-boot.c
cris-boot.h janitor: add guards to headers 2012-12-19 08:31:31 +01:00
cs4231.c
cs4231a.c
cuda.c cuda: Move ADB bus into CUDA state 2013-01-25 22:02:55 +01:00
debugcon.c
debugexit.c
dec_pci.c
dec_pci.h
device-hotplug.c
devices.h
dma.c
dp8393x.c
ds1225y.c Make all static TypeInfos const 2013-01-10 15:11:53 -06:00
ds1338.c
dummy_m68k.c
e1000_hw.h
e1000.c
ecc.c
eccmemctl.c
eepro100.c
eeprom93xx.c
eeprom93xx.h
elf_ops.h
empty_slot.c
empty_slot.h
es1370.c
escc.c
escc.h
esp-pci.c
esp.c
esp.h
etraxfs_dma.c
etraxfs_dma.h
etraxfs_eth.c trivial: etraxfs_eth: Eliminate checkpatch errors 2013-01-24 09:15:59 +01:00
etraxfs_pic.c
etraxfs_ser.c
etraxfs_timer.c
etraxfs.h
exynos4_boards.c
exynos4210_combiner.c
exynos4210_fimd.c
exynos4210_gic.c
exynos4210_i2c.c
exynos4210_mct.c
exynos4210_pmu.c
exynos4210_pwm.c
exynos4210_rtc.c
exynos4210_uart.c
exynos4210.c
exynos4210.h
fdc.c
fdc.h
fifo.c
fifo.h hw: Added generic FIFO API. 2012-10-10 11:13:32 +10:00
firmware_abi.h
flash.h
fmopl.c
fmopl.h
framebuffer.c
framebuffer.h
fw_cfg.c fw_cfg: Remove FW_CFG_MAX_CPUS from fw_cfg_init() 2013-01-27 14:34:27 +01:00
fw_cfg.h fw_cfg: Use void *, size_t instead of uint8_t *, uint32_t for blobs 2013-01-19 10:22:44 +00:00
g364fb.c
grackle_pci.c ppc: Move Mac machines to hw/ppc/ 2013-01-25 22:02:53 +01:00
grlib_apbuart.c
grlib_gptimer.c
grlib_irqmp.c
grlib.h
gt64xxx.c
gumstix.c
gus.c
gusemu_hal.c
gusemu_mixer.c
gusemu.h
gustate.h
hd-geometry.c
hda-audio.c
heathrow_pic.c ppc: Move Mac machines to hw/ppc/ 2013-01-25 22:02:53 +01:00
hid.c
hid.h hid: Change idle handling to use a timer 2013-01-07 12:57:24 +01:00
highbank.c
hpet_emul.h
hpet.c
hw.h
i2c.c Make all static TypeInfos const 2013-01-10 15:11:53 -06:00
i2c.h
i8254_common.c
i8254_internal.h
i8254.c
i8254.h
i8259_common.c
i8259_internal.h
i8259.c
i82374.c
i82378.c
i82801b11.c
ich9.h
ide.h ide/macio: QOM'ify MacIO IDE 2013-01-25 22:02:54 +01:00
imx_avic.c
imx_ccm.c
imx_serial.c
imx_timer.c
imx.h
integratorcp.c
intel-hda-defs.h
intel-hda.c
intel-hda.h
ioapic_common.c
ioapic_internal.h
ioapic.c
ioapic.h
ioh3420.c
ioh3420.h
ipack.c
ipack.h
ipoctal232.c
irq.c
irq.h
isa_mmio.c
isa-bus.c
isa.h
ivshmem.c pci,virtio 2013-01-14 10:23:50 -06:00
jazz_led.c
kvmvapic.c
kzm.c
lan9118.c
lance.c
leon3.c
lm32_boards.c
lm32_hwsetup.h
lm32_juart.c
lm32_juart.h
lm32_pic.c
lm32_pic.h
lm32_sys.c
lm32_timer.c Make all static TypeInfos const 2013-01-10 15:11:53 -06:00
lm32_uart.c
lm32.h
lm832x.c
lm4549.c
lm4549.h
loader.c
loader.h
lpc_ich9.c
lsi53c895a.c lsi: use qbus_reset_all to reset SCSI bus 2013-01-22 15:07:03 +01:00
m25p80.c m25p80.c: Return state to IDLE after COLLECTING 2013-01-27 01:00:19 +01:00
m48t59.c
mac_dbdma.c
mac_dbdma.h
mac_nvram.c mac_nvram: QOM'ify MacIO NVRAM 2013-01-25 22:02:54 +01:00
macio.c cuda: QOM'ify CUDA 2013-01-25 22:02:54 +01:00
mainstone.c
Makefile.objs build: remove extra-obj-y 2013-01-26 13:15:37 +00:00
marvell_88w8618_audio.c
max111x.c Make all static TypeInfos const 2013-01-10 15:11:53 -06:00
max7310.c
mc146818rtc_regs.h
mc146818rtc.c
mc146818rtc.h
mcf5206.c
mcf5208.c
mcf_fec.c
mcf_intc.c exec: move include files to include/exec/ 2012-12-19 08:31:31 +01:00
mcf_uart.c
mcf.h
megasas.c
mfi.h
microblaze_boot.c
microblaze_boot.h
microblaze_pic_cpu.c
microblaze_pic_cpu.h
milkymist-ac97.c
milkymist-hpdmc.c
milkymist-hw.h
milkymist-memcard.c
milkymist-minimac2.c
milkymist-pfpu.c
milkymist-softusb.c
milkymist-sysctl.c
milkymist-tmu2.c
milkymist-uart.c
milkymist-vgafb_template.h
milkymist-vgafb.c
milkymist.c
mips_addr.c
mips_cpudevs.h
mips_fulong2e.c
mips_int.c
mips_jazz.c
mips_malta.c
mips_mipssim.c
mips_r4k.c
mips_timer.c
mips-bios.h
mips.h
mipsnet.c
mpc8544_guts.c
msmouse.c
msmouse.h
mst_fpga.c
multiboot.c
multiboot.h
musicpal.c
nand.c
ne2000-isa.c
ne2000.c
ne2000.h
nseries.c
null-machine.c
nvram.h
omap1.c hw/omap1.c: Add fallthrough markers and breaks 2013-01-26 13:20:44 +00:00
omap2.c
omap_clk.c
omap_dma.c hw/omap_dma, hw/omap_spi: Explicitly mark fallthroughs 2013-01-26 13:20:44 +00:00
omap_dss.c
omap_gpio.c
omap_gpmc.c
omap_gptimer.c
omap_i2c.c
omap_intc.c
omap_l4.c
omap_lcd_template.h
omap_lcdc.c
omap_mmc.c
omap_sdrc.c
omap_spi.c hw/omap_dma, hw/omap_spi: Explicitly mark fallthroughs 2013-01-26 13:20:44 +00:00
omap_sx1.c
omap_synctimer.c
omap_tap.c
omap_uart.c
omap.h
onenand.c
opencores_eth.c
openpic.c openpic: add basic support for MPIC v4.2 2013-01-25 22:02:56 +01:00
openpic.h openpic: add basic support for MPIC v4.2 2013-01-25 22:02:56 +01:00
openrisc_pic.c
openrisc_sim.c
openrisc_timer.c
palm.c
pam.c
pam.h
parallel.c
pc87312.c
pc87312.h
pc_piix.c pc: Generate APIC IDs according to CPU topology 2013-01-27 14:34:27 +01:00
pc_q35.c
pc_sysfw.c
pc-testdev.c
pc.c pc: Set fw_cfg data based on APIC ID calculation 2013-01-27 14:34:27 +01:00
pc.h
pci_bridge_dev.c
pckbd.c
pcmcia.h
pcnet-pci.c
pcnet.c softmmu: move include files to include/sysemu/ 2012-12-19 08:32:45 +01:00
pcnet.h
pcspk.c
pcspk.h
petalogix_ml605_mmu.c
petalogix_s3adsp1800_mmu.c
pflash_cfi01.c
pflash_cfi02.c hw/pflash_cfi02.c: Mark deliberate fallthrough 2013-01-26 13:20:44 +00:00
piix4.c
piix_pci.c
pl011.c
pl022.c
pl031.c
pl041.c
pl041.h
pl041.hx
pl050.c
pl061.c
pl080.c
pl110_template.h
pl110.c
pl181.c
pl190.c
pm_smbus.c
pm_smbus.h
ppc4xx_devs.c
ppc4xx_pci.c
ppc4xx.h Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu 2012-12-23 00:40:49 +01:00
ppc405_boards.c
ppc405_uc.c
ppc405.h
ppc440_bamboo.c
ppc_booke.c
ppc_prep.c
ppc-viosrp.h
ppc.c
ppc.h
ppce500_pci.c
ppce500_pci.h
ppce500_spin.c sysbus: Drop sysbus_from_qdev() cast macro 2013-01-21 13:52:24 -06:00
prep_pci.c
primecell.h
ps2.c
ps2.h
ptimer.c misc: move include files to include/qemu/ 2012-12-19 08:32:39 +01:00
ptimer.h
puv3_dma.c
puv3_gpio.c
puv3_intc.c
puv3_ost.c
puv3_pm.c
puv3.c
puv3.h
pxa2xx_dma.c
pxa2xx_gpio.c
pxa2xx_keypad.c
pxa2xx_lcd.c
pxa2xx_mmci.c
pxa2xx_pcmcia.c
pxa2xx_pic.c
pxa2xx_template.h
pxa2xx_timer.c hw/pxa2xx_timer: Explicitly mark fallthroughs 2013-01-26 13:20:44 +00:00
pxa2xx.c
pxa.h
q35.c
q35.h
qdev-addr.c
qdev-addr.h
qdev-core.h qdev: add a maximum device allowed field for the bus. 2013-01-21 13:23:12 -06:00
qdev-dma.h
qdev-monitor.c
qdev-monitor.h
qdev-properties-system.c
qdev-properties.c
qdev-properties.h
qdev.c
qdev.h qdev: Split up header so it can be used in cpu.h 2012-11-15 02:18:55 +01:00
qxl-logger.c
qxl-render.c
qxl.c
qxl.h
r2d.c
rc4030.c
realview_gic.c
realview.c
rtl8139.c
s390-virtio-bus.c
s390-virtio-bus.h
s390-virtio.c s390: Add a hypercall registration interface. 2013-01-18 19:07:47 +01:00
s390-virtio.h
sb16.c
sbi.c
scsi-bus.c scsi: Drop useless null test in scsi_unit_attention() 2013-01-22 15:07:03 +01:00
scsi-defs.h
scsi-disk.c Merge remote-tracking branch 'bonzini/scsi-next' into staging 2013-01-23 09:08:54 -06:00
scsi-generic.c
scsi.h
sd.c
sd.h
serial-isa.c
serial-pci.c
serial.c Revert "serial: fix retry logic" 2013-01-24 09:45:03 -06:00
serial.h
sga.c
sh7750_regnames.c
sh7750_regnames.h
sh7750_regs.h
sh7750.c
sh_intc.c
sh_intc.h
sh_pci.c
sh_serial.c softmmu: move remaining include files to include/ subdirectories 2012-12-19 08:32:46 +01:00
sh_timer.c misc: move include files to include/qemu/ 2012-12-19 08:32:39 +01:00
sh.h Rename target_phys_addr_t to hwaddr 2012-10-23 08:58:25 -05:00
sharpsl.h
shix.c
slavio_intctl.c
slavio_misc.c
slavio_timer.c
sm501_template.h
sm501.c
smbios.c
smbios.h
smbus_eeprom.c
smbus_ich9.c
smbus.c
smbus.h
smc91c111.c hw/smc91c111: Add explicit 'return' rather than relying on fallthrough 2013-01-26 13:20:44 +00:00
soc_dma.c
soc_dma.h
spapr_events.c softmmu: move remaining include files to include/ subdirectories 2012-12-19 08:32:46 +01:00
spapr_hcall.c
spapr_iommu.c
spapr_llan.c
spapr_nvram.c
spapr_pci.c pseries: Improve handling of multiple PCI host bridges 2013-01-25 22:02:55 +01:00
spapr_pci.h pseries: Improve handling of multiple PCI host bridges 2013-01-25 22:02:55 +01:00
spapr_rtas.c
spapr_vio.c pseries: Adjust default VIO address allocations to play better with libvirt 2013-01-25 22:02:55 +01:00
spapr_vio.h
spapr_vscsi.c
spapr_vty.c
spapr.c pseries: Improve handling of multiple PCI host bridges 2013-01-25 22:02:55 +01:00
spapr.h
sparc32_dma.c
sparc32_dma.h
spitz.c
srp.h
ssd0303.c
ssd0323.c
ssi-sd.c
ssi.c
ssi.h
stellaris_enet.c
stellaris_input.c
stellaris.c
stream.c
stream.h
strongarm.c sysbus: Drop sysbus_from_qdev() cast macro 2013-01-21 13:52:24 -06:00
strongarm.h
sun4c_intctl.c
sun4m_iommu.c
sun4m.c fw_cfg: Remove FW_CFG_MAX_CPUS from fw_cfg_init() 2013-01-27 14:34:27 +01:00
sun4m.h
sun4u.c fw_cfg: Remove FW_CFG_MAX_CPUS from fw_cfg_init() 2013-01-27 14:34:27 +01:00
sysbus.c
sysbus.h
tc6393xb_template.h
tc6393xb.c
tc58128.c
tcx.c
tmp105_regs.h
tmp105.c
tmp105.h
tosa.c
tpci200.c
tsc210x.c
tsc2005.c
tusb6010.c
twl92230.c
uboot_image.h
unin_pci.c ppc: Move Mac machines to hw/ppc/ 2013-01-25 22:02:53 +01:00
usb.h
versatile_i2c.c
versatile_pci.c
versatilepb.c
vexpress.c
vfio_pci.c
vga_int.h
vga_template.h
vga-isa-mm.c
vga-isa.c
vga-pci.c
vga.c
vga.h
vhost_net.c
vhost_net.h
vhost.c vhost: backend masking support 2013-01-07 19:42:23 +02:00
vhost.h
virtex_ml507.c
virtio-balloon.c balloon: re-enable balloon stats 2013-01-25 10:47:48 -02:00
virtio-balloon.h pci: update all users to look in pci/ 2012-12-17 13:02:26 +02:00
virtio-blk.c
virtio-blk.h
virtio-bus.c
virtio-bus.h
virtio-console.c
virtio-net.c
virtio-net.h
virtio-pci.c
virtio-pci.h
virtio-rng.c misc: move include files to include/qemu/ 2012-12-19 08:32:39 +01:00
virtio-rng.h
virtio-scsi.c
virtio-scsi.h
virtio-serial-bus.c
virtio-serial.h
virtio.c
virtio.h
vmmouse.c
vmport.c
vmware_vga.c vmware_vga: fix out of bounds and invalid rects updating 2013-01-26 13:33:02 +00:00
vt82c686.c
vt82c686.h
watchdog.c
watchdog.h
wdt_i6300esb.c
wdt_ib700.c
wm8750.c
xen_apic.c
xen_backend.c
xen_backend.h
xen_blkif.h
xen_common.h
xen_console.c
xen_devconfig.c
xen_disk.c
xen_domainbuild.c
xen_domainbuild.h
xen_machine_pv.c
xen_nic.c
xen_platform.c
xen_pt_config_init.c
xen_pt_msi.c
xen_pt.c
xen_pt.h pci: update all users to look in pci/ 2012-12-17 13:02:26 +02:00
xen-host-pci-device.c
xen-host-pci-device.h
xen.h
xenfb.c
xgmac.c
xics.c
xics.h
xilinx_axidma.c
xilinx_axienet.c
xilinx_ethlite.c xilinx_ethlite: Avoid build warnings in debug code 2013-01-27 01:05:00 +01:00
xilinx_intc.c
xilinx_spi.c
xilinx_spips.c
xilinx_timer.c
xilinx_uartlite.c
xilinx_zynq.c
xilinx.h
xio3130_downstream.c
xio3130_downstream.h
xio3130_upstream.c
xio3130_upstream.h
xtensa_bootparam.h
xtensa_lx60.c
xtensa_pic.c
xtensa_sim.c
z2.c
zaurus.c
zynq_slcr.c