Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

enable the kvm_legacy to fetch multicpu reg info #994

Merged
merged 9 commits into from Nov 3, 2021
Merged

enable the kvm_legacy to fetch multicpu reg info #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9dd3a2a
bug fix: set HAVE_LIBVMI_REQUEST ON while find it
npc1054657282 Nov 7, 2020
16c3d6f
fix it by passing
npc1054657282 Nov 7, 2020
36f7415
bug fix: add '-lm'
npc1054657282 Nov 7, 2020
51af4ce
Merge pull request #1 from npc1054657282/patch-1
npc1054657282 Nov 7, 2020
a3dc62d
Merge pull request #2 from libvmi/master
npc1054657282 Jan 8, 2021
0d1691d
Create kvm-qemu-v2.12-libvmi.patch
npc1054657282 Jan 8, 2021
590fa98
Merge branch 'libvmi:master' into master
npc1054657282 Oct 27, 2021
04d73f0
enable the kvm_legacy to fetch multicpu reg info
npc1054657282 Oct 27, 2021
a535b2e
undo the mistake change
npc1054657282 Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 14 additions & 6 deletions libvmi/driver/kvm/kvm_legacy.c
View file
Open in desktop
Expand Up @@ -104,7 +104,7 @@ exec_info_registers(
kvm_instance_t *kvm)
{
char *query =
"{\"execute\": \"human-monitor-command\", \"arguments\": {\"command-line\": \"info registers\"}}";
"{\"execute\": \"human-monitor-command\", \"arguments\": {\"command-line\": \"info registers -a\"}}";
return exec_qmp_cmd(kvm, query);
}

Expand Down Expand Up @@ -774,16 +774,23 @@ kvm_get_vcpureg(
vmi_instance_t vmi,
uint64_t *value,
reg_t reg,
unsigned long UNUSED(vcpu))
unsigned long vcpu)
{
// TODO: vCPU specific registers
char *all_regs = NULL;
char *regs = NULL;

if (NULL == regs)
regs = exec_info_registers(kvm_get_instance(vmi));
char specific_vcpu_regs_finder[16] = "";

status_t ret = VMI_SUCCESS;

snprintf(specific_vcpu_regs_finder, sizeof(specific_vcpu_regs_finder), "CPU#%ld", vcpu);

all_regs = exec_info_registers(kvm_get_instance(vmi));
regs = strstr(all_regs, specific_vcpu_regs_finder);
if (NULL == regs) {
ret = VMI_FAILURE;
goto exit;
}

switch (reg) {
case CR0:
*value = parse_reg_value("CR0", regs);
Expand Down Expand Up @@ -1028,6 +1035,7 @@ kvm_get_vcpureg(
break;
}

exit:
if (regs)
free(regs);
return ret;
Expand Down