From: Peter Maydell Date: Tue, 1 Jul 2014 10:00:52 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.1' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b3959efdbb2dc3d5959e3b0a8e188126930beca8;p=qmiga%2Fqemu.git Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.1' into staging QOM and device refactorings * QOM unparenting cleanup * IRQ conversion to QOM # gpg: Signature made Tue 01 Jul 2014 04:03:23 BST using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber " # gpg: aka "Andreas Färber " * remotes/afaerber/tags/qom-devices-for-2.1: irq: Slim conversion of qemu_irq to QOM irq: Allocate IRQs individually hw: Fix qemu_allocate_irqs() leaks sdhci: Fix misuse of qemu_free_irqs() qom: Remove parent pointer when unparenting Signed-off-by: Peter Maydell --- b3959efdbb2dc3d5959e3b0a8e188126930beca8