From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a5mZ1-00064Q-4W for qemu-devel@nongnu.org; Sun, 06 Dec 2015 22:34:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a5mYx-0006IF-Qn for qemu-devel@nongnu.org; Sun, 06 Dec 2015 22:34:11 -0500 From: David Gibson Date: Mon, 7 Dec 2015 14:34:30 +1100 Message-Id: <1449459280-14983-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCHv2 00/10] Clean up pseries machine versioning List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: ehabkost@redhat.com, agraf@suse.de, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com Cc: lvivier@redhat.com, thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Thomas Huth recently posted a patches to switch the default USB controller for the pseries machine type to xHCI, which necessitated creating a pseries-2.6 machine type version. That raised a bunch of comments suggesting better ways we could manage the machine versioning for pseries. This is an attempt to implement those suggestions. For the most part it makes the handling of machine versions for pseries more similar to the handling of PC machine versions. Eduardo, - Any opinions on how 5/10 (the only patch which isn't spapr specific) should be merged? Otherwise I'm hoping to get some ACKs from outside Red Hat, at which point I'll merge these into my ppc-for-2.6 tree, to be pushed upstream once the 2.6 tree opens. Changes in v2: * General rework * Moved most actual fixes to existing behaviour earlier in the series for clarity * Now also avoid redundant calls to the base class instance_init function David Gibson (10): pseries: Remove redundant setting of mc->name for pseries-2.5 machine pseries: Rearrange versioned machine type code pseries: Remove redundant calls to spapr_machine_initfn() pseries: Remove versions from mc->desc Move SET_MACHINE_COMPAT macro to boards.h pseries: Use SET_MACHINE_COMPAT pseries: DEFINE_SPAPR_MACHINE pseries: Restructure class_options functions pseries: Improve setting of default machine version pseries: Add pseries-2.6 machine type hw/ppc/spapr.c | 238 +++++++++++++++++++++++++-------------------------- include/hw/boards.h | 9 ++ include/hw/i386/pc.h | 8 -- 3 files changed, 127 insertions(+), 128 deletions(-) -- 2.5.0