Page MenuHomeFreeBSD
Differential D1819

libdwarf: Handle .rel relocations
ClosedPublic
Actions

Authored by emaste on Feb 10 2015, 8:50 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 11, 5:30 PM
Unknown Object (File)
Mon, Mar 3, 8:53 AM
Unknown Object (File)
Feb 18 2025, 2:23 PM
Unknown Object (File)
Jan 23 2025, 5:33 AM
Unknown Object (File)
Jan 23 2025, 5:03 AM
Unknown Object (File)
Jan 7 2025, 3:58 PM
Unknown Object (File)
Dec 18 2024, 4:11 AM
Unknown Object (File)
Dec 18 2024, 3:21 AM
View All Files
Subscribers
freebsd-toolchain-list
rpaulo

Details

Reviewers
rpaulo
imp
gnn
br
Commits
rS278611: libdwarf: Handle .rel relocations
Summary

Some architectures have .rel relocations for debug data, so handle it in addition to .rela.

Issue discovered from ctfconvert on un-linked ARM object files.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste updated this revision to Diff 3722.Feb 10 2015, 8:50 PM
emaste retitled this revision from to libdwarf: Handle .rel relocations.
emaste updated this object.
emaste edited the test plan for this revision. (Show Details)
emaste added a reviewer: gnn.
emaste added a subscriber: Unknown Object (MLST).
rpaulo accepted this revision.Feb 11 2015, 7:19 PM
rpaulo added a reviewer: rpaulo.
rpaulo added a subscriber: rpaulo.

Reviewed.

This revision is now accepted and ready to land.Feb 11 2015, 7:19 PM
emaste added a reviewer: br.Feb 11 2015, 7:25 PM
emaste updated this revision to Diff 3741.Feb 11 2015, 8:00 PM
emaste edited edge metadata.

Refactor common parts of .rel and .rela handling, based on feedback about non-obvious size==0 return from _dwarf_get_reloc_size

This revision now requires review to proceed.Feb 11 2015, 8:00 PM
gnn accepted this revision.Feb 11 2015, 10:40 PM
gnn edited edge metadata.
This revision is now accepted and ready to land.Feb 11 2015, 10:40 PM
imp accepted this revision.Feb 11 2015, 11:33 PM
imp added a reviewer: imp.
emaste closed this revision.Feb 12 2015, 2:09 AM
emaste updated this revision to Diff 3742.

Closed by commit rS278611 (authored by @emaste).

Revision Contents
Changeset List

Diff 3741

View Options

libdwarf/_libdwarf.h

Show First 20 Lines • Show All 2,800 Lines • ▼ Show 20 Lines
VMM_STAT_FUNC(VMM_MEM_WIRED, "Wired memory", vm_get_wiredcnt); VMM_STAT_FUNC(VMM_MEM_WIRED, "Wired memory", vm_get_wiredcnt);
#ifdef BHYVE_SNAPSHOT #ifdef BHYVE_SNAPSHOT
static int static int
vm_snapshot_vcpus(struct vm *vm, struct vm_snapshot_meta *meta) vm_snapshot_vcpus(struct vm *vm, struct vm_snapshot_meta *meta)
{ {
uint64_t tsc, now; uint64_t tsc, now;
int ret; int ret;
int i;
struct vcpu *vcpu; struct vcpu *vcpu;
uint16_t i, maxcpus;
now = rdtsc(); now = rdtsc();
for (i = 0; i < VM_MAXCPU; i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
vcpu = &vm->vcpu[i]; vcpu = &vm->vcpu[i];
SNAPSHOT_VAR_OR_LEAVE(vcpu->x2apic_state, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->x2apic_state, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exitintinfo, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exitintinfo, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_vector, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_vector, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode_valid, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode_valid, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->guest_xcr0, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->guest_xcr0, meta, ret, done);
Show All 25 Lines
done: done:
return (ret); return (ret);
} }
static int static int
vm_snapshot_vmcx(struct vm *vm, struct vm_snapshot_meta *meta) vm_snapshot_vmcx(struct vm *vm, struct vm_snapshot_meta *meta)
{ {
int i, error; int error;
uint16_t i, maxcpus;
error = 0; error = 0;
for (i = 0; i < VM_MAXCPU; i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
error = vmmops_vmcx_snapshot(vm->cookie, meta, i); error = vmmops_vmcx_snapshot(vm->cookie, meta, i);
if (error != 0) { if (error != 0) {
printf("%s: failed to snapshot vmcs/vmcb data for " printf("%s: failed to snapshot vmcs/vmcb data for "
"vCPU: %d; error: %d\n", __func__, i, error); "vCPU: %d; error: %d\n", __func__, i, error);
goto done; goto done;
} }
} }
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Linesvm_snapshot_req(struct vm *vm, struct vm_snapshot_meta *meta)
return (ret); return (ret);
} }
int int
vm_set_tsc_offset(struct vm *vm, int vcpuid, uint64_t offset) vm_set_tsc_offset(struct vm *vm, int vcpuid, uint64_t offset)
{ {
struct vcpu *vcpu; struct vcpu *vcpu;
if (vcpuid < 0 || vcpuid >= VM_MAXCPU) if (vcpuid < 0 || vcpuid >= vm_get_maxcpus(vm))
return (EINVAL); return (EINVAL);
vcpu = &vm->vcpu[vcpuid]; vcpu = &vm->vcpu[vcpuid];
vcpu->tsc_offset = offset; vcpu->tsc_offset = offset;
return (0); return (0);
} }
int int
vm_restore_time(struct vm *vm) vm_restore_time(struct vm *vm)
{ {
int error, i; int error;
uint64_t now; uint64_t now;
struct vcpu *vcpu; struct vcpu *vcpu;
uint16_t i, maxcpus;
now = rdtsc(); now = rdtsc();
error = vhpet_restore_time(vm_hpet(vm)); error = vhpet_restore_time(vm_hpet(vm));
if (error) if (error)
return (error); return (error);
for (i = 0; i < nitems(vm->vcpu); i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
vcpu = &vm->vcpu[i]; vcpu = &vm->vcpu[i];
error = vmmops_restore_tsc(vm->cookie, i, vcpu->tsc_offset - error = vmmops_restore_tsc(vm->cookie, i, vcpu->tsc_offset -
now); now);
if (error) if (error)
return (error); return (error);
} }
return (0); return (0);
} }
#endif #endif
View Options

libdwarf/dwarf_reloc.c

Show First 20 Lines • Show All 2,800 Lines • ▼ Show 20 Lines
VMM_STAT_FUNC(VMM_MEM_WIRED, "Wired memory", vm_get_wiredcnt); VMM_STAT_FUNC(VMM_MEM_WIRED, "Wired memory", vm_get_wiredcnt);
#ifdef BHYVE_SNAPSHOT #ifdef BHYVE_SNAPSHOT
static int static int
vm_snapshot_vcpus(struct vm *vm, struct vm_snapshot_meta *meta) vm_snapshot_vcpus(struct vm *vm, struct vm_snapshot_meta *meta)
{ {
uint64_t tsc, now; uint64_t tsc, now;
int ret; int ret;
int i;
struct vcpu *vcpu; struct vcpu *vcpu;
uint16_t i, maxcpus;
now = rdtsc(); now = rdtsc();
for (i = 0; i < VM_MAXCPU; i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
vcpu = &vm->vcpu[i]; vcpu = &vm->vcpu[i];
SNAPSHOT_VAR_OR_LEAVE(vcpu->x2apic_state, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->x2apic_state, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exitintinfo, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exitintinfo, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_vector, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_vector, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode_valid, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode_valid, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->guest_xcr0, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->guest_xcr0, meta, ret, done);
Show All 25 Lines
done: done:
return (ret); return (ret);
} }
static int static int
vm_snapshot_vmcx(struct vm *vm, struct vm_snapshot_meta *meta) vm_snapshot_vmcx(struct vm *vm, struct vm_snapshot_meta *meta)
{ {
int i, error; int error;
uint16_t i, maxcpus;
error = 0; error = 0;
for (i = 0; i < VM_MAXCPU; i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
error = vmmops_vmcx_snapshot(vm->cookie, meta, i); error = vmmops_vmcx_snapshot(vm->cookie, meta, i);
if (error != 0) { if (error != 0) {
printf("%s: failed to snapshot vmcs/vmcb data for " printf("%s: failed to snapshot vmcs/vmcb data for "
"vCPU: %d; error: %d\n", __func__, i, error); "vCPU: %d; error: %d\n", __func__, i, error);
goto done; goto done;
} }
} }
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Linesvm_snapshot_req(struct vm *vm, struct vm_snapshot_meta *meta)
return (ret); return (ret);
} }
int int
vm_set_tsc_offset(struct vm *vm, int vcpuid, uint64_t offset) vm_set_tsc_offset(struct vm *vm, int vcpuid, uint64_t offset)
{ {
struct vcpu *vcpu; struct vcpu *vcpu;
if (vcpuid < 0 || vcpuid >= VM_MAXCPU) if (vcpuid < 0 || vcpuid >= vm_get_maxcpus(vm))
return (EINVAL); return (EINVAL);
vcpu = &vm->vcpu[vcpuid]; vcpu = &vm->vcpu[vcpuid];
vcpu->tsc_offset = offset; vcpu->tsc_offset = offset;
return (0); return (0);
} }
int int
vm_restore_time(struct vm *vm) vm_restore_time(struct vm *vm)
{ {
int error, i; int error;
uint64_t now; uint64_t now;
struct vcpu *vcpu; struct vcpu *vcpu;
uint16_t i, maxcpus;
now = rdtsc(); now = rdtsc();
error = vhpet_restore_time(vm_hpet(vm)); error = vhpet_restore_time(vm_hpet(vm));
if (error) if (error)
return (error); return (error);
for (i = 0; i < nitems(vm->vcpu); i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
vcpu = &vm->vcpu[i]; vcpu = &vm->vcpu[i];
error = vmmops_restore_tsc(vm->cookie, i, vcpu->tsc_offset - error = vmmops_restore_tsc(vm->cookie, i, vcpu->tsc_offset -
now); now);
if (error) if (error)
return (error); return (error);
} }
return (0); return (0);
} }
#endif #endif
View Options

libdwarf/dwarf_set_reloc_application.3

Show First 20 Lines • Show All 2,800 Lines • ▼ Show 20 Lines
VMM_STAT_FUNC(VMM_MEM_WIRED, "Wired memory", vm_get_wiredcnt); VMM_STAT_FUNC(VMM_MEM_WIRED, "Wired memory", vm_get_wiredcnt);
#ifdef BHYVE_SNAPSHOT #ifdef BHYVE_SNAPSHOT
static int static int
vm_snapshot_vcpus(struct vm *vm, struct vm_snapshot_meta *meta) vm_snapshot_vcpus(struct vm *vm, struct vm_snapshot_meta *meta)
{ {
uint64_t tsc, now; uint64_t tsc, now;
int ret; int ret;
int i;
struct vcpu *vcpu; struct vcpu *vcpu;
uint16_t i, maxcpus;
now = rdtsc(); now = rdtsc();
for (i = 0; i < VM_MAXCPU; i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
vcpu = &vm->vcpu[i]; vcpu = &vm->vcpu[i];
SNAPSHOT_VAR_OR_LEAVE(vcpu->x2apic_state, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->x2apic_state, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exitintinfo, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exitintinfo, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_vector, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_vector, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode_valid, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode_valid, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->guest_xcr0, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->guest_xcr0, meta, ret, done);
Show All 25 Lines
done: done:
return (ret); return (ret);
} }
static int static int
vm_snapshot_vmcx(struct vm *vm, struct vm_snapshot_meta *meta) vm_snapshot_vmcx(struct vm *vm, struct vm_snapshot_meta *meta)
{ {
int i, error; int error;
uint16_t i, maxcpus;
error = 0; error = 0;
for (i = 0; i < VM_MAXCPU; i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
error = vmmops_vmcx_snapshot(vm->cookie, meta, i); error = vmmops_vmcx_snapshot(vm->cookie, meta, i);
if (error != 0) { if (error != 0) {
printf("%s: failed to snapshot vmcs/vmcb data for " printf("%s: failed to snapshot vmcs/vmcb data for "
"vCPU: %d; error: %d\n", __func__, i, error); "vCPU: %d; error: %d\n", __func__, i, error);
goto done; goto done;
} }
} }
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Linesvm_snapshot_req(struct vm *vm, struct vm_snapshot_meta *meta)
return (ret); return (ret);
} }
int int
vm_set_tsc_offset(struct vm *vm, int vcpuid, uint64_t offset) vm_set_tsc_offset(struct vm *vm, int vcpuid, uint64_t offset)
{ {
struct vcpu *vcpu; struct vcpu *vcpu;
if (vcpuid < 0 || vcpuid >= VM_MAXCPU) if (vcpuid < 0 || vcpuid >= vm_get_maxcpus(vm))
return (EINVAL); return (EINVAL);
vcpu = &vm->vcpu[vcpuid]; vcpu = &vm->vcpu[vcpuid];
vcpu->tsc_offset = offset; vcpu->tsc_offset = offset;
return (0); return (0);
} }
int int
vm_restore_time(struct vm *vm) vm_restore_time(struct vm *vm)
{ {
int error, i; int error;
uint64_t now; uint64_t now;
struct vcpu *vcpu; struct vcpu *vcpu;
uint16_t i, maxcpus;
now = rdtsc(); now = rdtsc();
error = vhpet_restore_time(vm_hpet(vm)); error = vhpet_restore_time(vm_hpet(vm));
if (error) if (error)
return (error); return (error);
for (i = 0; i < nitems(vm->vcpu); i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
vcpu = &vm->vcpu[i]; vcpu = &vm->vcpu[i];
error = vmmops_restore_tsc(vm->cookie, i, vcpu->tsc_offset - error = vmmops_restore_tsc(vm->cookie, i, vcpu->tsc_offset -
now); now);
if (error) if (error)
return (error); return (error);
} }
return (0); return (0);
} }
#endif #endif
View Options

libdwarf/libdwarf.c

Show First 20 Lines • Show All 2,800 Lines • ▼ Show 20 Lines
VMM_STAT_FUNC(VMM_MEM_WIRED, "Wired memory", vm_get_wiredcnt); VMM_STAT_FUNC(VMM_MEM_WIRED, "Wired memory", vm_get_wiredcnt);
#ifdef BHYVE_SNAPSHOT #ifdef BHYVE_SNAPSHOT
static int static int
vm_snapshot_vcpus(struct vm *vm, struct vm_snapshot_meta *meta) vm_snapshot_vcpus(struct vm *vm, struct vm_snapshot_meta *meta)
{ {
uint64_t tsc, now; uint64_t tsc, now;
int ret; int ret;
int i;
struct vcpu *vcpu; struct vcpu *vcpu;
uint16_t i, maxcpus;
now = rdtsc(); now = rdtsc();
for (i = 0; i < VM_MAXCPU; i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
vcpu = &vm->vcpu[i]; vcpu = &vm->vcpu[i];
SNAPSHOT_VAR_OR_LEAVE(vcpu->x2apic_state, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->x2apic_state, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exitintinfo, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exitintinfo, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_vector, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_vector, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode_valid, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode_valid, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->guest_xcr0, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->guest_xcr0, meta, ret, done);
Show All 25 Lines
done: done:
return (ret); return (ret);
} }
static int static int
vm_snapshot_vmcx(struct vm *vm, struct vm_snapshot_meta *meta) vm_snapshot_vmcx(struct vm *vm, struct vm_snapshot_meta *meta)
{ {
int i, error; int error;
uint16_t i, maxcpus;
error = 0; error = 0;
for (i = 0; i < VM_MAXCPU; i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
error = vmmops_vmcx_snapshot(vm->cookie, meta, i); error = vmmops_vmcx_snapshot(vm->cookie, meta, i);
if (error != 0) { if (error != 0) {
printf("%s: failed to snapshot vmcs/vmcb data for " printf("%s: failed to snapshot vmcs/vmcb data for "
"vCPU: %d; error: %d\n", __func__, i, error); "vCPU: %d; error: %d\n", __func__, i, error);
goto done; goto done;
} }
} }
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Linesvm_snapshot_req(struct vm *vm, struct vm_snapshot_meta *meta)
return (ret); return (ret);
} }
int int
vm_set_tsc_offset(struct vm *vm, int vcpuid, uint64_t offset) vm_set_tsc_offset(struct vm *vm, int vcpuid, uint64_t offset)
{ {
struct vcpu *vcpu; struct vcpu *vcpu;
if (vcpuid < 0 || vcpuid >= VM_MAXCPU) if (vcpuid < 0 || vcpuid >= vm_get_maxcpus(vm))
return (EINVAL); return (EINVAL);
vcpu = &vm->vcpu[vcpuid]; vcpu = &vm->vcpu[vcpuid];
vcpu->tsc_offset = offset; vcpu->tsc_offset = offset;
return (0); return (0);
} }
int int
vm_restore_time(struct vm *vm) vm_restore_time(struct vm *vm)
{ {
int error, i; int error;
uint64_t now; uint64_t now;
struct vcpu *vcpu; struct vcpu *vcpu;
uint16_t i, maxcpus;
now = rdtsc(); now = rdtsc();
error = vhpet_restore_time(vm_hpet(vm)); error = vhpet_restore_time(vm_hpet(vm));
if (error) if (error)
return (error); return (error);
for (i = 0; i < nitems(vm->vcpu); i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
vcpu = &vm->vcpu[i]; vcpu = &vm->vcpu[i];
error = vmmops_restore_tsc(vm->cookie, i, vcpu->tsc_offset - error = vmmops_restore_tsc(vm->cookie, i, vcpu->tsc_offset -
now); now);
if (error) if (error)
return (error); return (error);
} }
return (0); return (0);
} }
#endif #endif
View Options

libdwarf/libdwarf_elf_init.c

Show First 20 Lines • Show All 2,800 Lines • ▼ Show 20 Lines
VMM_STAT_FUNC(VMM_MEM_WIRED, "Wired memory", vm_get_wiredcnt); VMM_STAT_FUNC(VMM_MEM_WIRED, "Wired memory", vm_get_wiredcnt);
#ifdef BHYVE_SNAPSHOT #ifdef BHYVE_SNAPSHOT
static int static int
vm_snapshot_vcpus(struct vm *vm, struct vm_snapshot_meta *meta) vm_snapshot_vcpus(struct vm *vm, struct vm_snapshot_meta *meta)
{ {
uint64_t tsc, now; uint64_t tsc, now;
int ret; int ret;
int i;
struct vcpu *vcpu; struct vcpu *vcpu;
uint16_t i, maxcpus;
now = rdtsc(); now = rdtsc();
for (i = 0; i < VM_MAXCPU; i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
vcpu = &vm->vcpu[i]; vcpu = &vm->vcpu[i];
SNAPSHOT_VAR_OR_LEAVE(vcpu->x2apic_state, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->x2apic_state, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exitintinfo, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exitintinfo, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_vector, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_vector, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode_valid, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode_valid, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->exc_errcode, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(vcpu->guest_xcr0, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->guest_xcr0, meta, ret, done);
Show All 25 Lines
done: done:
return (ret); return (ret);
} }
static int static int
vm_snapshot_vmcx(struct vm *vm, struct vm_snapshot_meta *meta) vm_snapshot_vmcx(struct vm *vm, struct vm_snapshot_meta *meta)
{ {
int i, error; int error;
uint16_t i, maxcpus;
error = 0; error = 0;
for (i = 0; i < VM_MAXCPU; i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
error = vmmops_vmcx_snapshot(vm->cookie, meta, i); error = vmmops_vmcx_snapshot(vm->cookie, meta, i);
if (error != 0) { if (error != 0) {
printf("%s: failed to snapshot vmcs/vmcb data for " printf("%s: failed to snapshot vmcs/vmcb data for "
"vCPU: %d; error: %d\n", __func__, i, error); "vCPU: %d; error: %d\n", __func__, i, error);
goto done; goto done;
} }
} }
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Linesvm_snapshot_req(struct vm *vm, struct vm_snapshot_meta *meta)
return (ret); return (ret);
} }
int int
vm_set_tsc_offset(struct vm *vm, int vcpuid, uint64_t offset) vm_set_tsc_offset(struct vm *vm, int vcpuid, uint64_t offset)
{ {
struct vcpu *vcpu; struct vcpu *vcpu;
if (vcpuid < 0 || vcpuid >= VM_MAXCPU) if (vcpuid < 0 || vcpuid >= vm_get_maxcpus(vm))
return (EINVAL); return (EINVAL);
vcpu = &vm->vcpu[vcpuid]; vcpu = &vm->vcpu[vcpuid];
vcpu->tsc_offset = offset; vcpu->tsc_offset = offset;
return (0); return (0);
} }
int int
vm_restore_time(struct vm *vm) vm_restore_time(struct vm *vm)
{ {
int error, i; int error;
uint64_t now; uint64_t now;
struct vcpu *vcpu; struct vcpu *vcpu;
uint16_t i, maxcpus;
now = rdtsc(); now = rdtsc();
error = vhpet_restore_time(vm_hpet(vm)); error = vhpet_restore_time(vm_hpet(vm));
if (error) if (error)
return (error); return (error);
for (i = 0; i < nitems(vm->vcpu); i++) { maxcpus = vm_get_maxcpus(vm);
for (i = 0; i < maxcpus; i++) {
vcpu = &vm->vcpu[i]; vcpu = &vm->vcpu[i];
error = vmmops_restore_tsc(vm->cookie, i, vcpu->tsc_offset - error = vmmops_restore_tsc(vm->cookie, i, vcpu->tsc_offset -
now); now);
if (error) if (error)
return (error); return (error);
} }
return (0); return (0);
} }
#endif #endif