External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Use enum for CPU model expansion type

Browse Source 
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2017-01-31 13:44:00 +01:00
parent f013828992
commit be3d59754b
5 changed files with 21 additions and 8 deletions

4
src/qemu/qemu_capabilities.c

@ -2863,7 +2863,9 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
model = "host"; model = "host";
} }
return qemuMonitorGetCPUModelExpansion(mon, "static", model, modelInfo); return qemuMonitorGetCPUModelExpansion(mon,
QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC,
model, modelInfo);
} }
struct tpmTypeToCaps { struct tpmTypeToCaps {

4
src/qemu/qemu_monitor.c

@ -3641,11 +3641,11 @@ qemuMonitorCPUDefInfoFree(qemuMonitorCPUDefInfoPtr cpu)
int int
qemuMonitorGetCPUModelExpansion(qemuMonitorPtr mon, qemuMonitorGetCPUModelExpansion(qemuMonitorPtr mon,
const char *type, qemuMonitorCPUModelExpansionType type,
const char *model_name, const char *model_name,
qemuMonitorCPUModelInfoPtr *model_info) qemuMonitorCPUModelInfoPtr *model_info)
{ {
VIR_DEBUG("type=%s model_name=%s", type, model_name); VIR_DEBUG("type=%d model_name=%s", type, model_name);
QEMU_CHECK_MONITOR_JSON(mon); QEMU_CHECK_MONITOR_JSON(mon);

6
src/qemu/qemu_monitor.h

@ -952,8 +952,12 @@ struct _qemuMonitorCPUModelInfo {
qemuMonitorCPUPropertyPtr props; qemuMonitorCPUPropertyPtr props;
}; };
typedef enum {
QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC,
} qemuMonitorCPUModelExpansionType;
int qemuMonitorGetCPUModelExpansion(qemuMonitorPtr mon, int qemuMonitorGetCPUModelExpansion(qemuMonitorPtr mon,
const char *type, qemuMonitorCPUModelExpansionType type,
const char *model_name, const char *model_name,
qemuMonitorCPUModelInfoPtr *model_info); qemuMonitorCPUModelInfoPtr *model_info);

11
src/qemu/qemu_monitor_json.c

@ -5026,7 +5026,7 @@ qemuMonitorJSONParseCPUModelProperty(const char *key,
int int
qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon, qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon,
const char *type, qemuMonitorCPUModelExpansionType type,
const char *model_name, const char *model_name,
qemuMonitorCPUModelInfoPtr *model_info) qemuMonitorCPUModelInfoPtr *model_info)
{ {
@ -5039,6 +5039,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon,
virJSONValuePtr cpu_props; virJSONValuePtr cpu_props;
qemuMonitorCPUModelInfoPtr machine_model = NULL; qemuMonitorCPUModelInfoPtr machine_model = NULL;
char const *cpu_name; char const *cpu_name;
const char *typeStr = "";
*model_info = NULL; *model_info = NULL;
@ -5048,8 +5049,14 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon,
if (virJSONValueObjectAppendString(model, "name", model_name) < 0) if (virJSONValueObjectAppendString(model, "name", model_name) < 0)
goto cleanup; goto cleanup;
switch (type) {
case QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC:
typeStr = "static";
break;
}
if (!(cmd = qemuMonitorJSONMakeCommand("query-cpu-model-expansion", if (!(cmd = qemuMonitorJSONMakeCommand("query-cpu-model-expansion",
"s:type", type, "s:type", typeStr,
"a:model", model, "a:model", model,
NULL))) NULL)))
goto cleanup; goto cleanup;

4
src/qemu/qemu_monitor_json.h

@ -354,10 +354,10 @@ int qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon,
ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(2);
int qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon, int qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon,
const char *type, qemuMonitorCPUModelExpansionType type,
const char *model_name, const char *model_name,
qemuMonitorCPUModelInfoPtr *model_info) qemuMonitorCPUModelInfoPtr *model_info)
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, int qemuMonitorJSONGetCommands(qemuMonitorPtr mon,
char ***commands) char ***commands)