| Message ID | 1603891979-11961-2-git-send-email-mihai.carabas@oracle.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/6] hw/misc/pvpanic: Build the pvpanic device for any machine | expand |
On Wed, 28 Oct 2020 at 14:20, Mihai Carabas <mihai.carabas@oracle.com> wrote: > > From: Philippe Mathieu-Daudé <philmd@redhat.com> > > The 'pvpanic' ISA device can be use by any machine with an ISA bus. > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Signed-off-by: Peng Hao <peng.hao2@zte.com.cn> > Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com> > --- > hw/misc/meson.build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/misc/meson.build b/hw/misc/meson.build > index 793d45b..cb250dd 100644 > --- a/hw/misc/meson.build > +++ b/hw/misc/meson.build > @@ -11,6 +11,7 @@ softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c')) > softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c')) > softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) > softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c')) > +softmmu_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c')) > > # ARM devices > softmmu_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c')) > @@ -90,7 +91,6 @@ softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysinfo.c') > softmmu_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c')) > softmmu_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c')) > > -softmmu_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c')) > softmmu_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c')) > softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_scu.c', 'aspeed_sdmc.c', 'aspeed_xdma.c')) > softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c')) This patch doesn't seem to actually change anything -- it's just moving a line of code around in the file ? thanks -- PMM
On Mon, 14 Dec 2020 at 10:47, Peter Maydell <peter.maydell@linaro.org> wrote: > > On Wed, 28 Oct 2020 at 14:20, Mihai Carabas <mihai.carabas@oracle.com> wrote: > > > > From: Philippe Mathieu-Daudé <philmd@redhat.com> > > > > The 'pvpanic' ISA device can be use by any machine with an ISA bus. > > > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Signed-off-by: Peng Hao <peng.hao2@zte.com.cn> > > Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com> > > --- > > hw/misc/meson.build | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/hw/misc/meson.build b/hw/misc/meson.build > > index 793d45b..cb250dd 100644 > > --- a/hw/misc/meson.build > > +++ b/hw/misc/meson.build > > @@ -11,6 +11,7 @@ softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c')) > > softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c')) > > softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) > > softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c')) > > +softmmu_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c')) > > > > # ARM devices > > softmmu_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c')) > > @@ -90,7 +91,6 @@ softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysinfo.c') > > softmmu_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c')) > > softmmu_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c')) > > > > -softmmu_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c')) > > softmmu_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c')) > > softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_scu.c', 'aspeed_sdmc.c', 'aspeed_xdma.c')) > > softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c')) > > This patch doesn't seem to actually change anything -- it's just > moving a line of code around in the file ? Also, this is not the patch which Philippe wrote and I reviewed, which was this one: https://patchew.org/QEMU/1544095560-70807-1-git-send-email-peng.hao2@zte.com.cn/1544095560-70807-2-git-send-email-peng.hao2@zte.com.cn/ That patch (for the old build system) does what the commit message says it does; this one (for the new build system) doesn't. Please don't retain authorship and reviewed-by tags if the patch is changed significantly like this. Have a look at, for example, how the ne2000 ISA and PCI devices in hw/net are structured and built (source file setup, meson.build, Kconfig stanzas) to see how to do this kind of "common core, multiple buses" setup. thanks -- PMM
diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 793d45b..cb250dd 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -11,6 +11,7 @@ softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c')) softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c')) softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c')) +softmmu_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c')) # ARM devices softmmu_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c')) @@ -90,7 +91,6 @@ softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysinfo.c') softmmu_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c')) softmmu_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c')) -softmmu_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c')) softmmu_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c')) softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_scu.c', 'aspeed_sdmc.c', 'aspeed_xdma.c')) softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c'))