Stefan Hajnoczi writes:
> On Tue, Oct 13, 2015 at 07:11:07PM +0200, Lluís Vilanova wrote:
>> diff --git a/trace/control-internal.h b/trace/control-internal.h
>> index 70e55df..b4069e3 100644
>> --- a/trace/control-internal.h
>> +++ b/trace/control-internal.h
>> @@ -12,6 +12,12 @@
>>
>> #include <string.h>
>>
>> +#include "qemu-common.h"
>> +/* GTK headers conflict with QOM's '_' */
>> +#if !defined(TRACE_CPU_INCLUDE_HACK)
>> +#include "qom/cpu.h"
>> +#endif
>> +
>>
>> extern TraceEvent trace_events[];
>>
>> @@ -63,11 +69,16 @@ static inline bool
>> trace_event_get_state_dynamic(TraceEvent *ev)
>> return ev->dstate;
>> }
>>
>> -static inline void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
>> +static inline bool trace_event_get_cpu_state_dynamic(CPUState *cpu,
>> + TraceEvent *ev)
>> {
>> +#if !defined(TRACE_CPU_INCLUDE_HACK)
>> + assert(cpu != NULL);
>> assert(ev != NULL);
>> - assert(trace_event_get_state_static(ev));
>> - ev->dstate = state;
>> + return cpu->tb_phys_idx & (((unsigned long)1) << ev->cpu_id);
>> +#else
>> + abort();
>> +#endif
>> }
> What exactly is the header conflict?
To be honest, I will try recompiling without that specific patch for the next
version (and document why is that necessary), since I had them lying around for
a long time and only checked if they compiled and run as supposed.
Thanks,
Lluis
--
"And it's much the same thing with knowledge, for whenever you learn
something new, the whole world becomes that much richer."
-- The Princess of Pure Reason, as told by Norton Juster in The Phantom
Tollbooth
