From: Zhao Liu <zhao1.liu@intel.com>
To: Michael Tokarev <mjt@tls.msk.ru>, Laurent Vivier <laurent@vivier.eu>
Cc: "Daniel P . Berrangé" <berrange@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
qemu-trivial@nongnu.org, qemu-devel@nongnu.org,
"Zhao Liu" <zhao1.liu@intel.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>
Subject: [PATCH 1/7] hw/i386/sgx: Get rid of qemu_open_old()
Date: Mon, 15 Jul 2024 16:21:49 +0800 [thread overview]
Message-ID: <20240715082155.28771-2-zhao1.liu@intel.com> (raw)
In-Reply-To: <20240715082155.28771-1-zhao1.liu@intel.com>
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>
---
hw/i386/sgx.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
index de76397bcfb3..a14a84bc6f69 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;
}
--
2.34.1
next prev parent reply other threads:[~2024-07-15 8:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-15 8:21 [PATCH 0/7] trivial: Replace some qemu_open_old() with qemu_open() Zhao Liu
2024-07-15 8:21 ` Zhao Liu [this message]
2024-07-15 8:21 ` [PATCH 2/7] hw/usb/host-libusb: Get rid of qemu_open_old() Zhao Liu
2024-07-15 9:44 ` Philippe Mathieu-Daudé
2024-07-15 8:21 ` [PATCH 3/7] hw/usb/u2f-passthru: " Zhao Liu
2024-07-15 9:44 ` Philippe Mathieu-Daudé
2024-07-15 8:21 ` [PATCH 4/7] hw/vfio/container: " Zhao Liu
2024-07-15 9:46 ` Philippe Mathieu-Daudé
2024-07-16 13:43 ` Cédric Le Goater
2024-07-15 8:21 ` [PATCH 5/7] backends/hostmem-epc: " Zhao Liu
2024-07-15 9:45 ` Philippe Mathieu-Daudé
2024-07-15 14:02 ` Igor Mammedov
2024-07-15 8:21 ` [PATCH 6/7] backends/iommufd: " Zhao Liu
2024-07-15 9:45 ` Philippe Mathieu-Daudé
2024-07-16 8:10 ` Yi Liu
2024-07-15 8:21 ` [PATCH 7/7] backends/rng-random: " Zhao Liu
2024-07-15 9:46 ` Philippe Mathieu-Daudé
2024-07-15 10:10 ` Zhao Liu
2024-07-15 11:07 ` Michael Tokarev
2024-07-15 12:44 ` Zhao Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240715082155.28771-2-zhao1.liu@intel.com \
--to=zhao1.liu@intel.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=laurent@vivier.eu \
--cc=marcel.apfelbaum@gmail.com \
--cc=mjt@tls.msk.ru \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).