mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 16:53:55 -06:00
hw/virtio: Constify all Property
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
d3eb6f73e1
commit
1577a9180f
38 changed files with 39 additions and 39 deletions
|
@ -337,7 +337,7 @@ static void vhost_vdpa_device_set_status(VirtIODevice *vdev, uint8_t status)
|
|||
}
|
||||
}
|
||||
|
||||
static Property vhost_vdpa_device_properties[] = {
|
||||
static const Property vhost_vdpa_device_properties[] = {
|
||||
DEFINE_PROP_STRING("vhostdev", VhostVdpaDevice, vhostdev),
|
||||
DEFINE_PROP_UINT16("queue-size", VhostVdpaDevice, queue_size, 0),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
|
|
|
@ -38,7 +38,7 @@ struct VHostSCSIPCI {
|
|||
VHostSCSI vdev;
|
||||
};
|
||||
|
||||
static Property vhost_scsi_pci_properties[] = {
|
||||
static const Property vhost_scsi_pci_properties[] = {
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
|
||||
DEV_NVECTORS_UNSPECIFIED),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
|
|
|
@ -43,7 +43,7 @@ struct VHostUserBlkPCI {
|
|||
VHostUserBlk vdev;
|
||||
};
|
||||
|
||||
static Property vhost_user_blk_pci_properties[] = {
|
||||
static const Property vhost_user_blk_pci_properties[] = {
|
||||
DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
|
||||
DEV_NVECTORS_UNSPECIFIED),
|
||||
|
|
|
@ -29,7 +29,7 @@ static const VMStateDescription vud_vmstate = {
|
|||
.unmigratable = 1,
|
||||
};
|
||||
|
||||
static Property vud_properties[] = {
|
||||
static const Property vud_properties[] = {
|
||||
DEFINE_PROP_CHR("chardev", VHostUserBase, chardev),
|
||||
DEFINE_PROP_UINT16("virtio-id", VHostUserBase, virtio_id, 0),
|
||||
DEFINE_PROP_UINT32("vq_size", VHostUserBase, vq_size, 64),
|
||||
|
|
|
@ -29,7 +29,7 @@ typedef struct VHostUserFSPCI VHostUserFSPCI;
|
|||
DECLARE_INSTANCE_CHECKER(VHostUserFSPCI, VHOST_USER_FS_PCI,
|
||||
TYPE_VHOST_USER_FS_PCI)
|
||||
|
||||
static Property vhost_user_fs_pci_properties[] = {
|
||||
static const Property vhost_user_fs_pci_properties[] = {
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
|
||||
DEV_NVECTORS_UNSPECIFIED),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
|
|
|
@ -403,7 +403,7 @@ static const VMStateDescription vuf_backend_vmstate = {
|
|||
},
|
||||
};
|
||||
|
||||
static Property vuf_properties[] = {
|
||||
static const Property vuf_properties[] = {
|
||||
DEFINE_PROP_CHR("chardev", VHostUserFS, conf.chardev),
|
||||
DEFINE_PROP_STRING("tag", VHostUserFS, conf.tag),
|
||||
DEFINE_PROP_UINT16("num-request-queues", VHostUserFS,
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "standard-headers/linux/virtio_ids.h"
|
||||
#include "standard-headers/linux/virtio_gpio.h"
|
||||
|
||||
static Property vgpio_properties[] = {
|
||||
static const Property vgpio_properties[] = {
|
||||
DEFINE_PROP_CHR("chardev", VHostUserBase, chardev),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "qemu/error-report.h"
|
||||
#include "standard-headers/linux/virtio_ids.h"
|
||||
|
||||
static Property vi2c_properties[] = {
|
||||
static const Property vi2c_properties[] = {
|
||||
DEFINE_PROP_CHR("chardev", VHostUserBase, chardev),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "hw/virtio/virtio-input.h"
|
||||
|
||||
static Property vinput_properties[] = {
|
||||
static const Property vinput_properties[] = {
|
||||
DEFINE_PROP_CHR("chardev", VHostUserBase, chardev),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
|
|
@ -23,7 +23,7 @@ typedef struct VHostUserRNGPCI VHostUserRNGPCI;
|
|||
DECLARE_INSTANCE_CHECKER(VHostUserRNGPCI, VHOST_USER_RNG_PCI,
|
||||
TYPE_VHOST_USER_RNG_PCI)
|
||||
|
||||
static Property vhost_user_rng_pci_properties[] = {
|
||||
static const Property vhost_user_rng_pci_properties[] = {
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
|
||||
DEV_NVECTORS_UNSPECIFIED),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
|
|
|
@ -20,7 +20,7 @@ static const VMStateDescription vu_rng_vmstate = {
|
|||
.unmigratable = 1,
|
||||
};
|
||||
|
||||
static Property vrng_properties[] = {
|
||||
static const Property vrng_properties[] = {
|
||||
DEFINE_PROP_CHR("chardev", VHostUserBase, chardev),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
|
|
@ -277,7 +277,7 @@ static const VMStateDescription vu_scmi_vmstate = {
|
|||
.unmigratable = 1,
|
||||
};
|
||||
|
||||
static Property vu_scmi_properties[] = {
|
||||
static const Property vu_scmi_properties[] = {
|
||||
DEFINE_PROP_CHR("chardev", VHostUserSCMI, chardev),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
|
|
@ -44,7 +44,7 @@ struct VHostUserSCSIPCI {
|
|||
VHostUserSCSI vdev;
|
||||
};
|
||||
|
||||
static Property vhost_user_scsi_pci_properties[] = {
|
||||
static const Property vhost_user_scsi_pci_properties[] = {
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
|
||||
DEV_NVECTORS_UNSPECIFIED),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
|
|
|
@ -21,7 +21,7 @@ static const VMStateDescription vu_snd_vmstate = {
|
|||
.unmigratable = 1,
|
||||
};
|
||||
|
||||
static Property vsnd_properties[] = {
|
||||
static const Property vsnd_properties[] = {
|
||||
DEFINE_PROP_CHR("chardev", VHostUserBase, chardev),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
|
|
@ -31,7 +31,7 @@ struct VHostUserVSockPCI {
|
|||
|
||||
/* vhost-user-vsock-pci */
|
||||
|
||||
static Property vhost_user_vsock_pci_properties[] = {
|
||||
static const Property vhost_user_vsock_pci_properties[] = {
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 3),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
|
|
@ -148,7 +148,7 @@ static void vuv_device_unrealize(DeviceState *dev)
|
|||
|
||||
}
|
||||
|
||||
static Property vuv_properties[] = {
|
||||
static const Property vuv_properties[] = {
|
||||
DEFINE_PROP_CHR("chardev", VHostUserVSock, conf.chardev),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
|
|
@ -285,7 +285,7 @@ static struct vhost_dev *vhost_vsock_common_get_vhost(VirtIODevice *vdev)
|
|||
return &vvc->vhost_dev;
|
||||
}
|
||||
|
||||
static Property vhost_vsock_common_properties[] = {
|
||||
static const Property vhost_vsock_common_properties[] = {
|
||||
DEFINE_PROP_ON_OFF_AUTO("seqpacket", VHostVSockCommon, seqpacket,
|
||||
ON_OFF_AUTO_AUTO),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
|
|
|
@ -35,7 +35,7 @@ struct VHostVSockPCI {
|
|||
|
||||
/* vhost-vsock-pci */
|
||||
|
||||
static Property vhost_vsock_pci_properties[] = {
|
||||
static const Property vhost_vsock_pci_properties[] = {
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 3),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
|
|
@ -205,7 +205,7 @@ static void vhost_vsock_device_unrealize(DeviceState *dev)
|
|||
vhost_vsock_common_unrealize(vdev);
|
||||
}
|
||||
|
||||
static Property vhost_vsock_properties[] = {
|
||||
static const Property vhost_vsock_properties[] = {
|
||||
DEFINE_PROP_UINT64("guest-cid", VHostVSock, conf.guest_cid, 0),
|
||||
DEFINE_PROP_STRING("vhostfd", VHostVSock, conf.vhostfd),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
|
|
|
@ -43,7 +43,7 @@ static void virtio_9p_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|||
qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
|
||||
}
|
||||
|
||||
static Property virtio_9p_pci_properties[] = {
|
||||
static const Property virtio_9p_pci_properties[] = {
|
||||
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
|
||||
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),
|
||||
|
|
|
@ -1015,7 +1015,7 @@ static const VMStateDescription vmstate_virtio_balloon = {
|
|||
},
|
||||
};
|
||||
|
||||
static Property virtio_balloon_properties[] = {
|
||||
static const Property virtio_balloon_properties[] = {
|
||||
DEFINE_PROP_BIT("deflate-on-oom", VirtIOBalloon, host_features,
|
||||
VIRTIO_BALLOON_F_DEFLATE_ON_OOM, false),
|
||||
DEFINE_PROP_BIT("free-page-hint", VirtIOBalloon, host_features,
|
||||
|
|
|
@ -38,7 +38,7 @@ struct VirtIOBlkPCI {
|
|||
VirtIOBlock vdev;
|
||||
};
|
||||
|
||||
static Property virtio_blk_pci_properties[] = {
|
||||
static const Property virtio_blk_pci_properties[] = {
|
||||
DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
|
||||
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
|
||||
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
|
||||
|
|
|
@ -37,7 +37,7 @@ struct VirtIOCryptoPCI {
|
|||
VirtIOCrypto vdev;
|
||||
};
|
||||
|
||||
static Property virtio_crypto_pci_properties[] = {
|
||||
static const Property virtio_crypto_pci_properties[] = {
|
||||
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
|
||||
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),
|
||||
|
|
|
@ -1128,7 +1128,7 @@ static const VMStateDescription vmstate_virtio_crypto = {
|
|||
},
|
||||
};
|
||||
|
||||
static Property virtio_crypto_properties[] = {
|
||||
static const Property virtio_crypto_properties[] = {
|
||||
DEFINE_PROP_LINK("cryptodev", VirtIOCrypto, conf.cryptodev,
|
||||
TYPE_CRYPTODEV_BACKEND, CryptoDevBackend *),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
|
|
|
@ -37,7 +37,7 @@ struct VirtIOInputHIDPCI {
|
|||
VirtIOInputHID vdev;
|
||||
};
|
||||
|
||||
static Property virtio_input_pci_properties[] = {
|
||||
static const Property virtio_input_pci_properties[] = {
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
|
|
@ -34,7 +34,7 @@ struct VirtIOIOMMUPCI {
|
|||
VirtIOIOMMU vdev;
|
||||
};
|
||||
|
||||
static Property virtio_iommu_pci_properties[] = {
|
||||
static const Property virtio_iommu_pci_properties[] = {
|
||||
DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
|
||||
DEFINE_PROP_ARRAY("reserved-regions", VirtIOIOMMUPCI,
|
||||
vdev.nr_prop_resv_regions, vdev.prop_resv_regions,
|
||||
|
|
|
@ -1655,7 +1655,7 @@ static const VMStateDescription vmstate_virtio_iommu = {
|
|||
},
|
||||
};
|
||||
|
||||
static Property virtio_iommu_properties[] = {
|
||||
static const Property virtio_iommu_properties[] = {
|
||||
DEFINE_PROP_LINK("primary-bus", VirtIOIOMMU, primary_bus,
|
||||
TYPE_PCI_BUS, PCIBus *),
|
||||
DEFINE_PROP_BOOL("boot-bypass", VirtIOIOMMU, boot_bypass, true),
|
||||
|
|
|
@ -1680,7 +1680,7 @@ static void virtio_mem_instance_finalize(Object *obj)
|
|||
vmem->mr = NULL;
|
||||
}
|
||||
|
||||
static Property virtio_mem_properties[] = {
|
||||
static const Property virtio_mem_properties[] = {
|
||||
DEFINE_PROP_UINT64(VIRTIO_MEM_ADDR_PROP, VirtIOMEM, addr, 0),
|
||||
DEFINE_PROP_UINT32(VIRTIO_MEM_NODE_PROP, VirtIOMEM, node, 0),
|
||||
DEFINE_PROP_BOOL(VIRTIO_MEM_PREALLOC_PROP, VirtIOMEM, prealloc, false),
|
||||
|
|
|
@ -751,7 +751,7 @@ static void virtio_mmio_pre_plugged(DeviceState *d, Error **errp)
|
|||
|
||||
/* virtio-mmio device */
|
||||
|
||||
static Property virtio_mmio_properties[] = {
|
||||
static const Property virtio_mmio_properties[] = {
|
||||
DEFINE_PROP_BOOL("format_transport_address", VirtIOMMIOProxy,
|
||||
format_transport_address, true),
|
||||
DEFINE_PROP_BOOL("force-legacy", VirtIOMMIOProxy, legacy, true),
|
||||
|
|
|
@ -38,7 +38,7 @@ struct VirtIONetPCI {
|
|||
VirtIONet vdev;
|
||||
};
|
||||
|
||||
static Property virtio_net_properties[] = {
|
||||
static const Property virtio_net_properties[] = {
|
||||
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
|
||||
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
|
||||
|
|
|
@ -1705,7 +1705,7 @@ static const VMStateDescription vmstate_virtio_nsm = {
|
|||
},
|
||||
};
|
||||
|
||||
static Property virtio_nsm_properties[] = {
|
||||
static const Property virtio_nsm_properties[] = {
|
||||
DEFINE_PROP_STRING("module-id", VirtIONSM, module_id),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
|
|
@ -2349,7 +2349,7 @@ static void virtio_pci_bus_reset_hold(Object *obj, ResetType type)
|
|||
}
|
||||
}
|
||||
|
||||
static Property virtio_pci_properties[] = {
|
||||
static const Property virtio_pci_properties[] = {
|
||||
DEFINE_PROP_BIT("virtio-pci-bus-master-bug-migration", VirtIOPCIProxy, flags,
|
||||
VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, false),
|
||||
DEFINE_PROP_BIT("migrate-extra", VirtIOPCIProxy, flags,
|
||||
|
@ -2431,7 +2431,7 @@ static const TypeInfo virtio_pci_info = {
|
|||
.abstract = true,
|
||||
};
|
||||
|
||||
static Property virtio_pci_generic_properties[] = {
|
||||
static const Property virtio_pci_generic_properties[] = {
|
||||
DEFINE_PROP_ON_OFF_AUTO("disable-legacy", VirtIOPCIProxy, disable_legacy,
|
||||
ON_OFF_AUTO_AUTO),
|
||||
DEFINE_PROP_BOOL("disable-modern", VirtIOPCIProxy, disable_modern, false),
|
||||
|
|
|
@ -155,7 +155,7 @@ static MemoryRegion *virtio_pmem_get_memory_region(VirtIOPMEM *pmem,
|
|||
return &pmem->memdev->mr;
|
||||
}
|
||||
|
||||
static Property virtio_pmem_properties[] = {
|
||||
static const Property virtio_pmem_properties[] = {
|
||||
DEFINE_PROP_UINT64(VIRTIO_PMEM_ADDR_PROP, VirtIOPMEM, start, 0),
|
||||
DEFINE_PROP_LINK(VIRTIO_PMEM_MEMDEV_PROP, VirtIOPMEM, memdev,
|
||||
TYPE_MEMORY_BACKEND, HostMemoryBackend *),
|
||||
|
|
|
@ -32,7 +32,7 @@ struct VirtIORngPCI {
|
|||
VirtIORNG vdev;
|
||||
};
|
||||
|
||||
static Property virtio_rng_properties[] = {
|
||||
static const Property virtio_rng_properties[] = {
|
||||
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
|
||||
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
|
||||
|
|
|
@ -249,7 +249,7 @@ static const VMStateDescription vmstate_virtio_rng = {
|
|||
},
|
||||
};
|
||||
|
||||
static Property virtio_rng_properties[] = {
|
||||
static const Property virtio_rng_properties[] = {
|
||||
/* Set a default rate limit of 2^47 bytes per minute or roughly 2TB/s. If
|
||||
* you have an entropy source capable of generating more entropy than this
|
||||
* and you can pass it through via virtio-rng, then hats off to you. Until
|
||||
|
|
|
@ -35,7 +35,7 @@ struct VirtIOSCSIPCI {
|
|||
VirtIOSCSI vdev;
|
||||
};
|
||||
|
||||
static Property virtio_scsi_pci_properties[] = {
|
||||
static const Property virtio_scsi_pci_properties[] = {
|
||||
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
|
||||
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
|
||||
|
|
|
@ -69,7 +69,7 @@ static void virtio_serial_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|||
qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
|
||||
}
|
||||
|
||||
static Property virtio_serial_pci_properties[] = {
|
||||
static const Property virtio_serial_pci_properties[] = {
|
||||
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
|
||||
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
|
||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),
|
||||
|
|
|
@ -4012,7 +4012,7 @@ static void virtio_device_instance_finalize(Object *obj)
|
|||
g_free(vdev->vector_queues);
|
||||
}
|
||||
|
||||
static Property virtio_properties[] = {
|
||||
static const Property virtio_properties[] = {
|
||||
DEFINE_VIRTIO_COMMON_FEATURES(VirtIODevice, host_features),
|
||||
DEFINE_PROP_BOOL("use-started", VirtIODevice, use_started, true),
|
||||
DEFINE_PROP_BOOL("use-disabled-flag", VirtIODevice, use_disabled_flag, true),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue