aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2023-03-20 16:26:10 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2023-04-24 13:53:44 -0400
commitfdd5e90fdb4de364e12cc2722993c8f14784e7a4 (patch)
tree269b4669b2c38b3fc5cf27a86af3e5d67baf2d6e
parentac5f7bf8e208cd7893dbb1a9520559e569a4677c (diff)
downloadqemu-fdd5e90fdb4de364e12cc2722993c8f14784e7a4.zip
qemu-fdd5e90fdb4de364e12cc2722993c8f14784e7a4.tar.gz
qemu-fdd5e90fdb4de364e12cc2722993c8f14784e7a4.tar.bz2
block/dmg: Declare a type definition for DMG uncompress function
Introduce the BdrvDmgUncompressFunc type defintion. To emphasis dmg_uncompress_bz2 and dmg_uncompress_lzfse are pointer to functions, declare them using this new typedef. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-id: 20230320152610.32052-1-philmd@linaro.org Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--block/dmg.c7
-rw-r--r--block/dmg.h8
2 files changed, 6 insertions, 9 deletions
diff --git a/block/dmg.c b/block/dmg.c
index e10b9a2..2769900 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -31,11 +31,8 @@
#include "qemu/memalign.h"
#include "dmg.h"
-int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in,
- char *next_out, unsigned int avail_out);
-
-int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in,
- char *next_out, unsigned int avail_out);
+BdrvDmgUncompressFunc *dmg_uncompress_bz2;
+BdrvDmgUncompressFunc *dmg_uncompress_lzfse;
enum {
/* Limit chunk sizes to prevent unreasonable amounts of memory being used
diff --git a/block/dmg.h b/block/dmg.h
index e488601..dcd6165 100644
--- a/block/dmg.h
+++ b/block/dmg.h
@@ -51,10 +51,10 @@ typedef struct BDRVDMGState {
z_stream zstream;
} BDRVDMGState;
-extern int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in,
- char *next_out, unsigned int avail_out);
+typedef int BdrvDmgUncompressFunc(char *next_in, unsigned int avail_in,
+ char *next_out, unsigned int avail_out);
-extern int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in,
- char *next_out, unsigned int avail_out);
+extern BdrvDmgUncompressFunc *dmg_uncompress_bz2;
+extern BdrvDmgUncompressFunc *dmg_uncompress_lzfse;
#endif