Commit 4acc8fdf authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160617' into staging 



ppc patch queue for 2016-06-17

Here's the current accumulated set of spapr, ppc and related patches.
  * The big thing in here is CPU hotplug for spapr
    - This includes a number of acked generic changes adding new
      infrastructure for hotplugging cpu cores
  * A number of TCG bug fixes are also included
  * This adds a new testcase to make it harder to accidentally break
    Macintosh (and other openbios) platforms

# gpg: Signature made Fri 17 Jun 2016 07:35:29 BST
# gpg:                using RSA key 0x6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.7-20160617:
  spapr: implement query-hotpluggable-cpus callback
  hmp: Add 'info hotpluggable-cpus' HMP command
  QMP: Add query-hotpluggable-cpus
  spapr: CPU hot unplug support
  spapr: CPU hotplug support
  spapr: convert boot CPUs into CPU core devices
  spapr: Move spapr_cpu_init() to spapr_cpu_core.c
  spapr: Abstract CPU core device and type specific core devices
  qom: API to get instance_size of a type
  spapr_drc: Prevent detach racing against attach for CPU DR
  xics,xics_kvm: Handle CPU unplug correctly
  cpu: Abstract CPU core type
  qdev: hotplug: Introduce HotplugHandler.pre_plug() callback
  target-ppc: Fix rlwimi, rlwinm, rlwnm
  vfio: Fix broken EEH
  target-ppc: Bug in BookE wait instruction
  ppc / sparc: Add a tester for checking whether OpenBIOS runs successfully
  hw/ppc/spapr: Silence deprecation message in qtest mode

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7263a903 2474bfd4

hmp-commands-info.hx

+14 −0
Original line number Diff line number Diff line
@@ -798,6 +798,20 @@ STEXI 
@item info dump

@findex dump

Display the latest dump status.

ETEXI



    {

        .name       = "hotpluggable-cpus",

        .args_type  = "",

        .params     = "",

        .help       = "Show information about hotpluggable CPUs",

        .mhandler.cmd = hmp_hotpluggable_cpus,

    },



STEXI

@item info hotpluggable-cpus

@findex hotpluggable-cpus

Show information about hotpluggable CPUs

ETEXI



STEXI

hmp.c

+42 −0
Original line number Diff line number Diff line
@@ -2433,3 +2433,45 @@ void hmp_info_dump(Monitor *mon, const QDict *qdict) 


    qapi_free_DumpQueryResult(result);

}



void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)

{

    Error *err = NULL;

    HotpluggableCPUList *l = qmp_query_hotpluggable_cpus(&err);

    HotpluggableCPUList *saved = l;

    CpuInstanceProperties *c;



    if (err != NULL) {

        hmp_handle_error(mon, &err);

        return;

    }



    monitor_printf(mon, "Hotpluggable CPUs:\n");

    while (l) {

        monitor_printf(mon, "  type: \"%s\"\n", l->value->type);

        monitor_printf(mon, "  vcpus_count: \"%" PRIu64 "\"\n",

                       l->value->vcpus_count);

        if (l->value->has_qom_path) {

            monitor_printf(mon, "  qom_path: \"%s\"\n", l->value->qom_path);

        }



        c = l->value->props;

        monitor_printf(mon, "  CPUInstance Properties:\n");

        if (c->has_node) {

            monitor_printf(mon, "    node: \"%" PRIu64 "\"\n", c->node);

        }

        if (c->has_socket) {

            monitor_printf(mon, "    socket: \"%" PRIu64 "\"\n", c->socket);

        }

        if (c->has_core) {

            monitor_printf(mon, "    core: \"%" PRIu64 "\"\n", c->core);

        }

        if (c->has_thread) {

            monitor_printf(mon, "    thread: \"%" PRIu64 "\"\n", c->thread);

        }



        l = l->next;

    }



    qapi_free_HotpluggableCPUList(saved);

}

hmp.h

+1 −0
Original line number Diff line number Diff line
@@ -132,5 +132,6 @@ void hmp_rocker_ports(Monitor *mon, const QDict *qdict); 
void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict);

void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict);

void hmp_info_dump(Monitor *mon, const QDict *qdict);

void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict);



#endif

hw/core/hotplug.c

+11 −0
Original line number Diff line number Diff line
@@ -13,6 +13,17 @@ 
#include "hw/hotplug.h"

#include "qemu/module.h"



void hotplug_handler_pre_plug(HotplugHandler *plug_handler,

                              DeviceState *plugged_dev,

                              Error **errp)

{

    HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler);



    if (hdc->pre_plug) {

        hdc->pre_plug(plug_handler, plugged_dev, errp);

    }

}



void hotplug_handler_plug(HotplugHandler *plug_handler,

                          DeviceState *plugged_dev,

                          Error **errp)

hw/core/qdev.c

+8 −1
Original line number Diff line number Diff line
@@ -902,6 +902,14 @@ static void device_set_realized(Object *obj, bool value, Error **errp) 
            g_free(name);

        }



        hotplug_ctrl = qdev_get_hotplug_handler(dev);

        if (hotplug_ctrl) {

            hotplug_handler_pre_plug(hotplug_ctrl, dev, &local_err);

            if (local_err != NULL) {

                goto fail;

            }

        }



        if (dc->realize) {

            dc->realize(dev, &local_err);

        }
@@ -912,7 +920,6 @@ static void device_set_realized(Object *obj, bool value, Error **errp) 


        DEVICE_LISTENER_CALL(realize, Forward, dev);



        hotplug_ctrl = qdev_get_hotplug_handler(dev);

        if (hotplug_ctrl) {

            hotplug_handler_plug(hotplug_ctrl, dev, &local_err);

        }