qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: peter.maydell@linaro.org, mdroth@linux.vnet.ibm.com, aik@ozlabs.ru
Cc: lvivier@redhat.com, thuth@redhat.com, agraf@suse.de,
	qemu-devel@nongnu.org, qemu-ppc@nongnu.org,
	David Gibson <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PULL 04/16] pseries: Remove redundant setting of mc->name for pseries-2.5 machine
Date: Mon, 11 Jan 2016 15:37:26 +1100	[thread overview]
Message-ID: <1452487058-17182-5-git-send-email-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <1452487058-17182-1-git-send-email-david@gibson.dropbear.id.au>

98cec76 "machine: Set MachineClass::name automatically" removed the setting
of mc->name for the pseries machine types, since it can be derived
automatically from the type names constructed with MACHINE_TYPE_NAME().

Unfortunately fb0fc8f "spapr: Create pseries-2.5 machine" went in later and
brought one of them back.

This removes it again.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 hw/ppc/spapr.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 29a16b7..a69856f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2440,7 +2440,6 @@ static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data)
     MachineClass *mc = MACHINE_CLASS(oc);
     sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc);
 
-    mc->name = "pseries-2.5";
     mc->desc = "pSeries Logical Partition (PAPR compliant) v2.5";
     mc->alias = "pseries";
     mc->is_default = 1;
-- 
2.5.0

  parent reply	other threads:[~2016-01-11  4:37 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-11  4:37 [Qemu-devel] [PULL 00/16] ppc-for-2.6 queue 20160111 David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 01/16] hw/ppc/spapr_rtc: Remove bad class_size value David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 02/16] target-ppc: Define kvmppc_read_int_dt() David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 03/16] spapr: Add /system-id David Gibson
2016-01-11  4:37 ` David Gibson [this message]
2016-01-11  4:37 ` [Qemu-devel] [PULL 05/16] pseries: Rearrange versioned machine type code David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 06/16] pseries: Remove redundant calls to spapr_machine_initfn() David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 07/16] pseries: Remove versions from mc->desc David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 08/16] Move SET_MACHINE_COMPAT macro to boards.h David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 09/16] pseries: Use SET_MACHINE_COMPAT David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 10/16] pseries: DEFINE_SPAPR_MACHINE David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 11/16] pseries: Restructure class_options functions David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 12/16] pseries: Improve setting of default machine version David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 13/16] pseries: Add pseries-2.6 machine type David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 14/16] hw/ppc/spapr: Use XHCI as host controller for new spapr machines David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 15/16] spapr vio: fix to incomplete QOMify David Gibson
2016-01-11  4:37 ` [Qemu-devel] [PULL 16/16] hw/ppc/spapr: fix spapr->kvm_type leak David Gibson
2016-01-11 12:29 ` [Qemu-devel] [PULL 00/16] ppc-for-2.6 queue 20160111 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1452487058-17182-5-git-send-email-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=agraf@suse.de \
    --cc=aik@ozlabs.ru \
    --cc=lvivier@redhat.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).