mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 13:45:38 +00:00
qemu: Make virtType of type virDomainVirtType
Earlier virtType was of type int. After, introducing the enum VIR_DOMAIN_VIRT_NONE, the type of virtType is modified to virDomainVirtType.
This commit is contained in:
parent
62569e45ea
commit
7383b8cc06
@ -2192,7 +2192,7 @@ struct _virDomainKeyWrapDef {
|
|||||||
typedef struct _virDomainDef virDomainDef;
|
typedef struct _virDomainDef virDomainDef;
|
||||||
typedef virDomainDef *virDomainDefPtr;
|
typedef virDomainDef *virDomainDefPtr;
|
||||||
struct _virDomainDef {
|
struct _virDomainDef {
|
||||||
int virtType;
|
virDomainVirtType virtType;
|
||||||
int id;
|
int id;
|
||||||
unsigned char uuid[VIR_UUID_BUFLEN];
|
unsigned char uuid[VIR_UUID_BUFLEN];
|
||||||
char *name;
|
char *name;
|
||||||
|
@ -1635,7 +1635,7 @@ qemuMonitorSetLink(qemuMonitorPtr mon,
|
|||||||
|
|
||||||
int
|
int
|
||||||
qemuMonitorGetVirtType(qemuMonitorPtr mon,
|
qemuMonitorGetVirtType(qemuMonitorPtr mon,
|
||||||
int *virtType)
|
virDomainVirtType *virtType)
|
||||||
{
|
{
|
||||||
QEMU_CHECK_MONITOR(mon);
|
QEMU_CHECK_MONITOR(mon);
|
||||||
|
|
||||||
|
@ -360,7 +360,7 @@ int qemuMonitorSystemPowerdown(qemuMonitorPtr mon);
|
|||||||
int qemuMonitorGetCPUInfo(qemuMonitorPtr mon,
|
int qemuMonitorGetCPUInfo(qemuMonitorPtr mon,
|
||||||
int **pids);
|
int **pids);
|
||||||
int qemuMonitorGetVirtType(qemuMonitorPtr mon,
|
int qemuMonitorGetVirtType(qemuMonitorPtr mon,
|
||||||
int *virtType);
|
virDomainVirtType *virtType);
|
||||||
int qemuMonitorGetBalloonInfo(qemuMonitorPtr mon,
|
int qemuMonitorGetBalloonInfo(qemuMonitorPtr mon,
|
||||||
unsigned long long *currmem);
|
unsigned long long *currmem);
|
||||||
int qemuMonitorGetMemoryStats(qemuMonitorPtr mon,
|
int qemuMonitorGetMemoryStats(qemuMonitorPtr mon,
|
||||||
|
@ -1339,7 +1339,7 @@ int qemuMonitorJSONGetCPUInfo(qemuMonitorPtr mon,
|
|||||||
|
|
||||||
|
|
||||||
int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon,
|
int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon,
|
||||||
int *virtType)
|
virDomainVirtType *virtType)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-kvm",
|
virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-kvm",
|
||||||
|
@ -56,7 +56,7 @@ int qemuMonitorJSONSystemReset(qemuMonitorPtr mon);
|
|||||||
int qemuMonitorJSONGetCPUInfo(qemuMonitorPtr mon,
|
int qemuMonitorJSONGetCPUInfo(qemuMonitorPtr mon,
|
||||||
int **pids);
|
int **pids);
|
||||||
int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon,
|
int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon,
|
||||||
int *virtType);
|
virDomainVirtType *virtType);
|
||||||
int qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon,
|
int qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon,
|
||||||
virDomainVideoDefPtr video,
|
virDomainVideoDefPtr video,
|
||||||
char *path);
|
char *path);
|
||||||
|
@ -564,7 +564,7 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon,
|
|||||||
|
|
||||||
|
|
||||||
int qemuMonitorTextGetVirtType(qemuMonitorPtr mon,
|
int qemuMonitorTextGetVirtType(qemuMonitorPtr mon,
|
||||||
int *virtType)
|
virDomainVirtType *virtType)
|
||||||
{
|
{
|
||||||
char *reply = NULL;
|
char *reply = NULL;
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ int qemuMonitorTextSystemReset(qemuMonitorPtr mon);
|
|||||||
int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon,
|
int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon,
|
||||||
int **pids);
|
int **pids);
|
||||||
int qemuMonitorTextGetVirtType(qemuMonitorPtr mon,
|
int qemuMonitorTextGetVirtType(qemuMonitorPtr mon,
|
||||||
int *virtType);
|
virDomainVirtType *virtType);
|
||||||
int qemuMonitorTextGetBalloonInfo(qemuMonitorPtr mon,
|
int qemuMonitorTextGetBalloonInfo(qemuMonitorPtr mon,
|
||||||
unsigned long long *currmem);
|
unsigned long long *currmem);
|
||||||
int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon,
|
int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon,
|
||||||
|
@ -1311,7 +1311,7 @@ testQemuMonitorJSONqemuMonitorJSONGetVirtType(const void *data)
|
|||||||
virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data;
|
virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data;
|
||||||
qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt);
|
qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt);
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
int virtType;
|
virDomainVirtType virtType;
|
||||||
|
|
||||||
if (!test)
|
if (!test)
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user