Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
32916b16
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
You need to sign in or sign up before continuing.
提交
32916b16
编写于
7月 08, 2016
作者:
F
Fabian Freyer
提交者:
Roman Bogorodskiy
7月 11, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bhyve: implement virConnectGetDomainCapabilities
上级
9bbb3676
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
99 addition
and
0 deletion
+99
-0
src/bhyve/bhyve_capabilities.c
src/bhyve/bhyve_capabilities.c
+26
-0
src/bhyve/bhyve_capabilities.h
src/bhyve/bhyve_capabilities.h
+5
-0
src/bhyve/bhyve_driver.c
src/bhyve/bhyve_driver.c
+68
-0
未找到文件。
src/bhyve/bhyve_capabilities.c
浏览文件 @
32916b16
...
...
@@ -3,6 +3,7 @@
*
* Copyright (C) 2014 Roman Bogorodskiy
* Copyright (C) 2014 Semihalf
* Copyright (C) 2016 Fabian Freyer
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
...
...
@@ -106,6 +107,31 @@ virBhyveCapsBuild(void)
return
NULL
;
}
virDomainCapsPtr
virBhyveDomainCapsBuild
(
const
char
*
emulatorbin
,
const
char
*
machine
,
virArch
arch
,
virDomainVirtType
virttype
)
{
virDomainCapsPtr
caps
=
NULL
;
if
(
!
(
caps
=
virDomainCapsNew
(
emulatorbin
,
machine
,
arch
,
virttype
)))
goto
cleanup
;
caps
->
os
.
supported
=
true
;
caps
->
disk
.
supported
=
true
;
VIR_DOMAIN_CAPS_ENUM_SET
(
caps
->
disk
.
diskDevice
,
VIR_DOMAIN_DISK_DEVICE_DISK
,
VIR_DOMAIN_DISK_DEVICE_CDROM
);
VIR_DOMAIN_CAPS_ENUM_SET
(
caps
->
disk
.
bus
,
VIR_DOMAIN_DISK_BUS_SATA
,
VIR_DOMAIN_DISK_BUS_VIRTIO
);
cleanup:
return
caps
;
}
int
virBhyveProbeGrubCaps
(
virBhyveGrubCapsFlags
*
caps
)
{
...
...
src/bhyve/bhyve_capabilities.h
浏览文件 @
32916b16
...
...
@@ -23,8 +23,13 @@
# define _BHYVE_CAPABILITIES
# include "capabilities.h"
# include "conf/domain_capabilities.h"
virCapsPtr
virBhyveCapsBuild
(
void
);
virDomainCapsPtr
virBhyveDomainCapsBuild
(
const
char
*
emulatorbin
,
const
char
*
machine
,
virArch
arch
,
virDomainVirtType
virttype
);
/* These are bit flags: */
typedef
enum
{
...
...
src/bhyve/bhyve_driver.c
浏览文件 @
32916b16
...
...
@@ -53,6 +53,7 @@
#include "nodeinfo.h"
#include "virhostcpu.h"
#include "virhostmem.h"
#include "conf/domain_capabilities.h"
#include "bhyve_device.h"
#include "bhyve_driver.h"
...
...
@@ -1572,6 +1573,72 @@ bhyveConnectDomainXMLFromNative(virConnectPtr conn,
return
xml
;
}
static
char
*
bhyveConnectGetDomainCapabilities
(
virConnectPtr
conn
,
const
char
*
emulatorbin
,
const
char
*
arch_str
,
const
char
*
machine
,
const
char
*
virttype_str
,
unsigned
int
flags
)
{
virDomainCapsPtr
caps
=
NULL
;
char
*
ret
=
NULL
;
int
virttype
=
VIR_DOMAIN_VIRT_BHYVE
;
int
arch
=
virArchFromHost
();
/* virArch */
virCheckFlags
(
0
,
ret
);
if
(
virConnectGetDomainCapabilitiesEnsureACL
(
conn
)
<
0
)
return
ret
;
if
(
virttype_str
&&
(
virttype
=
virDomainVirtTypeFromString
(
virttype_str
))
<
0
)
{
virReportError
(
VIR_ERR_INVALID_ARG
,
_
(
"unknown virttype: %s"
),
virttype_str
);
goto
cleanup
;
}
if
(
virttype
!=
VIR_DOMAIN_VIRT_BHYVE
)
{
virReportError
(
VIR_ERR_INVALID_ARG
,
_
(
"unknown virttype: %s"
),
virttype_str
);
goto
cleanup
;
}
if
(
arch_str
&&
(
arch
=
virArchFromString
(
arch_str
))
==
VIR_ARCH_NONE
)
{
virReportError
(
VIR_ERR_INVALID_ARG
,
_
(
"unknown architecture: %s"
),
arch_str
);
goto
cleanup
;
}
if
(
!
ARCH_IS_X86
(
arch
))
{
virReportError
(
VIR_ERR_NO_SUPPORT
,
_
(
"unsupported architecture: %s"
),
virArchToString
(
arch
));
goto
cleanup
;
}
if
(
emulatorbin
==
NULL
)
{
emulatorbin
=
"/usr/sbin/bhyve"
;
}
else
if
(
STRNEQ
(
emulatorbin
,
"/usr/sbin/bhyve"
))
{
virReportError
(
VIR_ERR_INVALID_ARG
,
_
(
"unknown emulator binary: %s"
),
emulatorbin
);
goto
cleanup
;
}
if
(
!
(
caps
=
virBhyveDomainCapsBuild
(
emulatorbin
,
machine
,
arch
,
virttype
)))
goto
cleanup
;
ret
=
virDomainCapsFormat
(
caps
);
cleanup:
virObjectUnref
(
caps
);
return
ret
;
}
static
virHypervisorDriver
bhyveHypervisorDriver
=
{
.
name
=
"bhyve"
,
.
connectOpen
=
bhyveConnectOpen
,
/* 1.2.2 */
...
...
@@ -1626,6 +1693,7 @@ static virHypervisorDriver bhyveHypervisorDriver = {
.
connectIsSecure
=
bhyveConnectIsSecure
,
/* 1.3.5 */
.
connectIsEncrypted
=
bhyveConnectIsEncrypted
,
/* 1.3.5 */
.
connectDomainXMLFromNative
=
bhyveConnectDomainXMLFromNative
,
/* 2.1.0 */
.
connectGetDomainCapabilities
=
bhyveConnectGetDomainCapabilities
,
/* 2.1.0 */
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录