diff mbox series

[07/10] trace: remove control-vcpu.h

Message ID 20230420150009.1675181-8-alex.bennee@linaro.org
State Superseded
Headers show
Series tracing: remove dynamic vcpu state | expand

Commit Message

Alex Bennée April 20, 2023, 3 p.m. UTC 
Now we no longer have vcpu controlled trace events we can excise the
code that allows us to query its status.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 trace/control-vcpu.h          | 47 -----------------------------------
 trace/qmp.c                   |  2 +-
 scripts/tracetool/format/h.py |  5 +---
 3 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 trace/control-vcpu.h

Comments

Philippe Mathieu-Daudé April 21, 2023, 6:50 a.m. UTC | #1 
On 20/4/23 17:00, Alex Bennée wrote:
> Now we no longer have vcpu controlled trace events we can excise the
> code that allows us to query its status.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   trace/control-vcpu.h          | 47 -----------------------------------
>   trace/qmp.c                   |  2 +-
>   scripts/tracetool/format/h.py |  5 +---
>   3 files changed, 2 insertions(+), 52 deletions(-)
>   delete mode 100644 trace/control-vcpu.h


> diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py
> index 285d7b03a9..ea126b07ea 100644
> --- a/scripts/tracetool/format/h.py
> +++ b/scripts/tracetool/format/h.py
> @@ -16,10 +16,7 @@
>   
>   
>   def generate(events, backend, group):
> -    if group == "root":
> -        header = "trace/control-vcpu.h"
> -    else:
> -        header = "trace/control.h"
> +    header = "trace/control.h"

Just include it in place in the template :) With that:

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

>   
>       out('/* This file is autogenerated by tracetool, do not edit. */',
>           '',
diff mbox series

Patch

diff --git a/trace/control-vcpu.h b/trace/control-vcpu.h
deleted file mode 100644
index 800fc5a219..0000000000
--- a/trace/control-vcpu.h
+++ /dev/null
@@ -1,47 +0,0 @@ 
-/*
- * Interface for configuring and controlling the state of tracing events.
- *
- * Copyright (C) 2011-2016 Lluís Vilanova <vilanova@ac.upc.edu>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#ifndef TRACE__CONTROL_VCPU_H
-#define TRACE__CONTROL_VCPU_H
-
-#include "control.h"
-#include "event-internal.h"
-#include "hw/core/cpu.h"
-
-/**
- * trace_event_get_vcpu_state:
- * @vcpu: Target vCPU.
- * @id: Event identifier name.
- *
- * Get the tracing state of an event (both static and dynamic) for the given
- * vCPU.
- *
- * If the event has the disabled property, the check will have no performance
- * impact.
- */
-#define trace_event_get_vcpu_state(vcpu, id)                            \
-    ((id ##_ENABLED) &&                                                 \
-     trace_event_get_vcpu_state_dynamic_by_vcpu_id(                     \
-         vcpu, _ ## id ## _EVENT.vcpu_id))
-
-#include "control-internal.h"
-
-static inline bool
-trace_event_get_vcpu_state_dynamic_by_vcpu_id(CPUState *vcpu,
-                                              uint32_t vcpu_id)
-{
-    /* it's on fast path, avoid consistency checks (asserts) */
-    if (unlikely(trace_events_enabled_count)) {
-        return test_bit(vcpu_id, vcpu->trace_dstate);
-    } else {
-        return false;
-    }
-}
-
-#endif
diff --git a/trace/qmp.c b/trace/qmp.c
index aa760f1fc4..3e3971c6a8 100644
--- a/trace/qmp.c
+++ b/trace/qmp.c
@@ -10,7 +10,7 @@ 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-trace.h"
-#include "control-vcpu.h"
+#include "control.h"
 
 
 static bool check_events(bool ignore_unavailable, bool is_pattern,
diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py
index 285d7b03a9..ea126b07ea 100644
--- a/scripts/tracetool/format/h.py
+++ b/scripts/tracetool/format/h.py
@@ -16,10 +16,7 @@ 
 
 
 def generate(events, backend, group):
-    if group == "root":
-        header = "trace/control-vcpu.h"
-    else:
-        header = "trace/control.h"
+    header = "trace/control.h"
 
     out('/* This file is autogenerated by tracetool, do not edit. */',
         '',