Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
bd8f10c6
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看板
提交
bd8f10c6
编写于
2月 10, 2017
作者:
P
Peter Krempa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
test: qemuhotplugtest: Add testing of individual vcpu hotplug
Test that the vcpu entity selection code works properly
上级
f557b335
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
945 addition
and
0 deletion
+945
-0
tests/qemuhotplugtest.c
tests/qemuhotplugtest.c
+63
-0
tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml
tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml
+20
-0
tests/qemuhotplugtestcpus/ppc64-modern-individual-monitor.json
.../qemuhotplugtestcpus/ppc64-modern-individual-monitor.json
+318
-0
tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
...muhotplugtestcpus/ppc64-modern-individual-result-conf.xml
+64
-0
tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
...muhotplugtestcpus/ppc64-modern-individual-result-live.xml
+72
-0
tests/qemuhotplugtestcpus/x86-modern-individual-add-domain.xml
.../qemuhotplugtestcpus/x86-modern-individual-add-domain.xml
+21
-0
tests/qemuhotplugtestcpus/x86-modern-individual-add-monitor.json
...emuhotplugtestcpus/x86-modern-individual-add-monitor.json
+299
-0
tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
...hotplugtestcpus/x86-modern-individual-add-result-conf.xml
+40
-0
tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
...hotplugtestcpus/x86-modern-individual-add-result-live.xml
+48
-0
未找到文件。
tests/qemuhotplugtest.c
浏览文件 @
bd8f10c6
...
...
@@ -493,6 +493,8 @@ testQemuHotplugCpuFinalize(struct testQemuHotplugCpuData *data)
struct
testQemuHotplugCpuParams
{
const
char
*
test
;
int
newcpus
;
const
char
*
cpumap
;
bool
state
;
bool
modern
;
bool
fail
;
};
...
...
@@ -533,6 +535,46 @@ testQemuHotplugCpuGroup(const void *opaque)
}
static
int
testQemuHotplugCpuIndividual
(
const
void
*
opaque
)
{
const
struct
testQemuHotplugCpuParams
*
params
=
opaque
;
struct
testQemuHotplugCpuData
*
data
=
NULL
;
virBitmapPtr
map
=
NULL
;
int
ret
=
-
1
;
int
rc
;
if
(
!
(
data
=
testQemuHotplugCpuPrepare
(
params
->
test
,
params
->
modern
)))
return
-
1
;
if
(
virBitmapParse
(
params
->
cpumap
,
&
map
,
128
)
<
0
)
goto
cleanup
;
rc
=
qemuDomainSetVcpuInternal
(
&
driver
,
data
->
vm
,
data
->
vm
->
def
,
data
->
vm
->
newDef
,
map
,
params
->
state
);
if
(
params
->
fail
)
{
if
(
rc
==
0
)
fprintf
(
stderr
,
"cpu test '%s' should have failed
\n
"
,
params
->
test
);
else
ret
=
0
;
goto
cleanup
;
}
else
{
if
(
rc
<
0
)
goto
cleanup
;
}
ret
=
testQemuHotplugCpuFinalize
(
data
);
cleanup:
virBitmapFree
(
map
);
testQemuHotplugCpuDataFree
(
data
);
return
ret
;
}
static
int
mymain
(
void
)
{
...
...
@@ -789,6 +831,27 @@ mymain(void)
DO_TEST_CPU_GROUP
(
"ppc64-modern-bulk"
,
23
,
true
,
true
);
DO_TEST_CPU_GROUP
(
"ppc64-modern-bulk"
,
25
,
true
,
true
);
#define DO_TEST_CPU_INDIVIDUAL(prefix, mapstr, statefl, modernhp, expectfail) \
do { \
cpudata.test = prefix; \
cpudata.cpumap = mapstr; \
cpudata.state = statefl; \
cpudata.modern = modernhp; \
cpudata.fail = expectfail; \
if (virTestRun("hotplug vcpus group " prefix, \
testQemuHotplugCpuIndividual, &cpudata) < 0) \
ret = -1; \
} while (0)
DO_TEST_CPU_INDIVIDUAL
(
"x86-modern-individual-add"
,
"7"
,
true
,
true
,
false
);
DO_TEST_CPU_INDIVIDUAL
(
"x86-modern-individual-add"
,
"6,7"
,
true
,
true
,
true
);
DO_TEST_CPU_INDIVIDUAL
(
"x86-modern-individual-add"
,
"7"
,
false
,
true
,
true
);
DO_TEST_CPU_INDIVIDUAL
(
"x86-modern-individual-add"
,
"7"
,
true
,
false
,
true
);
DO_TEST_CPU_INDIVIDUAL
(
"ppc64-modern-individual"
,
"16-23"
,
true
,
true
,
false
);
DO_TEST_CPU_INDIVIDUAL
(
"ppc64-modern-individual"
,
"16-22"
,
true
,
true
,
true
);
DO_TEST_CPU_INDIVIDUAL
(
"ppc64-modern-individual"
,
"17"
,
true
,
true
,
true
);
qemuTestDriverFree
(
&
driver
);
return
(
ret
==
0
)
?
EXIT_SUCCESS
:
EXIT_FAILURE
;
}
...
...
tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml
0 → 100644
浏览文件 @
bd8f10c6
<domain
type=
'qemu'
>
<name>
QEMUGuest1
</name>
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
219100
</memory>
<currentMemory
unit=
'KiB'
>
219100
</currentMemory>
<vcpu
placement=
'static'
current=
'8'
>
32
</vcpu>
<os>
<type
arch=
'x86_64'
machine=
'pc'
>
hvm
</type>
<boot
dev=
'network'
/>
</os>
<cpu>
<topology
sockets=
"1"
cores=
"4"
threads=
"8"
/>
</cpu>
<on_poweroff>
destroy
</on_poweroff>
<on_reboot>
restart
</on_reboot>
<on_crash>
destroy
</on_crash>
<devices>
<emulator>
/usr/bin/qemu
</emulator>
</devices>
</domain>
tests/qemuhotplugtestcpus/ppc64-modern-individual-monitor.json
0 → 100644
浏览文件 @
bd8f10c6
{
"execute"
:
"query-hotpluggable-cpus"
,
"id"
:
"libvirt-1"
}
{
"return"
:
[
{
"props"
:
{
"core-id"
:
24
},
"vcpus-count"
:
8
,
"type"
:
"host-spapr-cpu-core"
},
{
"props"
:
{
"core-id"
:
16
},
"vcpus-count"
:
8
,
"type"
:
"host-spapr-cpu-core"
},
{
"props"
:
{
"core-id"
:
8
},
"vcpus-count"
:
8
,
"type"
:
"host-spapr-cpu-core"
},
{
"props"
:
{
"core-id"
:
0
},
"vcpus-count"
:
8
,
"qom-path"
:
"/machine/unattached/device[1]"
,
"type"
:
"host-spapr-cpu-core"
}
],
"id"
:
"libvirt-15"
}
{
"execute"
:
"query-cpus"
,
"id"
:
"libvirt-2"
}
{
"return"
:
[
{
"arch"
:
"ppc"
,
"current"
:
true
,
"CPU"
:
0
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[0]"
,
"halted"
:
false
,
"thread_id"
:
21925
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
1
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[1]"
,
"halted"
:
false
,
"thread_id"
:
21926
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
2
,
"nip"
:
-4611686018422360608
,
"qom_path"
:
"/machine/unattached/device[1]/thread[2]"
,
"halted"
:
false
,
"thread_id"
:
21927
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
3
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[3]"
,
"halted"
:
false
,
"thread_id"
:
21928
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
4
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[4]"
,
"halted"
:
false
,
"thread_id"
:
21930
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
5
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[5]"
,
"halted"
:
false
,
"thread_id"
:
21931
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
6
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[6]"
,
"halted"
:
false
,
"thread_id"
:
21932
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
7
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[7]"
,
"halted"
:
false
,
"thread_id"
:
21933
}
],
"id"
:
"libvirt-12"
}
{
"execute"
:
"device_add"
,
"arguments"
:
{
"driver"
:
"host-spapr-cpu-core"
,
"id"
:
"vcpu16"
,
"core-id"
:
16
},
"id"
:
"libvirt-3"
}
{
"return"
:
{}}
{
"execute"
:
"query-hotpluggable-cpus"
,
"id"
:
"libvirt-4"
}
{
"return"
:
[
{
"props"
:
{
"core-id"
:
24
},
"vcpus-count"
:
8
,
"type"
:
"host-spapr-cpu-core"
},
{
"props"
:
{
"core-id"
:
16
},
"vcpus-count"
:
8
,
"qom-path"
:
"/machine/peripheral/vcpu16"
,
"type"
:
"host-spapr-cpu-core"
},
{
"props"
:
{
"core-id"
:
8
},
"vcpus-count"
:
8
,
"type"
:
"host-spapr-cpu-core"
},
{
"props"
:
{
"core-id"
:
0
},
"vcpus-count"
:
8
,
"qom-path"
:
"/machine/unattached/device[1]"
,
"type"
:
"host-spapr-cpu-core"
}
],
"id"
:
"libvirt-15"
}
{
"execute"
:
"query-cpus"
,
"id"
:
"libvirt-5"
}
{
"return"
:
[
{
"arch"
:
"ppc"
,
"current"
:
true
,
"CPU"
:
0
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[0]"
,
"halted"
:
false
,
"thread_id"
:
21925
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
1
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[1]"
,
"halted"
:
false
,
"thread_id"
:
21926
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
2
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[2]"
,
"halted"
:
false
,
"thread_id"
:
21927
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
3
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[3]"
,
"halted"
:
false
,
"thread_id"
:
21928
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
4
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[4]"
,
"halted"
:
false
,
"thread_id"
:
21930
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
5
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[5]"
,
"halted"
:
false
,
"thread_id"
:
21931
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
6
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[6]"
,
"halted"
:
false
,
"thread_id"
:
21932
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
7
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/unattached/device[1]/thread[7]"
,
"halted"
:
false
,
"thread_id"
:
21933
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
8
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/peripheral/vcpu16/thread[0]"
,
"halted"
:
false
,
"thread_id"
:
22131
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
9
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/peripheral/vcpu16/thread[1]"
,
"halted"
:
false
,
"thread_id"
:
22132
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
10
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/peripheral/vcpu16/thread[2]"
,
"halted"
:
false
,
"thread_id"
:
22133
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
11
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/peripheral/vcpu16/thread[3]"
,
"halted"
:
false
,
"thread_id"
:
22134
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
12
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/peripheral/vcpu16/thread[4]"
,
"halted"
:
false
,
"thread_id"
:
22135
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
13
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/peripheral/vcpu16/thread[5]"
,
"halted"
:
false
,
"thread_id"
:
22136
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
14
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/peripheral/vcpu16/thread[6]"
,
"halted"
:
false
,
"thread_id"
:
22137
},
{
"arch"
:
"ppc"
,
"current"
:
false
,
"CPU"
:
15
,
"nip"
:
-4611686018426772172
,
"qom_path"
:
"/machine/peripheral/vcpu16/thread[7]"
,
"halted"
:
false
,
"thread_id"
:
22138
}
],
"id"
:
"libvirt-14"
}
tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
0 → 100644
浏览文件 @
bd8f10c6
<domain
type=
'qemu'
>
<name>
QEMUGuest1
</name>
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
219100
</memory>
<currentMemory
unit=
'KiB'
>
219100
</currentMemory>
<vcpu
placement=
'static'
current=
'16'
>
32
</vcpu>
<vcpus>
<vcpu
id=
'0'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'1'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'2'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'3'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'4'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'5'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'6'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'7'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'8'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'9'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'10'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'11'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'12'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'13'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'14'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'15'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'16'
enabled=
'yes'
hotpluggable=
'yes'
/>
<vcpu
id=
'17'
enabled=
'yes'
hotpluggable=
'yes'
/>
<vcpu
id=
'18'
enabled=
'yes'
hotpluggable=
'yes'
/>
<vcpu
id=
'19'
enabled=
'yes'
hotpluggable=
'yes'
/>
<vcpu
id=
'20'
enabled=
'yes'
hotpluggable=
'yes'
/>
<vcpu
id=
'21'
enabled=
'yes'
hotpluggable=
'yes'
/>
<vcpu
id=
'22'
enabled=
'yes'
hotpluggable=
'yes'
/>
<vcpu
id=
'23'
enabled=
'yes'
hotpluggable=
'yes'
/>
<vcpu
id=
'24'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'25'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'26'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'27'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'28'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'29'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'30'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'31'
enabled=
'no'
hotpluggable=
'yes'
/>
</vcpus>
<os>
<type
arch=
'x86_64'
machine=
'pc'
>
hvm
</type>
<boot
dev=
'network'
/>
</os>
<cpu>
<topology
sockets=
'1'
cores=
'4'
threads=
'8'
/>
</cpu>
<clock
offset=
'utc'
/>
<on_poweroff>
destroy
</on_poweroff>
<on_reboot>
restart
</on_reboot>
<on_crash>
destroy
</on_crash>
<devices>
<emulator>
/usr/bin/qemu
</emulator>
<controller
type=
'usb'
index=
'0'
>
<address
type=
'pci'
domain=
'0x0000'
bus=
'0x00'
slot=
'0x01'
function=
'0x2'
/>
</controller>
<controller
type=
'pci'
index=
'0'
model=
'pci-root'
/>
<input
type=
'mouse'
bus=
'ps2'
/>
<input
type=
'keyboard'
bus=
'ps2'
/>
<memballoon
model=
'virtio'
>
<address
type=
'pci'
domain=
'0x0000'
bus=
'0x00'
slot=
'0x03'
function=
'0x0'
/>
</memballoon>
</devices>
</domain>
tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
0 → 100644
浏览文件 @
bd8f10c6
<domain
type=
'qemu'
id=
'7'
>
<name>
QEMUGuest1
</name>
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
219100
</memory>
<currentMemory
unit=
'KiB'
>
219100
</currentMemory>
<vcpu
placement=
'static'
current=
'16'
>
32
</vcpu>
<vcpus>
<vcpu
id=
'0'
enabled=
'yes'
hotpluggable=
'no'
order=
'1'
/>
<vcpu
id=
'1'
enabled=
'yes'
hotpluggable=
'no'
order=
'1'
/>
<vcpu
id=
'2'
enabled=
'yes'
hotpluggable=
'no'
order=
'1'
/>
<vcpu
id=
'3'
enabled=
'yes'
hotpluggable=
'no'
order=
'1'
/>
<vcpu
id=
'4'
enabled=
'yes'
hotpluggable=
'no'
order=
'1'
/>
<vcpu
id=
'5'
enabled=
'yes'
hotpluggable=
'no'
order=
'1'
/>
<vcpu
id=
'6'
enabled=
'yes'
hotpluggable=
'no'
order=
'1'
/>
<vcpu
id=
'7'
enabled=
'yes'
hotpluggable=
'no'
order=
'1'
/>
<vcpu
id=
'8'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'9'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'10'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'11'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'12'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'13'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'14'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'15'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'16'
enabled=
'yes'
hotpluggable=
'yes'
order=
'2'
/>
<vcpu
id=
'17'
enabled=
'yes'
hotpluggable=
'yes'
order=
'2'
/>
<vcpu
id=
'18'
enabled=
'yes'
hotpluggable=
'yes'
order=
'2'
/>
<vcpu
id=
'19'
enabled=
'yes'
hotpluggable=
'yes'
order=
'2'
/>
<vcpu
id=
'20'
enabled=
'yes'
hotpluggable=
'yes'
order=
'2'
/>
<vcpu
id=
'21'
enabled=
'yes'
hotpluggable=
'yes'
order=
'2'
/>
<vcpu
id=
'22'
enabled=
'yes'
hotpluggable=
'yes'
order=
'2'
/>
<vcpu
id=
'23'
enabled=
'yes'
hotpluggable=
'yes'
order=
'2'
/>
<vcpu
id=
'24'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'25'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'26'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'27'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'28'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'29'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'30'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'31'
enabled=
'no'
hotpluggable=
'yes'
/>
</vcpus>
<os>
<type
arch=
'x86_64'
machine=
'pc'
>
hvm
</type>
<boot
dev=
'network'
/>
</os>
<cpu>
<topology
sockets=
'1'
cores=
'4'
threads=
'8'
/>
</cpu>
<clock
offset=
'utc'
/>
<on_poweroff>
destroy
</on_poweroff>
<on_reboot>
restart
</on_reboot>
<on_crash>
destroy
</on_crash>
<devices>
<emulator>
/usr/bin/qemu
</emulator>
<controller
type=
'usb'
index=
'0'
>
<alias
name=
'usb'
/>
<address
type=
'pci'
domain=
'0x0000'
bus=
'0x00'
slot=
'0x01'
function=
'0x2'
/>
</controller>
<controller
type=
'pci'
index=
'0'
model=
'pci-root'
>
<alias
name=
'pci'
/>
</controller>
<input
type=
'mouse'
bus=
'ps2'
>
<alias
name=
'input0'
/>
</input>
<input
type=
'keyboard'
bus=
'ps2'
>
<alias
name=
'input1'
/>
</input>
<memballoon
model=
'virtio'
>
<alias
name=
'balloon0'
/>
<address
type=
'pci'
domain=
'0x0000'
bus=
'0x00'
slot=
'0x03'
function=
'0x0'
/>
</memballoon>
</devices>
</domain>
tests/qemuhotplugtestcpus/x86-modern-individual-add-domain.xml
0 → 100644
浏览文件 @
bd8f10c6
<domain
type=
'qemu'
>
<name>
QEMUGuest1
</name>
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
219100
</memory>
<currentMemory
unit=
'KiB'
>
219100
</currentMemory>
<vcpu
placement=
'static'
current=
'5'
>
8
</vcpu>
<os>
<type
arch=
'x86_64'
machine=
'pc'
>
hvm
</type>
<boot
dev=
'network'
/>
</os>
<cpu>
<topology
sockets=
"4"
cores=
"2"
threads=
"1"
/>
</cpu>
<clock
offset=
'utc'
/>
<on_poweroff>
destroy
</on_poweroff>
<on_reboot>
restart
</on_reboot>
<on_crash>
destroy
</on_crash>
<devices>
<emulator>
/usr/bin/qemu
</emulator>
</devices>
</domain>
tests/qemuhotplugtestcpus/x86-modern-individual-add-monitor.json
0 → 100644
浏览文件 @
bd8f10c6
{
"execute"
:
"query-hotpluggable-cpus"
,
"id"
:
"libvirt-1"
}
{
"return"
:
[
{
"props"
:
{
"core-id"
:
1
,
"thread-id"
:
1
,
"socket-id"
:
1
},
"vcpus-count"
:
1
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
1
,
"thread-id"
:
0
,
"socket-id"
:
1
},
"vcpus-count"
:
1
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
0
,
"thread-id"
:
1
,
"socket-id"
:
1
},
"vcpus-count"
:
1
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
0
,
"thread-id"
:
0
,
"socket-id"
:
1
},
"vcpus-count"
:
1
,
"qom-path"
:
"/machine/unattached/device[5]"
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
1
,
"thread-id"
:
1
,
"socket-id"
:
0
},
"vcpus-count"
:
1
,
"qom-path"
:
"/machine/unattached/device[4]"
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
1
,
"thread-id"
:
0
,
"socket-id"
:
0
},
"vcpus-count"
:
1
,
"qom-path"
:
"/machine/unattached/device[3]"
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
0
,
"thread-id"
:
1
,
"socket-id"
:
0
},
"vcpus-count"
:
1
,
"qom-path"
:
"/machine/unattached/device[2]"
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
0
,
"thread-id"
:
0
,
"socket-id"
:
0
},
"vcpus-count"
:
1
,
"qom-path"
:
"/machine/unattached/device[0]"
,
"type"
:
"qemu64-x86_64-cpu"
}
],
"id"
:
"libvirt-23"
}
{
"execute"
:
"query-cpus"
,
"id"
:
"libvirt-2"
}
{
"return"
:
[
{
"arch"
:
"x86"
,
"current"
:
true
,
"CPU"
:
0
,
"qom_path"
:
"/machine/unattached/device[0]"
,
"pc"
:
-2130415978
,
"halted"
:
true
,
"thread_id"
:
518291
},
{
"arch"
:
"x86"
,
"current"
:
false
,
"CPU"
:
1
,
"qom_path"
:
"/machine/unattached/device[2]"
,
"pc"
:
-2130415978
,
"halted"
:
true
,
"thread_id"
:
518292
},
{
"arch"
:
"x86"
,
"current"
:
false
,
"CPU"
:
2
,
"qom_path"
:
"/machine/unattached/device[3]"
,
"pc"
:
-2130415978
,
"halted"
:
true
,
"thread_id"
:
518294
},
{
"arch"
:
"x86"
,
"current"
:
false
,
"CPU"
:
3
,
"qom_path"
:
"/machine/unattached/device[4]"
,
"pc"
:
-2130415978
,
"halted"
:
true
,
"thread_id"
:
518295
},
{
"arch"
:
"x86"
,
"current"
:
false
,
"CPU"
:
4
,
"qom_path"
:
"/machine/unattached/device[5]"
,
"pc"
:
-2130415978
,
"halted"
:
true
,
"thread_id"
:
518296
}
],
"id"
:
"libvirt-22"
}
{
"execute"
:
"device_add"
,
"arguments"
:
{
"driver"
:
"qemu64-x86_64-cpu"
,
"id"
:
"vcpu7"
,
"socket-id"
:
1
,
"core-id"
:
1
,
"thread-id"
:
1
},
"id"
:
"libvirt-3"
}
{
"return"
:
{}}
{
"execute"
:
"query-hotpluggable-cpus"
,
"id"
:
"libvirt-4"
}
{
"return"
:
[
{
"props"
:
{
"core-id"
:
1
,
"thread-id"
:
1
,
"socket-id"
:
1
},
"vcpus-count"
:
1
,
"qom-path"
:
"/machine/peripheral/vcpu7"
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
1
,
"thread-id"
:
0
,
"socket-id"
:
1
},
"vcpus-count"
:
1
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
0
,
"thread-id"
:
1
,
"socket-id"
:
1
},
"vcpus-count"
:
1
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
0
,
"thread-id"
:
0
,
"socket-id"
:
1
},
"vcpus-count"
:
1
,
"qom-path"
:
"/machine/unattached/device[5]"
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
1
,
"thread-id"
:
1
,
"socket-id"
:
0
},
"vcpus-count"
:
1
,
"qom-path"
:
"/machine/unattached/device[4]"
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
1
,
"thread-id"
:
0
,
"socket-id"
:
0
},
"vcpus-count"
:
1
,
"qom-path"
:
"/machine/unattached/device[3]"
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
0
,
"thread-id"
:
1
,
"socket-id"
:
0
},
"vcpus-count"
:
1
,
"qom-path"
:
"/machine/unattached/device[2]"
,
"type"
:
"qemu64-x86_64-cpu"
},
{
"props"
:
{
"core-id"
:
0
,
"thread-id"
:
0
,
"socket-id"
:
0
},
"vcpus-count"
:
1
,
"qom-path"
:
"/machine/unattached/device[0]"
,
"type"
:
"qemu64-x86_64-cpu"
}
],
"id"
:
"libvirt-23"
}
{
"execute"
:
"query-cpus"
,
"id"
:
"libvirt-5"
}
{
"return"
:
[
{
"arch"
:
"x86"
,
"current"
:
true
,
"CPU"
:
0
,
"qom_path"
:
"/machine/unattached/device[0]"
,
"pc"
:
-2130415978
,
"halted"
:
true
,
"thread_id"
:
518291
},
{
"arch"
:
"x86"
,
"current"
:
false
,
"CPU"
:
1
,
"qom_path"
:
"/machine/unattached/device[2]"
,
"pc"
:
-2130415978
,
"halted"
:
true
,
"thread_id"
:
518292
},
{
"arch"
:
"x86"
,
"current"
:
false
,
"CPU"
:
2
,
"qom_path"
:
"/machine/unattached/device[3]"
,
"pc"
:
-2130415978
,
"halted"
:
true
,
"thread_id"
:
518294
},
{
"arch"
:
"x86"
,
"current"
:
false
,
"CPU"
:
3
,
"qom_path"
:
"/machine/unattached/device[4]"
,
"pc"
:
-2130415978
,
"halted"
:
true
,
"thread_id"
:
518295
},
{
"arch"
:
"x86"
,
"current"
:
false
,
"CPU"
:
4
,
"qom_path"
:
"/machine/unattached/device[5]"
,
"pc"
:
-2130415978
,
"halted"
:
true
,
"thread_id"
:
518296
},
{
"arch"
:
"x86"
,
"current"
:
false
,
"CPU"
:
5
,
"qom_path"
:
"/machine/peripheral/vcpu7"
,
"pc"
:
-2130415978
,
"halted"
:
true
,
"thread_id"
:
518297
}
],
"id"
:
"libvirt-22"
}
tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
0 → 100644
浏览文件 @
bd8f10c6
<domain
type=
'qemu'
>
<name>
QEMUGuest1
</name>
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
219100
</memory>
<currentMemory
unit=
'KiB'
>
219100
</currentMemory>
<vcpu
placement=
'static'
current=
'6'
>
8
</vcpu>
<vcpus>
<vcpu
id=
'0'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'1'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'2'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'3'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'4'
enabled=
'yes'
hotpluggable=
'no'
/>
<vcpu
id=
'5'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'6'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'7'
enabled=
'yes'
hotpluggable=
'yes'
/>
</vcpus>
<os>
<type
arch=
'x86_64'
machine=
'pc'
>
hvm
</type>
<boot
dev=
'network'
/>
</os>
<cpu>
<topology
sockets=
'4'
cores=
'2'
threads=
'1'
/>
</cpu>
<clock
offset=
'utc'
/>
<on_poweroff>
destroy
</on_poweroff>
<on_reboot>
restart
</on_reboot>
<on_crash>
destroy
</on_crash>
<devices>
<emulator>
/usr/bin/qemu
</emulator>
<controller
type=
'usb'
index=
'0'
>
<address
type=
'pci'
domain=
'0x0000'
bus=
'0x00'
slot=
'0x01'
function=
'0x2'
/>
</controller>
<controller
type=
'pci'
index=
'0'
model=
'pci-root'
/>
<input
type=
'mouse'
bus=
'ps2'
/>
<input
type=
'keyboard'
bus=
'ps2'
/>
<memballoon
model=
'virtio'
>
<address
type=
'pci'
domain=
'0x0000'
bus=
'0x00'
slot=
'0x03'
function=
'0x0'
/>
</memballoon>
</devices>
</domain>
tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
0 → 100644
浏览文件 @
bd8f10c6
<domain
type=
'qemu'
id=
'7'
>
<name>
QEMUGuest1
</name>
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
219100
</memory>
<currentMemory
unit=
'KiB'
>
219100
</currentMemory>
<vcpu
placement=
'static'
current=
'6'
>
8
</vcpu>
<vcpus>
<vcpu
id=
'0'
enabled=
'yes'
hotpluggable=
'no'
order=
'1'
/>
<vcpu
id=
'1'
enabled=
'yes'
hotpluggable=
'no'
order=
'2'
/>
<vcpu
id=
'2'
enabled=
'yes'
hotpluggable=
'no'
order=
'3'
/>
<vcpu
id=
'3'
enabled=
'yes'
hotpluggable=
'no'
order=
'4'
/>
<vcpu
id=
'4'
enabled=
'yes'
hotpluggable=
'no'
order=
'5'
/>
<vcpu
id=
'5'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'6'
enabled=
'no'
hotpluggable=
'yes'
/>
<vcpu
id=
'7'
enabled=
'yes'
hotpluggable=
'yes'
order=
'6'
/>
</vcpus>
<os>
<type
arch=
'x86_64'
machine=
'pc'
>
hvm
</type>
<boot
dev=
'network'
/>
</os>
<cpu>
<topology
sockets=
'4'
cores=
'2'
threads=
'1'
/>
</cpu>
<clock
offset=
'utc'
/>
<on_poweroff>
destroy
</on_poweroff>
<on_reboot>
restart
</on_reboot>
<on_crash>
destroy
</on_crash>
<devices>
<emulator>
/usr/bin/qemu
</emulator>
<controller
type=
'usb'
index=
'0'
>
<alias
name=
'usb'
/>
<address
type=
'pci'
domain=
'0x0000'
bus=
'0x00'
slot=
'0x01'
function=
'0x2'
/>
</controller>
<controller
type=
'pci'
index=
'0'
model=
'pci-root'
>
<alias
name=
'pci'
/>
</controller>
<input
type=
'mouse'
bus=
'ps2'
>
<alias
name=
'input0'
/>
</input>
<input
type=
'keyboard'
bus=
'ps2'
>
<alias
name=
'input1'
/>
</input>
<memballoon
model=
'virtio'
>
<alias
name=
'balloon0'
/>
<address
type=
'pci'
domain=
'0x0000'
bus=
'0x00'
slot=
'0x03'
function=
'0x0'
/>
</memballoon>
</devices>
</domain>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录