8547e28bd5
23233-hvm-cr-access.patch 23234-svm-decode-assist-base.patch 23235-svm-decode-assist-crs.patch 23236-svm-decode-assist-invlpg.patch 23238-svm-decode-assist-insn-fetch.patch 23303-cpufreq-misc.patch 23304-amd-oprofile-strings.patch 23305-amd-fam15-xenoprof.patch 23306-amd-fam15-vpmu.patch 23334-amd-fam12+14-vpmu.patch 23338-vtd-force-intremap.patch - fate#310957 - Update to Xen 4.1.1-rc1 c/s 23064 - xentrace: dynamic tracebuffer allocation xen-unstable.xentrace.dynamic_tbuf.patch xen-unstable.xentrace.empty_t_info_pages.patch xen-unstable.xentrace.verbose.patch xen-unstable.xentrace.no_gdprintk.patch xen-unstable.xentrace.comments.patch xen-unstable.xentrace.printk_prefix.patch xen-unstable.xentrace.remove_debug_printk.patch xen-unstable.xentrace.t_info_pages-formula.patch xen-unstable.xentrace.register_cpu_notifier-boot_time.patch xen-unstable.xentrace.t_info_page-overflow.patch xen-unstable.xentrace.t_info_first_offset.patch xen-unstable.xentrace.data_size__read_mostly.patch xen-unstable.xentrace.__insert_record-dst-type.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=124
69 lines
2.5 KiB
Diff
69 lines
2.5 KiB
Diff
xenpaging: pass integer to xenpaging_populate_page
|
|
|
|
Pass gfn as integer to xenpaging_populate_page(). xc_map_foreign_pages()
|
|
takes a pointer to a list of gfns, but its a const pointer. So writing
|
|
the value back to the caller is not needed.
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
---
|
|
tools/xenpaging/xenpaging.c | 17 ++++++-----------
|
|
1 file changed, 6 insertions(+), 11 deletions(-)
|
|
|
|
Index: xen-4.1.1-testing/tools/xenpaging/xenpaging.c
|
|
===================================================================
|
|
--- xen-4.1.1-testing.orig/tools/xenpaging/xenpaging.c
|
|
+++ xen-4.1.1-testing/tools/xenpaging/xenpaging.c
|
|
@@ -413,28 +413,24 @@ static int xenpaging_resume_page(xenpagi
|
|
return ret;
|
|
}
|
|
|
|
-static int xenpaging_populate_page(xenpaging_t *paging,
|
|
- uint64_t *gfn, int fd, int i)
|
|
+static int xenpaging_populate_page(xenpaging_t *paging, xen_pfn_t gfn, int fd, int i)
|
|
{
|
|
xc_interface *xch = paging->xc_handle;
|
|
- unsigned long _gfn;
|
|
void *page;
|
|
int ret;
|
|
unsigned char oom = 0;
|
|
|
|
- _gfn = *gfn;
|
|
- DPRINTF("populate_page < gfn %lx pageslot %d\n", _gfn, i);
|
|
+ DPRINTF("populate_page < gfn %"PRI_xen_pfn" pageslot %d\n", gfn, i);
|
|
do
|
|
{
|
|
/* Tell Xen to allocate a page for the domain */
|
|
- ret = xc_mem_paging_prep(xch, paging->mem_event.domain_id,
|
|
- _gfn);
|
|
+ ret = xc_mem_paging_prep(xch, paging->mem_event.domain_id, gfn);
|
|
if ( ret != 0 )
|
|
{
|
|
if ( errno == ENOMEM )
|
|
{
|
|
if ( oom++ == 0 )
|
|
- DPRINTF("ENOMEM while preparing gfn %lx\n", _gfn);
|
|
+ DPRINTF("ENOMEM while preparing gfn %"PRI_xen_pfn"\n", gfn);
|
|
sleep(1);
|
|
continue;
|
|
}
|
|
@@ -447,8 +443,7 @@ static int xenpaging_populate_page(xenpa
|
|
/* Map page */
|
|
ret = -EFAULT;
|
|
page = xc_map_foreign_pages(xch, paging->mem_event.domain_id,
|
|
- PROT_READ | PROT_WRITE, &_gfn, 1);
|
|
- *gfn = _gfn;
|
|
+ PROT_READ | PROT_WRITE, &gfn, 1);
|
|
if ( page == NULL )
|
|
{
|
|
ERROR("Error mapping page: page is null");
|
|
@@ -634,7 +629,7 @@ int main(int argc, char *argv[])
|
|
else
|
|
{
|
|
/* Populate the page */
|
|
- rc = xenpaging_populate_page(paging, &req.gfn, fd, i);
|
|
+ rc = xenpaging_populate_page(paging, req.gfn, fd, i);
|
|
if ( rc != 0 )
|
|
{
|
|
ERROR("Error populating page");
|