On Tue, Mar 26, 2019 at 5:07 PM Tzvetomir Stoyanov <tstoyanov@xxxxxxxxxx> wrote:
>
> In order to match host and guest events, a mapping between guest VCPU
> and the host task, running this VCPU is needed. Extended existing
> struct guest to hold such mapping and added logic in read_qemu_guests()
> function to initialize it. Implemented a new internal API,
> get_guest_vcpu_pid(), to retrieve VCPU-task mapping for given VM.
>
> Signed-off-by: Tzvetomir Stoyanov <tstoyanov@xxxxxxxxxx>
> ---
> tracecmd/include/trace-local.h | 1 +
> tracecmd/trace-record.c | 57 ++++++++++++++++++++++++++++++++++
> 2 files changed, 58 insertions(+)
>
> diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h
> index 8413054..62f5e47 100644
> --- a/tracecmd/include/trace-local.h
> +++ b/tracecmd/include/trace-local.h
> @@ -245,6 +245,7 @@ int tracecmd_local_cpu_count(void);
> void tracecmd_set_clock(struct buffer_instance *instance);
> void tracecmd_remove_instance(struct buffer_instance *instance);
>
> +int get_guest_vcpu_pid(unsigned int guest_cid, unsigned int guest_vcpu);
> /* No longer in event-utils.h */
> void __noreturn die(const char *fmt, ...); /* Can be overriden */
> void *malloc_or_die(unsigned int size); /* Can be overridden */
> diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
> index eacf7d2..72a8ed3 100644
> --- a/tracecmd/trace-record.c
> +++ b/tracecmd/trace-record.c
> @@ -2746,10 +2746,12 @@ static bool is_digits(const char *s)
> return true;
> }
>
> +#define VCPUS_MAX 256
> struct guest {
> char *name;
> int cid;
> int pid;
> + int cpu_pid[VCPUS_MAX];
> };
>
> static struct guest *guests;
> @@ -2767,6 +2769,46 @@ static char *get_qemu_guest_name(char *arg)
> return arg;
> }
>
> +static void read_qemu_guests_pids(char *guest_task, struct guest *guest)
> +{
> + struct dirent *entry_t;
> + char path[PATH_MAX];
> + char *buf = NULL;
> + size_t n = 0;
> + int vcpu;
> + DIR *dir;
> + FILE *ft;
Nit: I think the entry_t/ft are left overs from before when this
function was inlined in read_qemu_guests(). Can you change them to
entry/f now that there's no name collision?
Cheers,
-- Slavi
|