Commit a30b377e authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

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)

# gpg: Signature made Tue 05 Nov 2013 09:07:03 AM PST using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found

# By Andreas Färber (49) and others
# Via Andreas Färber
* afaerber/tags/qom-devices-for-anthony: (54 commits)
  pcmcia/pxa2xx: QOM'ify PXA2xxPCMCIAState
  ide: Drop ide_init2_with_non_qdev_drives()
  microdrive: Coding Style cleanups
  pcmcia: QOM'ify PCMCIACardState and MicroDriveState
  pxa: Fix typo "dettach"
  qom: Fix pointer to int property helpers' documentation
  qdev-monitor: Inline qdev_init() for device_add
  qdev-monitor: Avoid qdev as variable name
  qdev: Drop misleading qdev_free() function
  qdev-monitor: Unref device when device_add fails
  qdev-monitor: Fix crash when device_add is called with abstract driver
  qdev-monitor: Clean up qdev_device_add() variable naming
  arm11mpcore: Split off RealView MPCore
  arm11mpcore: Prepare for QOM embedding
  arm11mpcore: Convert mpcore_rirq_state to QOM realize
  realview_gic: Prepare for QOM embedding
  realview_gic: Convert to QOM realize
  arm11mpcore: Convert ARM11MPCorePriveState to QOM realize
  arm11mpcore: Split off SCU device
  arm11mpcore: Create container MemoryRegion in instance_init
  ...
parents c905c501 80bbaee6

default-configs/arm-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ CONFIG_BITBANG_I2C=y 
CONFIG_FRAMEBUFFER=y

CONFIG_XILINX_SPIPS=y



CONFIG_ARM11SCU=y

CONFIG_A9SCU=y

CONFIG_MARVELL_88W8618=y

CONFIG_OMAP=y

hw/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += net/ 
devices-dirs-$(CONFIG_SOFTMMU) += nvram/

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

devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/

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

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

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

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

hw/acpi/piix4.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots) 
            if (pc->no_hotplug) {

                slot_free = false;

            } else {

                qdev_free(qdev);

                object_unparent(OBJECT(qdev));

            }

        }

    }

hw/arm/armv7m.c

+14 −11
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include "hw/arm/arm.h"

#include "hw/loader.h"

#include "elf.h"

#include "sysemu/qtest.h"

#include "qemu/error-report.h"



/* Bitbanded IO.  Each word corresponds to a single bit.  */
@@ -232,11 +234,12 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem, 
    big_endian = 0;

#endif



    if (!kernel_filename) {

    if (!kernel_filename && !qtest_enabled()) {

        fprintf(stderr, "Guest image must be specified (using -kernel)\n");

        exit(1);

    }



    if (kernel_filename) {

        image_size = load_elf(kernel_filename, NULL, NULL, &entry, &lowaddr,

                              NULL, big_endian, ELF_MACHINE, 1);

        if (image_size < 0) {
@@ -244,10 +247,10 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem, 
            lowaddr = 0;

        }

        if (image_size < 0) {

        fprintf(stderr, "qemu: could not load kernel '%s'\n",

                kernel_filename);

            error_report("Could not load kernel '%s'", kernel_filename);

            exit(1);

        }

    }



    /* Hack to map an additional page of ram at the top of the address

       space.  This stops qemu complaining about executing code outside RAM

hw/arm/exynos4_boards.c

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
 */



#include "sysemu/sysemu.h"

#include "sysemu/qtest.h"

#include "hw/sysbus.h"

#include "net/net.h"

#include "hw/arm/arm.h"
@@ -96,7 +97,7 @@ static void lan9215_init(uint32_t base, qemu_irq irq) 
static Exynos4210State *exynos4_boards_init_common(QEMUMachineInitArgs *args,

                                                   Exynos4BoardType board_type)

{

    if (smp_cpus != EXYNOS4210_NCPUS) {

    if (smp_cpus != EXYNOS4210_NCPUS && !qtest_enabled()) {

        fprintf(stderr, "%s board supports only %d CPU cores. Ignoring smp_cpus"

                " value.\n",

                exynos4_machines[board_type].name,