| Message ID | 20181024085602.16611-1-eric.auger@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm/virt: Set VIRT_COMPAT_3_0 compat | expand |
On Wed, Oct 24, 2018 at 10:56:02AM +0200, Eric Auger wrote: > We are missing the VIRT_COMPAT_3_0 definition and setting. > Let's add them. > > Signed-off-by: Eric Auger <eric.auger@redhat.com> > --- > hw/arm/virt.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 9f677825f9..a2b8d8f7c2 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1871,6 +1871,9 @@ static void virt_machine_3_1_options(MachineClass *mc) > } > DEFINE_VIRT_MACHINE_AS_LATEST(3, 1) > > +#define VIRT_COMPAT_3_0 \ > + HW_COMPAT_3_0 > + > static void virt_3_0_instance_init(Object *obj) > { > virt_3_1_instance_init(obj); > @@ -1879,6 +1882,7 @@ static void virt_3_0_instance_init(Object *obj) > static void virt_machine_3_0_options(MachineClass *mc) > { > virt_machine_3_1_options(mc); > + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_3_0); > } > DEFINE_VIRT_MACHINE(3, 0) > > -- > 2.17.2 > > Oops, I should have done this with the 3.1 machine type. Thanks for the catching and patching. Reviewed-by: Andrew Jones <drjones@redhat.com>
On 24 October 2018 at 12:25, Andrew Jones <drjones@redhat.com> wrote: > On Wed, Oct 24, 2018 at 10:56:02AM +0200, Eric Auger wrote: >> We are missing the VIRT_COMPAT_3_0 definition and setting. >> Let's add them. >> >> Signed-off-by: Eric Auger <eric.auger@redhat.com> >> --- >> hw/arm/virt.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/hw/arm/virt.c b/hw/arm/virt.c >> index 9f677825f9..a2b8d8f7c2 100644 >> --- a/hw/arm/virt.c >> +++ b/hw/arm/virt.c >> @@ -1871,6 +1871,9 @@ static void virt_machine_3_1_options(MachineClass *mc) >> } >> DEFINE_VIRT_MACHINE_AS_LATEST(3, 1) >> >> +#define VIRT_COMPAT_3_0 \ >> + HW_COMPAT_3_0 >> + >> static void virt_3_0_instance_init(Object *obj) >> { >> virt_3_1_instance_init(obj); >> @@ -1879,6 +1882,7 @@ static void virt_3_0_instance_init(Object *obj) >> static void virt_machine_3_0_options(MachineClass *mc) >> { >> virt_machine_3_1_options(mc); >> + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_3_0); >> } >> DEFINE_VIRT_MACHINE(3, 0) >> >> -- >> 2.17.2 >> >> > > Oops, I should have done this with the 3.1 machine type. Thanks for the > catching and patching. > > Reviewed-by: Andrew Jones <drjones@redhat.com> Applied to target-arm.next, thanks. -- PMM
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9f677825f9..a2b8d8f7c2 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1871,6 +1871,9 @@ static void virt_machine_3_1_options(MachineClass *mc) } DEFINE_VIRT_MACHINE_AS_LATEST(3, 1) +#define VIRT_COMPAT_3_0 \ + HW_COMPAT_3_0 + static void virt_3_0_instance_init(Object *obj) { virt_3_1_instance_init(obj); @@ -1879,6 +1882,7 @@ static void virt_3_0_instance_init(Object *obj) static void virt_machine_3_0_options(MachineClass *mc) { virt_machine_3_1_options(mc); + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_3_0); } DEFINE_VIRT_MACHINE(3, 0)
We are missing the VIRT_COMPAT_3_0 definition and setting. Let's add them. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- hw/arm/virt.c | 4 ++++ 1 file changed, 4 insertions(+)