[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/24] usb/msd: move usb_msd_packet_complete()
From: |
Gerd Hoffmann |
Subject: |
[PULL 13/24] usb/msd: move usb_msd_packet_complete() |
Date: |
Tue, 27 Sep 2022 10:19:01 +0200 |
Change ordering to avoid adding forward declarations in
following patches. Fix comment code style while being
at it. No functional change.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20220830063827.813053-2-kraxel@redhat.com>
---
hw/usb/dev-storage.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 98639696e6d8..140ef2aeaa80 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -177,6 +177,20 @@ static const USBDesc desc = {
.str = desc_strings,
};
+static void usb_msd_packet_complete(MSDState *s)
+{
+ USBPacket *p = s->packet;
+
+ /*
+ * Set s->packet to NULL before calling usb_packet_complete
+ * because another request may be issued before
+ * usb_packet_complete returns.
+ */
+ trace_usb_msd_packet_complete();
+ s->packet = NULL;
+ usb_packet_complete(&s->dev, p);
+}
+
static void usb_msd_copy_data(MSDState *s, USBPacket *p)
{
uint32_t len;
@@ -208,18 +222,6 @@ static void usb_msd_send_status(MSDState *s, USBPacket *p)
memset(&s->csw, 0, sizeof(s->csw));
}
-static void usb_msd_packet_complete(MSDState *s)
-{
- USBPacket *p = s->packet;
-
- /* Set s->packet to NULL before calling usb_packet_complete
- because another request may be issued before
- usb_packet_complete returns. */
- trace_usb_msd_packet_complete();
- s->packet = NULL;
- usb_packet_complete(&s->dev, p);
-}
-
void usb_msd_transfer_data(SCSIRequest *req, uint32_t len)
{
MSDState *s = DO_UPCAST(MSDState, dev.qdev, req->bus->qbus.parent);
--
2.37.3
- [PULL 09/24] ui/vdagent: fix serial reset of guest agent, (continued)
- [PULL 09/24] ui/vdagent: fix serial reset of guest agent, Gerd Hoffmann, 2022/09/27
- [PULL 03/24] Revert "main-loop: Disable block backend global state assertion on Cocoa", Gerd Hoffmann, 2022/09/27
- [PULL 02/24] ui/cocoa: Run qemu_init in the main thread, Gerd Hoffmann, 2022/09/27
- [PULL 06/24] ui/clipboard: fix serial priority, Gerd Hoffmann, 2022/09/27
- [PULL 11/24] hw/usb/hcd-xhci: Check whether DMA accesses fail, Gerd Hoffmann, 2022/09/27
- [PULL 04/24] meson: Allow to enable gtk and sdl while cocoa is enabled, Gerd Hoffmann, 2022/09/27
- [PULL 16/24] usbnet: Add missing usb_wakeup() call in usbnet_receive(), Gerd Hoffmann, 2022/09/27
- [PULL 14/24] usb/msd: add usb_msd_fatal_error() and fix guest-triggerable assert, Gerd Hoffmann, 2022/09/27
- [PULL 15/24] hcd-xhci: drop operation with secondary stream arrays enabled, Gerd Hoffmann, 2022/09/27
- [PULL 12/24] hcd-ohci: Drop ohci_service_iso_td() if ed->head & OHCI_DPTR_MASK is zero, Gerd Hoffmann, 2022/09/27
- [PULL 13/24] usb/msd: move usb_msd_packet_complete(),
Gerd Hoffmann <=
- [PULL 19/24] usbnet: Report link-up via interrupt endpoint in CDC-ECM mode, Gerd Hoffmann, 2022/09/27
- [PULL 18/24] usbnet: Detect short packets as sent by the xHCI controller, Gerd Hoffmann, 2022/09/27
- [PULL 17/24] usbnet: Accept mandatory USB_CDC_SET_ETHERNET_PACKET_FILTER request, Gerd Hoffmann, 2022/09/27
- [PULL 24/24] virtio-gpu: update scanout if there is any area covered by the rect, Gerd Hoffmann, 2022/09/27
- [PULL 21/24] Revert "audio: Log context for audio bug", Gerd Hoffmann, 2022/09/27
- [PULL 20/24] audio: Add sndio backend, Gerd Hoffmann, 2022/09/27
- [PULL 22/24] audio: remove abort() in audio_bug(), Gerd Hoffmann, 2022/09/27
- [PULL 23/24] hw/display/ati_2d: Fix buffer overflow in ati_2d_blt (CVE-2021-3638), Gerd Hoffmann, 2022/09/27
- Re: [PULL 00/24] Kraxel 20220927 patches, Stefan Hajnoczi, 2022/09/27