Commit 21a21b85 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging 



x86 and machine queue, 2016-07-27

Highlights:
* Fixes to allow CPU hotplug/unplug in any order;
* Exit QEMU on invalid global properties.

# gpg: Signature made Wed 27 Jul 2016 15:28:53 BST
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-pull-request:
  vl: exit if a bad property value is passed to -global
  qdev: ignore GlobalProperty.errp for hotplugged devices
  machine: Add comment to abort path in machine_set_kernel_irqchip
  Revert "pc: Enforce adding CPUs contiguously and removing them in opposite order"
  pc: Init CPUState->cpu_index with index in possible_cpus[]
  qdev: Fix object reference leak in case device.realize() fails
  exec: Set cpu_index only if it's not been explictly set
  exec: Don't use cpu_index to detect if cpu_exec_init()'s been called
  exec: Reduce CONFIG_USER_ONLY ifdeffenery

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 51313fe4 03f28efb

bsd-user/qemu.h

+0 −2
Original line number Diff line number Diff line
@@ -209,8 +209,6 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, 
                       abi_ulong new_addr);

int target_msync(abi_ulong start, abi_ulong len, int flags);

extern unsigned long last_brk;

void cpu_list_lock(void);

void cpu_list_unlock(void);

#if defined(CONFIG_USE_NPTL)

void mmap_fork_start(void);

void mmap_fork_end(int child);

exec.c

+12 −54
Original line number Diff line number Diff line
@@ -598,30 +598,7 @@ AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx) 
}

#endif



#ifndef CONFIG_USER_ONLY

static DECLARE_BITMAP(cpu_index_map, MAX_CPUMASK_BITS);



static int cpu_get_free_index(Error **errp)

{

    int cpu = find_first_zero_bit(cpu_index_map, MAX_CPUMASK_BITS);



    if (cpu >= MAX_CPUMASK_BITS) {

        error_setg(errp, "Trying to use more CPUs than max of %d",

                   MAX_CPUMASK_BITS);

        return -1;

    }



    bitmap_set(cpu_index_map, cpu, 1);

    return cpu;

}



static void cpu_release_index(CPUState *cpu)

{

    bitmap_clear(cpu_index_map, cpu->cpu_index, 1);

}

#else



static int cpu_get_free_index(Error **errp)

static int cpu_get_free_index(void)

{

    CPUState *some_cpu;

    int cpu_index = 0;
@@ -632,33 +609,21 @@ static int cpu_get_free_index(Error **errp) 
    return cpu_index;

}



static void cpu_release_index(CPUState *cpu)

{

    return;

}

#endif



void cpu_exec_exit(CPUState *cpu)

{

    CPUClass *cc = CPU_GET_CLASS(cpu);



#if defined(CONFIG_USER_ONLY)

    cpu_list_lock();

#endif

    if (cpu->cpu_index == -1) {

        /* cpu_index was never allocated by this @cpu or was already freed. */

#if defined(CONFIG_USER_ONLY)

    if (cpu->node.tqe_prev == NULL) {

        /* there is nothing to undo since cpu_exec_init() hasn't been called */

        cpu_list_unlock();

#endif

        return;

    }



    QTAILQ_REMOVE(&cpus, cpu, node);

    cpu_release_index(cpu);

    cpu->cpu_index = -1;

#if defined(CONFIG_USER_ONLY)

    cpu->node.tqe_prev = NULL;

    cpu->cpu_index = UNASSIGNED_CPU_INDEX;

    cpu_list_unlock();

#endif



    if (cc->vmsd != NULL) {

        vmstate_unregister(NULL, cc->vmsd, cpu);
@@ -670,8 +635,8 @@ void cpu_exec_exit(CPUState *cpu) 


void cpu_exec_init(CPUState *cpu, Error **errp)

{

    CPUClass *cc = CPU_GET_CLASS(cpu);

    Error *local_err = NULL;

    CPUClass *cc ATTRIBUTE_UNUSED = CPU_GET_CLASS(cpu);

    Error *local_err ATTRIBUTE_UNUSED = NULL;



    cpu->as = NULL;

    cpu->num_ases = 0;
@@ -694,22 +659,15 @@ void cpu_exec_init(CPUState *cpu, Error **errp) 
    object_ref(OBJECT(cpu->memory));

#endif



#if defined(CONFIG_USER_ONLY)

    cpu_list_lock();

#endif

    cpu->cpu_index = cpu_get_free_index(&local_err);

    if (local_err) {

        error_propagate(errp, local_err);

#if defined(CONFIG_USER_ONLY)

        cpu_list_unlock();

#endif

        return;

    if (cpu->cpu_index == UNASSIGNED_CPU_INDEX) {

        cpu->cpu_index = cpu_get_free_index();

        assert(cpu->cpu_index != UNASSIGNED_CPU_INDEX);

    }

    QTAILQ_INSERT_TAIL(&cpus, cpu, node);

#if defined(CONFIG_USER_ONLY)

    (void) cc;

    cpu_list_unlock();

#else



#ifndef CONFIG_USER_ONLY

    if (qdev_get_vmsd(DEVICE(cpu)) == NULL) {

        vmstate_register(NULL, cpu->cpu_index, &vmstate_cpu_common, cpu);

    }

hw/core/machine.c

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ static void machine_set_kernel_irqchip(Object *obj, Visitor *v, 
            ms->kernel_irqchip_split = true;

            break;

        default:

            /* The value was checked in visit_type_OnOffSplit() above. If

             * we get here, then something is wrong in QEMU.

             */

            abort();

        }

    }

hw/core/qdev-properties.c

+2 −2
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ static void qdev_prop_set_globals_for_type(DeviceState *dev, 
        if (err != NULL) {

            error_prepend(&err, "can't apply global %s.%s=%s: ",

                          prop->driver, prop->property, prop->value);

            if (prop->errp) {

            if (!dev->hotplugged && prop->errp) {

                error_propagate(prop->errp, err);

            } else {

                assert(prop->user_provided);

hw/core/qdev.c

+7 −1
Original line number Diff line number Diff line
@@ -885,6 +885,8 @@ static void device_set_realized(Object *obj, bool value, Error **errp) 
    HotplugHandler *hotplug_ctrl;

    BusState *bus;

    Error *local_err = NULL;

    bool unattached_parent = false;

    static int unattached_count;



    if (dev->hotplugged && !dc->hotpluggable) {

        error_setg(errp, QERR_DEVICE_NO_HOTPLUG, object_get_typename(obj));
@@ -893,12 +895,12 @@ static void device_set_realized(Object *obj, bool value, Error **errp) 


    if (value && !dev->realized) {

        if (!obj->parent) {

            static int unattached_count;

            gchar *name = g_strdup_printf("device[%d]", unattached_count++);



            object_property_add_child(container_get(qdev_get_machine(),

                                                    "/unattached"),

                                      name, obj, &error_abort);

            unattached_parent = true;

            g_free(name);

        }
@@ -987,6 +989,10 @@ post_realize_fail: 


fail:

    error_propagate(errp, local_err);

    if (unattached_parent) {

        object_unparent(OBJECT(dev));

        unattached_count--;

    }

}



static bool device_get_hotpluggable(Object *obj, Error **errp)