提交 6202b723 编写于 作者: M Maxim Nestratov

vz: implement connectGetSysinfo hypervisor callback

Signed-off-by: NMaxim Nestratov <mnestratov@virtuozzo.com>
上级 eb5e9c1e
...@@ -179,6 +179,7 @@ static void vzDriverDispose(void * obj) ...@@ -179,6 +179,7 @@ static void vzDriverDispose(void * obj)
virObjectUnref(driver->caps); virObjectUnref(driver->caps);
virObjectUnref(driver->xmlopt); virObjectUnref(driver->xmlopt);
virObjectEventStateFree(driver->domainEventState); virObjectEventStateFree(driver->domainEventState);
virSysinfoDefFree(driver->hostsysinfo);
} }
static int vzDriverOnceInit(void) static int vzDriverOnceInit(void)
...@@ -312,6 +313,7 @@ vzDriverObjNew(void) ...@@ -312,6 +313,7 @@ vzDriverObjNew(void)
return NULL; return NULL;
} }
driver->hostsysinfo = virSysinfoRead();
ignore_value(prlsdkLoadDomains(driver)); ignore_value(prlsdkLoadDomains(driver));
return driver; return driver;
} }
...@@ -421,6 +423,28 @@ static char *vzConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) ...@@ -421,6 +423,28 @@ static char *vzConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED)
return virGetHostname(); return virGetHostname();
} }
static char *
vzConnectGetSysinfo(virConnectPtr conn, unsigned int flags)
{
vzConnPtr privconn = conn->privateData;
vzDriverPtr driver = privconn->driver;
virBuffer buf = VIR_BUFFER_INITIALIZER;
virCheckFlags(0, NULL);
if (!driver->hostsysinfo) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Host SMBIOS information is not available"));
return NULL;
}
if (virSysinfoFormat(&buf, driver->hostsysinfo) < 0)
return NULL;
if (virBufferCheckError(&buf) < 0)
return NULL;
return virBufferContentAndReset(&buf);
}
static int static int
vzConnectListDomains(virConnectPtr conn, int *ids, int maxids) vzConnectListDomains(virConnectPtr conn, int *ids, int maxids)
...@@ -1576,6 +1600,7 @@ static virHypervisorDriver vzHypervisorDriver = { ...@@ -1576,6 +1600,7 @@ static virHypervisorDriver vzHypervisorDriver = {
.connectClose = vzConnectClose, /* 0.10.0 */ .connectClose = vzConnectClose, /* 0.10.0 */
.connectGetVersion = vzConnectGetVersion, /* 0.10.0 */ .connectGetVersion = vzConnectGetVersion, /* 0.10.0 */
.connectGetHostname = vzConnectGetHostname, /* 0.10.0 */ .connectGetHostname = vzConnectGetHostname, /* 0.10.0 */
.connectGetSysinfo = vzConnectGetSysinfo, /* 1.3.4 */
.connectGetMaxVcpus = vzConnectGetMaxVcpus, /* 1.2.21 */ .connectGetMaxVcpus = vzConnectGetMaxVcpus, /* 1.2.21 */
.nodeGetInfo = vzNodeGetInfo, /* 0.10.0 */ .nodeGetInfo = vzNodeGetInfo, /* 0.10.0 */
.nodeGetCPUStats = vzNodeGetCPUStats, /* 1.2.21 */ .nodeGetCPUStats = vzNodeGetCPUStats, /* 1.2.21 */
......
...@@ -70,6 +70,7 @@ struct _vzDriver { ...@@ -70,6 +70,7 @@ struct _vzDriver {
virCapsPtr caps; virCapsPtr caps;
virDomainXMLOptionPtr xmlopt; virDomainXMLOptionPtr xmlopt;
virObjectEventStatePtr domainEventState; virObjectEventStatePtr domainEventState;
virSysinfoDefPtr hostsysinfo;
unsigned long vzVersion; unsigned long vzVersion;
vzCapabilities vzCaps; vzCapabilities vzCaps;
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册