KVM: selftests: Add another underscore to inner ioctl() helpers
Add a second underscore to inner ioctl() helpers to better align with commonly accepted kernel coding style, and to allow using a single underscore variant in the future for macro shenanigans. Signed-off-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
committed by
Paolo Bonzini
parent
ccc82ba6be
commit
2b38a7398f
@@ -457,7 +457,7 @@ static void run_test(struct vcpu_config *c)
|
|||||||
bool reject_reg = false;
|
bool reject_reg = false;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = _vcpu_ioctl(vm, 0, KVM_GET_ONE_REG, ®);
|
ret = __vcpu_ioctl(vm, 0, KVM_GET_ONE_REG, ®);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
printf("%s: Failed to get ", config_name(c));
|
printf("%s: Failed to get ", config_name(c));
|
||||||
print_reg(c, reg.id);
|
print_reg(c, reg.id);
|
||||||
@@ -469,7 +469,7 @@ static void run_test(struct vcpu_config *c)
|
|||||||
for_each_sublist(c, s) {
|
for_each_sublist(c, s) {
|
||||||
if (s->rejects_set && find_reg(s->rejects_set, s->rejects_set_n, reg.id)) {
|
if (s->rejects_set && find_reg(s->rejects_set, s->rejects_set_n, reg.id)) {
|
||||||
reject_reg = true;
|
reject_reg = true;
|
||||||
ret = _vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, ®);
|
ret = __vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, ®);
|
||||||
if (ret != -1 || errno != EPERM) {
|
if (ret != -1 || errno != EPERM) {
|
||||||
printf("%s: Failed to reject (ret=%d, errno=%d) ", config_name(c), ret, errno);
|
printf("%s: Failed to reject (ret=%d, errno=%d) ", config_name(c), ret, errno);
|
||||||
print_reg(c, reg.id);
|
print_reg(c, reg.id);
|
||||||
@@ -481,7 +481,7 @@ static void run_test(struct vcpu_config *c)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!reject_reg) {
|
if (!reject_reg) {
|
||||||
ret = _vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, ®);
|
ret = __vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, ®);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
printf("%s: Failed to set ", config_name(c));
|
printf("%s: Failed to set ", config_name(c));
|
||||||
print_reg(c, reg.id);
|
print_reg(c, reg.id);
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ static int set_fw_reg(struct kvm_vm *vm, uint64_t id, uint64_t val)
|
|||||||
.addr = (uint64_t)&val,
|
.addr = (uint64_t)&val,
|
||||||
};
|
};
|
||||||
|
|
||||||
return _vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, ®);
|
return __vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, ®);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void get_fw_reg(struct kvm_vm *vm, uint64_t id, uint64_t *addr)
|
static void get_fw_reg(struct kvm_vm *vm, uint64_t id, uint64_t *addr)
|
||||||
|
|||||||
@@ -27,12 +27,12 @@ static int add_init_2vcpus(struct kvm_vcpu_init *init1,
|
|||||||
vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);
|
vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);
|
||||||
|
|
||||||
vm_vcpu_add(vm, 0);
|
vm_vcpu_add(vm, 0);
|
||||||
ret = _vcpu_ioctl(vm, 0, KVM_ARM_VCPU_INIT, init1);
|
ret = __vcpu_ioctl(vm, 0, KVM_ARM_VCPU_INIT, init1);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto free_exit;
|
goto free_exit;
|
||||||
|
|
||||||
vm_vcpu_add(vm, 1);
|
vm_vcpu_add(vm, 1);
|
||||||
ret = _vcpu_ioctl(vm, 1, KVM_ARM_VCPU_INIT, init2);
|
ret = __vcpu_ioctl(vm, 1, KVM_ARM_VCPU_INIT, init2);
|
||||||
|
|
||||||
free_exit:
|
free_exit:
|
||||||
kvm_vm_free(vm);
|
kvm_vm_free(vm);
|
||||||
@@ -54,11 +54,11 @@ static int add_2vcpus_init_2vcpus(struct kvm_vcpu_init *init1,
|
|||||||
vm_vcpu_add(vm, 0);
|
vm_vcpu_add(vm, 0);
|
||||||
vm_vcpu_add(vm, 1);
|
vm_vcpu_add(vm, 1);
|
||||||
|
|
||||||
ret = _vcpu_ioctl(vm, 0, KVM_ARM_VCPU_INIT, init1);
|
ret = __vcpu_ioctl(vm, 0, KVM_ARM_VCPU_INIT, init1);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto free_exit;
|
goto free_exit;
|
||||||
|
|
||||||
ret = _vcpu_ioctl(vm, 1, KVM_ARM_VCPU_INIT, init2);
|
ret = __vcpu_ioctl(vm, 1, KVM_ARM_VCPU_INIT, init2);
|
||||||
|
|
||||||
free_exit:
|
free_exit:
|
||||||
kvm_vm_free(vm);
|
kvm_vm_free(vm);
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ static void guest_code(void)
|
|||||||
static int run_vcpu(struct kvm_vm *vm, uint32_t vcpuid)
|
static int run_vcpu(struct kvm_vm *vm, uint32_t vcpuid)
|
||||||
{
|
{
|
||||||
ucall_init(vm, NULL);
|
ucall_init(vm, NULL);
|
||||||
int ret = _vcpu_ioctl(vm, vcpuid, KVM_RUN, NULL);
|
int ret = __vcpu_ioctl(vm, vcpuid, KVM_RUN, NULL);
|
||||||
if (ret)
|
if (ret)
|
||||||
return -errno;
|
return -errno;
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -159,12 +159,12 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm,
|
|||||||
|
|
||||||
void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl,
|
void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl,
|
||||||
void *arg);
|
void *arg);
|
||||||
int _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl,
|
int __vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl,
|
||||||
void *arg);
|
void *arg);
|
||||||
void vm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);
|
void vm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);
|
||||||
int _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg);
|
int __vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg);
|
||||||
void kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);
|
void kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);
|
||||||
int _kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);
|
int __kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);
|
||||||
void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags);
|
void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags);
|
||||||
void vm_mem_region_move(struct kvm_vm *vm, uint32_t slot, uint64_t new_gpa);
|
void vm_mem_region_move(struct kvm_vm *vm, uint32_t slot, uint64_t new_gpa);
|
||||||
void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot);
|
void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot);
|
||||||
|
|||||||
@@ -1719,7 +1719,7 @@ struct kvm_reg_list *vcpu_get_reg_list(struct kvm_vm *vm, uint32_t vcpuid)
|
|||||||
struct kvm_reg_list reg_list_n = { .n = 0 }, *reg_list;
|
struct kvm_reg_list reg_list_n = { .n = 0 }, *reg_list;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = _vcpu_ioctl(vm, vcpuid, KVM_GET_REG_LIST, ®_list_n);
|
ret = __vcpu_ioctl(vm, vcpuid, KVM_GET_REG_LIST, ®_list_n);
|
||||||
TEST_ASSERT(ret == -1 && errno == E2BIG, "KVM_GET_REG_LIST n=0");
|
TEST_ASSERT(ret == -1 && errno == E2BIG, "KVM_GET_REG_LIST n=0");
|
||||||
reg_list = calloc(1, sizeof(*reg_list) + reg_list_n.n * sizeof(__u64));
|
reg_list = calloc(1, sizeof(*reg_list) + reg_list_n.n * sizeof(__u64));
|
||||||
reg_list->n = reg_list_n.n;
|
reg_list->n = reg_list_n.n;
|
||||||
@@ -1905,7 +1905,7 @@ void vcpu_fpu_get(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_fpu *fpu)
|
|||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = _vcpu_ioctl(vm, vcpuid, KVM_GET_FPU, fpu);
|
ret = __vcpu_ioctl(vm, vcpuid, KVM_GET_FPU, fpu);
|
||||||
TEST_ASSERT(ret == 0, "KVM_GET_FPU failed, rc: %i errno: %i (%s)",
|
TEST_ASSERT(ret == 0, "KVM_GET_FPU failed, rc: %i errno: %i (%s)",
|
||||||
ret, errno, strerror(errno));
|
ret, errno, strerror(errno));
|
||||||
}
|
}
|
||||||
@@ -1914,7 +1914,7 @@ void vcpu_fpu_set(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_fpu *fpu)
|
|||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = _vcpu_ioctl(vm, vcpuid, KVM_SET_FPU, fpu);
|
ret = __vcpu_ioctl(vm, vcpuid, KVM_SET_FPU, fpu);
|
||||||
TEST_ASSERT(ret == 0, "KVM_SET_FPU failed, rc: %i errno: %i (%s)",
|
TEST_ASSERT(ret == 0, "KVM_SET_FPU failed, rc: %i errno: %i (%s)",
|
||||||
ret, errno, strerror(errno));
|
ret, errno, strerror(errno));
|
||||||
}
|
}
|
||||||
@@ -1923,7 +1923,7 @@ void vcpu_get_reg(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_one_reg *reg)
|
|||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = _vcpu_ioctl(vm, vcpuid, KVM_GET_ONE_REG, reg);
|
ret = __vcpu_ioctl(vm, vcpuid, KVM_GET_ONE_REG, reg);
|
||||||
TEST_ASSERT(ret == 0, "KVM_GET_ONE_REG failed, rc: %i errno: %i (%s)",
|
TEST_ASSERT(ret == 0, "KVM_GET_ONE_REG failed, rc: %i errno: %i (%s)",
|
||||||
ret, errno, strerror(errno));
|
ret, errno, strerror(errno));
|
||||||
}
|
}
|
||||||
@@ -1932,7 +1932,7 @@ void vcpu_set_reg(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_one_reg *reg)
|
|||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = _vcpu_ioctl(vm, vcpuid, KVM_SET_ONE_REG, reg);
|
ret = __vcpu_ioctl(vm, vcpuid, KVM_SET_ONE_REG, reg);
|
||||||
TEST_ASSERT(ret == 0, "KVM_SET_ONE_REG failed, rc: %i errno: %i (%s)",
|
TEST_ASSERT(ret == 0, "KVM_SET_ONE_REG failed, rc: %i errno: %i (%s)",
|
||||||
ret, errno, strerror(errno));
|
ret, errno, strerror(errno));
|
||||||
}
|
}
|
||||||
@@ -1955,12 +1955,12 @@ void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid,
|
|||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = _vcpu_ioctl(vm, vcpuid, cmd, arg);
|
ret = __vcpu_ioctl(vm, vcpuid, cmd, arg);
|
||||||
TEST_ASSERT(ret == 0, "vcpu ioctl %lu failed, rc: %i errno: %i (%s)",
|
TEST_ASSERT(ret == 0, "vcpu ioctl %lu failed, rc: %i errno: %i (%s)",
|
||||||
cmd, ret, errno, strerror(errno));
|
cmd, ret, errno, strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
int _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid,
|
int __vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid,
|
||||||
unsigned long cmd, void *arg)
|
unsigned long cmd, void *arg)
|
||||||
{
|
{
|
||||||
struct vcpu *vcpu = vcpu_find(vm, vcpuid);
|
struct vcpu *vcpu = vcpu_find(vm, vcpuid);
|
||||||
@@ -2025,12 +2025,12 @@ void vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)
|
|||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = _vm_ioctl(vm, cmd, arg);
|
ret = __vm_ioctl(vm, cmd, arg);
|
||||||
TEST_ASSERT(ret == 0, "vm ioctl %lu failed, rc: %i errno: %i (%s)",
|
TEST_ASSERT(ret == 0, "vm ioctl %lu failed, rc: %i errno: %i (%s)",
|
||||||
cmd, ret, errno, strerror(errno));
|
cmd, ret, errno, strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
int _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)
|
int __vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)
|
||||||
{
|
{
|
||||||
return ioctl(vm->fd, cmd, arg);
|
return ioctl(vm->fd, cmd, arg);
|
||||||
}
|
}
|
||||||
@@ -2056,7 +2056,7 @@ void kvm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)
|
|||||||
cmd, ret, errno, strerror(errno));
|
cmd, ret, errno, strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
int _kvm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)
|
int __kvm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)
|
||||||
{
|
{
|
||||||
return ioctl(vm->kvm_fd, cmd, arg);
|
return ioctl(vm->kvm_fd, cmd, arg);
|
||||||
}
|
}
|
||||||
@@ -2185,7 +2185,7 @@ int _kvm_irq_line(struct kvm_vm *vm, uint32_t irq, int level)
|
|||||||
.level = level,
|
.level = level,
|
||||||
};
|
};
|
||||||
|
|
||||||
return _vm_ioctl(vm, KVM_IRQ_LINE, &irq_level);
|
return __vm_ioctl(vm, KVM_IRQ_LINE, &irq_level);
|
||||||
}
|
}
|
||||||
|
|
||||||
void kvm_irq_line(struct kvm_vm *vm, uint32_t irq, int level)
|
void kvm_irq_line(struct kvm_vm *vm, uint32_t irq, int level)
|
||||||
|
|||||||
@@ -295,7 +295,7 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code)
|
|||||||
* are powered-on using KVM_SET_MP_STATE ioctl().
|
* are powered-on using KVM_SET_MP_STATE ioctl().
|
||||||
*/
|
*/
|
||||||
mps.mp_state = KVM_MP_STATE_RUNNABLE;
|
mps.mp_state = KVM_MP_STATE_RUNNABLE;
|
||||||
r = _vcpu_ioctl(vm, vcpuid, KVM_SET_MP_STATE, &mps);
|
r = __vcpu_ioctl(vm, vcpuid, KVM_SET_MP_STATE, &mps);
|
||||||
TEST_ASSERT(!r, "IOCTL KVM_SET_MP_STATE failed (error %d)", r);
|
TEST_ASSERT(!r, "IOCTL KVM_SET_MP_STATE failed (error %d)", r);
|
||||||
|
|
||||||
/* Setup global pointer of guest to be same as the host */
|
/* Setup global pointer of guest to be same as the host */
|
||||||
|
|||||||
@@ -159,9 +159,9 @@ static void memop_ioctl(struct test_vcpu vcpu, struct kvm_s390_mem_op *ksmo)
|
|||||||
static int err_memop_ioctl(struct test_vcpu vcpu, struct kvm_s390_mem_op *ksmo)
|
static int err_memop_ioctl(struct test_vcpu vcpu, struct kvm_s390_mem_op *ksmo)
|
||||||
{
|
{
|
||||||
if (vcpu.id == VM_VCPU_ID)
|
if (vcpu.id == VM_VCPU_ID)
|
||||||
return _vm_ioctl(vcpu.vm, KVM_S390_MEM_OP, ksmo);
|
return __vm_ioctl(vcpu.vm, KVM_S390_MEM_OP, ksmo);
|
||||||
else
|
else
|
||||||
return _vcpu_ioctl(vcpu.vm, vcpu.id, KVM_S390_MEM_OP, ksmo);
|
return __vcpu_ioctl(vcpu.vm, vcpu.id, KVM_S390_MEM_OP, ksmo);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MEMOP(err, vcpu_p, mop_target_p, access_mode_p, buf_p, size_p, ...) \
|
#define MEMOP(err, vcpu_p, mop_target_p, access_mode_p, buf_p, size_p, ...) \
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ static void assert_noirq(void)
|
|||||||
|
|
||||||
irq_state.len = sizeof(buf);
|
irq_state.len = sizeof(buf);
|
||||||
irq_state.buf = (unsigned long)buf;
|
irq_state.buf = (unsigned long)buf;
|
||||||
irqs = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_GET_IRQ_STATE, &irq_state);
|
irqs = __vcpu_ioctl(vm, VCPU_ID, KVM_S390_GET_IRQ_STATE, &irq_state);
|
||||||
/*
|
/*
|
||||||
* irqs contains the number of retrieved interrupts. Any interrupt
|
* irqs contains the number of retrieved interrupts. Any interrupt
|
||||||
* (notably, the emergency call interrupt we have injected) should
|
* (notably, the emergency call interrupt we have injected) should
|
||||||
@@ -197,7 +197,7 @@ static void inject_irq(int cpu_id)
|
|||||||
irq_state.buf = (unsigned long)buf;
|
irq_state.buf = (unsigned long)buf;
|
||||||
irq->type = KVM_S390_INT_EMERGENCY;
|
irq->type = KVM_S390_INT_EMERGENCY;
|
||||||
irq->u.emerg.code = cpu_id;
|
irq->u.emerg.code = cpu_id;
|
||||||
irqs = _vcpu_ioctl(vm, cpu_id, KVM_S390_SET_IRQ_STATE, &irq_state);
|
irqs = __vcpu_ioctl(vm, cpu_id, KVM_S390_SET_IRQ_STATE, &irq_state);
|
||||||
TEST_ASSERT(irqs >= 0, "Error injecting EMERGENCY IRQ errno %d\n", errno);
|
TEST_ASSERT(irqs >= 0, "Error injecting EMERGENCY IRQ errno %d\n", errno);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ static void steal_time_init(struct kvm_vm *vm)
|
|||||||
};
|
};
|
||||||
int i, ret;
|
int i, ret;
|
||||||
|
|
||||||
ret = _vcpu_ioctl(vm, 0, KVM_HAS_DEVICE_ATTR, &dev);
|
ret = __vcpu_ioctl(vm, 0, KVM_HAS_DEVICE_ATTR, &dev);
|
||||||
if (ret != 0 && errno == ENXIO) {
|
if (ret != 0 && errno == ENXIO) {
|
||||||
print_skip("steal-time not supported");
|
print_skip("steal-time not supported");
|
||||||
exit(KSFT_SKIP);
|
exit(KSFT_SKIP);
|
||||||
@@ -184,13 +184,13 @@ static void steal_time_init(struct kvm_vm *vm)
|
|||||||
sync_global_to_guest(vm, st_gva[i]);
|
sync_global_to_guest(vm, st_gva[i]);
|
||||||
|
|
||||||
st_ipa = (ulong)st_gva[i] | 1;
|
st_ipa = (ulong)st_gva[i] | 1;
|
||||||
ret = _vcpu_ioctl(vm, i, KVM_SET_DEVICE_ATTR, &dev);
|
ret = __vcpu_ioctl(vm, i, KVM_SET_DEVICE_ATTR, &dev);
|
||||||
TEST_ASSERT(ret == -1 && errno == EINVAL, "Bad IPA didn't report EINVAL");
|
TEST_ASSERT(ret == -1 && errno == EINVAL, "Bad IPA didn't report EINVAL");
|
||||||
|
|
||||||
st_ipa = (ulong)st_gva[i];
|
st_ipa = (ulong)st_gva[i];
|
||||||
vcpu_ioctl(vm, i, KVM_SET_DEVICE_ATTR, &dev);
|
vcpu_ioctl(vm, i, KVM_SET_DEVICE_ATTR, &dev);
|
||||||
|
|
||||||
ret = _vcpu_ioctl(vm, i, KVM_SET_DEVICE_ATTR, &dev);
|
ret = __vcpu_ioctl(vm, i, KVM_SET_DEVICE_ATTR, &dev);
|
||||||
TEST_ASSERT(ret == -1 && errno == EEXIST, "Set IPA twice without EEXIST");
|
TEST_ASSERT(ret == -1 && errno == EEXIST, "Set IPA twice without EEXIST");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -121,9 +121,9 @@ void test_hv_cpuid_e2big(struct kvm_vm *vm, bool system)
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!system)
|
if (!system)
|
||||||
ret = _vcpu_ioctl(vm, VCPU_ID, KVM_GET_SUPPORTED_HV_CPUID, &cpuid);
|
ret = __vcpu_ioctl(vm, VCPU_ID, KVM_GET_SUPPORTED_HV_CPUID, &cpuid);
|
||||||
else
|
else
|
||||||
ret = _kvm_ioctl(vm, KVM_GET_SUPPORTED_HV_CPUID, &cpuid);
|
ret = __kvm_ioctl(vm, KVM_GET_SUPPORTED_HV_CPUID, &cpuid);
|
||||||
|
|
||||||
TEST_ASSERT(ret == -1 && errno == E2BIG,
|
TEST_ASSERT(ret == -1 && errno == E2BIG,
|
||||||
"%s KVM_GET_SUPPORTED_HV_CPUID didn't fail with -E2BIG when"
|
"%s KVM_GET_SUPPORTED_HV_CPUID didn't fail with -E2BIG when"
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ static void test_set_boot_busy(struct kvm_vm *vm)
|
|||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
|
|
||||||
res = _vm_ioctl(vm, KVM_SET_BOOT_CPU_ID, (void *) VCPU_ID0);
|
res = __vm_ioctl(vm, KVM_SET_BOOT_CPU_ID, (void *) VCPU_ID0);
|
||||||
TEST_ASSERT(res == -1 && errno == EBUSY,
|
TEST_ASSERT(res == -1 && errno == EBUSY,
|
||||||
"KVM_SET_BOOT_CPU_ID set while running vm");
|
"KVM_SET_BOOT_CPU_ID set while running vm");
|
||||||
}
|
}
|
||||||
@@ -133,13 +133,13 @@ static void check_set_bsp_busy(void)
|
|||||||
add_x86_vcpu(vm, VCPU_ID0, true);
|
add_x86_vcpu(vm, VCPU_ID0, true);
|
||||||
add_x86_vcpu(vm, VCPU_ID1, false);
|
add_x86_vcpu(vm, VCPU_ID1, false);
|
||||||
|
|
||||||
res = _vm_ioctl(vm, KVM_SET_BOOT_CPU_ID, (void *) VCPU_ID1);
|
res = __vm_ioctl(vm, KVM_SET_BOOT_CPU_ID, (void *) VCPU_ID1);
|
||||||
TEST_ASSERT(res == -1 && errno == EBUSY, "KVM_SET_BOOT_CPU_ID set after adding vcpu");
|
TEST_ASSERT(res == -1 && errno == EBUSY, "KVM_SET_BOOT_CPU_ID set after adding vcpu");
|
||||||
|
|
||||||
run_vcpu(vm, VCPU_ID0);
|
run_vcpu(vm, VCPU_ID0);
|
||||||
run_vcpu(vm, VCPU_ID1);
|
run_vcpu(vm, VCPU_ID1);
|
||||||
|
|
||||||
res = _vm_ioctl(vm, KVM_SET_BOOT_CPU_ID, (void *) VCPU_ID1);
|
res = __vm_ioctl(vm, KVM_SET_BOOT_CPU_ID, (void *) VCPU_ID1);
|
||||||
TEST_ASSERT(res == -1 && errno == EBUSY, "KVM_SET_BOOT_CPU_ID set to a terminated vcpu");
|
TEST_ASSERT(res == -1 && errno == EBUSY, "KVM_SET_BOOT_CPU_ID set to a terminated vcpu");
|
||||||
|
|
||||||
kvm_vm_free(vm);
|
kvm_vm_free(vm);
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
|
|||||||
vcpu_alloc_vmx(vm, &vmx_pages_gva);
|
vcpu_alloc_vmx(vm, &vmx_pages_gva);
|
||||||
vcpu_args_set(vm, VCPU_ID, 1, vmx_pages_gva);
|
vcpu_args_set(vm, VCPU_ID, 1, vmx_pages_gva);
|
||||||
|
|
||||||
tsc_khz = _vcpu_ioctl(vm, VCPU_ID, KVM_GET_TSC_KHZ, NULL);
|
tsc_khz = __vcpu_ioctl(vm, VCPU_ID, KVM_GET_TSC_KHZ, NULL);
|
||||||
TEST_ASSERT(tsc_khz != -1, "vcpu ioctl KVM_GET_TSC_KHZ failed");
|
TEST_ASSERT(tsc_khz != -1, "vcpu ioctl KVM_GET_TSC_KHZ failed");
|
||||||
|
|
||||||
/* scale down L1's TSC frequency */
|
/* scale down L1's TSC frequency */
|
||||||
|
|||||||
Reference in New Issue
Block a user