Hello Peter, This is my QOM (devices) patch queue. Please pull.
I've verified that the machine changes still build on FreeBSD. Regards, Andreas Cc: Peter Maydell <peter.mayd...@linaro.org> Cc: Anthony Liguori <anth...@codemonkey.ws> Cc: Marcel Apfelbaum <marce...@redhat.com> Cc: Peter Crosthwaite <peter.crosthwa...@xilinx.com> The following changes since commit 3ee933c9d4869891a5614fba4815a3857dc3ef8f: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2014-05-28 15:22:40 +0100) are available in the git repository at: git://github.com/afaerber/qemu-cpu.git tags/qom-devices-for-peter for you to fetch changes up to de77914e50477ca4cef1e9cdd7a05b8d0c0ff1d9: ssi: Name the CS GPIO (2014-05-28 17:36:21 +0200) ---------------------------------------------------------------- QOM/QTest infrastructure fixes and device conversions * qom-test extension * QEMUMachineInitArgs conversion to MachineState * -machine options turned into /machine properties * Named GPIO IRQs for devices ---------------------------------------------------------------- Cole Robinson (1): qom-test: Test qom-list on link<> properties Marcel Apfelbaum (5): machine: Conversion of QEMUMachineInitArgs to MachineState vl.c: Do not set 'type' property in obj_set_property() qapi: Avoid output visitor crashing if it encounters a NULL value tests: Check empty QMP output visitor machine: Make -machine opts properties of MachineState Peter Crosthwaite (2): qdev: Implement named GPIOs ssi: Name the CS GPIO hw/alpha/dp264.c | 12 +- hw/arm/collie.c | 10 +- hw/arm/cubieboard.c | 11 +- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4_boards.c | 22 +-- hw/arm/gumstix.c | 6 +- hw/arm/highbank.c | 24 +-- hw/arm/integratorcp.c | 12 +- hw/arm/kzm.c | 12 +- hw/arm/mainstone.c | 14 +- hw/arm/musicpal.c | 10 +- hw/arm/nseries.c | 22 +-- hw/arm/omap_sx1.c | 21 +-- hw/arm/palm.c | 10 +- hw/arm/realview.c | 44 ++--- hw/arm/spitz.c | 26 +-- hw/arm/stellaris.c | 19 ++- hw/arm/tosa.c | 10 +- hw/arm/versatilepb.c | 26 +-- hw/arm/vexpress.c | 21 +-- hw/arm/virt.c | 16 +- hw/arm/xilinx_zynq.c | 14 +- hw/arm/z2.c | 10 +- hw/core/machine.c | 280 +++++++++++++++++++++++++++++++ hw/core/null-machine.c | 2 +- hw/core/qdev.c | 85 ++++++++-- hw/cris/axis_dev88.c | 10 +- hw/i386/pc_piix.c | 109 ++++++------ hw/i386/pc_q35.c | 67 ++++---- hw/lm32/lm32_boards.c | 16 +- hw/lm32/milkymist.c | 10 +- hw/m68k/an5206.c | 8 +- hw/m68k/dummy_m68k.c | 8 +- hw/m68k/mcf5208.c | 8 +- hw/microblaze/petalogix_ml605_mmu.c | 8 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 8 +- hw/mips/mips_fulong2e.c | 12 +- hw/mips/mips_jazz.c | 12 +- hw/mips/mips_malta.c | 12 +- hw/mips/mips_mipssim.c | 12 +- hw/mips/mips_r4k.c | 12 +- hw/moxie/moxiesim.c | 12 +- hw/openrisc/openrisc_sim.c | 8 +- hw/ppc/e500.c | 44 ++--- hw/ppc/e500.h | 2 +- hw/ppc/e500plat.c | 4 +- hw/ppc/mac_newworld.c | 14 +- hw/ppc/mac_oldworld.c | 14 +- hw/ppc/mpc8544ds.c | 4 +- hw/ppc/ppc405_boards.c | 18 +- hw/ppc/ppc440_bamboo.c | 12 +- hw/ppc/prep.c | 14 +- hw/ppc/spapr.c | 14 +- hw/ppc/virtex_ml507.c | 16 +- hw/s390x/s390-virtio-ccw.c | 10 +- hw/s390x/s390-virtio.c | 10 +- hw/sh4/r2d.c | 10 +- hw/sh4/shix.c | 4 +- hw/sparc/leon3.c | 8 +- hw/sparc/sun4m.c | 68 ++++---- hw/sparc64/sun4u.c | 36 ++-- hw/ssi/ssi.c | 4 +- hw/unicore32/puv3.c | 10 +- hw/xenpv/xen_machine_pv.c | 8 +- hw/xtensa/xtensa_lx60.c | 26 +-- hw/xtensa/xtensa_sim.c | 8 +- include/hw/boards.h | 27 ++- include/hw/qdev-core.h | 24 ++- include/hw/ssi.h | 2 + qapi/qmp-output-visitor.c | 6 + qdev-monitor.c | 16 +- qtest.c | 19 ++- tests/qom-test.c | 15 +- tests/test-qmp-output-visitor.c | 11 ++ vl.c | 24 +-- 75 files changed, 990 insertions(+), 585 deletions(-)