From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3K49-0008SB-W8 for qemu-devel@nongnu.org; Mon, 30 Nov 2015 03:44:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3K49-0002YP-7J for qemu-devel@nongnu.org; Mon, 30 Nov 2015 03:44:09 -0500 From: David Gibson Date: Mon, 30 Nov 2015 19:44:42 +1100 Message-Id: <1448873085-9277-3-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1448873085-9277-1-git-send-email-david@gibson.dropbear.id.au> References: <1448873085-9277-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PULL 2/5] hw/ppc/spapr: Remove duplicated "pseries" alias List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, aik@ozlabs.ru, qemu-stable@nongnu.org, agraf@suse.de, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, David Gibson From: Thomas Huth The "pseries" alias is currently set twice, one time for the pseries-2.4 machine and one time for the "pseries-2.5" machine. To avoid confusion with the alias, let's remove the one from the older machine class. And while we're at it, also remove the "is_default = 0" there since the is_default variable should be set to zero by default already. Signed-off-by: Thomas Huth Signed-off-by: David Gibson --- hw/ppc/spapr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 3bb8bcd..6bfb908 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2423,8 +2423,6 @@ static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data) MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4"; - mc->alias = "pseries"; - mc->is_default = 0; mc->compat_props = compat_props; } -- 2.5.0