提交 00ee955d 编写于 作者: J Julio Faracco 提交者: Eric Blake

conf: use typedefs for enums in "src/conf/cpu_conf.h"

In "src/conf/" there are many enumeration (enum) declarations.
Similar to the recent cleanup to "src/util" directory, it's
better to use a typedef for variable types, function types and
other usages. Other enumeration and folders will be changed to
typedef's in the future. Most of the files changed in this commit
are related to CPU (cpu_conf) enums.
Signed-off-by: NJulio Faracco <jcfaracco@gmail.com>
Signed-off-by: NEric Blake <eblake@redhat.com>
上级 1b14c449
......@@ -176,7 +176,7 @@ virCPUDefCopy(const virCPUDef *cpu)
virCPUDefPtr
virCPUDefParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt,
enum virCPUType mode)
virCPUType mode)
{
virCPUDefPtr def;
xmlNodePtr *nodes = NULL;
......
......@@ -32,46 +32,46 @@
# define VIR_CPU_VENDOR_ID_LENGTH 12
enum virCPUType {
typedef enum {
VIR_CPU_TYPE_HOST,
VIR_CPU_TYPE_GUEST,
VIR_CPU_TYPE_AUTO,
VIR_CPU_TYPE_LAST
};
} virCPUType;
VIR_ENUM_DECL(virCPU)
enum virCPUMode {
typedef enum {
VIR_CPU_MODE_CUSTOM,
VIR_CPU_MODE_HOST_MODEL,
VIR_CPU_MODE_HOST_PASSTHROUGH,
VIR_CPU_MODE_LAST
};
} virCPUMode;
VIR_ENUM_DECL(virCPUMode)
enum virCPUMatch {
typedef enum {
VIR_CPU_MATCH_MINIMUM,
VIR_CPU_MATCH_EXACT,
VIR_CPU_MATCH_STRICT,
VIR_CPU_MATCH_LAST
};
} virCPUMatch;
VIR_ENUM_DECL(virCPUMatch)
enum virCPUFallback {
typedef enum {
VIR_CPU_FALLBACK_ALLOW,
VIR_CPU_FALLBACK_FORBID,
VIR_CPU_FALLBACK_LAST
};
} virCPUFallback;
VIR_ENUM_DECL(virCPUFallback)
enum virCPUFeaturePolicy {
typedef enum {
VIR_CPU_FEATURE_FORCE,
VIR_CPU_FEATURE_REQUIRE,
VIR_CPU_FEATURE_OPTIONAL,
......@@ -79,7 +79,7 @@ enum virCPUFeaturePolicy {
VIR_CPU_FEATURE_FORBID,
VIR_CPU_FEATURE_LAST
};
} virCPUFeaturePolicy;
VIR_ENUM_DECL(virCPUFeaturePolicy)
......@@ -140,7 +140,7 @@ virCPUDefCopy(const virCPUDef *cpu);
virCPUDefPtr
virCPUDefParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt,
enum virCPUType mode);
virCPUType mode);
bool
virCPUDefIsEqual(virCPUDefPtr src,
......
......@@ -32,13 +32,13 @@
# include "virthread.h"
# include "virbuffer.h"
enum virDeviceAddressPCIMulti {
typedef enum {
VIR_DEVICE_ADDRESS_PCI_MULTI_DEFAULT = 0,
VIR_DEVICE_ADDRESS_PCI_MULTI_ON,
VIR_DEVICE_ADDRESS_PCI_MULTI_OFF,
VIR_DEVICE_ADDRESS_PCI_MULTI_LAST
};
} virDeviceAddressPCIMulti;
typedef struct _virDevicePCIAddress virDevicePCIAddress;
typedef virDevicePCIAddress *virDevicePCIAddressPtr;
......
......@@ -534,7 +534,7 @@ static int
ppcUpdate(virCPUDefPtr guest,
const virCPUDef *host)
{
switch ((enum virCPUMode) guest->mode) {
switch ((virCPUMode) guest->mode) {
case VIR_CPU_MODE_HOST_MODEL:
case VIR_CPU_MODE_HOST_PASSTHROUGH:
guest->match = VIR_CPU_MATCH_EXACT;
......
......@@ -1615,7 +1615,7 @@ x86DecodeCPUData(virCPUDefPtr cpu,
static virCPUx86Data *
x86EncodePolicy(const virCPUDef *cpu,
const struct x86_map *map,
enum virCPUFeaturePolicy policy)
virCPUFeaturePolicy policy)
{
struct x86_model *model;
virCPUx86Data *data = NULL;
......@@ -2045,7 +2045,7 @@ static int
x86Update(virCPUDefPtr guest,
const virCPUDef *host)
{
switch ((enum virCPUMode) guest->mode) {
switch ((virCPUMode) guest->mode) {
case VIR_CPU_MODE_CUSTOM:
return x86UpdateCustom(guest, host);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册