From: Peter Maydell Date: Mon, 14 Mar 2016 11:13:11 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160311' into staging X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~30^2~6^2~8^2~127 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1ab9681ac54a01aece0f17f082a7f8677311f51;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160311' into staging CPU hotplug via cpu-add for s390x, cleanup of the s390x machine compat code and a bugfix in the s390-ccw bios. # gpg: Signature made Fri 11 Mar 2016 09:48:02 GMT using RSA key ID C6F02FAF # gpg: Good signature from "Cornelia Huck " # gpg: aka "Cornelia Huck " * remotes/cohuck/tags/s390x-20160311: s390x/cpu: use g_new0 s390x: Introduce S390MachineClass s390x: Introduce machine definition macros pc-bios/s390-ccw: fix old bug in ptr increment s390x/cpu: Allow hotplug of CPUs s390x/cpu: Add error handling to cpu creation s390x/cpu: Add CPU property links s390x/cpu: Tolerate max_cpus s390x/cpu: Get rid of side effects when creating a vcpu s390x/cpu: Set initial CPU state in common routine s390x/cpu: Cleanup init in preparation for hotplug Signed-off-by: Peter Maydell --- d1ab9681ac54a01aece0f17f082a7f8677311f51