ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request (v2) 

I dropped the zoned storage patches that had CI failures. This pull request
 only contains fixes now.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmRGwoIACgkQnKSrs4Gr
 c8jyeAf+JqYgJ0sG7rkYwGNUnmdyzjcZh8sokmIoR0a1VbFjpG54QqvvsSdrtZ5V
 +XdYPgn3ASqyw6/737chw8BBQ1YQEtALCXCk9vx2/Vpmmd6NUkJcxTLvV17o8wit
 asMO14R8p4b/9NUbRnMA+OcnJ1R0y0nKaw0fK4v2DjCN3Uy7b7zJ5Xb5Mg1lkrN6
 RCB6uobWwN58LqY90lN2m1EMvBy0hhI5P1wDjcuZjG1/GnnvVzrIVMOC0ddiLgRH
 0vh9MvdSjOwkdM1J9eJyeijfyEjKS9e/E/c4WrjUs+gH5wcb9zNMNFOGeG7Ih2U0
 wEUIpe2y3YjSHTSTGZLYGguCGmJPZQ==
 =MKCk
 -----END PGP SIGNATURE-----

Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging

Pull request (v2)

I dropped the zoned storage patches that had CI failures. This pull request
only contains fixes now.

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmRGwoIACgkQnKSrs4Gr
# c8jyeAf+JqYgJ0sG7rkYwGNUnmdyzjcZh8sokmIoR0a1VbFjpG54QqvvsSdrtZ5V
# +XdYPgn3ASqyw6/737chw8BBQ1YQEtALCXCk9vx2/Vpmmd6NUkJcxTLvV17o8wit
# asMO14R8p4b/9NUbRnMA+OcnJ1R0y0nKaw0fK4v2DjCN3Uy7b7zJ5Xb5Mg1lkrN6
# RCB6uobWwN58LqY90lN2m1EMvBy0hhI5P1wDjcuZjG1/GnnvVzrIVMOC0ddiLgRH
# 0vh9MvdSjOwkdM1J9eJyeijfyEjKS9e/E/c4WrjUs+gH5wcb9zNMNFOGeG7Ih2U0
# wEUIpe2y3YjSHTSTGZLYGguCGmJPZQ==
# =MKCk
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 24 Apr 2023 06:55:14 PM BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]

* tag 'block-pull-request' of https://gitlab.com/stefanha/qemu:
  tracetool: use relative paths for '#line' preprocessor directives
  block/dmg: Declare a type definition for DMG uncompress function

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-04-25 09:13:07 +01:00
parent ac5f7bf8e2 9d672e2904
commit 3f1b44bdc1
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
block/dmg.c
View File

@ -31,11 +31,8 @@
#include "qemu/memalign.h" #include "qemu/memalign.h"
#include "dmg.h" #include "dmg.h"
int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in, BdrvDmgUncompressFunc *dmg_uncompress_bz2;
char *next_out, unsigned int avail_out); BdrvDmgUncompressFunc *dmg_uncompress_lzfse;
int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in,
char *next_out, unsigned int avail_out);
enum { enum {
/* Limit chunk sizes to prevent unreasonable amounts of memory being used /* Limit chunk sizes to prevent unreasonable amounts of memory being used

8
block/dmg.h
View File

@ -51,10 +51,10 @@ typedef struct BDRVDMGState {
z_stream zstream; z_stream zstream;
} BDRVDMGState; } BDRVDMGState;
extern int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in, typedef int BdrvDmgUncompressFunc(char *next_in, unsigned int avail_in,
char *next_out, unsigned int avail_out); char *next_out, unsigned int avail_out);
extern int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in, extern BdrvDmgUncompressFunc *dmg_uncompress_bz2;
char *next_out, unsigned int avail_out); extern BdrvDmgUncompressFunc *dmg_uncompress_lzfse;
#endif #endif

4
scripts/tracetool/backend/ftrace.py
View File

@ -12,6 +12,8 @@ __maintainer__ = "Stefan Hajnoczi"
__email__ = "stefanha@redhat.com" __email__ = "stefanha@redhat.com"
import os.path
from tracetool import out from tracetool import out
@ -45,7 +47,7 @@ def generate_h(event, group):
args=event.args, args=event.args,
event_id="TRACE_" + event.name.upper(), event_id="TRACE_" + event.name.upper(),
event_lineno=event.lineno, event_lineno=event.lineno,
event_filename=event.filename, event_filename=os.path.relpath(event.filename),
fmt=event.fmt.rstrip("\n"), fmt=event.fmt.rstrip("\n"),
argnames=argnames) argnames=argnames)

4
scripts/tracetool/backend/log.py
View File

@ -12,6 +12,8 @@ __maintainer__ = "Stefan Hajnoczi"
__email__ = "stefanha@redhat.com" __email__ = "stefanha@redhat.com"
import os.path
from tracetool import out from tracetool import out
@ -53,7 +55,7 @@ def generate_h(event, group):
' }', ' }',
cond=cond, cond=cond,
event_lineno=event.lineno, event_lineno=event.lineno,
event_filename=event.filename, event_filename=os.path.relpath(event.filename),
name=event.name, name=event.name,
fmt=event.fmt.rstrip("\n"), fmt=event.fmt.rstrip("\n"),
argnames=argnames) argnames=argnames)

4
scripts/tracetool/backend/syslog.py
View File

@ -12,6 +12,8 @@ __maintainer__ = "Stefan Hajnoczi"
__email__ = "stefanha@redhat.com" __email__ = "stefanha@redhat.com"
import os.path
from tracetool import out from tracetool import out
@ -41,7 +43,7 @@ def generate_h(event, group):
' }', ' }',
cond=cond, cond=cond,
event_lineno=event.lineno, event_lineno=event.lineno,
event_filename=event.filename, event_filename=os.path.relpath(event.filename),
name=event.name, name=event.name,
fmt=event.fmt.rstrip("\n"), fmt=event.fmt.rstrip("\n"),
argnames=argnames) argnames=argnames)