diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2010-05-28 09:38:18 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2010-05-28 09:38:18 +0100 |
commit | a2b5973ee0d143545a62903c629f800dc25f2837 (patch) | |
tree | 92c5d6aa33362fc2aabcebc0ea3a3e5d64d1321c /tools/libxc/xc_domain_restore.c | |
parent | 861aef6e1558bebad8fc60c1c723f0706fd3ed87 (diff) | |
download | xen-a2b5973ee0d143545a62903c629f800dc25f2837.tar.gz xen-a2b5973ee0d143545a62903c629f800dc25f2837.tar.bz2 xen-a2b5973ee0d143545a62903c629f800dc25f2837.zip |
libxc: remove \n from strings passed to PERROR
Previously, the code was inconsistent: some calls to PERROR passed \n
and some did not. With the new logging arrangements, passing \n is
definitely incorrect.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxc/xc_domain_restore.c')
-rw-r--r-- | tools/libxc/xc_domain_restore.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 4804a61b5a..4f68948d48 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -124,7 +124,7 @@ static int break_super_page(xc_interface *xch, if ( ram_base == NULL ) { - PERROR("map batch failed\n"); + PERROR("map batch failed"); rc = 1; goto out; } @@ -136,7 +136,7 @@ static int break_super_page(xc_interface *xch, if ( xc_domain_memory_decrease_reservation(xch, dom, 1, SUPERPAGE_PFN_SHIFT, &start_pfn) != 0 ) { - PERROR("free 2M page failure @ 0x%ld.\n", next_pfn); + PERROR("free 2M page failure @ 0x%ld.", next_pfn); rc = 1; goto out; } @@ -153,7 +153,7 @@ static int break_super_page(xc_interface *xch, if (xc_domain_memory_populate_physmap(xch, dom, 1, 0, 0, &mfn) != 0) { - PERROR("Failed to allocate physical memory.!\n"); + PERROR("Failed to allocate physical memory.!"); errno = ENOMEM; rc = 1; goto out; @@ -171,7 +171,7 @@ static int break_super_page(xc_interface *xch, page_array, tot_pfns); if ( ram_base == NULL ) { - PERROR("map batch failed\n"); + PERROR("map batch failed"); rc = 1; goto out; } @@ -283,7 +283,7 @@ normal_page: if (xc_domain_memory_populate_physmap(xch, dom, 1, 0, 0, &mfn) != 0) { - PERROR("Failed to allocate physical memory.! pfn=0x%lx, mfn=0x%lx.\n", + PERROR("Failed to allocate physical memory.! pfn=0x%lx, mfn=0x%lx.", pfn, mfn); errno = ENOMEM; return 1; @@ -1497,7 +1497,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, if ( !completed ) { pagebuf.nr_physpages = pagebuf.nr_pages = 0; if ( pagebuf_get_one(xch, &pagebuf, io_fd, dom) < 0 ) { - PERROR("Error when reading batch\n"); + PERROR("Error when reading batch"); goto out; } } @@ -1929,7 +1929,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, frc = xc_domctl(xch, &domctl); if ( frc != 0 ) { - PERROR("Couldn't set extended vcpu%d info\n", i); + PERROR("Couldn't set extended vcpu%d info", i); goto out; } } |