From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Stefano Stabellini" <sstabellini@kernel.org>, "Eduardo Habkost" <ehabkost@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Paul Durrant" <paul@xen.org>, "Paolo Bonzini" <pbonzini@redhat.com>, "Anthony Perard" <anthony.perard@citrix.com>, xen-devel@lists.xenproject.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Richard Henderson" <rth@twiddle.net> Subject: [PATCH v2 6/6] typedefs: Restrict PCMachineState to 'hw/i386/pc.h' Date: Tue, 8 Sep 2020 17:55:30 +0200 [thread overview] Message-ID: <20200908155530.249806-7-philmd@redhat.com> (raw) In-Reply-To: <20200908155530.249806-1-philmd@redhat.com> The PCMachineState type is only used under hw/i386/. We don't need to forward-declare it for all architectures, restrict it to the X86 one. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- include/hw/i386/pc.h | 4 ++-- include/qemu/typedefs.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index fe52e165b27..d4ebefcf2b4 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -19,7 +19,7 @@ * @boot_cpus: number of present VCPUs * @smp_dies: number of dies per one package */ -struct PCMachineState { +typedef struct PCMachineState { /*< private >*/ X86MachineState parent_obj; @@ -50,7 +50,7 @@ struct PCMachineState { /* ACPI Memory hotplug IO base address */ hwaddr memhp_io_base; -}; +} PCMachineState; #define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device" #define PC_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g" diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 427027a9707..6281eae3b55 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -90,7 +90,6 @@ typedef struct PCIExpressDevice PCIExpressDevice; typedef struct PCIExpressHost PCIExpressHost; typedef struct PCIHostDeviceAddress PCIHostDeviceAddress; typedef struct PCIHostState PCIHostState; -typedef struct PCMachineState PCMachineState; typedef struct PostcopyDiscardState PostcopyDiscardState; typedef struct Property Property; typedef struct PropertyInfo PropertyInfo; -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Richard Henderson" <rth@twiddle.net>, "Anthony Perard" <anthony.perard@citrix.com>, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, xen-devel@lists.xenproject.org, "Michael S. Tsirkin" <mst@redhat.com>, "Stefano Stabellini" <sstabellini@kernel.org>, "Paolo Bonzini" <pbonzini@redhat.com>, "Paul Durrant" <paul@xen.org>, "Eduardo Habkost" <ehabkost@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com> Subject: [PATCH v2 6/6] typedefs: Restrict PCMachineState to 'hw/i386/pc.h' Date: Tue, 8 Sep 2020 17:55:30 +0200 [thread overview] Message-ID: <20200908155530.249806-7-philmd@redhat.com> (raw) In-Reply-To: <20200908155530.249806-1-philmd@redhat.com> The PCMachineState type is only used under hw/i386/. We don't need to forward-declare it for all architectures, restrict it to the X86 one. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- include/hw/i386/pc.h | 4 ++-- include/qemu/typedefs.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index fe52e165b27..d4ebefcf2b4 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -19,7 +19,7 @@ * @boot_cpus: number of present VCPUs * @smp_dies: number of dies per one package */ -struct PCMachineState { +typedef struct PCMachineState { /*< private >*/ X86MachineState parent_obj; @@ -50,7 +50,7 @@ struct PCMachineState { /* ACPI Memory hotplug IO base address */ hwaddr memhp_io_base; -}; +} PCMachineState; #define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device" #define PC_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g" diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 427027a9707..6281eae3b55 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -90,7 +90,6 @@ typedef struct PCIExpressDevice PCIExpressDevice; typedef struct PCIExpressHost PCIExpressHost; typedef struct PCIHostDeviceAddress PCIHostDeviceAddress; typedef struct PCIHostState PCIHostState; -typedef struct PCMachineState PCMachineState; typedef struct PostcopyDiscardState PostcopyDiscardState; typedef struct Property Property; typedef struct PropertyInfo PropertyInfo; -- 2.26.2
next prev parent reply other threads:[~2020-09-08 16:04 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-08 15:55 [PATCH v2 0/6] hw/xen: Housekeeping Philippe Mathieu-Daudé 2020-09-08 15:55 ` Philippe Mathieu-Daudé 2020-09-08 15:55 ` [PATCH v2 1/6] hw/i386/q35: Remove unreachable Xen code on Q35 machine Philippe Mathieu-Daudé 2020-09-08 15:55 ` Philippe Mathieu-Daudé 2020-09-08 15:55 ` [PATCH v2 2/6] hw/i386/xen: Rename X86/PC specific function as xen_hvm_init_pc() Philippe Mathieu-Daudé 2020-09-08 15:55 ` Philippe Mathieu-Daudé 2020-09-08 15:55 ` [PATCH v2 3/6] sysemu/xen: Add missing 'exec/cpu-common.h' header for ram_addr_t type Philippe Mathieu-Daudé 2020-09-08 15:55 ` Philippe Mathieu-Daudé 2020-09-08 15:55 ` [PATCH v2 4/6] stubs: Split accelerator / hardware related stubs Philippe Mathieu-Daudé 2020-09-08 15:55 ` Philippe Mathieu-Daudé 2020-09-08 15:59 ` Philippe Mathieu-Daudé 2020-09-08 15:59 ` Philippe Mathieu-Daudé 2020-09-08 15:55 ` [PATCH v2 5/6] hw/xen: Split x86-specific declaration from generic hardware ones Philippe Mathieu-Daudé 2020-09-08 15:55 ` Philippe Mathieu-Daudé 2020-09-08 15:55 ` Philippe Mathieu-Daudé [this message] 2020-09-08 15:55 ` [PATCH v2 6/6] typedefs: Restrict PCMachineState to 'hw/i386/pc.h' Philippe Mathieu-Daudé 2020-09-22 9:40 ` [PATCH v2 0/6] hw/xen: Housekeeping Paolo Bonzini 2020-09-22 9:40 ` Paolo Bonzini
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=20200908155530.249806-7-philmd@redhat.com \ --to=philmd@redhat.com \ --cc=anthony.perard@citrix.com \ --cc=ehabkost@redhat.com \ --cc=mst@redhat.com \ --cc=paul@xen.org \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ --cc=sstabellini@kernel.org \ --cc=xen-devel@lists.xenproject.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.