openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE----- 

Version: GnuPG v1
 
 iQEcBAABAgAGBQJWF4WhAAoJEJykq7OBq3PI2OMH+weMGoUmI8Dqdva+DlZYu7L9
 dq+GHoLREW957GQHe+S98nqIVsfdyWiM8CburRRANl8NHUU3D+8JB5UCn2GI1nLh
 RY2isfeKZozEBZoFiDImnKqhR0g215gmGhMsQrXhgOC5e28ridBwcve49bwdzk9R
 se2T5tN50u6HeFUAm3OPrPwHRchk15kJtRa8Yu2hWHRCv1LeCOc/yzleY7XEE9CP
 7+fw1hSXB6WKcBr3cN54V6QnOtJd1hWa/G2bLGaFD74QP2zoWfpKb+qp7Z9+Nmhs
 1So0G7lq5JDj7y8UQ6gpSmAP9aA7crrh5OrRHD2nbrXUqFHBRQa1/2FPqKHZlVY=
 =M8Fl
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

# gpg: Signature made Fri 09 Oct 2015 10:15:13 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/tracing-pull-request:
  trace: remove malloc tracing
  docs: update the usage example of "dtrace" backend in tracing.txt

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-10-09 12:18:13 +01:00
parent 8be6e623a2 98cf48f60a
commit b37686f7e8
3 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/tracing.txt
View File

@ -258,7 +258,7 @@ is generated to make use in scripts more convenient. This step can also be
performed manually after a build in order to change the binary name in the .stp performed manually after a build in order to change the binary name in the .stp
probes: probes:
scripts/tracetool --dtrace --stap \ scripts/tracetool.py --backends=dtrace --format=stap \
--binary path/to/qemu-binary \ --binary path/to/qemu-binary \
--target-type system \ --target-type system \
--target-name x86_64 \ --target-name x86_64 \

3
trace-events
View File

@ -603,9 +603,6 @@ scsi_request_sense(int target, int lun, int tag) "target %d lun %d tag %d"
vm_state_notify(int running, int reason) "running %d reason %d" vm_state_notify(int running, int reason) "running %d reason %d"
load_file(const char *name, const char *path) "name %s location %s" load_file(const char *name, const char *path) "name %s location %s"
runstate_set(int new_state) "new state %d" runstate_set(int new_state) "new state %d"
g_malloc(size_t size, void *ptr) "size %zu ptr %p"
g_realloc(void *ptr, size_t size, void *newptr) "ptr %p size %zu newptr %p"
g_free(void *ptr) "ptr %p"
system_wakeup_request(int reason) "reason=%d" system_wakeup_request(int reason) "reason=%d"
qemu_system_shutdown_request(void) "" qemu_system_shutdown_request(void) ""
qemu_system_powerdown_request(void) "" qemu_system_powerdown_request(void) ""

27
vl.c
View File

@ -2703,26 +2703,6 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
return popt; return popt;
} }
static gpointer malloc_and_trace(gsize n_bytes)
{
void *ptr = malloc(n_bytes);
trace_g_malloc(n_bytes, ptr);
return ptr;
}
static gpointer realloc_and_trace(gpointer mem, gsize n_bytes)
{
void *ptr = realloc(mem, n_bytes);
trace_g_realloc(mem, n_bytes, ptr);
return ptr;
}
static void free_and_trace(gpointer mem)
{
trace_g_free(mem);
free(mem);
}
static int machine_set_property(void *opaque, static int machine_set_property(void *opaque,
const char *name, const char *value, const char *name, const char *value,
Error **errp) Error **errp)
@ -2950,11 +2930,6 @@ int main(int argc, char **argv, char **envp)
bool userconfig = true; bool userconfig = true;
const char *log_mask = NULL; const char *log_mask = NULL;
const char *log_file = NULL; const char *log_file = NULL;
GMemVTable mem_trace = {
.malloc = malloc_and_trace,
.realloc = realloc_and_trace,
.free = free_and_trace,
};
const char *trace_events = NULL; const char *trace_events = NULL;
const char *trace_file = NULL; const char *trace_file = NULL;
ram_addr_t maxram_size; ram_addr_t maxram_size;
@ -2970,8 +2945,6 @@ int main(int argc, char **argv, char **envp)
error_set_progname(argv[0]); error_set_progname(argv[0]);
qemu_init_exec_dir(argv[0]); qemu_init_exec_dir(argv[0]);
g_mem_set_vtable(&mem_trace);
module_call_init(MODULE_INIT_QOM); module_call_init(MODULE_INIT_QOM);
qemu_add_opts(&qemu_drive_opts); qemu_add_opts(&qemu_drive_opts);