hw/i386/acpi: Improve build modularity (isapc/q35/...)
cover hw/i386/acpi: Improve build modularity (isapc/q35/...)
This series allow to build the ISAPC/Q35 machines independently.
Regards,
Phil.
Philippe Mathieu-Daudé (3):
hw/acpi/piix4: Move TYPE_PIIX4_PM to a public header hw/i386/acpi: Add object_resolve_type_unambiguous to improve
modularity
hw/i386/acpi: Assert a pointer is not null BEFORE using it
hw/acpi/piix4.c | 13 ------------- hw/i386/acpi-build.c | 22 +++++++++++++++++----- hw/isa/lpc_ich9.c | 11 ----------- include/hw/acpi/piix4.h | 2 +- include/hw/i386/ich9.h | 2 -- 5 files changed, 18 insertions(+), 32 deletions(-)
Signature · 1 line
2.20.1
Quoted 1 line · Philippe Mathieu-Daudé
This series allow to build the ISAPC/Q35 machines independently.
Oops I guess I forgot:
Based-on: [email protected] (i440fx is not a machine)
https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04673.html
Quoted 18 lines
Regards,
Phil.
Philippe Mathieu-Daudé (3):
hw/acpi/piix4: MoveTYPE_PIIX4_PMto a public header hw/i386/acpi: Addobject_resolve_type_unambiguousto improve
modularity
hw/i386/acpi: Assert a pointer is not null BEFORE using ithw/acpi/piix4.c | 13 ------------- hw/i386/acpi-build.c | 22 +++++++++++++++++----- hw/isa/lpc_ich9.c | 11 ----------- include/hw/acpi/piix4.h | 2 +- include/hw/i386/ich9.h | 2 -- 5 files changed, 18 insertions(+), 32 deletions(-)
Paolo Bonzini
AppliedQuoted 7 lines · Philippe Mathieu-Daudé
Quoted 1 line · Philippe Mathieu-Daudé
This series allow to build the ISAPC/Q35 machines independently.
Oops I guess I forgot:
Based-on: [email protected] (i440fx is not a machine)
https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04673.html
Queued (*without* the based-on-but-not-really series), thanks.
Paolo
Quoted 19 lines
Quoted 19 lines
Regards,
Phil.
Philippe Mathieu-Daudé (3):
hw/acpi/piix4: MoveTYPE_PIIX4_PMto a public header hw/i386/acpi: Addobject_resolve_type_unambiguousto improve
modularity
hw/i386/acpi: Assert a pointer is not null BEFORE using ithw/acpi/piix4.c | 13 ------------- hw/i386/acpi-build.c | 22 +++++++++++++++++----- hw/isa/lpc_ich9.c | 11 ----------- include/hw/acpi/piix4.h | 2 +- include/hw/i386/ich9.h | 2 -- 5 files changed, 18 insertions(+), 32 deletions(-)
PATCH 1/3 hw/acpi/piix4: Move TYPE_PIIX4_PM to a public header
In reply to Philippe Mathieu-DaudéMove the TYPE_PIIX4_PM definition to the corresponding header, so other files can use it.
--- hw/acpi/piix4.c | 2 -- include/hw/acpi/piix4.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
hw/acpi/piix4.c +0 -2
@@ -92,8 +92,6 @@ typedef struct PIIX4PMState {MemHotplugState acpi_memory_hotplug; } PIIX4PMState; -#define TYPE_PIIX4_PM "PIIX4_PM" -#define PIIX4_PM (obj) \ OBJECT_CHECK(PIIX4PMState, (obj), TYPE_PIIX4_PM)
include/hw/acpi/piix4.h +2 -0
@@ -1,6 +1,8 @@#ifndef HW_ACPI_PIIX4_H #define HW_ACPI_PIIX4_H +#define TYPE_PIIX4_PM "PIIX4_PM" +Object *piix4_pm_find (void );#endif
Signature · 1 line
2.20.1
PATCH 2/3 hw/i386/acpi: Add object_resolve_type_unambiguous to improve modularity
In reply to Philippe Mathieu-DaudéWhen building with CONFIG_Q35=n, we get:
LINK x86_64-softmmu/qemu-system-x86_64
/usr/bin/ld: hw/i386/acpi-build.o: in function `acpi_get_misc_info':
/source/qemu/hw/i386/acpi-build.c:243: undefined reference to `ich9_lpc_find'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:204: qemu-system-x86_64] Error 1
This is due to a dependency in acpi-build.c on the ICH9_LPC (via ich9_lpc_find) and PIIX4_PM (via piix4_pm_find) devices.
To allow better modularity (compile acpi-build.c with only Q35/ICH9 or ISAPC/PIIX4), refactor the similar helper as object_resolve_type_unambiguous(). This way we relax the linker dependencies and can build the x86 targets with a selection of machines (instead of all of them).
--- hw/acpi/piix4.c | 11 ----------- hw/i386/acpi-build.c | 20 ++++++++++++++++---- hw/isa/lpc_ich9.c | 11 ----------- include/hw/acpi/piix4.h | 2 -- include/hw/i386/ich9.h | 2 -- 5 files changed, 16 insertions(+), 30 deletions(-)
hw/acpi/piix4.c +0 -11
@@ -552,17 +552,6 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp)piix4_pm_add_propeties (s); } -Object *piix4_pm_find (void ) -{ -bool ambig; -Object *o =object_resolve_path_type ("" ,TYPE_PIIX4_PM , &ambig); - -if (ambig || !o) { -return NULL ; - } -return o; -} -I2CBus *piix4_pm_init (PCIBus *bus,int devfn,uint32_t smb_io_base,qemu_irq sci_irq,qemu_irq smi_irq,int smm_enabled,DeviceState **piix4_pm)
hw/i386/acpi-build.c +16 -4
@@ -35,6 +35,7 @@#include "hw/acpi/acpi-defs.h" #include "hw/acpi/acpi.h" #include "hw/acpi/cpu.h" +#include "hw/acpi/piix4.h" #include "hw/nvram/fw_cfg.h" #include "hw/acpi/bios-linker-loader.h" #include "hw/loader.h"
@@ -164,10 +165,21 @@ static void init_common_fadt_data(Object *o, AcpiFadtData *data) *data = fadt; } +static Object *object_resolve_type_unambiguous (const char *typename) +{ +bool ambig; +Object *o =object_resolve_path_type ("" , typename, &ambig); + +if (ambig || !o) { +return NULL ; + } +return o; +} +static void acpi_get_pm_info (AcpiPmInfo *pm) { -Object *piix =piix4_pm_find (); -Object *lpc =ich9_lpc_find (); +Object *piix =object_resolve_type_unambiguous (TYPE_PIIX4_PM ); +Object *lpc =object_resolve_type_unambiguous (TYPE_ICH9_LPC_DEVICE );Object *obj = piix ? piix : lpc;QObject *o; pm->cpu_hp_io_base =0 ;
@@ -228,8 +240,8 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)static void acpi_get_misc_info (AcpiMiscInfo *info) { -Object *piix =piix4_pm_find (); -Object *lpc =ich9_lpc_find (); +Object *piix =object_resolve_type_unambiguous (TYPE_PIIX4_PM ); +Object *lpc =object_resolve_type_unambiguous (TYPE_ICH9_LPC_DEVICE );assert (!!piix != !!lpc);if (piix) {
hw/isa/lpc_ich9.c +0 -11
@@ -624,17 +624,6 @@ static const MemoryRegionOps ich9_rst_cnt_ops = { .endianness = DEVICE_LITTLE_ENDIAN }; -Object *ich9_lpc_find (void ) -{ -bool ambig; -Object *o =object_resolve_path_type ("" ,TYPE_ICH9_LPC_DEVICE , &ambig); - -if (ambig) { -return NULL ; - } -return o; -} -static void ich9_lpc_get_sci_int (Object *obj,Visitor *v,const char *name,void *opaque,Error **errp) {
include/hw/acpi/piix4.h +0 -2
@@ -3,6 +3,4 @@#define TYPE_PIIX4_PM "PIIX4_PM" -Object *piix4_pm_find (void ); -#endif
include/hw/i386/ich9.h +0 -2
@@ -81,8 +81,6 @@ typedef struct ICH9LPCState {qemu_irq gsi[GSI_NUM_PINS ]; } ICH9LPCState; -Object *ich9_lpc_find (void ); -#define Q35_MASK (bit, ms_bit, ls_bit) \ ((uint##bit##_t)(((1ULL << ((ms_bit) + 1)) - 1) & ~((1ULL << ls_bit) - 1)))
Signature · 1 line
2.20.1
PATCH 3/3 hw/i386/acpi: Assert a pointer is not null BEFORE using it
In reply to Philippe Mathieu-DaudéCommit 72c194f7e75c added a non-null check on the 'obj' pointer. Later, commit 500b11ea5095 added code which uses the 'obj' pointer _before_ the assertion check. Move the assertion _before_ the pointer use.
--- hw/i386/acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/i386/acpi-build.c +1 -1
@@ -186,6 +186,7 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) pm->pcihp_io_base =0 ; pm->pcihp_io_len =0 ; +assert (obj);init_common_fadt_data (obj, &pm->fadt);if (piix) {/* w2k requires FADT(rev1) or it won't boot, keep PC compatible */
@@ -204,7 +205,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) pm->fadt.flags |=1 <<ACPI_FADT_F_RESET_REG_SUP ; pm->cpu_hp_io_base =ICH9_CPU_HOTPLUG_IO_BASE ; } -assert (obj);/* The above need not be conditional on machine type because the reset port * happens to be the same on PIIX (pc) and ICH9 (q35). */
Signature · 1 line
2.20.1