[libvirt] [PATCH] Fix domain_conf.c compile warning

# HG changeset patch # User john.levon(a)sun.com # Date 1229367890 28800 # Node ID ead0d1c1d3adacf478db05ee8d6abe270c96c5da # Parent 728f90c86f2cd950463923c80fc57754d6e762eb Fix domain_conf.c compile warning Fix this problem in all the places needed: "src/domain_conf.c", line 122: warning: syntax error: empty declaration Signed-off-by: John Levon <john.levon(a)sun.com&gt; diff --git a/src/domain_conf.c b/src/domain_conf.c --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -119,7 +119,7 @@ VIR_ENUM_IMPL(virDomainSoundModel, VIR_D VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "sb16", "es1370", - "pcspk"); + "pcspk") VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", diff --git a/src/node_device_conf.c b/src/node_device_conf.c --- a/src/node_device_conf.c +++ b/src/node_device_conf.c @@ -45,11 +45,11 @@ VIR_ENUM_IMPL(virNodeDevCap, VIR_NODE_DE "net", "scsi_host", "scsi", - "storage"); + "storage") VIR_ENUM_IMPL(virNodeDevNetCap, VIR_NODE_DEV_CAP_NET_LAST, "80203", - "80211"); + "80211") #define virNodeDeviceLog(msg...) fprintf(stderr, msg) diff --git a/src/node_device_conf.h b/src/node_device_conf.h --- a/src/node_device_conf.h +++ b/src/node_device_conf.h @@ -47,8 +47,8 @@ enum virNodeDevNetCapType { VIR_NODE_DEV_CAP_NET_LAST }; -VIR_ENUM_DECL(virNodeDevCap); -VIR_ENUM_DECL(virNodeDevNetCap); +VIR_ENUM_DECL(virNodeDevCap) +VIR_ENUM_DECL(virNodeDevNetCap) enum virNodeDevStorageCapFlags { VIR_NODE_DEV_CAP_STORAGE_REMOVABLE = (1 << 0), diff --git a/src/storage_conf.c b/src/storage_conf.c --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -49,26 +49,26 @@ VIR_ENUM_IMPL(virStoragePool, VIR_STORAGE_POOL_LAST, "dir", "fs", "netfs", "logical", "disk", "iscsi", - "scsi"); + "scsi") VIR_ENUM_IMPL(virStoragePoolFormatFileSystem, VIR_STORAGE_POOL_FS_LAST, "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf", - "gfs", "gfs2", "vfat", "hfs+", "xfs"); + "gfs", "gfs2", "vfat", "hfs+", "xfs") VIR_ENUM_IMPL(virStoragePoolFormatFileSystemNet, VIR_STORAGE_POOL_NETFS_LAST, - "auto", "nfs"); + "auto", "nfs") VIR_ENUM_IMPL(virStoragePoolFormatDisk, VIR_STORAGE_POOL_DISK_LAST, "unknown", "dos", "dvh", "gpt", - "mac", "bsd", "pc98", "sun", "lvm2"); + "mac", "bsd", "pc98", "sun", "lvm2") VIR_ENUM_IMPL(virStoragePoolFormatLogical, VIR_STORAGE_POOL_LOGICAL_LAST, - "unknown", "lvm2"); + "unknown", "lvm2") VIR_ENUM_IMPL(virStorageVolFormatDisk, @@ -76,13 +76,13 @@ VIR_ENUM_IMPL(virStorageVolFormatDisk, "none", "linux", "fat16", "fat32", "linux-swap", "linux-lvm", "linux-raid", - "extended"); + "extended") VIR_ENUM_IMPL(virStorageVolFormatFileSystem, VIR_STORAGE_VOL_FILE_LAST, "raw", "dir", "bochs", "cloop", "cow", "dmg", "iso", - "qcow", "qcow2", "vmdk", "vpc"); + "qcow", "qcow2", "vmdk", "vpc") typedef const char *(*virStorageVolFormatToString)(int format); diff --git a/src/storage_conf.h b/src/storage_conf.h --- a/src/storage_conf.h +++ b/src/storage_conf.h @@ -113,7 +113,7 @@ enum virStoragePoolType { VIR_STORAGE_POOL_LAST, }; -VIR_ENUM_DECL(virStoragePool); +VIR_ENUM_DECL(virStoragePool) enum virStoragePoolAuthType { @@ -342,14 +342,14 @@ enum virStoragePoolFormatFileSystem { VIR_STORAGE_POOL_FS_XFS, VIR_STORAGE_POOL_FS_LAST, }; -VIR_ENUM_DECL(virStoragePoolFormatFileSystem); +VIR_ENUM_DECL(virStoragePoolFormatFileSystem) enum virStoragePoolFormatFileSystemNet { VIR_STORAGE_POOL_NETFS_AUTO = 0, VIR_STORAGE_POOL_NETFS_NFS, VIR_STORAGE_POOL_NETFS_LAST, }; -VIR_ENUM_DECL(virStoragePoolFormatFileSystemNet); +VIR_ENUM_DECL(virStoragePoolFormatFileSystemNet) enum virStoragePoolFormatDisk { VIR_STORAGE_POOL_DISK_UNKNOWN = 0, @@ -364,14 +364,14 @@ enum virStoragePoolFormatDisk { VIR_STORAGE_POOL_DISK_LAST, }; -VIR_ENUM_DECL(virStoragePoolFormatDisk); +VIR_ENUM_DECL(virStoragePoolFormatDisk) enum virStoragePoolFormatLogical { VIR_STORAGE_POOL_LOGICAL_UNKNOWN = 0, VIR_STORAGE_POOL_LOGICAL_LVM2 = 1, VIR_STORAGE_POOL_LOGICAL_LAST, }; -VIR_ENUM_DECL(virStoragePoolFormatLogical); +VIR_ENUM_DECL(virStoragePoolFormatLogical) enum virStorageVolFormatFileSystem { @@ -388,7 +388,7 @@ enum virStorageVolFormatFileSystem { VIR_STORAGE_VOL_FILE_VPC, VIR_STORAGE_VOL_FILE_LAST, }; -VIR_ENUM_DECL(virStorageVolFormatFileSystem); +VIR_ENUM_DECL(virStorageVolFormatFileSystem) /* * XXX these are basically partition types. @@ -410,7 +410,7 @@ enum virStorageVolFormatDisk { VIR_STORAGE_VOL_DISK_EXTENDED, VIR_STORAGE_VOL_DISK_LAST, }; -VIR_ENUM_DECL(virStorageVolFormatDisk); +VIR_ENUM_DECL(virStorageVolFormatDisk)