ide-test: check return of fwrite

[Qemu-devel] [PATCH] ide-test: check return of fwrite

Posted by John Snow 6 years, 10 months ago

To quiet patchew, add an assert for fwrite's return value.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/ide-test.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/ide-test.c b/tests/ide-test.c
index 139ebc0..bfd79dd 100644
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -796,11 +796,13 @@ static void cdrom_pio_impl(int nblocks)
     int i, j;
     uint8_t data;
     uint16_t limit;
+    size_t ret;
 
     /* Prepopulate the CDROM with an interesting pattern */
     generate_pattern(pattern, patt_len, ATAPI_BLOCK_SIZE);
     fh = fopen(tmp_path, "w+");
-    fwrite(pattern, ATAPI_BLOCK_SIZE, patt_blocks, fh);
+    ret = fwrite(pattern, ATAPI_BLOCK_SIZE, patt_blocks, fh);
+    g_assert_cmpint(ret, ==, patt_blocks);
     fclose(fh);
 
     ide_test_start("-drive if=none,file=%s,media=cdrom,format=raw,id=sr0,index=0 "
@@ -880,6 +882,7 @@ static void test_cdrom_pio_large(void)
 static void test_cdrom_dma(void)
 {
     static const size_t len = ATAPI_BLOCK_SIZE;
+    size_t ret;
     char *pattern = g_malloc(ATAPI_BLOCK_SIZE * 16);
     char *rx = g_malloc0(len);
     uintptr_t guest_buf;
@@ -896,7 +899,8 @@ static void test_cdrom_dma(void)
 
     generate_pattern(pattern, ATAPI_BLOCK_SIZE * 16, ATAPI_BLOCK_SIZE);
     fh = fopen(tmp_path, "w+");
-    fwrite(pattern, ATAPI_BLOCK_SIZE, 16, fh);
+    ret = fwrite(pattern, ATAPI_BLOCK_SIZE, 16, fh);
+    g_assert_cmpint(ret, ==, 16);
     fclose(fh);
 
     send_dma_request(CMD_PACKET, 0, 1, prdt, 1, send_scsi_cdb_read10);
-- 
2.9.4

Re: [Qemu-devel] [PATCH] ide-test: check return of fwrite

Posted by Jeff Cody 6 years, 10 months ago

On Wed, May 31, 2017 at 03:28:36PM -0400, John Snow wrote:
> To quiet patchew, add an assert for fwrite's return value.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/ide-test.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/ide-test.c b/tests/ide-test.c
> index 139ebc0..bfd79dd 100644
> --- a/tests/ide-test.c
> +++ b/tests/ide-test.c
> @@ -796,11 +796,13 @@ static void cdrom_pio_impl(int nblocks)
>      int i, j;
>      uint8_t data;
>      uint16_t limit;
> +    size_t ret;
>  
>      /* Prepopulate the CDROM with an interesting pattern */
>      generate_pattern(pattern, patt_len, ATAPI_BLOCK_SIZE);
>      fh = fopen(tmp_path, "w+");
> -    fwrite(pattern, ATAPI_BLOCK_SIZE, patt_blocks, fh);
> +    ret = fwrite(pattern, ATAPI_BLOCK_SIZE, patt_blocks, fh);
> +    g_assert_cmpint(ret, ==, patt_blocks);
>      fclose(fh);
>  
>      ide_test_start("-drive if=none,file=%s,media=cdrom,format=raw,id=sr0,index=0 "
> @@ -880,6 +882,7 @@ static void test_cdrom_pio_large(void)
>  static void test_cdrom_dma(void)
>  {
>      static const size_t len = ATAPI_BLOCK_SIZE;
> +    size_t ret;
>      char *pattern = g_malloc(ATAPI_BLOCK_SIZE * 16);
>      char *rx = g_malloc0(len);
>      uintptr_t guest_buf;
> @@ -896,7 +899,8 @@ static void test_cdrom_dma(void)
>  
>      generate_pattern(pattern, ATAPI_BLOCK_SIZE * 16, ATAPI_BLOCK_SIZE);
>      fh = fopen(tmp_path, "w+");
> -    fwrite(pattern, ATAPI_BLOCK_SIZE, 16, fh);
> +    ret = fwrite(pattern, ATAPI_BLOCK_SIZE, 16, fh);
> +    g_assert_cmpint(ret, ==, 16);
>      fclose(fh);
>  
>      send_dma_request(CMD_PACKET, 0, 1, prdt, 1, send_scsi_cdb_read10);
> -- 
> 2.9.4
> 
>

Reviewed-by: Jeff Cody <jcody@redhat.com>

Re: [Qemu-devel] [Qemu-trivial] [PATCH] ide-test: check return of fwrite

Posted by Laurent Vivier 6 years, 10 months ago

On 31/05/2017 21:28, John Snow wrote:
> To quiet patchew, add an assert for fwrite's return value.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>

Reviewed-by: Laurent Vivier <lvivier@redhat.com>

> ---
>  tests/ide-test.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/ide-test.c b/tests/ide-test.c
> index 139ebc0..bfd79dd 100644
> --- a/tests/ide-test.c
> +++ b/tests/ide-test.c
> @@ -796,11 +796,13 @@ static void cdrom_pio_impl(int nblocks)
>      int i, j;
>      uint8_t data;
>      uint16_t limit;
> +    size_t ret;
>  
>      /* Prepopulate the CDROM with an interesting pattern */
>      generate_pattern(pattern, patt_len, ATAPI_BLOCK_SIZE);
>      fh = fopen(tmp_path, "w+");
> -    fwrite(pattern, ATAPI_BLOCK_SIZE, patt_blocks, fh);
> +    ret = fwrite(pattern, ATAPI_BLOCK_SIZE, patt_blocks, fh);
> +    g_assert_cmpint(ret, ==, patt_blocks);
>      fclose(fh);
>  
>      ide_test_start("-drive if=none,file=%s,media=cdrom,format=raw,id=sr0,index=0 "
> @@ -880,6 +882,7 @@ static void test_cdrom_pio_large(void)
>  static void test_cdrom_dma(void)
>  {
>      static const size_t len = ATAPI_BLOCK_SIZE;
> +    size_t ret;
>      char *pattern = g_malloc(ATAPI_BLOCK_SIZE * 16);
>      char *rx = g_malloc0(len);
>      uintptr_t guest_buf;
> @@ -896,7 +899,8 @@ static void test_cdrom_dma(void)
>  
>      generate_pattern(pattern, ATAPI_BLOCK_SIZE * 16, ATAPI_BLOCK_SIZE);
>      fh = fopen(tmp_path, "w+");
> -    fwrite(pattern, ATAPI_BLOCK_SIZE, 16, fh);
> +    ret = fwrite(pattern, ATAPI_BLOCK_SIZE, 16, fh);
> +    g_assert_cmpint(ret, ==, 16);
>      fclose(fh);
>  
>      send_dma_request(CMD_PACKET, 0, 1, prdt, 1, send_scsi_cdb_read10);
>

Re: [Qemu-devel] [PATCH] ide-test: check return of fwrite

Posted by Michael Tokarev 6 years, 10 months ago

31.05.2017 22:28, John Snow wrote:
> To quiet patchew, add an assert for fwrite's return value.

Applied to -trivial, thanks!

/mjt