| Message ID | 20220919231720.163121-2-shentey@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Deprecate sysbus_get_default() and get_system_memory() et. al | expand |
On Tue, Sep 20, 2022 at 9:18 AM Bernhard Beschow <shentey@gmail.com> wrote: > > SiFiveEState inherits from SysBusDevice while it's TypeInfo claims it to > inherit from TYPE_MACHINE. This is an inconsistency which can cause > undefined behavior such as memory corruption. > > Change SiFiveEState to inherit from MachineState since it is registered > as a machine. > > Signed-off-by: Bernhard Beschow <shentey@gmail.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > include/hw/riscv/sifive_e.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/include/hw/riscv/sifive_e.h b/include/hw/riscv/sifive_e.h > index 83604da805..d738745925 100644 > --- a/include/hw/riscv/sifive_e.h > +++ b/include/hw/riscv/sifive_e.h > @@ -22,6 +22,7 @@ > #include "hw/riscv/riscv_hart.h" > #include "hw/riscv/sifive_cpu.h" > #include "hw/gpio/sifive_gpio.h" > +#include "hw/boards.h" > > #define TYPE_RISCV_E_SOC "riscv.sifive.e.soc" > #define RISCV_E_SOC(obj) \ > @@ -41,7 +42,7 @@ typedef struct SiFiveESoCState { > > typedef struct SiFiveEState { > /*< private >*/ > - SysBusDevice parent_obj; > + MachineState parent_obj; > > /*< public >*/ > SiFiveESoCState soc; > -- > 2.37.3 > >
Alistair Francis <alistair23@gmail.com> writes: > On Tue, Sep 20, 2022 at 9:18 AM Bernhard Beschow <shentey@gmail.com> wrote: >> >> SiFiveEState inherits from SysBusDevice while it's TypeInfo claims it to >> inherit from TYPE_MACHINE. This is an inconsistency which can cause >> undefined behavior such as memory corruption. >> >> Change SiFiveEState to inherit from MachineState since it is registered >> as a machine. >> >> Signed-off-by: Bernhard Beschow <shentey@gmail.com> > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> To the SiFive maintainers: since this is a bug fix, let's merge it right away.
Am 20. September 2022 11:36:47 UTC schrieb Markus Armbruster <armbru@redhat.com>: >Alistair Francis <alistair23@gmail.com> writes: > >> On Tue, Sep 20, 2022 at 9:18 AM Bernhard Beschow <shentey@gmail.com> wrote: >>> >>> SiFiveEState inherits from SysBusDevice while it's TypeInfo claims it to >>> inherit from TYPE_MACHINE. This is an inconsistency which can cause >>> undefined behavior such as memory corruption. >>> >>> Change SiFiveEState to inherit from MachineState since it is registered >>> as a machine. >>> >>> Signed-off-by: Bernhard Beschow <shentey@gmail.com> >> >> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > >To the SiFive maintainers: since this is a bug fix, let's merge it right >away. I could repost this particular patch with the three new tags (incl. Fixes) if desired. Best regards, Bernhard >
Bernhard Beschow <shentey@gmail.com> writes: > Am 20. September 2022 11:36:47 UTC schrieb Markus Armbruster <armbru@redhat.com>: >>Alistair Francis <alistair23@gmail.com> writes: >> >>> On Tue, Sep 20, 2022 at 9:18 AM Bernhard Beschow <shentey@gmail.com> wrote: >>>> >>>> SiFiveEState inherits from SysBusDevice while it's TypeInfo claims it to >>>> inherit from TYPE_MACHINE. This is an inconsistency which can cause >>>> undefined behavior such as memory corruption. >>>> >>>> Change SiFiveEState to inherit from MachineState since it is registered >>>> as a machine. >>>> >>>> Signed-off-by: Bernhard Beschow <shentey@gmail.com> >>> >>> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> >> >>To the SiFive maintainers: since this is a bug fix, let's merge it right >>away. > > I could repost this particular patch with the three new tags (incl. Fixes) if desired. Can't hurt, and could help the maintainers.
Am 21. September 2022 04:55:02 UTC schrieb Markus Armbruster <armbru@redhat.com>: >Bernhard Beschow <shentey@gmail.com> writes: > >> Am 20. September 2022 11:36:47 UTC schrieb Markus Armbruster <armbru@redhat.com>: >>>Alistair Francis <alistair23@gmail.com> writes: >>> >>>> On Tue, Sep 20, 2022 at 9:18 AM Bernhard Beschow <shentey@gmail.com> wrote: >>>>> >>>>> SiFiveEState inherits from SysBusDevice while it's TypeInfo claims it to >>>>> inherit from TYPE_MACHINE. This is an inconsistency which can cause >>>>> undefined behavior such as memory corruption. >>>>> >>>>> Change SiFiveEState to inherit from MachineState since it is registered >>>>> as a machine. >>>>> >>>>> Signed-off-by: Bernhard Beschow <shentey@gmail.com> >>>> >>>> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> >>> >>>To the SiFive maintainers: since this is a bug fix, let's merge it right >>>away. >> >> I could repost this particular patch with the three new tags (incl. Fixes) if desired. > >Can't hurt, and could help the maintainers. [X] Done. Best regards, Bernhard
diff --git a/include/hw/riscv/sifive_e.h b/include/hw/riscv/sifive_e.h index 83604da805..d738745925 100644 --- a/include/hw/riscv/sifive_e.h +++ b/include/hw/riscv/sifive_e.h @@ -22,6 +22,7 @@ #include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_cpu.h" #include "hw/gpio/sifive_gpio.h" +#include "hw/boards.h" #define TYPE_RISCV_E_SOC "riscv.sifive.e.soc" #define RISCV_E_SOC(obj) \ @@ -41,7 +42,7 @@ typedef struct SiFiveESoCState { typedef struct SiFiveEState { /*< private >*/ - SysBusDevice parent_obj; + MachineState parent_obj; /*< public >*/ SiFiveESoCState soc;
SiFiveEState inherits from SysBusDevice while it's TypeInfo claims it to inherit from TYPE_MACHINE. This is an inconsistency which can cause undefined behavior such as memory corruption. Change SiFiveEState to inherit from MachineState since it is registered as a machine. Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- include/hw/riscv/sifive_e.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)