From: David Gibson <david@gibson.dropbear.id.au>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>,
Eduardo Habkost <ehabkost@redhat.com>
Subject: Re: [Qemu-devel] [for-4.0 PATCH v2 8/9] q35/440fx/arm/spapr: Add QEMU 4.0 machine type
Date: Tue, 4 Dec 2018 11:18:48 +1100 [thread overview]
Message-ID: <20181204001848.GA1682@umbus.fritz.box> (raw)
In-Reply-To: <154385451622.17724.12272989665681200621.stgit@gimli.home>
[-- Attachment #1: Type: text/plain, Size: 6684 bytes --]
On Mon, Dec 03, 2018 at 09:28:36AM -0700, Alex Williamson wrote:
> Including all machine types that might have a pcie-root-port.
>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Cc: David Gibson <david@gibson.dropbear.id.au>
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> hw/arm/virt.c | 19 +++++++++++++++++--
> hw/i386/pc_piix.c | 15 ++++++++++++---
> hw/i386/pc_q35.c | 13 +++++++++++--
> hw/ppc/spapr.c | 25 ++++++++++++++++++++++---
> include/hw/compat.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> 6 files changed, 68 insertions(+), 10 deletions(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index f69e7eb39977..beaf6bc43905 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1797,7 +1797,7 @@ static void machvirt_machine_init(void)
> }
> type_init(machvirt_machine_init);
>
> -static void virt_3_1_instance_init(Object *obj)
> +static void virt_4_0_instance_init(Object *obj)
> {
> VirtMachineState *vms = VIRT_MACHINE(obj);
> VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
> @@ -1867,10 +1867,25 @@ static void virt_3_1_instance_init(Object *obj)
> vms->irqmap = a15irqmap;
> }
>
> +static void virt_machine_4_0_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(4, 0)
> +
> +#define VIRT_COMPAT_3_1 \
> + HW_COMPAT_3_1
> +
> +static void virt_3_1_instance_init(Object *obj)
> +{
> + virt_4_0_instance_init(obj);
> +}
> +
> static void virt_machine_3_1_options(MachineClass *mc)
> {
> + virt_machine_4_0_options(mc);
> + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_3_1);
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(3, 1)
> +DEFINE_VIRT_MACHINE(3, 1)
>
> #define VIRT_COMPAT_3_0 \
> HW_COMPAT_3_0
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 7092d6d13f66..cfaa83ee2fad 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -428,21 +428,30 @@ static void pc_i440fx_machine_options(MachineClass *m)
> machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
> }
>
> -static void pc_i440fx_3_1_machine_options(MachineClass *m)
> +static void pc_i440fx_4_0_machine_options(MachineClass *m)
> {
> pc_i440fx_machine_options(m);
> m->alias = "pc";
> m->is_default = 1;
> }
>
> +DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL,
> + pc_i440fx_4_0_machine_options);
> +
> +static void pc_i440fx_3_1_machine_options(MachineClass *m)
> +{
> + pc_i440fx_4_0_machine_options(m);
> + m->is_default = 0;
> + m->alias = NULL;
> + SET_MACHINE_COMPAT(m, PC_COMPAT_3_1);
> +}
> +
> DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL,
> pc_i440fx_3_1_machine_options);
>
> static void pc_i440fx_3_0_machine_options(MachineClass *m)
> {
> pc_i440fx_3_1_machine_options(m);
> - m->is_default = 0;
> - m->alias = NULL;
> SET_MACHINE_COMPAT(m, PC_COMPAT_3_0);
> }
>
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 4702bb13c472..e245db096dc1 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -311,19 +311,28 @@ static void pc_q35_machine_options(MachineClass *m)
> m->max_cpus = 288;
> }
>
> -static void pc_q35_3_1_machine_options(MachineClass *m)
> +static void pc_q35_4_0_machine_options(MachineClass *m)
> {
> pc_q35_machine_options(m);
> m->alias = "q35";
> }
>
> +DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
> + pc_q35_4_0_machine_options);
> +
> +static void pc_q35_3_1_machine_options(MachineClass *m)
> +{
> + pc_q35_4_0_machine_options(m);
> + m->alias = NULL;
> + SET_MACHINE_COMPAT(m, PC_COMPAT_3_1);
> +}
> +
> DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL,
> pc_q35_3_1_machine_options);
>
> static void pc_q35_3_0_machine_options(MachineClass *m)
> {
> pc_q35_3_1_machine_options(m);
> - m->alias = NULL;
> SET_MACHINE_COMPAT(m, PC_COMPAT_3_0);
> }
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 7afd1a175bf2..80d8498867a6 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -3956,19 +3956,38 @@ static const TypeInfo spapr_machine_info = {
> } \
> type_init(spapr_machine_register_##suffix)
>
> - /*
> +/*
> + * pseries-4.0
> + */
> +static void spapr_machine_4_0_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void spapr_machine_4_0_class_options(MachineClass *mc)
> +{
> + /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE(4_0, "4.0", true);
> +
> +/*
> * pseries-3.1
> */
> +#define SPAPR_COMPAT_3_1 \
> + HW_COMPAT_3_1
> +
> static void spapr_machine_3_1_instance_options(MachineState *machine)
> {
> + spapr_machine_4_0_instance_options(machine);
> }
>
> static void spapr_machine_3_1_class_options(MachineClass *mc)
> {
> - /* Defaults for the latest behaviour inherited from the base class */
> + spapr_machine_3_1_class_options(mc);
> + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_3_1);
> }
>
> -DEFINE_SPAPR_MACHINE(3_1, "3.1", true);
> +DEFINE_SPAPR_MACHINE(3_1, "3.1", false);
>
> /*
> * pseries-3.0
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index 6f4d5fc64704..70958328fe7a 100644
> --- a/include/hw/compat.h
> +++ b/include/hw/compat.h
> @@ -1,6 +1,9 @@
> #ifndef HW_COMPAT_H
> #define HW_COMPAT_H
>
> +#define HW_COMPAT_3_1 \
> + /* empty */
> +
> #define HW_COMPAT_3_0 \
> /* empty */
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 136fe497b6b2..cb645bf368a3 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -294,6 +294,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
> int e820_get_num_entries(void);
> bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
>
> +#define PC_COMPAT_3_1 \
> + HW_COMPAT_3_1 \
> +
> #define PC_COMPAT_3_0 \
> HW_COMPAT_3_0 \
> {\
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2018-12-04 0:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-03 16:27 [Qemu-devel] [for-4.0 PATCH v2 0/9] pcie: Enhanced link speed and width support Alex Williamson
2018-12-03 16:27 ` [Qemu-devel] [for-4.0 PATCH v2 1/9] pcie: Create enums for link speed and width Alex Williamson
2018-12-03 16:27 ` [Qemu-devel] [for-4.0 PATCH v2 2/9] pci: Sync PCIe downstream port LNKSTA on read Alex Williamson
2018-12-03 16:27 ` [Qemu-devel] [for-4.0 PATCH v2 3/9] qapi: Define PCIe link speed and width properties Alex Williamson
2018-12-03 16:27 ` [Qemu-devel] [for-4.0 PATCH v2 4/9] pcie: Add link speed and width fields to PCIESlot Alex Williamson
2018-12-03 16:28 ` [Qemu-devel] [for-4.0 PATCH v2 5/9] pcie: Fill PCIESlot link fields to support higher speeds and widths Alex Williamson
2018-12-03 16:28 ` [Qemu-devel] [for-4.0 PATCH v2 6/9] pcie: Allow generic PCIe root port to specify link speed and width Alex Williamson
2018-12-03 16:28 ` [Qemu-devel] [for-4.0 PATCH v2 7/9] vfio/pci: Remove PCIe Link Status emulation Alex Williamson
2018-12-03 16:28 ` [Qemu-devel] [for-4.0 PATCH v2 8/9] q35/440fx/arm/spapr: Add QEMU 4.0 machine type Alex Williamson
2018-12-04 0:18 ` David Gibson [this message]
2018-12-04 18:27 ` Eduardo Habkost
2018-12-05 1:37 ` David Gibson
2018-12-04 18:29 ` Peter Maydell
2018-12-03 16:28 ` [Qemu-devel] [for-4.0 PATCH v2 9/9] pcie: Fast PCIe root ports for new machines Alex Williamson
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=20181204001848.GA1682@umbus.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=alex.williamson@redhat.com \
--cc=ehabkost@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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).