diff options
| author | Zhao Liu <zhao1.liu@intel.com> | 2024-07-15 16:21:49 +0800 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2024-07-17 14:04:15 +0300 |
| commit | 1a48869c8f30de935b7b003b0d4ba30dd2185ed7 (patch) | |
| tree | 57adbbcc94d9e731925020599becf2445c21a762 | |
| parent | 1b1238c7a55532d2ca6db5f4a78756124d762d5b (diff) | |
| download | qemu-1a48869c8f30de935b7b003b0d4ba30dd2185ed7.zip qemu-1a48869c8f30de935b7b003b0d4ba30dd2185ed7.tar.gz qemu-1a48869c8f30de935b7b003b0d4ba30dd2185ed7.tar.bz2 | |
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>
| -rw-r--r-- | hw/i386/sgx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c index de76397..a14a84b 100644 --- a/hw/i386/sgx.c +++ b/hw/i386/sgx.c @@ -157,10 +157,12 @@ SGXInfo *qmp_query_sgx_capabilities(Error **errp) { SGXInfo *info = NULL; 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) { - 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; } |