External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove trailing semi-colons causing empty statement warnings (John Levon)

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-12-17 21:09:44 +00:00
parent 7e58aaa7ae
commit 34cd4f9076
6 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Dec 17 20:53:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
* domain_conf.c, node_device_conf.c, node_device_conf.h,
storage_conf.c, storage_conf.h: Remove trailing semi-colon
causing empty statement compile warnings on solaris (John
Levon).
Wed Dec 17 18:10:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com> Wed Dec 17 18:10:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
Anonymous union fixes for non-GCC compilers (John Levon) Anonymous union fixes for non-GCC compilers (John Levon)

2
src/domain_conf.c
View File

@ -119,7 +119,7 @@ VIR_ENUM_IMPL(virDomainChr, VIR_DOMAIN_CHR_TYPE_LAST,
VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST,
"sb16", "sb16",
"es1370", "es1370",
"pcspk"); "pcspk")
VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST,
"mouse", "mouse",

4
src/node_device_conf.c
View File

@ -45,11 +45,11 @@ VIR_ENUM_IMPL(virNodeDevCap, VIR_NODE_DEV_CAP_LAST,
"net", "net",
"scsi_host", "scsi_host",
"scsi", "scsi",
"storage"); "storage")
VIR_ENUM_IMPL(virNodeDevNetCap, VIR_NODE_DEV_CAP_NET_LAST, VIR_ENUM_IMPL(virNodeDevNetCap, VIR_NODE_DEV_CAP_NET_LAST,
"80203", "80203",
"80211"); "80211")
#define virNodeDeviceLog(msg...) fprintf(stderr, msg) #define virNodeDeviceLog(msg...) fprintf(stderr, msg)

4
src/node_device_conf.h
View File

@ -47,8 +47,8 @@ enum virNodeDevNetCapType {
VIR_NODE_DEV_CAP_NET_LAST VIR_NODE_DEV_CAP_NET_LAST
}; };
VIR_ENUM_DECL(virNodeDevCap); VIR_ENUM_DECL(virNodeDevCap)
VIR_ENUM_DECL(virNodeDevNetCap); VIR_ENUM_DECL(virNodeDevNetCap)
enum virNodeDevStorageCapFlags { enum virNodeDevStorageCapFlags {
VIR_NODE_DEV_CAP_STORAGE_REMOVABLE = (1 << 0), VIR_NODE_DEV_CAP_STORAGE_REMOVABLE = (1 << 0),

14
src/storage_conf.c
View File

@ -54,26 +54,26 @@ VIR_ENUM_IMPL(virStoragePool,
VIR_STORAGE_POOL_LAST, VIR_STORAGE_POOL_LAST,
"dir", "fs", "netfs", "dir", "fs", "netfs",
"logical", "disk", "iscsi", "logical", "disk", "iscsi",
"scsi"); "scsi")
VIR_ENUM_IMPL(virStoragePoolFormatFileSystem, VIR_ENUM_IMPL(virStoragePoolFormatFileSystem,
VIR_STORAGE_POOL_FS_LAST, VIR_STORAGE_POOL_FS_LAST,
"auto", "ext2", "ext3", "auto", "ext2", "ext3",
"ext4", "ufs", "iso9660", "udf", "ext4", "ufs", "iso9660", "udf",
"gfs", "gfs2", "vfat", "hfs+", "xfs"); "gfs", "gfs2", "vfat", "hfs+", "xfs")
VIR_ENUM_IMPL(virStoragePoolFormatFileSystemNet, VIR_ENUM_IMPL(virStoragePoolFormatFileSystemNet,
VIR_STORAGE_POOL_NETFS_LAST, VIR_STORAGE_POOL_NETFS_LAST,
"auto", "nfs"); "auto", "nfs")
VIR_ENUM_IMPL(virStoragePoolFormatDisk, VIR_ENUM_IMPL(virStoragePoolFormatDisk,
VIR_STORAGE_POOL_DISK_LAST, VIR_STORAGE_POOL_DISK_LAST,
"unknown", "dos", "dvh", "gpt", "unknown", "dos", "dvh", "gpt",
"mac", "bsd", "pc98", "sun", "lvm2"); "mac", "bsd", "pc98", "sun", "lvm2")
VIR_ENUM_IMPL(virStoragePoolFormatLogical, VIR_ENUM_IMPL(virStoragePoolFormatLogical,
VIR_STORAGE_POOL_LOGICAL_LAST, VIR_STORAGE_POOL_LOGICAL_LAST,
"unknown", "lvm2"); "unknown", "lvm2")
VIR_ENUM_IMPL(virStorageVolFormatDisk, VIR_ENUM_IMPL(virStorageVolFormatDisk,
@ -81,13 +81,13 @@ VIR_ENUM_IMPL(virStorageVolFormatDisk,
"none", "linux", "fat16", "none", "linux", "fat16",
"fat32", "linux-swap", "fat32", "linux-swap",
"linux-lvm", "linux-raid", "linux-lvm", "linux-raid",
"extended"); "extended")
VIR_ENUM_IMPL(virStorageVolFormatFileSystem, VIR_ENUM_IMPL(virStorageVolFormatFileSystem,
VIR_STORAGE_VOL_FILE_LAST, VIR_STORAGE_VOL_FILE_LAST,
"raw", "dir", "bochs", "raw", "dir", "bochs",
"cloop", "cow", "dmg", "iso", "cloop", "cow", "dmg", "iso",
"qcow", "qcow2", "vmdk", "vpc"); "qcow", "qcow2", "vmdk", "vpc")
typedef const char *(*virStorageVolFormatToString)(int format); typedef const char *(*virStorageVolFormatToString)(int format);

14
src/storage_conf.h
View File

@ -113,7 +113,7 @@ enum virStoragePoolType {
VIR_STORAGE_POOL_LAST, VIR_STORAGE_POOL_LAST,
}; };
VIR_ENUM_DECL(virStoragePool); VIR_ENUM_DECL(virStoragePool)
enum virStoragePoolAuthType { enum virStoragePoolAuthType {
@ -349,14 +349,14 @@ enum virStoragePoolFormatFileSystem {
VIR_STORAGE_POOL_FS_XFS, VIR_STORAGE_POOL_FS_XFS,
VIR_STORAGE_POOL_FS_LAST, VIR_STORAGE_POOL_FS_LAST,
}; };
VIR_ENUM_DECL(virStoragePoolFormatFileSystem); VIR_ENUM_DECL(virStoragePoolFormatFileSystem)
enum virStoragePoolFormatFileSystemNet { enum virStoragePoolFormatFileSystemNet {
VIR_STORAGE_POOL_NETFS_AUTO = 0, VIR_STORAGE_POOL_NETFS_AUTO = 0,
VIR_STORAGE_POOL_NETFS_NFS, VIR_STORAGE_POOL_NETFS_NFS,
VIR_STORAGE_POOL_NETFS_LAST, VIR_STORAGE_POOL_NETFS_LAST,
}; };
VIR_ENUM_DECL(virStoragePoolFormatFileSystemNet); VIR_ENUM_DECL(virStoragePoolFormatFileSystemNet)
enum virStoragePoolFormatDisk { enum virStoragePoolFormatDisk {
VIR_STORAGE_POOL_DISK_UNKNOWN = 0, VIR_STORAGE_POOL_DISK_UNKNOWN = 0,
@ -371,14 +371,14 @@ enum virStoragePoolFormatDisk {
VIR_STORAGE_POOL_DISK_LAST, VIR_STORAGE_POOL_DISK_LAST,
}; };
VIR_ENUM_DECL(virStoragePoolFormatDisk); VIR_ENUM_DECL(virStoragePoolFormatDisk)
enum virStoragePoolFormatLogical { enum virStoragePoolFormatLogical {
VIR_STORAGE_POOL_LOGICAL_UNKNOWN = 0, VIR_STORAGE_POOL_LOGICAL_UNKNOWN = 0,
VIR_STORAGE_POOL_LOGICAL_LVM2 = 1, VIR_STORAGE_POOL_LOGICAL_LVM2 = 1,
VIR_STORAGE_POOL_LOGICAL_LAST, VIR_STORAGE_POOL_LOGICAL_LAST,
}; };
VIR_ENUM_DECL(virStoragePoolFormatLogical); VIR_ENUM_DECL(virStoragePoolFormatLogical)
enum virStorageVolFormatFileSystem { enum virStorageVolFormatFileSystem {
@ -395,7 +395,7 @@ enum virStorageVolFormatFileSystem {
VIR_STORAGE_VOL_FILE_VPC, VIR_STORAGE_VOL_FILE_VPC,
VIR_STORAGE_VOL_FILE_LAST, VIR_STORAGE_VOL_FILE_LAST,
}; };
VIR_ENUM_DECL(virStorageVolFormatFileSystem); VIR_ENUM_DECL(virStorageVolFormatFileSystem)
/* /*
* XXX these are basically partition types. * XXX these are basically partition types.
@ -417,7 +417,7 @@ enum virStorageVolFormatDisk {
VIR_STORAGE_VOL_DISK_EXTENDED, VIR_STORAGE_VOL_DISK_EXTENDED,
VIR_STORAGE_VOL_DISK_LAST, VIR_STORAGE_VOL_DISK_LAST,
}; };
VIR_ENUM_DECL(virStorageVolFormatDisk); VIR_ENUM_DECL(virStorageVolFormatDisk)