Commit 61e8a923 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging 



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

# gpg: Signature made Mon 17 Feb 2014 22:15:37 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-devices-for-peter: (49 commits)
  qtest: Include system headers before user headers
  qapi: Refine human printing of sizes
  qdev: Use QAPI type names for properties
  qdev: Add enum property types to QAPI schema
  block: Handle "rechs" and "large" translation options
  qdev: Remove hex8/32/64 property types
  qdev: Remove most legacy printers
  qdev: Use human mode in "info qtree"
  qapi: Add human mode to StringOutputVisitor
  qdev: Inline qdev_prop_parse()
  qdev: Legacy properties are just strings
  qdev: Legacy properties are now read-only
  qdev: Remove legacy parsers for hex8/32/64
  qdev: Sizes are now parsed by StringInputVisitor
  qapi: Add size parser to StringInputVisitor
  qtest: Don't segfault with invalid -qtest option
  ipack: Move IndustryPack out of hw/char/
  ipoctal232: QOM parent field cleanup
  ipack: QOM parent field cleanup for IPackDevice
  ipack: QOM parent field cleanup for IPackBus
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4c0c9bbe 91f32b0c

blockdev.c

+4 −0
Original line number Diff line number Diff line
@@ -779,6 +779,10 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
            translation = BIOS_ATA_TRANSLATION_NONE;

        } else if (!strcmp(value, "lba")) {

            translation = BIOS_ATA_TRANSLATION_LBA;

        } else if (!strcmp(value, "large")) {

            translation = BIOS_ATA_TRANSLATION_LARGE;

        } else if (!strcmp(value, "rechs")) {

            translation = BIOS_ATA_TRANSLATION_RECHS;

        } else if (!strcmp(value, "auto")) {

            translation = BIOS_ATA_TRANSLATION_AUTO;

        } else {

default-configs/ppc-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ CONFIG_XILINX=y 
CONFIG_XILINX_ETHLITE=y

CONFIG_OPENPIC=y

CONFIG_PREP=y

CONFIG_MAC=y

CONFIG_E500=y

CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))

# For PReP

default-configs/ppc64-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ CONFIG_XILINX_ETHLITE=y 
CONFIG_OPENPIC=y

CONFIG_PSERIES=y

CONFIG_PREP=y

CONFIG_MAC=y

CONFIG_E500=y

CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))

# For pSeries

default-configs/ppcemb-softmmu.mak

+0 −20
Original line number Diff line number Diff line
@@ -3,30 +3,12 @@ 
include pci.mak

include sound.mak

include usb.mak

CONFIG_ISA_MMIO=y

CONFIG_ESCC=y

CONFIG_M48T59=y

CONFIG_VGA=y

CONFIG_VGA_PCI=y

CONFIG_SERIAL=y

CONFIG_I8254=y

CONFIG_FDC=y

CONFIG_I8257=y

CONFIG_OPENPIC=y

CONFIG_MACIO=y

CONFIG_CUDA=y

CONFIG_ADB=y

CONFIG_MAC_NVRAM=y

CONFIG_MAC_DBDMA=y

CONFIG_HEATHROW_PIC=y

CONFIG_GRACKLE_PCI=y

CONFIG_UNIN_PCI=y

CONFIG_DEC_PCI=y

CONFIG_PPCE500_PCI=y

CONFIG_IDE_ISA=y

CONFIG_IDE_CMD646=y

CONFIG_IDE_MACIO=y

CONFIG_NE2000_ISA=y

CONFIG_PFLASH_CFI01=y

CONFIG_PFLASH_CFI02=y

CONFIG_PTIMER=y
@@ -34,5 +16,3 @@ CONFIG_I8259=y 
CONFIG_XILINX=y

CONFIG_XILINX_ETHLITE=y

CONFIG_OPENPIC=y
 
CONFIG_E500=y

CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))

hw/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += i2c/ 
devices-dirs-$(CONFIG_SOFTMMU) += ide/

devices-dirs-$(CONFIG_SOFTMMU) += input/

devices-dirs-$(CONFIG_SOFTMMU) += intc/

devices-dirs-$(CONFIG_IPACK) += ipack/

devices-dirs-$(CONFIG_SOFTMMU) += isa/

devices-dirs-$(CONFIG_SOFTMMU) += misc/

devices-dirs-$(CONFIG_SOFTMMU) += net/