| Message ID | 20171003051523.17650-4-aik@ozlabs.ru |
|---|---|
| State | Superseded |
| Headers | show |
| Series | fdt: Pass the resulting device tree to QEMU | expand |
On Tue, 3 Oct 2017 16:15:21 +1100 Alexey Kardashevskiy <aik@ozlabs.ru> wrote: > This reverts commit 1c17c13a57 "rtas: Improve error > handling in instantiate-rtas" as it has improved a thing > about to be reverted. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- Well, this technically breaks bisectability since QEMU doesn't implement KVMPPC_H_RTAS_UPDATE... maybe you should fold patch 3 and 4 actually. > board-qemu/slof/rtas.fs | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/board-qemu/slof/rtas.fs b/board-qemu/slof/rtas.fs > index 54d3929..0d2bf49 100644 > --- a/board-qemu/slof/rtas.fs > +++ b/board-qemu/slof/rtas.fs > @@ -173,13 +173,10 @@ rtas-node set-node > : instantiate-rtas ( adr -- entry ) > dup rtas-base swap rtas-size move > dup rtas-entry rtas-base - + > - 2dup hv-rtas-update dup 0 <> IF > - \ Ignore hcall not implemented error, print error otherwise > - dup -2 <> IF ." HV-RTAS-UPDATE error: " . cr ELSE drop THEN > - ELSE > - drop > + 2dup hv-rtas-update 0 <> IF > + ." Failed to update RTAS " cr > THEN > - nip > + nip > ; > > device-end
diff --git a/board-qemu/slof/rtas.fs b/board-qemu/slof/rtas.fs index 54d3929..0d2bf49 100644 --- a/board-qemu/slof/rtas.fs +++ b/board-qemu/slof/rtas.fs @@ -173,13 +173,10 @@ rtas-node set-node : instantiate-rtas ( adr -- entry ) dup rtas-base swap rtas-size move dup rtas-entry rtas-base - + - 2dup hv-rtas-update dup 0 <> IF - \ Ignore hcall not implemented error, print error otherwise - dup -2 <> IF ." HV-RTAS-UPDATE error: " . cr ELSE drop THEN - ELSE - drop + 2dup hv-rtas-update 0 <> IF + ." Failed to update RTAS " cr THEN - nip + nip ; device-end
This reverts commit 1c17c13a57 "rtas: Improve error handling in instantiate-rtas" as it has improved a thing about to be reverted. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- board-qemu/slof/rtas.fs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)