hw/misc: sifive_u_otp: Use error_report() when block operation fails
PATCH 1/1 hw/misc: sifive_u_otp: Use error_report() when block operation fails
From: Bin Meng <[email protected]>
At present when blk_pread() / blk_pwrite() fails, a guest error is logged, but this is not really a guest error. Change to use error_report() instead.
---
hw/misc/sifive_u_otp.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
hw/misc/sifive_u_otp.c +5 -8
@@ -23,6 +23,7 @@#include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" +#include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/misc/sifive_u_otp.h"
@@ -65,8 +66,7 @@ static uint64_t sifive_u_otp_read(void *opaque, hwaddr addr, unsigned int size)if (blk_pread (s->blk, s->pa *SIFIVE_U_OTP_FUSE_WORD , &buf,SIFIVE_U_OTP_FUSE_WORD ) <0 ) { -qemu_log_mask (LOG_GUEST_ERROR , -"read error index<%d>\n" , s->pa); +error_report ("read error index<%d>" , s->pa);return 0xff ; }
@@ -169,8 +169,7 @@ static void sifive_u_otp_write(void *opaque, hwaddr addr,if (blk_pwrite (s->blk, s->pa *SIFIVE_U_OTP_FUSE_WORD , &s->fuse[s->pa],SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) { -qemu_log_mask (LOG_GUEST_ERROR , -"write error index<%d>\n" , s->pa); +error_report ("write error index<%d>" , s->pa); } }
@@ -260,15 +259,13 @@ static void sifive_u_otp_reset(DeviceState *dev) serial_data = s->serial;if (blk_pwrite (s->blk, index *SIFIVE_U_OTP_FUSE_WORD , &serial_data,SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) { -qemu_log_mask (LOG_GUEST_ERROR , -"write error index<%d>\n" , index); +error_report ("write error index<%d>" , index); } serial_data = ~(s->serial);if (blk_pwrite (s->blk, (index +1 ) *SIFIVE_U_OTP_FUSE_WORD , &serial_data,SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) { -qemu_log_mask (LOG_GUEST_ERROR , -"write error index<%d>\n" , index +1 ); +error_report ("write error index<%d>" , index +1 ); } }
Signature · 1 line
2.7.4
Quoted 11 lines · Bin Meng
From: Bin Meng <[email protected]>
At present when
blk_pread()/blk_pwrite()fails, a guest error is logged, but this is not really a guest error. Change to useerror_report()instead.Signed-off-by Bin Meng <[email protected]>---
hw/misc/sifive_u_otp.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
Quoted 8 lines · Bin Meng
From: Bin Meng <[email protected]>
At present when
blk_pread()/blk_pwrite()fails, a guest error is logged, but this is not really a guest error. Change to useerror_report()instead.Signed-off-by Bin Meng <[email protected]>
Alistair
Quoted 59 lines
---
hw/misc/sifive_u_otp.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)hw/misc/sifive_u_otp.c +5
-9@@ -23,6 +23,7 @@#include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" +#include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/misc/sifive_u_otp.h" @@ -65,8 +66,7 @@ static uint64_t sifive_u_otp_read(void *opaque, hwaddr addr, unsigned int size)if (blk_pread (s->blk, s->pa *SIFIVE_U_OTP_FUSE_WORD , &buf,SIFIVE_U_OTP_FUSE_WORD ) <0 ) { -qemu_log_mask (LOG_GUEST_ERROR , -"read error index<%d>\n" , s->pa); +error_report ("read error index<%d>" , s->pa);return 0xff ; }@@ -169,8 +169,7 @@ static void sifive_u_otp_write(void *opaque, hwaddr addr,if (blk_pwrite (s->blk, s->pa *SIFIVE_U_OTP_FUSE_WORD , &s->fuse[s->pa],SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) { -qemu_log_mask (LOG_GUEST_ERROR , -"write error index<%d>\n" , s->pa); +error_report ("write error index<%d>" , s->pa); } }@@ -260,15 +259,13 @@ static void sifive_u_otp_reset(DeviceState *dev) serial_data = s->serial;if (blk_pwrite (s->blk, index *SIFIVE_U_OTP_FUSE_WORD , &serial_data,SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) { -qemu_log_mask (LOG_GUEST_ERROR , -"write error index<%d>\n" , index); +error_report ("write error index<%d>" , index); } serial_data = ~(s->serial);if (blk_pwrite (s->blk, (index +1 ) *SIFIVE_U_OTP_FUSE_WORD , &serial_data,SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) { -qemu_log_mask (LOG_GUEST_ERROR , -"write error index<%d>\n" , index +1 ); +error_report ("write error index<%d>" , index +1 ); } } --2.7.4
Alistair Francis
AppliedQuoted 8 lines · Bin Meng
From: Bin Meng <[email protected]>
At present when
blk_pread()/blk_pwrite()fails, a guest error is logged, but this is not really a guest error. Change to useerror_report()instead.Signed-off-by Bin Meng <[email protected]>
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 59 lines
---
hw/misc/sifive_u_otp.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)hw/misc/sifive_u_otp.c +5
-9@@ -23,6 +23,7 @@#include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" +#include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/misc/sifive_u_otp.h" @@ -65,8 +66,7 @@ static uint64_t sifive_u_otp_read(void *opaque, hwaddr addr, unsigned int size)if (blk_pread (s->blk, s->pa *SIFIVE_U_OTP_FUSE_WORD , &buf,SIFIVE_U_OTP_FUSE_WORD ) <0 ) { -qemu_log_mask (LOG_GUEST_ERROR , -"read error index<%d>\n" , s->pa); +error_report ("read error index<%d>" , s->pa);return 0xff ; }@@ -169,8 +169,7 @@ static void sifive_u_otp_write(void *opaque, hwaddr addr,if (blk_pwrite (s->blk, s->pa *SIFIVE_U_OTP_FUSE_WORD , &s->fuse[s->pa],SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) { -qemu_log_mask (LOG_GUEST_ERROR , -"write error index<%d>\n" , s->pa); +error_report ("write error index<%d>" , s->pa); } }@@ -260,15 +259,13 @@ static void sifive_u_otp_reset(DeviceState *dev) serial_data = s->serial;if (blk_pwrite (s->blk, index *SIFIVE_U_OTP_FUSE_WORD , &serial_data,SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) { -qemu_log_mask (LOG_GUEST_ERROR , -"write error index<%d>\n" , index); +error_report ("write error index<%d>" , index); } serial_data = ~(s->serial);if (blk_pwrite (s->blk, (index +1 ) *SIFIVE_U_OTP_FUSE_WORD , &serial_data,SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) { -qemu_log_mask (LOG_GUEST_ERROR , -"write error index<%d>\n" , index +1 ); +error_report ("write error index<%d>" , index +1 ); } } --2.7.4