From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Gerd Hoffmann" <kraxel@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 9/9] hw/usb/u2f-passthru: Use QOM type-safe cast conversion macros
Date: Mon, 20 Feb 2023 16:05:15 +0100 [thread overview]
Message-ID: <20230220150515.32549-10-philmd@linaro.org> (raw)
In-Reply-To: <20230220150515.32549-1-philmd@linaro.org>
Use the QOM cast macros to avoid accessing internal fields.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/usb/u2f-passthru.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/usb/u2f-passthru.c b/hw/usb/u2f-passthru.c
index fc93429c9c..b99c0b622f 100644
--- a/hw/usb/u2f-passthru.c
+++ b/hw/usb/u2f-passthru.c
@@ -299,7 +299,7 @@ static void u2f_passthru_recv_from_host(U2FPassthruState *key,
if (transaction->resp_size >= transaction->resp_bcnt) {
u2f_transaction_close(key, cid);
}
- u2f_send_to_guest(&key->base, packet);
+ u2f_send_to_guest(U2F_KEY(key), packet);
}
static void u2f_passthru_read(void *opaque)
@@ -316,9 +316,10 @@ static void u2f_passthru_read(void *opaque)
ret = read(key->hidraw_fd, packet, sizeof(packet));
if (ret < 0) {
+ USBDevice *udev = USB_DEVICE(key);
/* Detach */
- if (base->dev.attached) {
- usb_device_detach(&base->dev);
+ if (udev->attached) {
+ usb_device_detach(udev);
u2f_passthru_reset(key);
}
return;
--
2.38.1
prev parent reply other threads:[~2023-02-20 15:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 15:05 [PATCH 0/9] hw/usb: Cleanups around QOM style Philippe Mathieu-Daudé
2023-02-20 15:05 ` [PATCH 1/9] hw/usb/dev-smartcard-reader: Avoid forward-declaring CCIDBus Philippe Mathieu-Daudé
2023-02-20 19:08 ` Richard Henderson
2023-02-20 15:05 ` [PATCH 2/9] hw/usb/hcd-ohci: Use OHCIState type definition Philippe Mathieu-Daudé
2023-02-20 19:09 ` Richard Henderson
2023-02-20 15:05 ` [PATCH 3/9] hw/usb/hcd-ohci-pci: Use QOM type-safe cast conversion macro Philippe Mathieu-Daudé
2023-02-20 15:05 ` [PATCH 4/9] hw/usb/hcd-uhci: Declare QOM macros using OBJECT_DECLARE_TYPE() Philippe Mathieu-Daudé
2023-02-20 19:11 ` Richard Henderson
2023-02-20 15:05 ` [PATCH 5/9] hw/usb/hcd-uhci: Replace container_of() by UHCI_GET_CLASS() QOM macro Philippe Mathieu-Daudé
2023-02-20 19:11 ` Richard Henderson
2023-02-20 15:05 ` [PATCH 6/9] hw/usb/hcd-xhci-nec: Declare QOM macros for NEC_XHCI Philippe Mathieu-Daudé
2023-02-20 19:12 ` Richard Henderson
2023-02-20 15:05 ` [PATCH 7/9] hw/usb/hcd-xhci-nec: Replace container_of() by NEC_XHCI() QOM cast macro Philippe Mathieu-Daudé
2023-02-20 19:13 ` Richard Henderson
2023-02-20 15:05 ` [PATCH 8/9] hw/usb/u2f: Declare QOM macros using OBJECT_DECLARE_TYPE() Philippe Mathieu-Daudé
2023-02-20 19:22 ` Richard Henderson
2023-02-20 15:05 ` Philippe Mathieu-Daudé [this message]
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=20230220150515.32549-10-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=armbru@redhat.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.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).