From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
To: Damien Hedde <damien.hedde@greensocs.com>
Cc: "Eduardo Habkost" <eduardo@habkost.net>,
"Daniel P. Berrangé" <berrange@redhat.com>,
qemu-devel@nongnu.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: Re: [PATCH v2 4/5] rename machine_class_allow_dynamic_sysbus_dev
Date: Thu, 7 Apr 2022 15:07:35 +0200 [thread overview]
Message-ID: <20220407130735.GE3143488@toto> (raw)
In-Reply-To: <20220331115312.30018-5-damien.hedde@greensocs.com>
On Thu, Mar 31, 2022 at 01:53:11PM +0200, Damien Hedde wrote:
> All callsite are updated to the new function name
> "machine_class_allow_dynamic_device"
>
> Signed-off-by: Damien Hedde <damien.hedde@greensocs.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
> ---
> hw/arm/virt.c | 10 +++++-----
> hw/i386/microvm.c | 2 +-
> hw/i386/pc_piix.c | 4 ++--
> hw/i386/pc_q35.c | 8 ++++----
> hw/ppc/e500plat.c | 2 +-
> hw/ppc/spapr.c | 2 +-
> hw/riscv/virt.c | 2 +-
> hw/xen/xen-legacy-backend.c | 2 +-
> 8 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index d2e5ecd234..1442b8840b 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -2829,12 +2829,12 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
> * configuration of the particular instance.
> */
> mc->max_cpus = 512;
> - machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_CALXEDA_XGMAC);
> - machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE);
> - machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
> - machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_PLATFORM);
> + machine_class_allow_dynamic_device(mc, TYPE_VFIO_CALXEDA_XGMAC);
> + machine_class_allow_dynamic_device(mc, TYPE_VFIO_AMD_XGBE);
> + machine_class_allow_dynamic_device(mc, TYPE_RAMFB_DEVICE);
> + machine_class_allow_dynamic_device(mc, TYPE_VFIO_PLATFORM);
> #ifdef CONFIG_TPM
> - machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
> + machine_class_allow_dynamic_device(mc, TYPE_TPM_TIS_SYSBUS);
> #endif
> mc->block_default_type = IF_VIRTIO;
> mc->no_cdrom = 1;
> diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
> index 4b3b1dd262..4f8f423d31 100644
> --- a/hw/i386/microvm.c
> +++ b/hw/i386/microvm.c
> @@ -756,7 +756,7 @@ static void microvm_class_init(ObjectClass *oc, void *data)
> MICROVM_MACHINE_AUTO_KERNEL_CMDLINE,
> "Set off to disable adding virtio-mmio devices to the kernel cmdline");
>
> - machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
> + machine_class_allow_dynamic_device(mc, TYPE_RAMFB_DEVICE);
> }
>
> static const TypeInfo microvm_machine_info = {
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index b72c03d0a6..27373cb16a 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -411,8 +411,8 @@ static void pc_i440fx_machine_options(MachineClass *m)
> m->desc = "Standard PC (i440FX + PIIX, 1996)";
> m->default_machine_opts = "firmware=bios-256k.bin";
> m->default_display = "std";
> - machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
> - machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
> + machine_class_allow_dynamic_device(m, TYPE_RAMFB_DEVICE);
> + machine_class_allow_dynamic_device(m, TYPE_VMBUS_BRIDGE);
> }
>
> static void pc_i440fx_7_0_machine_options(MachineClass *m)
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 1780f79bc1..8221615fa4 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -353,10 +353,10 @@ static void pc_q35_machine_options(MachineClass *m)
> m->default_display = "std";
> m->default_kernel_irqchip_split = false;
> m->no_floppy = 1;
> - machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE);
> - machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE);
> - machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
> - machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
> + machine_class_allow_dynamic_device(m, TYPE_AMD_IOMMU_DEVICE);
> + machine_class_allow_dynamic_device(m, TYPE_INTEL_IOMMU_DEVICE);
> + machine_class_allow_dynamic_device(m, TYPE_RAMFB_DEVICE);
> + machine_class_allow_dynamic_device(m, TYPE_VMBUS_BRIDGE);
> m->max_cpus = 288;
> }
>
> diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
> index fc911bbb7b..273cde9d06 100644
> --- a/hw/ppc/e500plat.c
> +++ b/hw/ppc/e500plat.c
> @@ -102,7 +102,7 @@ static void e500plat_machine_class_init(ObjectClass *oc, void *data)
> mc->max_cpus = 32;
> mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("e500v2_v30");
> mc->default_ram_id = "mpc8544ds.ram";
> - machine_class_allow_dynamic_sysbus_dev(mc, TYPE_ETSEC_COMMON);
> + machine_class_allow_dynamic_device(mc, TYPE_ETSEC_COMMON);
> }
>
> static const TypeInfo e500plat_info = {
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index a4372ba189..70e12d9037 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4586,7 +4586,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
> mc->default_ram_id = "ppc_spapr.ram";
> mc->default_display = "std";
> mc->kvm_type = spapr_kvm_type;
> - machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SPAPR_PCI_HOST_BRIDGE);
> + machine_class_allow_dynamic_device(mc, TYPE_SPAPR_PCI_HOST_BRIDGE);
> mc->pci_allow_0_address = true;
> assert(!mc->get_hotplug_handler);
> mc->get_hotplug_handler = spapr_get_hotplug_handler;
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index da50cbed43..b6e2b0051b 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -1513,7 +1513,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
> mc->numa_mem_supported = true;
> mc->default_ram_id = "riscv_virt_board.ram";
>
> - machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
> + machine_class_allow_dynamic_device(mc, TYPE_RAMFB_DEVICE);
>
> object_class_property_add_bool(oc, "aclint", virt_get_aclint,
> virt_set_aclint);
> diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
> index 085fd31ef7..7c81c4846a 100644
> --- a/hw/xen/xen-legacy-backend.c
> +++ b/hw/xen/xen-legacy-backend.c
> @@ -722,7 +722,7 @@ static void xen_set_dynamic_sysbus(void)
> ObjectClass *oc = object_get_class(machine);
> MachineClass *mc = MACHINE_CLASS(oc);
>
> - machine_class_allow_dynamic_sysbus_dev(mc, TYPE_XENSYSDEV);
> + machine_class_allow_dynamic_device(mc, TYPE_XENSYSDEV);
> }
>
> int xen_be_register(const char *type, struct XenDevOps *ops)
> --
> 2.35.1
>
>
next prev parent reply other threads:[~2022-04-07 13:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-31 11:53 [PATCH v2 0/5] Generalize the sysbus device machine allowance Damien Hedde
2022-03-31 11:53 ` [PATCH v2 1/5] qdev: add user_creatable_requires_machine_allowance class flag Damien Hedde
2022-04-07 13:05 ` Edgar E. Iglesias
2022-04-21 15:59 ` Peter Maydell
2022-04-21 16:46 ` Damien Hedde
2022-03-31 11:53 ` [PATCH v2 2/5] machine: update machine allowed list related functions/fields Damien Hedde
2022-04-07 13:05 ` Edgar E. Iglesias
2022-03-31 11:53 ` [PATCH v2 3/5] qdev-monitor: use the new user_creatable_requires_machine_allowance Damien Hedde
2022-04-07 13:07 ` Edgar E. Iglesias
2022-03-31 11:53 ` [PATCH v2 4/5] rename machine_class_allow_dynamic_sysbus_dev Damien Hedde
2022-04-07 13:07 ` Edgar E. Iglesias [this message]
2022-03-31 11:53 ` [PATCH v2 5/5] machine: remove temporary inline functions Damien Hedde
2022-04-07 13:08 ` Edgar E. Iglesias
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=20220407130735.GE3143488@toto \
--to=edgar.iglesias@gmail.com \
--cc=berrange@redhat.com \
--cc=damien.hedde@greensocs.com \
--cc=eduardo@habkost.net \
--cc=f4bug@amsat.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wangyanan55@huawei.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).