diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 7a8f84e036..dd381f303e 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -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) diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index ff7d6c9d5f..66a999760c 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -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 { diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c3406cfbe6..4c6f7b9a2c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -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", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8a3673361a..2a827a093f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -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) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 93e6e8a14c..0e5d05b6b8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -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;