Commit d14b9d79 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150626' into staging 



target-arm queue:
 * Change the virt board's default interface type for block devices to virtio
 * Improve some error messages that will now be triggered by some incorrect
   but previously worked-by-accident command lines
 * Print ELR if we're doing debug logging of AArch64 exception entry
 * Handle the "completely empty semihosting commandline" correctly for
   softmmu (we already did for linux-user)
 * Add GICv2m description to ACPI tables for virt board
 * Fix some incorrect table revision entries in virt board ACPI tables

# gpg: Signature made Fri Jun 26 14:29:39 2015 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"

* remotes/pmaydell/tags/pull-target-arm-20150626:
  hw/arm/virt: Make block devices default to virtio
  qdev-properties-system: Improve error message for drive assignment conflict
  qdev-properties-system: Change set_pointer's parse callback to use Error
  target-arm: A64: Print ELR when taking exceptions
  target-arm: default empty semihosting cmdline
  hw/arm/virt-acpi-build: Add GICv2m description in ACPI MADT table
  hw/arm/virt-acpi-build: Fix table revision and some comments

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ccb0c7e1 4e2c0b2a

hw/arm/virt-acpi-build.c

+17 −5
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ build_mcfg(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info) 
    mcfg->allocation[0].end_bus_number = (memmap[VIRT_PCIE_ECAM].size

                                          / PCIE_MMCFG_SIZE_MIN) - 1;



    build_header(linker, table_data, (void *)mcfg, "MCFG", len, 5);

    build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1);

}



/* GTDT */
@@ -413,7 +413,7 @@ build_gtdt(GArray *table_data, GArray *linker) 


    build_header(linker, table_data,

                 (void *)(table_data->data + gtdt_start), "GTDT",

                 table_data->len - gtdt_start, 5);

                 table_data->len - gtdt_start, 2);

}



/* MADT */
@@ -423,8 +423,10 @@ build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info, 
{

    int madt_start = table_data->len;

    const MemMapEntry *memmap = guest_info->memmap;

    const int *irqmap = guest_info->irqmap;

    AcpiMultipleApicTable *madt;

    AcpiMadtGenericDistributor *gicd;

    AcpiMadtGenericMsiFrame *gic_msi;

    int i;



    madt = acpi_data_push(table_data, sizeof *madt);
@@ -448,9 +450,18 @@ build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info, 
    gicd->length = sizeof(*gicd);

    gicd->base_address = memmap[VIRT_GIC_DIST].base;



    gic_msi = acpi_data_push(table_data, sizeof *gic_msi);

    gic_msi->type = ACPI_APIC_GENERIC_MSI_FRAME;

    gic_msi->length = sizeof(*gic_msi);

    gic_msi->gic_msi_frame_id = 0;

    gic_msi->base_address = cpu_to_le64(memmap[VIRT_GIC_V2M].base);

    gic_msi->flags = cpu_to_le32(1);

    gic_msi->spi_count = cpu_to_le16(NUM_GICV2M_SPIS);

    gic_msi->spi_base = cpu_to_le16(irqmap[VIRT_GIC_V2M] + ARM_SPI_BASE);



    build_header(linker, table_data,

                 (void *)(table_data->data + madt_start), "APIC",

                 table_data->len - madt_start, 5);

                 table_data->len - madt_start, 3);

}



/* FADT */
@@ -507,7 +518,7 @@ build_dsdt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info) 
    g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);

    build_header(linker, table_data,

        (void *)(table_data->data + table_data->len - dsdt->buf->len),

        "DSDT", dsdt->buf->len, 5);

        "DSDT", dsdt->buf->len, 2);

    free_aml_allocator();

}
@@ -545,6 +556,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables) 
     * FADT

     * GTDT

     * MADT

     * MCFG

     * DSDT

     */
@@ -552,7 +564,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables) 
    dsdt = tables_blob->len;

    build_dsdt(tables_blob, tables->linker, guest_info);



    /* FADT MADT GTDT SPCR pointed to by RSDT */

    /* FADT MADT GTDT MCFG SPCR pointed to by RSDT */

    acpi_add_table(table_offsets, tables_blob);

    build_fadt(tables_blob, tables->linker, dsdt);

hw/arm/virt.c

+2 −0
Original line number Diff line number Diff line
@@ -956,6 +956,8 @@ static void virt_class_init(ObjectClass *oc, void *data) 
    mc->init = machvirt_init;

    mc->max_cpus = 8;

    mc->has_dynamic_sysbus = true;

    mc->block_default_type = IF_VIRTIO;

    mc->no_cdrom = 1;

}



static const TypeInfo machvirt_info = {

hw/core/qdev-properties-system.c

+29 −13
Original line number Diff line number Diff line
@@ -35,15 +35,15 @@ static void get_pointer(Object *obj, Visitor *v, Property *prop, 
}



static void set_pointer(Object *obj, Visitor *v, Property *prop,

                        int (*parse)(DeviceState *dev, const char *str,

                                     void **ptr),

                        void (*parse)(DeviceState *dev, const char *str,

                                      void **ptr, const char *propname,

                                      Error **errp),

                        const char *name, Error **errp)

{

    DeviceState *dev = DEVICE(obj);

    Error *local_err = NULL;

    void **ptr = qdev_get_prop_ptr(dev, prop);

    char *str;

    int ret;



    if (dev->realized) {

        qdev_prop_set_after_realize(dev, name, errp);
@@ -60,26 +60,38 @@ static void set_pointer(Object *obj, Visitor *v, Property *prop, 
        *ptr = NULL;

        return;

    }

    ret = parse(dev, str, ptr);

    error_set_from_qdev_prop_error(errp, ret, dev, prop, str);

    parse(dev, str, ptr, prop->name, errp);

    g_free(str);

}



/* --- drive --- */



static int parse_drive(DeviceState *dev, const char *str, void **ptr)

static void parse_drive(DeviceState *dev, const char *str, void **ptr,

                        const char *propname, Error **errp)

{

    BlockBackend *blk;



    blk = blk_by_name(str);

    if (!blk) {

        return -ENOENT;

        error_setg(errp, "Property '%s.%s' can't find value '%s'",

                   object_get_typename(OBJECT(dev)), propname, str);

        return;

    }

    if (blk_attach_dev(blk, dev) < 0) {

        return -EEXIST;

        DriveInfo *dinfo = blk_legacy_dinfo(blk);



        if (dinfo->type != IF_NONE) {

            error_setg(errp, "Drive '%s' is already in use because "

                       "it has been automatically connected to another "

                       "device (did you need 'if=none' in the drive options?)",

                       str);

        } else {

            error_setg(errp, "Drive '%s' is already in use by another device",

                       str);

        }

        return;

    }

    *ptr = blk;

    return 0;

}



static void release_drive(Object *obj, const char *name, void *opaque)
@@ -121,17 +133,21 @@ PropertyInfo qdev_prop_drive = { 


/* --- character device --- */



static int parse_chr(DeviceState *dev, const char *str, void **ptr)

static void parse_chr(DeviceState *dev, const char *str, void **ptr,

                      const char *propname, Error **errp)

{

    CharDriverState *chr = qemu_chr_find(str);

    if (chr == NULL) {

        return -ENOENT;

        error_setg(errp, "Property '%s.%s' can't find value '%s'",

                   object_get_typename(OBJECT(dev)), propname, str);

        return;

    }

    if (qemu_chr_fe_claim(chr) != 0) {

        return -EEXIST;

        error_setg(errp, "Property '%s.%s' can't take value '%s', it's in use",

                  object_get_typename(OBJECT(dev)), propname, str);

        return;

    }

    *ptr = chr;

    return 0;

}



static void release_chr(Object *obj, const char *name, void *opaque)

include/hw/acpi/acpi-defs.h

+12 −0
Original line number Diff line number Diff line
@@ -372,6 +372,18 @@ struct AcpiMadtGenericDistributor { 


typedef struct AcpiMadtGenericDistributor AcpiMadtGenericDistributor;



struct AcpiMadtGenericMsiFrame {

    ACPI_SUB_HEADER_DEF

    uint16_t reserved;

    uint32_t gic_msi_frame_id;

    uint64_t base_address;

    uint32_t flags;

    uint16_t spi_count;

    uint16_t spi_base;

} QEMU_PACKED;



typedef struct AcpiMadtGenericMsiFrame AcpiMadtGenericMsiFrame;



/*

 * Generic Timer Description Table (GTDT)

 */

target-arm/arm-semi.c

+9 −2
Original line number Diff line number Diff line
@@ -436,12 +436,19 @@ uint32_t do_arm_semihosting(CPUARMState *env) 
            size_t input_size;

            size_t output_size;

            int status = 0;

#if !defined(CONFIG_USER_ONLY)

            const char *cmdline;

#endif

            GET_ARG(0);

            GET_ARG(1);

            input_size = arg1;

            /* Compute the size of the output string.  */

#if !defined(CONFIG_USER_ONLY)

            output_size = strlen(semihosting_get_cmdline()) + 1;

            cmdline = semihosting_get_cmdline();

            if (cmdline == NULL) {

                cmdline = ""; /* Default to an empty line. */

            }

            output_size = strlen(cmdline) + 1; /* Count terminating 0. */

#else

            unsigned int i;
@@ -472,7 +479,7 @@ uint32_t do_arm_semihosting(CPUARMState *env) 


            /* Copy the command-line arguments.  */

#if !defined(CONFIG_USER_ONLY)

            pstrcpy(output_buffer, output_size, semihosting_get_cmdline());

            pstrcpy(output_buffer, output_size, cmdline);

#else

            if (output_size == 1) {

                /* Empty command-line.  */