* [Qemu-devel] [PULL v3 00/58] QOM devices patch queue 2013-11-05
@ 2013-11-05 17:11 Andreas Färber
2013-11-05 17:12 ` [Qemu-devel] [PULL v3 52/57] qom: Fix pointer to int property helpers' documentation Andreas Färber
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Färber @ 2013-11-05 17:11 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Stefan Hajnoczi, Mian M. Hamayun,
Michael S. Tsirkin, Anthony Liguori, Paolo Bonzini,
Andreas Färber
Hello Anthony,
This is my updated QOM devices patch queue. Please pull.
v3 is rebased on mst's pull so that make check passes
and it contains new Reviewed-bys by Eric.
Thanks,
Andreas
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Mian M. Hamayun <m.hamayun@virtualopensystems.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
The following changes since commit a126050a103c924b03388a9a64ce9af8c96b0969:
Merge remote-tracking branch 'kwolf/tags/for-anthony' into staging (2013-10-31 17:02:26 +0100)
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 80bbaee66ac38bcb5fe5a6f285e20457afcc8bec:
pcmcia/pxa2xx: QOM'ify PXA2xxPCMCIAState (2013-11-05 18:06:52 +0100)
----------------------------------------------------------------
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 for PCMCIA/MicroDrive (last legacy IDE device)
----------------------------------------------------------------
Andreas Färber (50):
Merge tag 'for_anthony' of git://git.kernel.org/pub/scm/virt/kvm/mst/qemu
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 (1):
qdev-monitor: Fix crash when device_add is called with abstract driver
Michael S. Tsirkin (3):
pc: disable acpi info for isapc and old pc machine
exec: limit system memory size
qom: Fix pointer to int property helpers' documentation
Paolo Bonzini (1):
vl: allow "cont" from panicked state
Stefan Hajnoczi (2):
qdev-monitor: Unref device when device_add fails
qdev: Drop misleading qdev_free() function
default-configs/arm-softmmu.mak | 1 +
exec.c | 7 +-
gdbstub.c | 3 -
hw/Makefile.objs | 1 +
hw/acpi/piix4.c | 2 +-
hw/arm/armv7m.c | 25 +--
hw/arm/exynos4_boards.c | 3 +-
hw/arm/gumstix.c | 11 +-
hw/arm/mainstone.c | 5 +-
hw/arm/omap_sx1.c | 3 +-
hw/arm/palm.c | 3 +-
hw/arm/z2.c | 5 +-
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/i386/pc_piix.c | 2 +
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 | 73 +++++---
qdev-monitor.c | 63 ++++---
tests/Makefile | 26 +++
tests/qom-test.c | 253 +++++++++++++++++++++++++++
vl.c | 6 +-
70 files changed, 1684 insertions(+), 747 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
^ permalink raw reply [flat|nested] 3+ messages in thread* [Qemu-devel] [PULL v3 52/57] qom: Fix pointer to int property helpers' documentation 2013-11-05 17:11 [Qemu-devel] [PULL v3 00/58] QOM devices patch queue 2013-11-05 Andreas Färber @ 2013-11-05 17:12 ` Andreas Färber 2013-11-05 19:02 ` Andreas Färber 0 siblings, 1 reply; 3+ messages in thread From: Andreas Färber @ 2013-11-05 17:12 UTC (permalink / raw) To: qemu-devel; +Cc: Andreas Färber, Michael S. Tsirkin From: "Michael S. Tsirkin" <mst@redhat.com> Relocate to alongside the other object_property_add_* helpers while at it. Signed-off-by: Andreas Färber <afaerber@suse.de> --- include/qom/object.h | 73 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 21 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index d02172a..a275db2 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -795,27 +795,6 @@ void object_property_add(Object *obj, const char *name, const char *type, void object_property_del(Object *obj, const char *name, Error **errp); /** - * object_property_add_uint8_ptr: - * object_property_add_uint16_ptr: - * object_property_add_uint32_ptr: - * object_property_add_uint64_ptr: - * @obj: the object to add a property to - * @name: the name of the property - * @v: pointer to value - * - * Add an integer property in memory. This function will add a - * property of the appropriate type. - */ -void object_property_add_uint8_ptr(Object *obj, const char *name, - const uint8_t *v, Error **errp); -void object_property_add_uint16_ptr(Object *obj, const char *name, - const uint16_t *v, Error **errp); -void object_property_add_uint32_ptr(Object *obj, const char *name, - const uint32_t *v, Error **errp); -void object_property_add_uint64_ptr(Object *obj, const char *name, - const uint64_t *v, Error **Errp); - -/** * object_property_find: * @obj: the object * @name: the name of the property @@ -1134,6 +1113,58 @@ void object_property_add_bool(Object *obj, const char *name, Error **errp); /** + * object_property_add_uint8_ptr: + * @obj: the object to add a property to + * @name: the name of the property + * @v: pointer to value + * @errp: if an error occurs, a pointer to an area to store the error + * + * Add an integer property in memory. This function will add a + * property of type 'uint8'. + */ +void object_property_add_uint8_ptr(Object *obj, const char *name, + const uint8_t *v, Error **errp); + +/** + * object_property_add_uint16_ptr: + * @obj: the object to add a property to + * @name: the name of the property + * @v: pointer to value + * @errp: if an error occurs, a pointer to an area to store the error + * + * Add an integer property in memory. This function will add a + * property of type 'uint16'. + */ +void object_property_add_uint16_ptr(Object *obj, const char *name, + const uint16_t *v, Error **errp); + +/** + * object_property_add_uint32_ptr: + * @obj: the object to add a property to + * @name: the name of the property + * @v: pointer to value + * @errp: if an error occurs, a pointer to an area to store the error + * + * Add an integer property in memory. This function will add a + * property of type 'uint32'. + */ +void object_property_add_uint32_ptr(Object *obj, const char *name, + const uint32_t *v, Error **errp); + +/** + * object_property_add_uint64_ptr: + * @obj: the object to add a property to + * @name: the name of the property + * @v: pointer to value + * @errp: if an error occurs, a pointer to an area to store the error + * + * Add an integer property in memory. This function will add a + * property of type 'uint64'. + */ +void object_property_add_uint64_ptr(Object *obj, const char *name, + const uint64_t *v, Error **Errp); + +/** * object_child_foreach: * @obj: the object whose children will be navigated * @fn: the iterator function to be called -- 1.8.1.4 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PULL v3 52/57] qom: Fix pointer to int property helpers' documentation 2013-11-05 17:12 ` [Qemu-devel] [PULL v3 52/57] qom: Fix pointer to int property helpers' documentation Andreas Färber @ 2013-11-05 19:02 ` Andreas Färber 0 siblings, 0 replies; 3+ messages in thread From: Andreas Färber @ 2013-11-05 19:02 UTC (permalink / raw) To: Michael S. Tsirkin; +Cc: qemu-devel Am 05.11.2013 18:12, schrieb Andreas Färber: > From: "Michael S. Tsirkin" <mst@redhat.com> > > Relocate to alongside the other object_property_add_* helpers while at it. > > Signed-off-by: Andreas Färber <afaerber@suse.de> Sorry Michael, forgot to edit the --author after resolving the merge conflict. Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-05 19:02 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-11-05 17:11 [Qemu-devel] [PULL v3 00/58] QOM devices patch queue 2013-11-05 Andreas Färber 2013-11-05 17:12 ` [Qemu-devel] [PULL v3 52/57] qom: Fix pointer to int property helpers' documentation Andreas Färber 2013-11-05 19:02 ` Andreas Färber
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).