D21945.id63105.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21945.id63105.diff
View Options

	Index: lib/libkvm/kvm.h
	===================================================================
	--- lib/libkvm/kvm.h
	+++ lib/libkvm/kvm.h
	@@ -82,18 +82,18 @@
	};

	struct kvm_page {
	- unsigned int version;
	- u_long paddr;
	- u_long kmap_vaddr;
	- u_long dmap_vaddr;
	- vm_prot_t prot;
	- u_long offset;
	- size_t len;
	- /* end of version 1 */
	+ u_int kp_version;
	+ kpaddr_t kp_paddr;
	+ kvaddr_t kp_kmap_vaddr;
	+ kvaddr_t kp_dmap_vaddr;
	+ vm_prot_t kp_prot;
	+ off_t kp_offset;
	+ size_t kp_len;
	+ /* end of version 2 */
	};

	#define SWIF_DEV_PREFIX 0x0002
	-#define LIBKVM_WALK_PAGES_VERSION 1
	+#define LIBKVM_WALK_PAGES_VERSION 2

	__BEGIN_DECLS
	int kvm_close(kvm_t *);
	Index: lib/libkvm/kvm_private.c
	===================================================================
	--- lib/libkvm/kvm_private.c
	+++ lib/libkvm/kvm_private.c
	@@ -755,13 +755,13 @@
	{
	unsigned int pgsz = page_size ? page_size : len;
	struct kvm_page p = {
	- .version = LIBKVM_WALK_PAGES_VERSION,
	- .paddr = pa,
	- .kmap_vaddr = kmap_vaddr,
	- .dmap_vaddr = dmap_vaddr,
	- .prot = prot,
	- .offset = _kvm_pt_find(kd, pa, pgsz),
	- .len = len,
	+ .kp_version = LIBKVM_WALK_PAGES_VERSION,
	+ .kp_paddr = pa,
	+ .kp_kmap_vaddr = kmap_vaddr,
	+ .kp_dmap_vaddr = dmap_vaddr,
	+ .kp_prot = prot,
	+ .kp_offset = _kvm_pt_find(kd, pa, pgsz),
	+ .kp_len = len,
	};

	return cb(&p, arg);