mirror of https://github.com/xemu-project/xemu.git
hw/i386/sgx: Get rid of qemu_open_old()
For qemu_open_old(), osdep.h said: > Don't introduce new usage of this function, prefer the following > qemu_open/qemu_create that take an "Error **errp". So replace qemu_open_old() with qemu_open(). And considering the SGX enablement description is useful, convert it into a error message hint. Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Richard Henderson <richard.henderson@linaro.org> Cc: Eduardo Habkost <eduardo@habkost.net> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> Signed-off-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
parent
1b1238c7a5
commit
1a48869c8f
|
@ -157,10 +157,12 @@ SGXInfo *qmp_query_sgx_capabilities(Error **errp)
|
||||||
{
|
{
|
||||||
SGXInfo *info = NULL;
|
SGXInfo *info = NULL;
|
||||||
uint32_t eax, ebx, ecx, edx;
|
uint32_t eax, ebx, ecx, edx;
|
||||||
|
Error *local_err = NULL;
|
||||||
|
|
||||||
int fd = qemu_open_old("/dev/sgx_vepc", O_RDWR);
|
int fd = qemu_open("/dev/sgx_vepc", O_RDWR, &local_err);
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
error_setg(errp, "SGX is not enabled in KVM");
|
error_append_hint(&local_err, "SGX is not enabled in KVM");
|
||||||
|
error_propagate(errp, local_err);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue