Hello Peter, This is my QOM (devices) patch queue. Please pull.
Regards, Andreas Cc: Peter Maydell <peter.mayd...@linaro.org> Cc: Anthony Liguori <anth...@codemonkey.ws> Cc: Markus Armbruster <arm...@redhat.com> Cc: Alexander Graf <ag...@suse.de> Cc: Stefan Hajnoczi <stefa...@redhat.com> Cc: Paolo Bonzini <pbonz...@redhat.com> The following changes since commit 1f6b12f75f2c22f861d0202374033a7594c91707: Merge remote-tracking branch 'remotes/mwalle/tags/lm32-fixes/20140204' into staging (2014-02-08 15:57:51 +0000) 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 55b6351cf124e0c7c5fa62505b641bd7e2de0a3e: qapi: Refine human printing of sizes (2014-02-10 19:17:15 +0100) ---------------------------------------------------------------- QOM infrastructure fixes and device conversions * QTest cleanups and test cases for PCI NICs * NAND fix for "info qtree" * Cleanup and extension of QOM machine tests * IndustryPack test cases and conversion to QOM realize * I2C cleanups * Cleanups of legacy qdev properties ---------------------------------------------------------------- Andreas Färber (29): prep: Drop from ppcemb-softmmu ppcemb-softmmu: Drop Mac and e500 emulation target-ppc: Make ppc40x CPUs available in ppcemb nand: Don't use qdev_create() in nand_init() i2c: Rename i2c_bus to I2CBus pxa2xx: QOM'ify I2C slave tosa: QOM'ify DAC z2: QOM'ify AER915 wm8750: QOM'ify ssd0303: QOM'ify max7310: QOM'ify lm832x: QOM'ify ds1338: QOM'ify twl92230: QOM'ify i2c: Drop FROM_I2C_SLAVE() macro tests: Add e1000 qtest tests: Add vmxnet3 qtest tests: Add rtl8139 qtest tests: Add pcnet qtest tests: Add eepro100 qtest tests: Add ne2000 qtest tests: Add virtio-net qtest tests: Add tpci200 qtest tests: Add ipoctal232 qtest ipack: Convert to QOM realize ipack: QOM parent field cleanup for IPackBus ipack: QOM parent field cleanup for IPackDevice ipoctal232: QOM parent field cleanup ipack: Move IndustryPack out of hw/char/ Fam Zheng (1): qtest: Don't segfault with invalid -qtest option Markus Armbruster (2): qom-test: Run for all available machines qom-test: Test shutdown in addition to startup Michael S. Tsirkin (1): qtest: don't report signals if qtest driver enabled Paolo Bonzini (14): qapi: Add size parser to StringInputVisitor qdev: Sizes are now parsed by StringInputVisitor qdev: Remove legacy parsers for hex8/32/64 qdev: Legacy properties are now read-only qdev: Legacy properties are just strings qdev: Inline qdev_prop_parse() qapi: Add human mode to StringOutputVisitor qdev: Use human mode in "info qtree" qdev: Remove most legacy printers qdev: Remove hex8/32/64 property types block: Handle "rechs" and "large" translation options qdev: Add enum property types to QAPI schema qdev: Use QAPI type names for properties qapi: Refine human printing of sizes Peter Maydell (1): tests: Run qom-test for every architecture blockdev.c | 4 + default-configs/ppc-softmmu.mak | 2 + default-configs/ppc64-softmmu.mak | 2 + default-configs/ppcemb-softmmu.mak | 25 --- hw/Makefile.objs | 1 + hw/acpi/piix4.c | 6 +- hw/arm/exynos4210.c | 2 +- hw/arm/musicpal.c | 4 +- hw/arm/nseries.c | 2 +- hw/arm/pxa2xx.c | 44 ++++-- hw/arm/realview.c | 4 +- hw/arm/spitz.c | 2 +- hw/arm/stellaris.c | 8 +- hw/arm/tosa.c | 18 ++- hw/arm/versatilepb.c | 4 +- hw/arm/z2.c | 22 ++- hw/audio/adlib.c | 2 +- hw/audio/cs4231a.c | 2 +- hw/audio/gus.c | 2 +- hw/audio/pcspk.c | 2 +- hw/audio/sb16.c | 4 +- hw/audio/wm8750.c | 33 ++-- hw/block/fdc.c | 2 +- hw/block/nand.c | 2 +- hw/char/Makefile.objs | 2 +- hw/char/debugcon.c | 4 +- hw/char/ipoctal232.c | 20 +-- hw/char/parallel.c | 2 +- hw/char/serial-isa.c | 2 +- hw/core/qdev-properties-system.c | 12 +- hw/core/qdev-properties.c | 204 ++---------------------- hw/core/qdev.c | 38 +---- hw/display/g364fb.c | 2 +- hw/display/ssd0303.c | 18 ++- hw/display/tcx.c | 4 +- hw/dma/i82374.c | 2 +- hw/dma/sun4m_iommu.c | 2 +- hw/gpio/max7310.c | 23 +-- hw/i2c/bitbang_i2c.c | 6 +- hw/i2c/bitbang_i2c.h | 2 +- hw/i2c/core.c | 32 ++-- hw/i2c/exynos4210_i2c.c | 2 +- hw/i2c/omap_i2c.c | 4 +- hw/i2c/pm_smbus.c | 2 +- hw/i2c/smbus.c | 18 +-- hw/i2c/smbus_eeprom.c | 2 +- hw/i2c/smbus_ich9.c | 2 +- hw/i2c/versatile_i2c.c | 2 +- hw/i386/kvm/i8254.c | 8 +- hw/i386/pc_piix.c | 2 +- hw/ide/isa.c | 4 +- hw/ide/qdev.c | 2 +- hw/input/lm832x.c | 22 +-- hw/intc/i8259_common.c | 6 +- hw/ipack/Makefile.objs | 2 + hw/{char => ipack}/ipack.c | 43 ++--- hw/{char => ipack}/tpci200.c | 2 +- hw/isa/pc87312.c | 2 +- hw/isa/vt82c686.c | 4 +- hw/mips/mips_fulong2e.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/misc/applesmc.c | 2 +- hw/misc/debugexit.c | 4 +- hw/misc/eccmemctl.c | 2 +- hw/net/ne2000-isa.c | 2 +- hw/nvram/fw_cfg.c | 4 +- hw/ppc/Makefile.objs | 6 +- hw/ppc/spapr_pci.c | 16 +- hw/scsi/megasas.c | 2 +- hw/scsi/scsi-disk.c | 6 +- hw/sd/sdhci.c | 4 +- hw/timer/ds1338.c | 21 ++- hw/timer/i8254.c | 2 +- hw/timer/m48t59.c | 4 +- hw/timer/mc146818rtc.c | 14 +- hw/timer/twl92230.c | 35 ++-- hw/usb/host-libusb.c | 4 +- hw/virtio/virtio-pci.c | 6 +- include/hw/arm/exynos4210.h | 2 +- include/hw/arm/omap.h | 2 +- include/hw/arm/pxa.h | 2 +- include/hw/block/block.h | 6 - include/hw/i2c/i2c.h | 20 ++- include/hw/i2c/pm_smbus.h | 2 +- include/hw/i2c/smbus.h | 20 +-- include/hw/i386/ich9.h | 2 +- include/hw/i386/pc.h | 6 +- {hw/char => include/hw/ipack}/ipack.h | 15 +- include/hw/isa/vt82c686.h | 4 +- include/hw/qdev-core.h | 1 - include/hw/qdev-dma.h | 2 +- include/hw/qdev-properties.h | 11 -- include/qapi/string-output-visitor.h | 2 +- include/qemu-common.h | 8 - include/qemu/typedefs.h | 2 +- include/qom/object.h | 3 +- include/sysemu/qtest.h | 5 +- qapi-schema.json | 58 +++++++ qapi/string-input-visitor.c | 24 +++ qapi/string-output-visitor.c | 56 ++++++- qdev-monitor.c | 6 +- qom/object.c | 4 +- qtest.c | 13 +- target-ppc/translate_init.c | 38 ++--- tests/Makefile | 71 ++++++--- tests/e1000-test.c | 33 ++++ tests/eepro100-test.c | 63 ++++++++ tests/ipoctal232-test.c | 33 ++++ tests/ne2000-test.c | 33 ++++ tests/pcnet-test.c | 33 ++++ tests/qom-test.c | 289 ++++++++-------------------------- tests/rtl8139-test.c | 33 ++++ tests/test-string-output-visitor.c | 2 +- tests/test-visitor-serialization.c | 2 +- tests/tpci200-test.c | 33 ++++ tests/virtio-net-test.c | 33 ++++ tests/vmxnet3-test.c | 33 ++++ vl.c | 32 +++- 118 files changed, 1031 insertions(+), 847 deletions(-) create mode 100644 hw/ipack/Makefile.objs rename hw/{char => ipack}/ipack.c (72%) rename hw/{char => ipack}/tpci200.c (99%) rename {hw/char => include/hw/ipack}/ipack.h (91%) create mode 100644 tests/e1000-test.c create mode 100644 tests/eepro100-test.c create mode 100644 tests/ipoctal232-test.c create mode 100644 tests/ne2000-test.c create mode 100644 tests/pcnet-test.c create mode 100644 tests/rtl8139-test.c create mode 100644 tests/tpci200-test.c create mode 100644 tests/virtio-net-test.c create mode 100644 tests/vmxnet3-test.c