0d71e75f73
26369-libxl-devid.patch - fate##313584: pass bios information to XEN HVM guest 26554-hvm-firmware-passthrough.patch 26555-hvm-firmware-passthrough.patch 26556-hvm-firmware-passthrough.patch - Upstream patches from Jan 26516-ACPI-parse-table-retval.patch (Replaces CVE-2013-0153-xsa36.patch) 26517-AMD-IOMMU-clear-irtes.patch (Replaces CVE-2013-0153-xsa36.patch) 26518-AMD-IOMMU-disable-if-SATA-combined-mode.patch (Replaces CVE-2013-0153-xsa36.patch) 26519-AMD-IOMMU-perdev-intremap-default.patch (Replaces CVE-2013-0153-xsa36.patch) 26526-pvdrv-no-devinit.patch 26529-gcc48-build-fix.patch 26531-AMD-IOMMU-IVHD-special-missing.patch (Replaces CVE-2013-0153-xsa36.patch) 26532-AMD-IOMMU-phantom-MSI.patch 26536-xenoprof-div-by-0.patch 26576-x86-APICV-migration.patch 26577-x86-APICV-x2APIC.patch 26578-AMD-IOMMU-replace-BUG_ON.patch - bnc#797014 - no way to control live migrations 26547-tools-xc_fix_logic_error_in_stdiostream_progress.patch 26548-tools-xc_handle_tty_output_differently_in_stdiostream_progress.patch 26549-tools-xc_turn_XCFLAGS_*_into_shifts.patch 26550-tools-xc_restore_logging_in_xc_save.patch 26551-tools-xc_log_pid_in_xc_save-xc_restore_output.patch - PVonHVM: __devinit was removed in linux-3.8 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=229
112 lines
4.2 KiB
Diff
112 lines
4.2 KiB
Diff
changeset: 26551:48f9436959dd
|
|
user: Olaf Hering <olaf@aepfle.de>
|
|
date: Fri Feb 15 13:32:13 2013 +0000
|
|
files: tools/libxc/xc_domain_restore.c tools/libxc/xc_domain_save.c tools/xcutils/xc_restore.c tools/xcutils/xc_save.c
|
|
description:
|
|
tools/xc: log pid in xc_save/xc_restore output
|
|
|
|
If several migrations log their output to xend.log its not clear which
|
|
line belongs to a which guest. Print entry/exit of xc_save and
|
|
xc_restore and also request to print pid with each log call.
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
|
Committed-by: Ian Campbell <ian.campbell@citrix.com>
|
|
|
|
|
|
Index: xen-4.2.1-testing/tools/libxc/xc_domain_restore.c
|
|
===================================================================
|
|
--- xen-4.2.1-testing.orig/tools/libxc/xc_domain_restore.c
|
|
+++ xen-4.2.1-testing/tools/libxc/xc_domain_restore.c
|
|
@@ -1382,6 +1382,8 @@ int xc_domain_restore(xc_interface *xch,
|
|
struct restore_ctx *ctx = &_ctx;
|
|
struct domain_info_context *dinfo = &ctx->dinfo;
|
|
|
|
+ DPRINTF("%s: starting restore of new domid %u", __func__, dom);
|
|
+
|
|
pagebuf_init(&pagebuf);
|
|
memset(&tailbuf, 0, sizeof(tailbuf));
|
|
tailbuf.ishvm = hvm;
|
|
@@ -1408,7 +1410,7 @@ int xc_domain_restore(xc_interface *xch,
|
|
PERROR("read: p2m_size");
|
|
goto out;
|
|
}
|
|
- DPRINTF("xc_domain_restore start: p2m_size = %lx\n", dinfo->p2m_size);
|
|
+ DPRINTF("%s: p2m_size = %lx\n", __func__, dinfo->p2m_size);
|
|
|
|
if ( !get_platform_info(xch, dom,
|
|
&ctx->max_mfn, &ctx->hvirt_start, &ctx->pt_levels, &dinfo->guest_width) )
|
|
@@ -2215,7 +2217,7 @@ int xc_domain_restore(xc_interface *xch,
|
|
|
|
fcntl(io_fd, F_SETFL, orig_io_fd_flags);
|
|
|
|
- DPRINTF("Restore exit with rc=%d\n", rc);
|
|
+ DPRINTF("Restore exit of domid %u with rc=%d\n", dom, rc);
|
|
|
|
return rc;
|
|
}
|
|
Index: xen-4.2.1-testing/tools/libxc/xc_domain_save.c
|
|
===================================================================
|
|
--- xen-4.2.1-testing.orig/tools/libxc/xc_domain_save.c
|
|
+++ xen-4.2.1-testing/tools/libxc/xc_domain_save.c
|
|
@@ -897,6 +897,8 @@ int xc_domain_save(xc_interface *xch, in
|
|
|
|
int completed = 0;
|
|
|
|
+ DPRINTF("%s: starting save of domid %u", __func__, dom);
|
|
+
|
|
if ( hvm && !callbacks->switch_qemu_logdirty )
|
|
{
|
|
ERROR("No switch_qemu_logdirty callback provided.");
|
|
@@ -2112,7 +2114,7 @@ int xc_domain_save(xc_interface *xch, in
|
|
free(pfn_err);
|
|
free(to_fix);
|
|
|
|
- DPRINTF("Save exit rc=%d\n",rc);
|
|
+ DPRINTF("Save exit of domid %u with rc=%d\n", dom, rc);
|
|
|
|
return !!rc;
|
|
}
|
|
Index: xen-4.2.1-testing/tools/xcutils/xc_restore.c
|
|
===================================================================
|
|
--- xen-4.2.1-testing.orig/tools/xcutils/xc_restore.c
|
|
+++ xen-4.2.1-testing/tools/xcutils/xc_restore.c
|
|
@@ -19,17 +19,22 @@ int
|
|
main(int argc, char **argv)
|
|
{
|
|
unsigned int domid, store_evtchn, console_evtchn;
|
|
- unsigned int hvm, pae, apic;
|
|
+ unsigned int hvm, pae, apic, lflags;
|
|
xc_interface *xch;
|
|
int io_fd, ret;
|
|
int superpages;
|
|
unsigned long store_mfn, console_mfn;
|
|
+ xentoollog_level lvl;
|
|
+ xentoollog_logger *l;
|
|
|
|
if ( (argc != 8) && (argc != 9) )
|
|
errx(1, "usage: %s iofd domid store_evtchn "
|
|
"console_evtchn hvm pae apic [superpages]", argv[0]);
|
|
|
|
- xch = xc_interface_open(0,0,0);
|
|
+ lvl = XTL_DETAIL;
|
|
+ lflags = XTL_STDIOSTREAM_SHOW_PID | XTL_STDIOSTREAM_HIDE_PROGRESS;
|
|
+ l = (xentoollog_logger *)xtl_createlogger_stdiostream(stderr, lvl, lflags);
|
|
+ xch = xc_interface_open(l, 0, 0);
|
|
if ( !xch )
|
|
errx(1, "failed to open control interface");
|
|
|
|
Index: xen-4.2.1-testing/tools/xcutils/xc_save.c
|
|
===================================================================
|
|
--- xen-4.2.1-testing.orig/tools/xcutils/xc_save.c
|
|
+++ xen-4.2.1-testing/tools/xcutils/xc_save.c
|
|
@@ -184,7 +184,7 @@ main(int argc, char **argv)
|
|
si.suspend_evtchn = -1;
|
|
|
|
lvl = si.flags & XCFLAGS_DEBUG ? XTL_DEBUG: XTL_DETAIL;
|
|
- lflags = XTL_STDIOSTREAM_HIDE_PROGRESS;
|
|
+ lflags = XTL_STDIOSTREAM_SHOW_PID | XTL_STDIOSTREAM_HIDE_PROGRESS;
|
|
l = (xentoollog_logger *)xtl_createlogger_stdiostream(stderr, lvl, lflags);
|
|
si.xch = xc_interface_open(l, 0, 0);
|
|
if (!si.xch)
|