From nobody Mon Feb 9 11:51:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615831453; cv=none; d=zohomail.com; s=zohoarc; b=iQIH0RJqrou91NmQmCw2tfJBMwPmS7CNLfzNL81wa0d5EaDUweP7Z9Uw1EhskE0bRh2851gefctvYgRY7YQiXDcsUlDxqHAVQNnlH6/Xe9CdjLc23nOMvEtNlUZILdbyWZ5hrshUmIMoOy4EGjQio9V7OSUB094MmqNwlq8ikLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615831453; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l0ENLpXO9/OCXCt43VuaRTJBJGPkzvUN0C8va0TwKN8=; b=jWBq0+bqnVqC6mW3NCns7GKevjH1j10GxAvFmXoc8KUs78UM0MBFdJI4RDS1pp9bJQoqStRCyZt280IqRGfrZwZs6lr3zS5X+iYkZh9JuWlI/P/WgewAEc+yP4tcnV7DGaY68Rt5BDbJg9Xq7ecCWZQxa78J0X4Y2FZp4MRi8io= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 16158314532541016.1896517166482; Mon, 15 Mar 2021 11:04:13 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-597-bfKxv8TqPUCwetBiIDrxJw-1; Mon, 15 Mar 2021 14:03:09 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EAD9E1015C8D; Mon, 15 Mar 2021 18:02:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BFFD710023AB; Mon, 15 Mar 2021 18:02:57 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7D07E57DC6; Mon, 15 Mar 2021 18:02:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12FI2qwX007523 for ; Mon, 15 Mar 2021 14:02:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 68E305C8B3; Mon, 15 Mar 2021 18:02:52 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-141.ams2.redhat.com [10.36.112.141]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EBB891C4; Mon, 15 Mar 2021 18:02:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 886941800840; Mon, 15 Mar 2021 19:02:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615831452; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=l0ENLpXO9/OCXCt43VuaRTJBJGPkzvUN0C8va0TwKN8=; b=hkPRIY8HsrgxULzs1VtCYt10PyYD2RDokFxLx6i00jMkOg5BNXRsNDV2sgVh57LwiMjdeN APG97QEfCh2+hdItmpavoNOCoM3R0cWMF3K/zk153NnFY6c/UHkz9/qVE71mytdV0DjXxt y5kn8XhKeYUnq2Rqc4J3GGY+bRmTnng= X-MC-Unique: bfKxv8TqPUCwetBiIDrxJw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 10/13] usb/storage: move usb-bot device to separate source file Date: Mon, 15 Mar 2021 19:02:37 +0100 Message-Id: <20210315180240.1597240-11-kraxel@redhat.com> In-Reply-To: <20210315180240.1597240-1-kraxel@redhat.com> References: <20210315180240.1597240-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: libvir-list@redhat.com, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Gerd Hoffmann , Paolo Bonzini , Samuel Thibault X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Pure code motion, no functional change. Signed-off-by: Gerd Hoffmann Message-Id: <20210312090425.772900-3-kraxel@redhat.com> --- hw/usb/dev-storage-bot.c | 63 ++++++++++++++++++++++++++++++++++++++++ hw/usb/dev-storage.c | 42 --------------------------- hw/usb/meson.build | 1 + 3 files changed, 64 insertions(+), 42 deletions(-) create mode 100644 hw/usb/dev-storage-bot.c diff --git a/hw/usb/dev-storage-bot.c b/hw/usb/dev-storage-bot.c new file mode 100644 index 000000000000..6aad026d1133 --- /dev/null +++ b/hw/usb/dev-storage-bot.c @@ -0,0 +1,63 @@ +/* + * USB Mass Storage Device emulation + * + * Copyright (c) 2006 CodeSourcery. + * Written by Paul Brook + * + * This code is licensed under the LGPL. + */ + +#include "qemu/osdep.h" +#include "qemu/typedefs.h" +#include "qapi/error.h" +#include "hw/usb.h" +#include "hw/usb/desc.h" +#include "hw/usb/msd.h" + +static const struct SCSIBusInfo usb_msd_scsi_info_bot =3D { + .tcq =3D false, + .max_target =3D 0, + .max_lun =3D 15, + + .transfer_data =3D usb_msd_transfer_data, + .complete =3D usb_msd_command_complete, + .cancel =3D usb_msd_request_cancelled, + .load_request =3D usb_msd_load_request, +}; + +static void usb_msd_bot_realize(USBDevice *dev, Error **errp) +{ + MSDState *s =3D USB_STORAGE_DEV(dev); + DeviceState *d =3D DEVICE(dev); + + usb_desc_create_serial(dev); + usb_desc_init(dev); + if (d->hotplugged) { + s->dev.auto_attach =3D 0; + } + + scsi_bus_new(&s->bus, sizeof(s->bus), DEVICE(dev), + &usb_msd_scsi_info_bot, NULL); + usb_msd_handle_reset(dev); +} + +static void usb_msd_class_bot_initfn(ObjectClass *klass, void *data) +{ + USBDeviceClass *uc =3D USB_DEVICE_CLASS(klass); + + uc->realize =3D usb_msd_bot_realize; + uc->attached_settable =3D true; +} + +static const TypeInfo bot_info =3D { + .name =3D "usb-bot", + .parent =3D TYPE_USB_STORAGE, + .class_init =3D usb_msd_class_bot_initfn, +}; + +static void register_types(void) +{ + type_register_static(&bot_info); +} + +type_init(register_types) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 027e29dda3f5..3e613ecc886b 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -551,17 +551,6 @@ static const struct SCSIBusInfo usb_msd_scsi_info_stor= age =3D { .load_request =3D usb_msd_load_request, }; =20 -static const struct SCSIBusInfo usb_msd_scsi_info_bot =3D { - .tcq =3D false, - .max_target =3D 0, - .max_lun =3D 15, - - .transfer_data =3D usb_msd_transfer_data, - .complete =3D usb_msd_command_complete, - .cancel =3D usb_msd_request_cancelled, - .load_request =3D usb_msd_load_request, -}; - static void usb_msd_storage_realize(USBDevice *dev, Error **errp) { MSDState *s =3D USB_STORAGE_DEV(dev); @@ -613,22 +602,6 @@ static void usb_msd_storage_realize(USBDevice *dev, Er= ror **errp) s->scsi_dev =3D scsi_dev; } =20 -static void usb_msd_bot_realize(USBDevice *dev, Error **errp) -{ - MSDState *s =3D USB_STORAGE_DEV(dev); - DeviceState *d =3D DEVICE(dev); - - usb_desc_create_serial(dev); - usb_desc_init(dev); - if (d->hotplugged) { - s->dev.auto_attach =3D 0; - } - - scsi_bus_new(&s->bus, sizeof(s->bus), DEVICE(dev), - &usb_msd_scsi_info_bot, NULL); - usb_msd_handle_reset(dev); -} - static const VMStateDescription vmstate_usb_msd =3D { .name =3D "usb-storage", .version_id =3D 1, @@ -734,14 +707,6 @@ static void usb_msd_instance_init(Object *obj) object_property_set_int(obj, "bootindex", -1, NULL); } =20 -static void usb_msd_class_bot_initfn(ObjectClass *klass, void *data) -{ - USBDeviceClass *uc =3D USB_DEVICE_CLASS(klass); - - uc->realize =3D usb_msd_bot_realize; - uc->attached_settable =3D true; -} - static const TypeInfo msd_info =3D { .name =3D "usb-storage", .parent =3D TYPE_USB_STORAGE, @@ -749,17 +714,10 @@ static const TypeInfo msd_info =3D { .instance_init =3D usb_msd_instance_init, }; =20 -static const TypeInfo bot_info =3D { - .name =3D "usb-bot", - .parent =3D TYPE_USB_STORAGE, - .class_init =3D usb_msd_class_bot_initfn, -}; - static void usb_msd_register_types(void) { type_register_static(&usb_storage_dev_type_info); type_register_static(&msd_info); - type_register_static(&bot_info); } =20 type_init(usb_msd_register_types) diff --git a/hw/usb/meson.build b/hw/usb/meson.build index 6e3159798e93..518cd1fbbbea 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -41,6 +41,7 @@ softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hu= b.c')) softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hid.c')) softmmu_ss.add(when: 'CONFIG_USB_TABLET_WACOM', if_true: files('dev-wacom.= c')) softmmu_ss.add(when: 'CONFIG_USB_STORAGE_BOT', if_true: files('dev-storage= .c')) +softmmu_ss.add(when: 'CONFIG_USB_STORAGE_BOT', if_true: files('dev-storage= -bot.c')) softmmu_ss.add(when: 'CONFIG_USB_STORAGE_UAS', if_true: files('dev-uas.c')) softmmu_ss.add(when: 'CONFIG_USB_AUDIO', if_true: files('dev-audio.c')) softmmu_ss.add(when: 'CONFIG_USB_SERIAL', if_true: files('dev-serial.c')) --=20 2.29.2