Andreas Färber [Fri, 26 Jul 2013 16:24:27 +0000 (18:24 +0200)]
omap_i2c: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 16:13:46 +0000 (18:13 +0200)]
bitbang_i2c: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 15:41:16 +0000 (17:41 +0200)]
gpio/zaurus: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 15:37:37 +0000 (17:37 +0200)]
puv3_gpio: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 15:31:46 +0000 (17:31 +0200)]
pl061: QOM'ify pl061 and pl061_luminary
Let pl061_luminary inherit from pl061, with differing instance_init.
Introduce type constant and use QOM casts.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 15:21:21 +0000 (17:21 +0200)]
pl061: Rename pl061_state to PL061State
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 15:19:36 +0000 (17:19 +0200)]
omap_gpio: QOM cast cleanup for omap2_gpif_s
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 15:14:40 +0000 (17:14 +0200)]
omap_gpio: QOM cast cleanup for omap_gpif_s
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 14:58:49 +0000 (16:58 +0200)]
sun4m_iommu: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 14:55:59 +0000 (16:55 +0200)]
sparc32_dma: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 14:43:17 +0000 (16:43 +0200)]
pxa2xx_dma: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 14:04:39 +0000 (16:04 +0200)]
puv3_dma: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 10:47:17 +0000 (12:47 +0200)]
pl080: QOM'ify pl080 and pl081
Let pl081 inherit from pl080 and replace triple SysBus initfn with two
instance_inits.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 10:37:06 +0000 (12:37 +0200)]
pl080: Rename pl080_state to PL080State
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 21:48:30 +0000 (23:48 +0200)]
empty_slot: QOM cast cleanup
Introduce type constant and use QOM casts.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 21:29:17 +0000 (23:29 +0200)]
pl011: QOM'ify pl011 and pl011_luminary
Let the Luminary variant inherit from the ARM one, overwriting its ID on
instance_init. Introduce type constant and use QOM casts. Replace
triplicated SysBusDevice initfn with QOM realizefn and instance_init.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 21:13:57 +0000 (23:13 +0200)]
pl011: Rename pl011_state
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 21:08:14 +0000 (23:08 +0200)]
milkymist-uart: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 20:59:55 +0000 (22:59 +0200)]
lm32_uart: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 20:56:36 +0000 (22:56 +0200)]
lm32_juart: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 20:49:02 +0000 (22:49 +0200)]
lm32_juart: Relocate and tidy header
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 20:43:22 +0000 (22:43 +0200)]
imx_serial: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 20:38:10 +0000 (22:38 +0200)]
grlib_apbuart: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 20:21:05 +0000 (22:21 +0200)]
exynos4210_uart: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 19:30:40 +0000 (21:30 +0200)]
escc: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 19:23:29 +0000 (21:23 +0200)]
cadence_uart: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 07:37:20 +0000 (09:37 +0200)]
versatilepb: QOM cast cleanup for vpb_sic_state
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 07:32:06 +0000 (09:32 +0200)]
strongarm: QOM cast cleanup for StrongARMSSPState
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 07:29:14 +0000 (09:29 +0200)]
strongarm: QOM cast cleanup for StrongARMUARTState
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 07:26:04 +0000 (09:26 +0200)]
strongarm: QOM cast cleanup for StrongARMPPCInfo
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 07:23:14 +0000 (09:23 +0200)]
strongarm: QOM cast cleanup for StrongARMGPIOInfo
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 07:20:15 +0000 (09:20 +0200)]
strongarm: QOM cast cleanup for StrongARMRTCState
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 07:17:13 +0000 (09:17 +0200)]
strongarm: QOM cast cleanup for StrongARMPICState
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 07:13:06 +0000 (09:13 +0200)]
stellaris: QOM cast cleanup for stellaris_adc_state
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 07:08:23 +0000 (09:08 +0200)]
stellaris: QOM cast cleanup for stellaris_i2c_state
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 07:03:33 +0000 (09:03 +0200)]
stellaris: QOM cast cleanup for gptm_state
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 06:58:32 +0000 (08:58 +0200)]
spitz: QOM cast cleanup for SpitzKeyboardState
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 06:54:33 +0000 (08:54 +0200)]
spitz: QOM cast cleanup for SLNANDState
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 00:08:09 +0000 (02:08 +0200)]
pxa2xx_pic: QOM cast cleanup for PXA2xxPICState
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 00:03:39 +0000 (02:03 +0200)]
pxa2xx_gpio: QOM cast cleanup for PXA2xxGPIOInfo
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 23:56:59 +0000 (01:56 +0200)]
pxa2xx: QOM cast cleanup for PXA2xxI2CState
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 23:50:26 +0000 (01:50 +0200)]
pxa2xx: QOM cast cleanup for PXA2xxRTCState
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 23:45:10 +0000 (01:45 +0200)]
pxa2xx: QOM cast cleanup for PXA2xxSSPState
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 23:38:59 +0000 (01:38 +0200)]
musicpal: QOM cast cleanup for musicpal_key_state
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 23:36:24 +0000 (01:36 +0200)]
musicpal: QOM cast cleanup for musicpal_gpio_state
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 23:32:00 +0000 (01:32 +0200)]
musicpal: QOM cast cleanup for mv88w8618_flashcfg
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 23:27:32 +0000 (01:27 +0200)]
musicpal: QOM cast cleanup for mv88w8618_pit_state
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 23:22:07 +0000 (01:22 +0200)]
musicpal: QOM cast cleanup mv88w8618_pic_state
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 23:16:13 +0000 (01:16 +0200)]
musicpal: QOM cast cleanup for musicpal_lcd_state
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 23:12:52 +0000 (01:12 +0200)]
musicpal: QOM cast cleanup for mv88w8618_eth_state
Introduce type constant and use QOM casts.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Stefan Weil [Sun, 28 Jul 2013 05:54:55 +0000 (07:54 +0200)]
musicpal: Fix typo in name of local function
The misspelling was spotted by Andreas Färber.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 23:08:01 +0000 (01:08 +0200)]
integratorcp: QOM cast cleanup for icp_pic_state
Introduce type constant and use QOM cast.
Fix indentation.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 23:00:27 +0000 (01:00 +0200)]
integratorcp: QOM cast cleanup for integratorcm_state
Rename to IntegratorCMState, introduce type constant and use QOM cast.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 22:52:40 +0000 (00:52 +0200)]
highbank: QOM cast cleanup for HighbankRegsState
Add type constant and use QOM casts.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Tue, 23 Jul 2013 22:46:43 +0000 (00:46 +0200)]
armv7m: QOM cast cleanup for BitBandState
Introduce TYPE_* constant and use QOM cast.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 19:50:54 +0000 (21:50 +0200)]
imx_ccm: QOM cast cleanup
Introduce type constant and use QOM casts.
Acked-by: Peter Chubb <peter.chubb@nicta.com.au>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 17:31:08 +0000 (19:31 +0200)]
imx_avic: QOM cast cleanup
Introduce type constant, use QOM casts and prepare SysBus initfn for QOM
realize by resolving SysBusDevice vs. DeviceState "dev" name conflict.
Acked-by: Peter Chubb <peter.chubb@nicta.com.au>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 23:13:54 +0000 (01:13 +0200)]
tcx: QOM cast cleanup
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 23:09:03 +0000 (01:09 +0200)]
pl110: QOM'ify pl110, pl110_versatile and pl111
Let pl110_versatile and pl111 inherit from pl110 and use PL110() cast;
set their version index in an instance_init.
Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>
[AF: Set version PL110 explicitly, suggested by Hu Tao; fixed inheritence]
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 22:57:23 +0000 (00:57 +0200)]
pl110: Rename pl110_state to PL110State
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 22:53:39 +0000 (00:53 +0200)]
milkymist-vgafb: QOM cast cleanup
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 22:48:23 +0000 (00:48 +0200)]
milkymist-tmu2: QOM cast cleanup
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 22:35:51 +0000 (00:35 +0200)]
jazz_led: QOM cast cleanup
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 22:30:30 +0000 (00:30 +0200)]
g364fb: QOM cast cleanup
Introduce a type constant, use QOM casts and rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 22:24:50 +0000 (00:24 +0200)]
exynos4210_fimd: QOM cast cleanup
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 08:44:48 +0000 (10:44 +0200)]
onenand: QOM cast cleanup
Introduce a type constant, use QOM casts and rename the parent field and
prepare for QOM realize.
Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 08:19:32 +0000 (10:19 +0200)]
pl041: QOM cast cleanup
Introduce a type constant, use QOM casts and rename the parent field.
Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Sat, 27 Jul 2013 17:45:52 +0000 (19:45 +0200)]
pl041: Rename pl041_state to PL041State
Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>
[AF: Split off renaming from QOM cast changes]
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 08:15:29 +0000 (10:15 +0200)]
milkymist-ac97: QOM cast cleanup
Introduce a type constant, use QOM casts and rename the parent field.
Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 08:10:44 +0000 (10:10 +0200)]
audio/marvell_88w8618: QOM cast cleanup
Introduce a type constant, use QOM casts and rename the parent field.
Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 08:04:31 +0000 (10:04 +0200)]
cs4231: QOM cast cleanup
Introduce a type constant, use QOM casts and rename the parent field.
Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 21:37:28 +0000 (23:37 +0200)]
xilinx_uartlite: QOM cast cleanups
Introduce type constant and use QOM casts.
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 21:34:25 +0000 (23:34 +0200)]
xilinx_uartlite: Rename xlx_uartlite to XilinxUARTLite
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 19:52:26 +0000 (21:52 +0200)]
etraxfs_ser: QOM cast cleanups
Rename etrax_serial to ETRAXSerial, introduce type constant and use QOM
casts.
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 12 Jul 2013 17:56:00 +0000 (19:56 +0200)]
pcie_port: Turn PCIEPort and PCIESlot into abstract QOM types
Move PCIEPort's "port" property to the new type, same for "aer_log_max".
Move PCIESlot's "chassis" and "slot" properties to the new type.
Reviewed-by: Don Koch <dkoch@verizon.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 12 Jul 2013 17:21:22 +0000 (19:21 +0200)]
pci-bridge/i82801b11: Rename parent field
Rename it to avoid accidental use.
Reviewed-by: Don Koch <dkoch@verizon.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 12 Jul 2013 17:16:46 +0000 (19:16 +0200)]
pci-bridge-dev: QOM parent field cleanup
Rename it to avoid accidental use.
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Don Koch <dkoch@verizon.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Thu, 11 Jul 2013 15:13:43 +0000 (17:13 +0200)]
pci-bridge: Turn PCIBridge into abstract QOM type
Introduce TYPE_PCI_BRIDGE as base type and use PCI_BRIDGE() casts.
Reviewed-by: Don Koch <dkoch@verizon.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
[AF: Updated pbm-bridge parent to TYPE_PCI_BRIDGE]
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 22:11:10 +0000 (00:11 +0200)]
arm11mpcore: QOM cast cleanups for mpcore_rirq_state
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Wed, 24 Jul 2013 21:59:01 +0000 (23:59 +0200)]
arm11mpcore: QOM cast cleanups for ARM11MPCorePriveState
Introduce a type constant, use QOM casts and rename the parent field.
Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Sun, 30 Jun 2013 19:03:27 +0000 (21:03 +0200)]
cpu/a15mpcore: QOM cast cleanup
Introduce type constant and cast macro and rename A15MPPrivState::busdev
field to parent_obj to enforce its use.
Prepares for QOM realize.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Andreas Färber [Sun, 30 Jun 2013 17:37:10 +0000 (19:37 +0200)]
timer/arm_mptimer: QOM cast cleanup
Introduce type constant and cast macro and rename
ARMMPTimerState::busdev to enforce its use.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Andreas Färber [Sun, 30 Jun 2013 17:07:29 +0000 (19:07 +0200)]
cpu/a9mpcore: QOM casting cleanup
Introduce type constant and cast macro and enforce its use by
renaming A9MPPrivState::busdev field to parent_obj.
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Andreas Färber [Wed, 17 Jul 2013 16:44:48 +0000 (18:44 +0200)]
ide: Introduce abstract QOM type for PCIIDEState
Needed for QOM casts.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Peter Crosthwaite [Mon, 24 Jun 2013 06:56:30 +0000 (16:56 +1000)]
ide/piix: QOM casting sweep
Use standard QOM cast macro. Remove usage of DO_UPCAST() and
direct -> style upcasting.
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber [Fri, 26 Jul 2013 23:55:26 +0000 (01:55 +0200)]
fdc: Fix inheritence for SUNW,fdtwo
Since commit
dd3be7420774f7dc8f37a96ca24d07f0b6f31b3b SUNW,fdtwo's
initfn (realizefn since
940194c2369e50d91d1abf6f36d43853eea5e539)
was using SYSBUS_FDC() cast. This uses type sysbus-fdc rather than
SUNW,fdtwo.
Fix this by letting SUNW,fdtwo and sysbus-fdc both inherit from an
abstract type base-sysbus-fdc.
This allows to consolidate realizefns by using instance_init functions.
Clean up variable names and variable order while at it.
Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Hu Tao <hutao@cn.fujitsu.com>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Anthony Liguori [Mon, 29 Jul 2013 16:33:48 +0000 (11:33 -0500)]
Merge remote-tracking branch 'stefanha/block' into staging
# By Stefan Hajnoczi (4) and others
# Via Stefan Hajnoczi
* stefanha/block:
dataplane: refuse to start if device is already in use
dataplane: enable virtio-blk x-data-plane=on live migration
migration: fix spice migration
migration: notify migration state before starting thread
block: Repair the throttling code.
gluster: Add image resize support
Message-id:
1375112172-24863-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Anthony Liguori [Mon, 29 Jul 2013 16:33:34 +0000 (11:33 -0500)]
Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging
QOM CPUState refactorings
* Fix x86 cpu-add
* Change KVM PMU behavior for 1.6
# gpg: Signature made Mon 29 Jul 2013 10:28:18 AM CDT using RSA key ID
3E7E013F
# gpg: Can't check signature: public key not found
# By Eduardo Habkost (2) and Andreas Färber (1)
# Via Andreas Färber
* afaerber/tags/qom-cpu-for-anthony:
target-i386: Disable PMU CPUID leaf by default
target-i386: Pass X86CPU object to cpu_x86_find_by_name()
cpu: Partially revert "cpu: Change qemu_init_vcpu() argument to CPUState"
Markus Armbruster [Fri, 26 Jul 2013 14:44:34 +0000 (16:44 +0200)]
qapi: Rename ChardevBackend member "memory" to "ringbuf"
Commit 1da48c6 called the new member "memory" after commit 3949e59
standardized "ringbuf". Rename for consistency.
However, member name "memory" is visible in QMP since 1.5. It's
undocumented just like the driver name. Keep it working anyway.
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id:
1374849874-25531-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Markus Armbruster [Fri, 26 Jul 2013 14:44:33 +0000 (16:44 +0200)]
qemu-char: Register ring buffer driver with correct name "ringbuf"
The driver is new in 1.4, with the documented name "ringbuf".
However, it's actual name is the completely undocumented "memory".
Screwed up in commit 3949e59. Fix code to match documentation.
Keep the undocumented name working as an alias for compatibility.
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id:
1374849874-25531-3-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Markus Armbruster [Fri, 26 Jul 2013 14:44:32 +0000 (16:44 +0200)]
Revert "chardev: Make the name of memory device consistent"
This reverts commit
6a85e60cb994bd95d1537aafbff65816f3de4637.
Commit 51767e7 "qemu-char: Add new char backend CirMemCharDriver"
introduced a memory ring buffer character device driver named
"memory". Commit 3949e59 "qemu-char: Saner naming of memchar stuff &
doc fixes" changed the driver name to "ringbuf", along with a whole
bunch of other names, with the following rationale:
Naming is a mess. The code calls the device driver
CirMemCharDriver, the public API calls it "memory", "memchardev",
or "memchar", and the special commands are named like
"memchar-FOO". "memory" is a particularly unfortunate choice,
because there's another character device driver called
MemoryDriver. Moreover, the device's distinctive property is that
it's a ring buffer, not that's in memory.
This is what we released in 1.4.0.
Unfortunately, the rename missed a critical instance of "memory": the
actual driver name. Thus, the new device could be used only by an
entirely undocumented name. The documented name did not work.
Bummer.
Commit 6a85e60 fixes this by changing the documentation to match the
code. It also changes some, but not all related occurences of
"ringbuf" to "memory". Left alone are identifiers in C code, HMP and
QMP commands. The latter are external interface, so they can't be
changed.
The result is an inconsistent mess. Moreover, "memory" is a rotten
name. The device's distinctive property is that it's a ring buffer,
not that's in memory. User's don't care whether it's in RAM, flash,
or carved into chocolate tablets by Oompa Loompas.
Revert the commit. Next commit will fix just the bug.
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id:
1374849874-25531-2-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Markus Armbruster [Sat, 27 Jul 2013 15:42:01 +0000 (17:42 +0200)]
qapi.py: Permit comments starting anywhere on the line
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id:
1374939721-7876-10-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Markus Armbruster [Sat, 27 Jul 2013 15:42:00 +0000 (17:42 +0200)]
qapi.py: Rename expr_eval to expr in parse_schema()
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id:
1374939721-7876-9-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Markus Armbruster [Sat, 27 Jul 2013 15:41:59 +0000 (17:41 +0200)]
qapi.py: Fix diagnosing non-objects at a schema's top-level
Report syntax error instead of crashing.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id:
1374939721-7876-8-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Markus Armbruster [Sat, 27 Jul 2013 15:41:58 +0000 (17:41 +0200)]
qapi.py: Fix schema parser to check syntax systematically
Fixes at least the following parser bugs:
* accepts any token in place of a colon
* treats comma as optional
* crashes when closing braces or brackets are missing
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id:
1374939721-7876-7-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Markus Armbruster [Sat, 27 Jul 2013 15:41:57 +0000 (17:41 +0200)]
qapi.py: Reject invalid characters in schema file
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id:
1374939721-7876-6-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Markus Armbruster [Sat, 27 Jul 2013 15:41:56 +0000 (17:41 +0200)]
qapi.py: Decent syntax error reporting
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id:
1374939721-7876-5-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Markus Armbruster [Sat, 27 Jul 2013 15:41:55 +0000 (17:41 +0200)]
qapi.py: Restructure lexer and parser
The parser has a rather unorthodox structure:
Until EOF:
Read a section:
Generator function get_expr() yields one section after the
other, as a string. An unindented, non-empty line that
isn't a comment starts a new section.
Lexing:
Split section into a list of tokens (strings), with help
of generator function tokenize().
Parsing:
Parse the first expression from the list of tokens, with
parse(), throw away any remaining tokens.
In parse_schema(): record value of an enum, union or
struct key (if any) in the appropriate global table,
append expression to the list of expressions.
Return list of expressions.
Known issues:
(1) Indentation is significant, unlike in real JSON.
(2) Neither lexer nor parser have any idea of source positions. Error
reporting is hard, let's go shopping.
(3) The one error we bother to detect, we "report" via raise.
(4) The lexer silently ignores invalid characters.
(5) If everything in a section gets ignored, the parser crashes.
(6) The lexer treats a string containing a structural character exactly
like the structural character.
(7) Tokens trailing the first expression in a section are silently
ignored.
(8) The parser accepts any token in place of a colon.
(9) The parser treats comma as optional.
(10) parse() crashes on unexpected EOF.
(11) parse_schema() crashes when a section's expression isn't a JSON
object.
Replace this piece of original art by a thoroughly unoriginal design.
Takes care of (1), (2), (5), (6) and (7), and lays the groundwork for
addressing the others. Generated source files remain unchanged.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id:
1374939721-7876-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Markus Armbruster [Sat, 27 Jul 2013 15:41:54 +0000 (17:41 +0200)]
tests: Use qapi-schema-test.json as schema parser test
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id:
1374939721-7876-3-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Markus Armbruster [Sat, 27 Jul 2013 15:41:53 +0000 (17:41 +0200)]
tests: QAPI schema parser tests
The parser handles erroneous input badly. To be improved shortly.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id:
1374939721-7876-2-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>