|
@@ -17,7 +17,6 @@
|
|
|
#include "sysemu/reset.h"
|
|
|
#include "hw/qdev-properties.h"
|
|
|
#include "migration/vmstate.h"
|
|
|
-#include "monitor/monitor.h"
|
|
|
#include "hw/irq.h"
|
|
|
#include "hw/ppc/xive.h"
|
|
|
#include "hw/ppc/xive2.h"
|
|
@@ -1419,8 +1418,7 @@ static void xive_end_enqueue(XiveEND *end, uint32_t data)
|
|
|
end->w1 = xive_set_field32(END_W1_PAGE_OFF, end->w1, qindex);
|
|
|
}
|
|
|
|
|
|
-void xive_end_eas_pic_print_info(XiveEND *end, uint32_t end_idx,
|
|
|
- Monitor *mon)
|
|
|
+void xive_end_eas_pic_print_info(XiveEND *end, uint32_t end_idx, GString *buf)
|
|
|
{
|
|
|
XiveEAS *eas = (XiveEAS *) &end->w4;
|
|
|
uint8_t pq;
|
|
@@ -1431,15 +1429,15 @@ void xive_end_eas_pic_print_info(XiveEND *end, uint32_t end_idx,
|
|
|
|
|
|
pq = xive_get_field32(END_W1_ESe, end->w1);
|
|
|
|
|
|
- monitor_printf(mon, " %08x %c%c %c%c end:%02x/%04x data:%08x\n",
|
|
|
- end_idx,
|
|
|
- pq & XIVE_ESB_VAL_P ? 'P' : '-',
|
|
|
- pq & XIVE_ESB_VAL_Q ? 'Q' : '-',
|
|
|
- xive_eas_is_valid(eas) ? 'V' : ' ',
|
|
|
- xive_eas_is_masked(eas) ? 'M' : ' ',
|
|
|
- (uint8_t) xive_get_field64(EAS_END_BLOCK, eas->w),
|
|
|
- (uint32_t) xive_get_field64(EAS_END_INDEX, eas->w),
|
|
|
- (uint32_t) xive_get_field64(EAS_END_DATA, eas->w));
|
|
|
+ g_string_append_printf(buf, " %08x %c%c %c%c end:%02x/%04x data:%08x\n",
|
|
|
+ end_idx,
|
|
|
+ pq & XIVE_ESB_VAL_P ? 'P' : '-',
|
|
|
+ pq & XIVE_ESB_VAL_Q ? 'Q' : '-',
|
|
|
+ xive_eas_is_valid(eas) ? 'V' : ' ',
|
|
|
+ xive_eas_is_masked(eas) ? 'M' : ' ',
|
|
|
+ (uint8_t) xive_get_field64(EAS_END_BLOCK, eas->w),
|
|
|
+ (uint32_t) xive_get_field64(EAS_END_INDEX, eas->w),
|
|
|
+ (uint32_t) xive_get_field64(EAS_END_DATA, eas->w));
|
|
|
}
|
|
|
|
|
|
/*
|