From bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 Mon Sep 17 00:00:00 2001 From: RajithaY Date: Tue, 25 Apr 2017 03:31:15 -0700 Subject: Adding qemu as a submodule of KVMFORNFV This Patch includes the changes to add qemu as a submodule to kvmfornfv repo and make use of the updated latest qemu for the execution of all testcase Change-Id: I1280af507a857675c7f81d30c95255635667bdd7 Signed-off-by:RajithaY --- qemu/hw/s390x/s390-skeys-kvm.c | 76 ------------------------------------------ 1 file changed, 76 deletions(-) delete mode 100644 qemu/hw/s390x/s390-skeys-kvm.c (limited to 'qemu/hw/s390x/s390-skeys-kvm.c') diff --git a/qemu/hw/s390x/s390-skeys-kvm.c b/qemu/hw/s390x/s390-skeys-kvm.c deleted file mode 100644 index 131da56bb..000000000 --- a/qemu/hw/s390x/s390-skeys-kvm.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * s390 storage key device - * - * Copyright 2015 IBM Corp. - * Author(s): Jason J. Herne - * - * This work is licensed under the terms of the GNU GPL, version 2 or (at - * your option) any later version. See the COPYING file in the top-level - * directory. - */ - -#include "qemu/osdep.h" -#include "hw/s390x/storage-keys.h" -#include "sysemu/kvm.h" -#include "qemu/error-report.h" - -static int kvm_s390_skeys_enabled(S390SKeysState *ss) -{ - S390SKeysClass *skeyclass = S390_SKEYS_GET_CLASS(ss); - uint8_t single_key; - int r; - - r = skeyclass->get_skeys(ss, 0, 1, &single_key); - if (r != 0 && r != KVM_S390_GET_SKEYS_NONE) { - error_report("S390_GET_KEYS error %d", r); - } - return (r == 0); -} - -static int kvm_s390_skeys_get(S390SKeysState *ss, uint64_t start_gfn, - uint64_t count, uint8_t *keys) -{ - struct kvm_s390_skeys args = { - .start_gfn = start_gfn, - .count = count, - .skeydata_addr = (__u64)keys - }; - - return kvm_vm_ioctl(kvm_state, KVM_S390_GET_SKEYS, &args); -} - -static int kvm_s390_skeys_set(S390SKeysState *ss, uint64_t start_gfn, - uint64_t count, uint8_t *keys) -{ - struct kvm_s390_skeys args = { - .start_gfn = start_gfn, - .count = count, - .skeydata_addr = (__u64)keys - }; - - return kvm_vm_ioctl(kvm_state, KVM_S390_SET_SKEYS, &args); -} - -static void kvm_s390_skeys_class_init(ObjectClass *oc, void *data) -{ - S390SKeysClass *skeyclass = S390_SKEYS_CLASS(oc); - - skeyclass->skeys_enabled = kvm_s390_skeys_enabled; - skeyclass->get_skeys = kvm_s390_skeys_get; - skeyclass->set_skeys = kvm_s390_skeys_set; -} - -static const TypeInfo kvm_s390_skeys_info = { - .name = TYPE_KVM_S390_SKEYS, - .parent = TYPE_S390_SKEYS, - .instance_size = sizeof(S390SKeysState), - .class_init = kvm_s390_skeys_class_init, - .class_size = sizeof(S390SKeysClass), -}; - -static void kvm_s390_skeys_register_types(void) -{ - type_register_static(&kvm_s390_skeys_info); -} - -type_init(kvm_s390_skeys_register_types) -- cgit 1.2.3-korg