@samitouri / QOSamiQemu / commits / a2deb54e7e

hw/qdev: Remove DEFINE_PROP_DMAADDR() and 'hw/qdev-dma.h'

DEFINE_PROP_DMAADDR() is only used once. Since it doesn't add much value, simply remove it, along with the header defining it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20230203145536.17585-14-philmd@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>

Philippe Mathieu-Daudé committed Feb 3, 2023 at 10:55 UTC a2deb54e7efc94ddb609c66f90bcaed5f9fbf6b6
4 files changed +1 -20
hw/usb/hcd-ohci-pci.c
-1
@@ -25,7 +25,6 @@
25 #include "migration/vmstate.h"
26 #include "hw/pci/pci_device.h"
27 #include "hw/core/sysbus.h"
28 -#include "hw/core/qdev-dma.h"
28 #include "hw/core/qdev-properties.h"
29 #include "trace.h"
30 #include "hcd-ohci.h"
hw/usb/hcd-ohci-sysbus.c
+1 -2
@@ -26,7 +26,6 @@
26 #include "hw/usb/usb.h"
27 #include "migration/vmstate.h"
28 #include "hw/core/sysbus.h"
29 -#include "hw/core/qdev-dma.h"
29 #include "hw/core/qdev-properties.h"
30 #include "trace.h"
31 #include "hcd-ohci.h"
@@ -61,7 +60,7 @@ static const Property ohci_sysbus_properties[] = {
60 DEFINE_PROP_STRING("masterbus", OHCISysBusState, masterbus),
61 DEFINE_PROP_UINT32("num-ports", OHCISysBusState, num_ports, 3),
62 DEFINE_PROP_UINT32("firstport", OHCISysBusState, firstport, 0),
64 - DEFINE_PROP_DMAADDR("dma-offset", OHCISysBusState, dma_offset, 0),
63 + DEFINE_PROP_UINT64("dma-offset", OHCISysBusState, dma_offset, 0),
64 };
65
66 static void ohci_sysbus_class_init(ObjectClass *klass, const void *data)
hw/usb/hcd-ohci.c
-1
@@ -34,7 +34,6 @@
34 #include "hw/usb/usb.h"
35 #include "migration/vmstate.h"
36 #include "hw/core/sysbus.h"
37 -#include "hw/core/qdev-dma.h"
37 #include "hw/core/qdev-properties.h"
38 #include "trace.h"
39 #include "hcd-ohci.h"
include/hw/core/qdev-dma.h deleted
-16
@@ -1,16 +0,0 @@
1 -/*
2 - * Support for dma_addr_t typed properties
3 - *
4 - * Copyright (C) 2012 David Gibson, IBM Corporation.
5 - *
6 - * This work is licensed under the terms of the GNU GPL, version 2 or later.
7 - * See the COPYING file in the top-level directory.
8 - */
9 -
10 -#ifndef HW_QDEV_DMA_H
11 -#define HW_QDEV_DMA_H
12 -
13 -#define DEFINE_PROP_DMAADDR(_n, _s, _f, _d) \
14 - DEFINE_PROP_UINT64(_n, _s, _f, _d)
15 -
16 -#endif