[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/13] hw/usb/bus: Remove the "full-path" property
From: |
Gerd Hoffmann |
Subject: |
[PULL 01/13] hw/usb/bus: Remove the "full-path" property |
Date: |
Mon, 15 Mar 2021 19:02:28 +0100 |
From: Thomas Huth <thuth@redhat.com>
This property was only required for the pc-1.0 and earlier machine
types. Since these have been removed now, we can delete the property
as well.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210302120152.118042-1-thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/hw/usb.h | 1 -
hw/usb/bus.c | 7 +------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/hw/usb.h b/include/hw/usb.h
index abfbfc5284c2..9f42394efaea 100644
--- a/include/hw/usb.h
+++ b/include/hw/usb.h
@@ -216,7 +216,6 @@ struct USBEndpoint {
};
enum USBDeviceFlags {
- USB_DEV_FLAG_FULL_PATH,
USB_DEV_FLAG_IS_HOST,
USB_DEV_FLAG_MSOS_DESC_ENABLE,
USB_DEV_FLAG_MSOS_DESC_IN_USE,
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 064f94e9c3cc..df7411fea8e4 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -19,8 +19,6 @@ static void usb_qdev_unrealize(DeviceState *qdev);
static Property usb_props[] = {
DEFINE_PROP_STRING("port", USBDevice, port_path),
DEFINE_PROP_STRING("serial", USBDevice, serial),
- DEFINE_PROP_BIT("full-path", USBDevice, flags,
- USB_DEV_FLAG_FULL_PATH, true),
DEFINE_PROP_BIT("msos-desc", USBDevice, flags,
USB_DEV_FLAG_MSOS_DESC_ENABLE, true),
DEFINE_PROP_STRING("pcap", USBDevice, pcap_filename),
@@ -596,11 +594,8 @@ static char *usb_get_dev_path(DeviceState *qdev)
{
USBDevice *dev = USB_DEVICE(qdev);
DeviceState *hcd = qdev->parent_bus->parent;
- char *id = NULL;
+ char *id = qdev_get_dev_path(hcd);
- if (dev->flags & (1 << USB_DEV_FLAG_FULL_PATH)) {
- id = qdev_get_dev_path(hcd);
- }
if (id) {
char *ret = g_strdup_printf("%s/%s", id, dev->port->path);
g_free(id);
--
2.29.2
- [PULL 00/13] Usb 20210315 patches, Gerd Hoffmann, 2021/03/15
- [PULL 04/13] usb: Un-deprecate -usbdevice (except for -usbdevice audio which gets removed), Gerd Hoffmann, 2021/03/15
- [PULL 03/13] usb: remove '-usbdevice u2f-key', Gerd Hoffmann, 2021/03/15
- [PULL 07/13] hw/usb/hcd-uhci: Expose generic prototypes to local header, Gerd Hoffmann, 2021/03/15
- [PULL 13/13] usb/storage: clear csw on reset, Gerd Hoffmann, 2021/03/15
- [PULL 01/13] hw/usb/bus: Remove the "full-path" property,
Gerd Hoffmann <=
- [PULL 06/13] hw/southbridge: Add missing Kconfig dependency VT82C686 on USB_UHCI, Gerd Hoffmann, 2021/03/15
- [PULL 10/13] usb/storage: move usb-bot device to separate source file, Gerd Hoffmann, 2021/03/15
- [PULL 12/13] usb/storage: add kconfig symbols, Gerd Hoffmann, 2021/03/15
- [PULL 11/13] usb/storage move usb-storage device to separate source file, Gerd Hoffmann, 2021/03/15
- [PULL 08/13] hw/usb: Extract VT82C686 UHCI PCI function into a new unit, Gerd Hoffmann, 2021/03/15
- [PULL 05/13] usb: Document the missing -usbdevice options, Gerd Hoffmann, 2021/03/15
- [PULL 09/13] usb/storage: move declarations to usb/msd.h header, Gerd Hoffmann, 2021/03/15
- [PULL 02/13] usb: remove support for -usbdevice parameters, Gerd Hoffmann, 2021/03/15
- Re: [PULL 00/13] Usb 20210315 patches, Peter Maydell, 2021/03/16