mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
conf: Move virDomainDeviceAddressType to device_conf
It's used in virDomainDeviceInfo, which makes domain_conf the wrong place to declare it. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
d8313d3cf2
commit
edeef77958
@ -32,6 +32,21 @@
|
||||
|
||||
#define VIR_FROM_THIS VIR_FROM_DEVICE
|
||||
|
||||
VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST,
|
||||
"none",
|
||||
"pci",
|
||||
"drive",
|
||||
"virtio-serial",
|
||||
"ccid",
|
||||
"usb",
|
||||
"spapr-vio",
|
||||
"virtio-s390",
|
||||
"ccw",
|
||||
"virtio-mmio",
|
||||
"isa",
|
||||
"dimm",
|
||||
);
|
||||
|
||||
int
|
||||
virDomainDeviceInfoCopy(virDomainDeviceInfoPtr dst,
|
||||
virDomainDeviceInfoPtr src)
|
||||
|
@ -51,6 +51,8 @@ typedef enum {
|
||||
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST
|
||||
} virDomainDeviceAddressType;
|
||||
|
||||
VIR_ENUM_DECL(virDomainDeviceAddress);
|
||||
|
||||
typedef struct _virDomainDeviceDriveAddress virDomainDeviceDriveAddress;
|
||||
typedef virDomainDeviceDriveAddress *virDomainDeviceDriveAddressPtr;
|
||||
struct _virDomainDeviceDriveAddress {
|
||||
|
@ -263,20 +263,6 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST,
|
||||
"iommu",
|
||||
"vsock")
|
||||
|
||||
VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST,
|
||||
"none",
|
||||
"pci",
|
||||
"drive",
|
||||
"virtio-serial",
|
||||
"ccid",
|
||||
"usb",
|
||||
"spapr-vio",
|
||||
"virtio-s390",
|
||||
"ccw",
|
||||
"virtio-mmio",
|
||||
"isa",
|
||||
"dimm")
|
||||
|
||||
VIR_ENUM_IMPL(virDomainDiskDevice, VIR_DOMAIN_DISK_DEVICE_LAST,
|
||||
"disk",
|
||||
"cdrom",
|
||||
|
@ -3380,7 +3380,6 @@ VIR_ENUM_DECL(virDomainCapsFeature)
|
||||
VIR_ENUM_DECL(virDomainLifecycle)
|
||||
VIR_ENUM_DECL(virDomainLifecycleAction)
|
||||
VIR_ENUM_DECL(virDomainDevice)
|
||||
VIR_ENUM_DECL(virDomainDeviceAddress)
|
||||
VIR_ENUM_DECL(virDomainDiskDevice)
|
||||
VIR_ENUM_DECL(virDomainDiskGeometryTrans)
|
||||
VIR_ENUM_DECL(virDomainDiskBus)
|
||||
|
@ -95,6 +95,7 @@ virCPUModeTypeToString;
|
||||
# conf/device_conf.h
|
||||
virDeviceInfoPCIAddressIsPresent;
|
||||
virDeviceInfoPCIAddressIsWanted;
|
||||
virDomainDeviceAddressTypeToString;
|
||||
virDomainDeviceInfoAddressIsEqual;
|
||||
virDomainDeviceInfoCopy;
|
||||
virInterfaceLinkFormat;
|
||||
@ -291,7 +292,6 @@ virDomainDefValidate;
|
||||
virDomainDefVcpuOrderClear;
|
||||
virDomainDeleteConfig;
|
||||
virDomainDeviceAddressIsValid;
|
||||
virDomainDeviceAddressTypeToString;
|
||||
virDomainDeviceAliasIsUserAlias;
|
||||
virDomainDeviceDefCopy;
|
||||
virDomainDeviceDefFree;
|
||||
|
Loading…
Reference in New Issue
Block a user