From patchwork Tue Oct 8 17:43:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 281635 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 311732C00AB for ; Wed, 9 Oct 2013 07:38:18 +1100 (EST) Received: from localhost ([::1]:38200 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbi1-0000Z6-3X for incoming@patchwork.ozlabs.org; Tue, 08 Oct 2013 14:08:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbe0-00053H-PQ for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTbdt-0007Vm-Gl for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:28 -0400 Received: from cantor2.suse.de ([195.135.220.15]:43006 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbdt-0007TZ-0f for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:21 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 49394A50DE; Tue, 8 Oct 2013 19:45:01 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 8 Oct 2013 19:43:58 +0200 Message-Id: <1381254296-3203-1-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.1.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Peter Maydell , "Mian M. Hamayun" , "Michael S. Tsirkin" , Anthony Liguori , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PULL 00/58] QOM devices patch queue 2013-10-08 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Hello Anthony, This is my current QOM devices patch queue. Please pull. Thanks, Andreas Cc: Anthony Liguori Cc: Peter Maydell Cc: Mian M. Hamayun Cc: Paolo Bonzini Cc: Michael S. Tsirkin The following changes since commit a684f3cf9b9b9c3cb82be87aafc463de8974610c: Merge remote-tracking branch 'kraxel/seabios-1.7.3.2' into staging (2013-09-30 17:15:27 -0500) are available in the git repository at: git://github.com/afaerber/qemu-cpu.git tags/qom-devices-for-anthony for you to fetch changes up to c0a0dd4242be94386ef7968ce47b3411ebea0aec: pcmcia/pxa2xx: QOM'ify PXA2xxPCMCIAState (2013-10-08 19:17:49 +0200) ---------------------------------------------------------------- QOM device refactorings * QTest coverage for all machines * QOM realize for Milkymist UART * QOM realize for ARM MPCore * device_add bug fixes and cleanups * QOM API extensions and cleanups * QOM for PCMCIA/MicroDrive (last legacy IDE device) ---------------------------------------------------------------- Andreas Färber (49): mips_mipssim: Silence BIOS loading warning for qtest puv3: Turn puv3_load_kernel() into a no-op for qtest without -kernel mainstone: Don't enforce use of -pflash for qtest gumstix: Don't enforce use of -pflash for qtest z2: Don't enforce use of -pflash for qtest palm: Don't enforce loading ROM or kernel for qtest omap_sx1: Don't enforce use of kernel or flash for qtest exynos4_boards: Silence lack of -smp 2 warning for qtest armv7m: Don't enforce use of kernel for qtest axis_dev88: Don't enforce use of kernel for qtest mcf5208: Don't enforce use of kernel for qtest an5206: Don't enforce use of kernel for qtest milkymist: Suppress -kernel/-bios/-drive error for qtest shix: Drop debug output shix: Don't require firmware presence for qtest leon3: Don't enforce use of -bios with qtest qtest: Prepare QOM machine tests a9mpcore: Split off instance_init arm_gic: Extract headers hw/intc/arm_gic{,_common}.h a9mpcore: Embed GICState a9scu: QOM cleanups a9mpcore: Embed A9SCUState arm_mptimer: Convert to QOM realize a9mpcore: Embed ARMMPTimerState a9mpcore: Convert to QOM realize a9mpcore: Prepare for QOM embedding a15mpcore: Split off instance_init a15mpcore: Embed GICState a15mpcore: Convert to QOM realize a15mpcore: Prepare for QOM embedding a9scu: Build only once arm11mpcore: Fix typo in MemoryRegion name arm11mpcore: Drop unused fields arm11mpcore: Create container MemoryRegion in instance_init arm11mpcore: Split off SCU device arm11mpcore: Convert ARM11MPCorePriveState to QOM realize realview_gic: Convert to QOM realize realview_gic: Prepare for QOM embedding arm11mpcore: Convert mpcore_rirq_state to QOM realize arm11mpcore: Prepare for QOM embedding arm11mpcore: Split off RealView MPCore qdev-monitor: Clean up qdev_device_add() variable naming qdev-monitor: Avoid qdev as variable name qdev-monitor: Inline qdev_init() for device_add pxa: Fix typo "dettach" pcmcia: QOM'ify PCMCIACardState and MicroDriveState microdrive: Coding Style cleanups ide: Drop ide_init2_with_non_qdev_drives() pcmcia/pxa2xx: QOM'ify PXA2xxPCMCIAState Antony Pavlov (1): milkymist-uart: Use Device::realize instead of SysBusDevice::init Igor Mammedov (2): qdev-monitor: Fix crash when device_add is called with abstract driver qom: Include error.h directly in object.h Michael S. Tsirkin (2): qom: Clean up struct Error references qom: Add pointer to int property helpers Peter Maydell (2): hw/arm/boot: Make user not specifying a kernel not an error hw/arm: Tidy up conditional calls to arm_load_kernel() Stefan Hajnoczi (2): qdev-monitor: Unref device when device_add fails qdev: Drop misleading qdev_free() function default-configs/arm-softmmu.mak | 1 + hw/Makefile.objs | 1 + hw/acpi/piix4.c | 2 +- hw/arm/armv7m.c | 25 +-- hw/arm/boot.c | 6 +- hw/arm/exynos4_boards.c | 3 +- hw/arm/gumstix.c | 11 +- hw/arm/mainstone.c | 5 +- hw/arm/omap_sx1.c | 13 +- hw/arm/palm.c | 13 +- hw/arm/z2.c | 17 +- hw/block/tc58128.c | 10 +- hw/char/milkymist-uart.c | 24 +-- hw/core/qdev.c | 12 +- hw/cpu/Makefile.objs | 1 + hw/cpu/a15mpcore.c | 81 ++++----- hw/cpu/a9mpcore.c | 120 +++++++------ hw/cpu/arm11mpcore.c | 251 +++++++------------------- hw/cpu/realview_mpcore.c | 139 +++++++++++++++ hw/cris/axis_dev88.c | 11 +- hw/ide/core.c | 49 ------ hw/ide/internal.h | 2 - hw/ide/microdrive.c | 226 +++++++++++++++++------- hw/intc/arm_gic_common.c | 18 +- hw/intc/gic_internal.h | 80 +-------- hw/intc/realview_gic.c | 58 +++--- hw/lm32/milkymist.c | 3 +- hw/m68k/an5206.c | 4 + hw/m68k/mcf5208.c | 4 + hw/mips/mips_mipssim.c | 4 +- hw/misc/Makefile.objs | 4 +- hw/misc/a9scu.c | 25 +-- hw/misc/arm11scu.c | 100 +++++++++++ hw/pci/pci-hotplug-old.c | 2 +- hw/pci/pci_bridge.c | 2 +- hw/pci/pcie.c | 2 +- hw/pci/shpc.c | 2 +- hw/pcmcia/Makefile.objs | 2 + hw/pcmcia/pcmcia.c | 24 +++ hw/{misc/pxa2xx_pcmcia.c => pcmcia/pxa2xx.c} | 130 +++++++++++--- hw/s390x/virtio-ccw.c | 2 +- hw/scsi/scsi-bus.c | 6 +- hw/sh4/shix.c | 16 +- hw/sparc/leon3.c | 3 +- hw/timer/arm_mptimer.c | 60 ++----- hw/unicore32/puv3.c | 4 + hw/usb/bus.c | 7 +- hw/usb/dev-storage.c | 2 +- hw/usb/host-legacy.c | 2 +- hw/virtio/virtio-bus.c | 4 +- hw/xen/xen_platform.c | 2 +- include/hw/arm/pxa.h | 2 +- include/hw/cpu/a15mpcore.h | 44 +++++ include/hw/cpu/a9mpcore.h | 37 ++++ include/hw/cpu/arm11mpcore.h | 35 ++++ include/hw/intc/arm_gic.h | 42 +++++ include/hw/intc/arm_gic_common.h | 92 ++++++++++ include/hw/intc/realview_gic.h | 28 +++ include/hw/misc/a9scu.h | 31 ++++ include/hw/misc/arm11scu.h | 29 +++ include/hw/pcmcia.h | 46 +++-- include/hw/qdev-core.h | 1 - include/hw/timer/arm_mptimer.h | 54 ++++++ include/qom/object.h | 104 ++++++++--- qdev-monitor.c | 63 ++++--- qom/object.c | 60 +++++++ tests/Makefile | 26 +++ tests/qom-test.c | 253 +++++++++++++++++++++++++++ 68 files changed, 1777 insertions(+), 765 deletions(-) create mode 100644 hw/cpu/realview_mpcore.c create mode 100644 hw/misc/arm11scu.c create mode 100644 hw/pcmcia/Makefile.objs create mode 100644 hw/pcmcia/pcmcia.c rename hw/{misc/pxa2xx_pcmcia.c => pcmcia/pxa2xx.c} (61%) create mode 100644 include/hw/cpu/a15mpcore.h create mode 100644 include/hw/cpu/a9mpcore.h create mode 100644 include/hw/cpu/arm11mpcore.h create mode 100644 include/hw/intc/arm_gic.h create mode 100644 include/hw/intc/arm_gic_common.h create mode 100644 include/hw/intc/realview_gic.h create mode 100644 include/hw/misc/a9scu.h create mode 100644 include/hw/misc/arm11scu.h create mode 100644 include/hw/timer/arm_mptimer.h create mode 100644 tests/qom-test.c