From: David Gibson <david@gibson.dropbear.id.au>
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 <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PULL 2/5] hw/ppc/spapr: Remove duplicated "pseries" alias
Date: Mon, 30 Nov 2015 19:44:42 +1100 [thread overview]
Message-ID: <1448873085-9277-3-git-send-email-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <1448873085-9277-1-git-send-email-david@gibson.dropbear.id.au>
From: Thomas Huth <thuth@redhat.com>
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 <thuth@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
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
next prev parent reply other threads:[~2015-11-30 8:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-30 8:44 [Qemu-devel] [PULL 0/5] ppc-for-2.5 queue 20151130 David Gibson
2015-11-30 8:44 ` [Qemu-devel] [PULL 1/5] mac_dbdma: always initialize channel field in DBDMA_channel David Gibson
2015-11-30 8:44 ` David Gibson [this message]
2015-11-30 8:44 ` [Qemu-devel] [PULL 3/5] hw/ppc/ppc405_boards: Fix infinite recursion by converting taihu_cpld from old_mmio David Gibson
2015-11-30 8:44 ` [Qemu-devel] [PULL 4/5] target-ppc: Move the FPSCR bit update macros to cpu.h David Gibson
2015-11-30 8:44 ` [Qemu-devel] [PULL 5/5] target-ppc/fpu_helper: fix FPSCR_FX bit shift operation David Gibson
2015-11-30 21:53 ` [Qemu-devel] [PULL 0/5] ppc-for-2.5 queue 20151130 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=1448873085-9277-3-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=qemu-stable@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).