Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 22d8f55b 编写于 作者: P Peter Krempa
浏览文件
操作

qemu: capabilities: Detect active block commit via QMP schema probing if possible 

For versions where we can probe that the arguments are optional we can
perform the probing by a schema query rather than sending a separate
command to do so.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>
上级 139ee1f1
展开全部 隐藏空白更改
内联 并排
Showing with 2002 addition and 2400 deletion
src/qemu/qemu_capabilities.c
浏览文件 @ 22d8f55b
......@@ -1307,6 +1307,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
{ "blockdev-add/arg-type/+qcow2/encrypt/+luks/key-secret", QEMU_CAPS_QCOW2_LUKS },
{ "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS },
{ "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE },
{ "block-commit/arg-type/*top", QEMU_CAPS_ACTIVE_COMMIT },
};
typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
......@@ -2163,9 +2164,10 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps,
VIR_FORCE_CLOSE(fd);
}
/* Probe for active commit of qemu 2.1 (for now, we are choosing
* to ignore the fact that qemu 2.0 can also do active commit) */
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCK_COMMIT) &&
/* Probe for active commit of qemu 2.1. We don't need to query directly
* if we have QMP schema support */
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA) &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCK_COMMIT) &&
qemuMonitorSupportsActiveCommit(mon))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_ACTIVE_COMMIT);
......
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
浏览文件 @ 22d8f55b
......@@ -507,25 +507,9 @@
"id": "libvirt-5"
}
{
"execute": "block-commit",
"arguments": {
"device": "bogus"
},
"id": "libvirt-6"
}
{
"id": "libvirt-6",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'bogus' not found"
}
}
{
"execute": "query-kvm",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -533,12 +517,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "query-events",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -655,12 +639,12 @@
"name": "ACPI_DEVICE_OST"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
"execute": "qom-list-types",
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -3230,7 +3214,7 @@
"parent": "rng-backend"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -3238,7 +3222,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -3466,7 +3450,7 @@
"type": "str"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -3474,7 +3458,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -3761,7 +3745,7 @@
"type": "uint16"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -3769,7 +3753,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -3930,7 +3914,7 @@
"type": "str"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -3938,11 +3922,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
"id": "libvirt-13"
"id": "libvirt-12"
}
{
"id": "libvirt-13",
"id": "libvirt-12",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
......@@ -3954,11 +3938,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
"id": "libvirt-14"
"id": "libvirt-13"
}
{
"id": "libvirt-14",
"id": "libvirt-13",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
......@@ -3970,11 +3954,11 @@
"arguments": {
"typename": "virtio-net-s390"
},
"id": "libvirt-15"
"id": "libvirt-14"
}
{
"id": "libvirt-15",
"id": "libvirt-14",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-s390' not found"
......@@ -3986,11 +3970,11 @@
"arguments": {
"typename": "pci-assign"
},
"id": "libvirt-16"
"id": "libvirt-15"
}
{
"id": "libvirt-16",
"id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'pci-assign' not found"
......@@ -4002,11 +3986,11 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
"id": "libvirt-17",
"id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pci-assign' not found"
......@@ -4018,7 +4002,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -4125,7 +4109,7 @@
"type": "bool"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -4133,7 +4117,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -4247,7 +4231,7 @@
"type": "uint64"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -4255,7 +4239,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -4331,7 +4315,7 @@
"type": "uint16"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -4339,11 +4323,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
"id": "libvirt-21",
"id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
......@@ -4355,7 +4339,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -4424,7 +4408,7 @@
"type": "uint32"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -4432,7 +4416,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -4459,7 +4443,7 @@
"type": "uint32"
}
],
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -4467,11 +4451,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
"id": "libvirt-24",
"id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
......@@ -4483,11 +4467,11 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
"id": "libvirt-25",
"id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
......@@ -4499,7 +4483,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -4572,7 +4556,7 @@
"type": "uint16"
}
],
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -4580,11 +4564,11 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
"id": "libvirt-27",
"id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
......@@ -4596,7 +4580,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -4653,7 +4637,7 @@
"type": "int32"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -4661,7 +4645,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -4812,7 +4796,7 @@
"type": "str"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -4820,7 +4804,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -4867,7 +4851,7 @@
"type": "size"
}
],
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -4875,11 +4859,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
"id": "libvirt-31",
"id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
......@@ -4891,7 +4875,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -5034,7 +5018,7 @@
"type": "str"
}
],
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -5042,11 +5026,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
"id": "libvirt-33",
"id": "libvirt-32",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -5058,7 +5042,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -5102,7 +5086,7 @@
"type": "bool"
}
],
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -5110,7 +5094,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -5190,12 +5174,12 @@
"type": "uint32"
}
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
"execute": "query-machines",
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -5462,12 +5446,12 @@
"cpu-max": 1
}
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -5633,34 +5617,34 @@
"static": false
}
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
"execute": "query-tpm-models",
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"return": [
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"execute": "query-tpm-types",
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"return": [
],
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"execute": "query-command-line-options",
"id": "libvirt-40"
"id": "libvirt-39"
}
{
......@@ -6805,12 +6789,12 @@
"option": "drive"
}
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-41"
"id": "libvirt-40"
}
{
......@@ -6860,12 +6844,12 @@
"capability": "return-path"
}
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -16588,12 +16572,12 @@
"meta-type": "object"
}
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"execute": "query-gic-capabilities",
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......@@ -16609,7 +16593,7 @@
"kernel": true
}
],
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
浏览文件 @ 22d8f55b
......@@ -161,7 +161,7 @@
<flag name='egl-headless'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>307647</microcodeVersion>
<microcodeVersion>307434</microcodeVersion>
<package> (v2.10.0)</package>
<arch>aarch64</arch>
<cpu type='kvm' name='pxa262'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
浏览文件 @ 22d8f55b
......@@ -504,25 +504,9 @@
"id": "libvirt-5"
}
{
"execute": "block-commit",
"arguments": {
"device": "bogus"
},
"id": "libvirt-6"
}
{
"id": "libvirt-6",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'bogus' not found"
}
}
{
"execute": "query-kvm",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -530,12 +514,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "query-events",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -652,12 +636,12 @@
"name": "ACPI_DEVICE_OST"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
"execute": "qom-list-types",
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -3331,7 +3315,7 @@
"parent": "7455-family-powerpc64-cpu"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -3339,7 +3323,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -3567,7 +3551,7 @@
"type": "str"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -3575,7 +3559,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -3862,7 +3846,7 @@
"type": "uint16"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -3870,7 +3854,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -4031,7 +4015,7 @@
"type": "str"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -4039,11 +4023,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
"id": "libvirt-13"
"id": "libvirt-12"
}
{
"id": "libvirt-13",
"id": "libvirt-12",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
......@@ -4055,11 +4039,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
"id": "libvirt-14"
"id": "libvirt-13"
}
{
"id": "libvirt-14",
"id": "libvirt-13",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
......@@ -4071,11 +4055,11 @@
"arguments": {
"typename": "virtio-net-s390"
},
"id": "libvirt-15"
"id": "libvirt-14"
}
{
"id": "libvirt-15",
"id": "libvirt-14",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-s390' not found"
......@@ -4087,11 +4071,11 @@
"arguments": {
"typename": "pci-assign"
},
"id": "libvirt-16"
"id": "libvirt-15"
}
{
"id": "libvirt-16",
"id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'pci-assign' not found"
......@@ -4103,11 +4087,11 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
"id": "libvirt-17",
"id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pci-assign' not found"
......@@ -4119,7 +4103,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -4226,7 +4210,7 @@
"type": "bool"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -4234,7 +4218,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -4348,7 +4332,7 @@
"type": "uint64"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -4356,7 +4340,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -4432,7 +4416,7 @@
"type": "uint16"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -4440,11 +4424,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
"id": "libvirt-21",
"id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
......@@ -4456,7 +4440,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -4525,7 +4509,7 @@
"type": "uint32"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -4533,7 +4517,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -4560,7 +4544,7 @@
"type": "uint32"
}
],
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -4568,11 +4552,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
"id": "libvirt-24",
"id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
......@@ -4584,11 +4568,11 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
"id": "libvirt-25",
"id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
......@@ -4600,7 +4584,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -4673,7 +4657,7 @@
"type": "uint16"
}
],
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -4681,11 +4665,11 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
"id": "libvirt-27",
"id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
......@@ -4697,7 +4681,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -4754,7 +4738,7 @@
"type": "int32"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -4762,7 +4746,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -4913,7 +4897,7 @@
"type": "str"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -4921,7 +4905,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -4968,7 +4952,7 @@
"type": "size"
}
],
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -4976,11 +4960,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
"id": "libvirt-31",
"id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
......@@ -4992,7 +4976,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -5135,7 +5119,7 @@
"type": "str"
}
],
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -5143,11 +5127,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
"id": "libvirt-33",
"id": "libvirt-32",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -5159,7 +5143,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -5203,7 +5187,7 @@
"type": "bool"
}
],
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -5211,7 +5195,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -5291,7 +5275,7 @@
"type": "uint32"
}
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -5299,7 +5283,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -5385,12 +5369,12 @@
"type": "uint32"
}
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
"execute": "query-machines",
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -5508,12 +5492,12 @@
"cpu-max": 1
}
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -7689,34 +7673,34 @@
"static": false
}
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"execute": "query-tpm-models",
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"return": [
],
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"execute": "query-tpm-types",
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"return": [
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"execute": "query-command-line-options",
"id": "libvirt-41"
"id": "libvirt-40"
}
{
......@@ -8856,12 +8840,12 @@
"option": "drive"
}
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -8911,12 +8895,12 @@
"capability": "return-path"
}
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"execute": "query-qmp-schema",
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......@@ -18639,7 +18623,7 @@
"meta-type": "object"
}
],
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
浏览文件 @ 22d8f55b
......@@ -160,7 +160,7 @@
<flag name='egl-headless'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>386992</microcodeVersion>
<microcodeVersion>386779</microcodeVersion>
<package> (v2.10.0)</package>
<arch>ppc64</arch>
<cpu type='kvm' name='default'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
浏览文件 @ 22d8f55b
......@@ -516,25 +516,9 @@
"id": "libvirt-5"
}
{
"execute": "block-commit",
"arguments": {
"device": "bogus"
},
"id": "libvirt-6"
}
{
"id": "libvirt-6",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'bogus' not found"
}
}
{
"execute": "query-kvm",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -542,12 +526,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "query-events",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -664,12 +648,12 @@
"name": "ACPI_DEVICE_OST"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
"execute": "qom-list-types",
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1571,7 +1555,7 @@
"parent": "virtio-device"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1579,7 +1563,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -1807,7 +1791,7 @@
"type": "str"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -1815,7 +1799,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -2102,7 +2086,7 @@
"type": "uint16"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -2110,7 +2094,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -2271,7 +2255,7 @@
"type": "str"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -2279,7 +2263,7 @@
"arguments": {
"typename": "virtio-blk-ccw"
},
"id": "libvirt-13"
"id": "libvirt-12"
}
{
......@@ -2417,7 +2401,7 @@
"type": "uint32"
}
],
"id": "libvirt-13"
"id": "libvirt-12"
}
{
......@@ -2425,7 +2409,7 @@
"arguments": {
"typename": "virtio-net-ccw"
},
"id": "libvirt-14"
"id": "libvirt-13"
}
{
......@@ -2626,7 +2610,7 @@
"type": "uint16"
}
],
"id": "libvirt-14"
"id": "libvirt-13"
}
{
......@@ -2634,7 +2618,7 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
"id": "libvirt-15"
"id": "libvirt-14"
}
{
......@@ -2709,7 +2693,7 @@
"type": "uint32"
}
],
"id": "libvirt-15"
"id": "libvirt-14"
}
{
......@@ -2717,11 +2701,11 @@
"arguments": {
"typename": "virtio-net-s390"
},
"id": "libvirt-16"
"id": "libvirt-15"
}
{
"id": "libvirt-16",
"id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-s390' not found"
......@@ -2733,11 +2717,11 @@
"arguments": {
"typename": "pci-assign"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
"id": "libvirt-17",
"id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'pci-assign' not found"
......@@ -2749,11 +2733,11 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
"id": "libvirt-18",
"id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pci-assign' not found"
......@@ -2765,7 +2749,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -2872,7 +2856,7 @@
"type": "bool"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -2880,7 +2864,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -2994,7 +2978,7 @@
"type": "uint64"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -3002,11 +2986,11 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
"id": "libvirt-21",
"id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
......@@ -3018,11 +3002,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
"id": "libvirt-22",
"id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
......@@ -3034,11 +3018,11 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
"id": "libvirt-23",
"id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
......@@ -3050,7 +3034,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -3077,7 +3061,7 @@
"type": "uint32"
}
],
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -3085,11 +3069,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
"id": "libvirt-25",
"id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
......@@ -3101,11 +3085,11 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
"id": "libvirt-26",
"id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
......@@ -3117,11 +3101,11 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
"id": "libvirt-27",
"id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
......@@ -3133,7 +3117,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -3284,7 +3268,7 @@
"type": "str"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -3292,7 +3276,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -3339,7 +3323,7 @@
"type": "size"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -3347,11 +3331,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
"id": "libvirt-30",
"id": "libvirt-29",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
......@@ -3363,7 +3347,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -3506,7 +3490,7 @@
"type": "str"
}
],
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -3514,7 +3498,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -3576,7 +3560,7 @@
"type": "uint32"
}
],
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -3584,7 +3568,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -3628,7 +3612,7 @@
"type": "bool"
}
],
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -3636,7 +3620,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -3646,12 +3630,12 @@
"type": "bool"
}
],
"id": "libvirt-34"
"id": "libvirt-33"
}
{
"execute": "query-machines",
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -3699,12 +3683,12 @@
"cpu-max": 248
}
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -4238,34 +4222,34 @@
"migration-safe": true
}
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
"execute": "query-tpm-models",
"id": "libvirt-37"
"id": "libvirt-36"
}
{
"return": [
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
"execute": "query-tpm-types",
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"return": [
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"execute": "query-command-line-options",
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -5370,12 +5354,12 @@
"option": "drive"
}
],
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-40"
"id": "libvirt-39"
}
{
......@@ -5425,12 +5409,12 @@
"capability": "return-path"
}
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"execute": "query-qmp-schema",
"id": "libvirt-41"
"id": "libvirt-40"
}
{
......@@ -15153,7 +15137,7 @@
"meta-type": "object"
}
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
......@@ -15164,7 +15148,7 @@
"name": "host"
}
},
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -15204,7 +15188,7 @@
}
}
},
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -15218,11 +15202,11 @@
}
}
},
"id": "libvirt-43"
"id": "libvirt-42"
}
{
"id": "libvirt-43",
"id": "libvirt-42",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
......
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
浏览文件 @ 22d8f55b
......@@ -121,7 +121,7 @@
<flag name='egl-headless'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>307899</microcodeVersion>
<microcodeVersion>307686</microcodeVersion>
<package></package>
<arch>s390x</arch>
<hostCPU type='kvm' model='z14-base' migratability='no'>
......
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
浏览文件 @ 22d8f55b
......@@ -513,25 +513,9 @@
"id": "libvirt-5"
}
{
"execute": "block-commit",
"arguments": {
"device": "bogus"
},
"id": "libvirt-6"
}
{
"id": "libvirt-6",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'bogus' not found"
}
}
{
"execute": "query-kvm",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -539,12 +523,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "query-events",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -661,12 +645,12 @@
"name": "ACPI_DEVICE_OST"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
"execute": "qom-list-types",
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -2208,7 +2192,7 @@
"parent": "virtio-input-hid-pci"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -2216,7 +2200,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -2444,7 +2428,7 @@
"type": "str"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -2452,7 +2436,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -2739,7 +2723,7 @@
"type": "uint16"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -2747,7 +2731,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -2908,7 +2892,7 @@
"type": "str"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -2916,11 +2900,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
"id": "libvirt-13"
"id": "libvirt-12"
}
{
"id": "libvirt-13",
"id": "libvirt-12",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
......@@ -2932,11 +2916,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
"id": "libvirt-14"
"id": "libvirt-13"
}
{
"id": "libvirt-14",
"id": "libvirt-13",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
......@@ -2948,11 +2932,11 @@
"arguments": {
"typename": "virtio-net-s390"
},
"id": "libvirt-15"
"id": "libvirt-14"
}
{
"id": "libvirt-15",
"id": "libvirt-14",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-s390' not found"
......@@ -2964,11 +2948,11 @@
"arguments": {
"typename": "pci-assign"
},
"id": "libvirt-16"
"id": "libvirt-15"
}
{
"id": "libvirt-16",
"id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'pci-assign' not found"
......@@ -2980,7 +2964,7 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -3042,7 +3026,7 @@
"type": "bool"
}
],
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -3050,7 +3034,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -3157,7 +3141,7 @@
"type": "bool"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -3165,7 +3149,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -3279,7 +3263,7 @@
"type": "uint64"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -3287,7 +3271,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -3363,7 +3347,7 @@
"type": "uint16"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -3371,7 +3355,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -3434,7 +3418,7 @@
"type": "int32"
}
],
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -3442,7 +3426,7 @@
"arguments": {
"typename": "usb-redir"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -3491,7 +3475,7 @@
"type": "bool"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -3499,7 +3483,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -3568,7 +3552,7 @@
"type": "uint32"
}
],
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -3576,7 +3560,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -3603,7 +3587,7 @@
"type": "uint32"
}
],
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -3611,7 +3595,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -3649,7 +3633,7 @@
"type": "child<qemu:memory-region>"
}
],
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -3657,7 +3641,7 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -3735,7 +3719,7 @@
"type": "uint64"
}
],
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -3743,7 +3727,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -3816,7 +3800,7 @@
"type": "uint16"
}
],
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -3824,7 +3808,7 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -3838,7 +3822,7 @@
"type": "LostTickPolicy"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -3846,7 +3830,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -3903,7 +3887,7 @@
"type": "int32"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -3911,7 +3895,7 @@
"arguments": {
"typename": "vmware-svga"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -3954,7 +3938,7 @@
"type": "int32"
}
],
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -3962,7 +3946,7 @@
"arguments": {
"typename": "qxl"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -4057,7 +4041,7 @@
"type": "uint32"
}
],
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -4065,7 +4049,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -4226,7 +4210,7 @@
"type": "str"
}
],
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -4234,7 +4218,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -4291,7 +4275,7 @@
"type": "size"
}
],
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -4299,7 +4283,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -4395,7 +4379,7 @@
"type": "uint32"
}
],
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -4403,7 +4387,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -4546,7 +4530,7 @@
"type": "str"
}
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -4554,11 +4538,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-36"
"id": "libvirt-35"
}
{
"id": "libvirt-36",
"id": "libvirt-35",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -4570,7 +4554,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -4614,7 +4598,7 @@
"type": "bool"
}
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -4622,7 +4606,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -4702,7 +4686,7 @@
"type": "uint32"
}
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -4710,7 +4694,7 @@
"arguments": {
"typename": "intel-iommu"
},
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -4745,7 +4729,7 @@
"type": "bool"
}
],
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -4753,7 +4737,7 @@
"arguments": {
"typename": "mch"
},
"id": "libvirt-40"
"id": "libvirt-39"
}
{
......@@ -4779,12 +4763,12 @@
"type": "pci-devfn"
}
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"execute": "query-machines",
"id": "libvirt-41"
"id": "libvirt-40"
}
{
......@@ -4973,12 +4957,12 @@
"alias": "q35"
}
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -5313,36 +5297,36 @@
"migration-safe": true
}
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"execute": "query-tpm-models",
"id": "libvirt-43"
"id": "libvirt-42"
}
{
"return": [
"tpm-tis"
],
"id": "libvirt-43"
"id": "libvirt-42"
}
{
"execute": "query-tpm-types",
"id": "libvirt-44"
"id": "libvirt-43"
}
{
"return": [
"passthrough"
],
"id": "libvirt-44"
"id": "libvirt-43"
}
{
"execute": "query-command-line-options",
"id": "libvirt-45"
"id": "libvirt-44"
}
{
......@@ -6621,12 +6605,12 @@
"option": "drive"
}
],
"id": "libvirt-45"
"id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-46"
"id": "libvirt-45"
}
{
......@@ -6676,12 +6660,12 @@
"capability": "return-path"
}
],
"id": "libvirt-46"
"id": "libvirt-45"
}
{
"execute": "query-qmp-schema",
"id": "libvirt-47"
"id": "libvirt-46"
}
{
......@@ -16404,7 +16388,7 @@
"meta-type": "object"
}
],
"id": "libvirt-47"
"id": "libvirt-46"
}
{
......@@ -16415,7 +16399,7 @@
"name": "host"
}
},
"id": "libvirt-48"
"id": "libvirt-47"
}
{
......@@ -16594,7 +16578,7 @@
}
}
},
"id": "libvirt-48"
"id": "libvirt-47"
}
{
......@@ -16775,7 +16759,7 @@
}
}
},
"id": "libvirt-49"
"id": "libvirt-48"
}
{
......@@ -17018,7 +17002,7 @@
}
}
},
"id": "libvirt-49"
"id": "libvirt-48"
}
{
......@@ -17032,7 +17016,7 @@
}
}
},
"id": "libvirt-50"
"id": "libvirt-49"
}
{
......@@ -17211,7 +17195,7 @@
}
}
},
"id": "libvirt-50"
"id": "libvirt-49"
}
{
......@@ -17392,7 +17376,7 @@
}
}
},
"id": "libvirt-51"
"id": "libvirt-50"
}
{
......@@ -17635,7 +17619,7 @@
}
}
},
"id": "libvirt-51"
"id": "libvirt-50"
}
{
......
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
浏览文件 @ 22d8f55b
......@@ -205,7 +205,7 @@
<flag name='egl-headless'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>367995</microcodeVersion>
<microcodeVersion>367782</microcodeVersion>
<package> (v2.10.0)</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
......
tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
浏览文件 @ 22d8f55b
......@@ -525,25 +525,9 @@
"id": "libvirt-5"
}
{
"execute": "block-commit",
"arguments": {
"device": "bogus"
},
"id": "libvirt-6"
}
{
"id": "libvirt-6",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'bogus' not found"
}
}
{
"execute": "query-kvm",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -551,12 +535,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "query-events",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -673,12 +657,12 @@
"name": "ACPI_DEVICE_OST"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
"execute": "qom-list-types",
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1612,7 +1596,7 @@
"parent": "virtio-device"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1620,7 +1604,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -1848,7 +1832,7 @@
"type": "str"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -1856,7 +1840,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -2143,7 +2127,7 @@
"type": "uint16"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -2151,7 +2135,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -2316,7 +2300,7 @@
"type": "str"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -2324,7 +2308,7 @@
"arguments": {
"typename": "virtio-blk-ccw"
},
"id": "libvirt-13"
"id": "libvirt-12"
}
{
......@@ -2462,7 +2446,7 @@
"type": "uint32"
}
],
"id": "libvirt-13"
"id": "libvirt-12"
}
{
......@@ -2470,7 +2454,7 @@
"arguments": {
"typename": "virtio-net-ccw"
},
"id": "libvirt-14"
"id": "libvirt-13"
}
{
......@@ -2671,7 +2655,7 @@
"type": "uint16"
}
],
"id": "libvirt-14"
"id": "libvirt-13"
}
{
......@@ -2679,7 +2663,7 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
"id": "libvirt-15"
"id": "libvirt-14"
}
{
......@@ -2758,7 +2742,7 @@
"type": "uint32"
}
],
"id": "libvirt-15"
"id": "libvirt-14"
}
{
......@@ -2766,11 +2750,11 @@
"arguments": {
"typename": "virtio-net-s390"
},
"id": "libvirt-16"
"id": "libvirt-15"
}
{
"id": "libvirt-16",
"id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-s390' not found"
......@@ -2782,11 +2766,11 @@
"arguments": {
"typename": "pci-assign"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
"id": "libvirt-17",
"id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'pci-assign' not found"
......@@ -2798,11 +2782,11 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
"id": "libvirt-18",
"id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pci-assign' not found"
......@@ -2814,7 +2798,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -2926,7 +2910,7 @@
"type": "bool"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -2934,7 +2918,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -3048,7 +3032,7 @@
"type": "uint64"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -3056,11 +3040,11 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
"id": "libvirt-21",
"id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
......@@ -3072,11 +3056,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
"id": "libvirt-22",
"id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
......@@ -3088,11 +3072,11 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
"id": "libvirt-23",
"id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
......@@ -3104,7 +3088,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -3131,7 +3115,7 @@
"type": "uint32"
}
],
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -3139,11 +3123,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
"id": "libvirt-25",
"id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
......@@ -3155,11 +3139,11 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
"id": "libvirt-26",
"id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
......@@ -3171,11 +3155,11 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
"id": "libvirt-27",
"id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
......@@ -3187,7 +3171,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -3338,7 +3322,7 @@
"type": "str"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -3346,7 +3330,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -3393,7 +3377,7 @@
"type": "size"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -3401,11 +3385,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
"id": "libvirt-30",
"id": "libvirt-29",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
......@@ -3417,7 +3401,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -3560,7 +3544,7 @@
"type": "str"
}
],
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -3568,7 +3552,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -3630,7 +3614,7 @@
"type": "uint32"
}
],
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -3638,7 +3622,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -3682,7 +3666,7 @@
"type": "bool"
}
],
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -3690,7 +3674,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -3755,7 +3739,7 @@
"type": "uint32"
}
],
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -3763,7 +3747,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -3773,12 +3757,12 @@
"type": "bool"
}
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
"execute": "query-machines",
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -3831,12 +3815,12 @@
"cpu-max": 248
}
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -4370,35 +4354,35 @@
"migration-safe": true
}
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
"execute": "query-tpm-models",
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"return": [
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"execute": "query-tpm-types",
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"return": [
"emulator"
],
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"execute": "query-command-line-options",
"id": "libvirt-40"
"id": "libvirt-39"
}
{
......@@ -5519,12 +5503,12 @@
"option": "drive"
}
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-41"
"id": "libvirt-40"
}
{
......@@ -5582,12 +5566,12 @@
"capability": "x-multifd"
}
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -15455,7 +15439,7 @@
"meta-type": "object"
}
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -15466,7 +15450,7 @@
"name": "host"
}
},
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......@@ -15505,7 +15489,7 @@
}
}
},
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......@@ -15519,11 +15503,11 @@
}
}
},
"id": "libvirt-44"
"id": "libvirt-43"
}
{
"id": "libvirt-44",
"id": "libvirt-43",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
......
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
浏览文件 @ 22d8f55b
......@@ -128,7 +128,7 @@
<flag name='egl-headless'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>346751</microcodeVersion>
<microcodeVersion>346538</microcodeVersion>
<package></package>
<arch>s390x</arch>
<hostCPU type='kvm' model='z14-base' migratability='no'>
......
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
浏览文件 @ 22d8f55b
......@@ -522,25 +522,9 @@
"id": "libvirt-5"
}
{
"execute": "block-commit",
"arguments": {
"device": "bogus"
},
"id": "libvirt-6"
}
{
"id": "libvirt-6",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'bogus' not found"
}
}
{
"execute": "query-kvm",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -548,12 +532,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "query-events",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -670,12 +654,12 @@
"name": "ACPI_DEVICE_OST"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
"execute": "qom-list-types",
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -2201,7 +2185,7 @@
"parent": "virtio-input-hid-pci"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -2209,7 +2193,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -2437,7 +2421,7 @@
"type": "str"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -2445,7 +2429,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -2732,7 +2716,7 @@
"type": "uint16"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -2740,7 +2724,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -2905,7 +2889,7 @@
"type": "str"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -2913,11 +2897,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
"id": "libvirt-13"
"id": "libvirt-12"
}
{
"id": "libvirt-13",
"id": "libvirt-12",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
......@@ -2929,11 +2913,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
"id": "libvirt-14"
"id": "libvirt-13"
}
{
"id": "libvirt-14",
"id": "libvirt-13",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
......@@ -2945,11 +2929,11 @@
"arguments": {
"typename": "virtio-net-s390"
},
"id": "libvirt-15"
"id": "libvirt-14"
}
{
"id": "libvirt-15",
"id": "libvirt-14",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-s390' not found"
......@@ -2961,11 +2945,11 @@
"arguments": {
"typename": "pci-assign"
},
"id": "libvirt-16"
"id": "libvirt-15"
}
{
"id": "libvirt-16",
"id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'pci-assign' not found"
......@@ -2977,11 +2961,11 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
"id": "libvirt-17",
"id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pci-assign' not found"
......@@ -2993,7 +2977,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -3105,7 +3089,7 @@
"type": "bool"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -3113,7 +3097,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -3227,7 +3211,7 @@
"type": "uint64"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -3235,7 +3219,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -3311,7 +3295,7 @@
"type": "uint16"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -3319,7 +3303,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -3382,7 +3366,7 @@
"type": "int32"
}
],
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -3390,7 +3374,7 @@
"arguments": {
"typename": "usb-redir"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -3439,7 +3423,7 @@
"type": "bool"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -3447,7 +3431,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -3516,7 +3500,7 @@
"type": "uint32"
}
],
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -3524,7 +3508,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -3551,7 +3535,7 @@
"type": "uint32"
}
],
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -3559,7 +3543,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -3601,7 +3585,7 @@
"type": "bool"
}
],
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -3609,7 +3593,7 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -3691,7 +3675,7 @@
"type": "uint64"
}
],
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -3699,7 +3683,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -3772,7 +3756,7 @@
"type": "uint16"
}
],
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -3780,7 +3764,7 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -3794,7 +3778,7 @@
"type": "LostTickPolicy"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -3802,7 +3786,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -3859,7 +3843,7 @@
"type": "int32"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -3867,7 +3851,7 @@
"arguments": {
"typename": "vmware-svga"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -3910,7 +3894,7 @@
"type": "int32"
}
],
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -3918,7 +3902,7 @@
"arguments": {
"typename": "qxl"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -4013,7 +3997,7 @@
"type": "uint32"
}
],
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -4021,7 +4005,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -4182,7 +4166,7 @@
"type": "str"
}
],
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -4190,7 +4174,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -4247,7 +4231,7 @@
"type": "size"
}
],
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -4255,7 +4239,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -4351,7 +4335,7 @@
"type": "uint32"
}
],
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -4359,7 +4343,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -4502,7 +4486,7 @@
"type": "str"
}
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -4510,11 +4494,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-36"
"id": "libvirt-35"
}
{
"id": "libvirt-36",
"id": "libvirt-35",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -4526,7 +4510,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -4570,7 +4554,7 @@
"type": "bool"
}
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -4578,7 +4562,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -4658,7 +4642,7 @@
"type": "uint32"
}
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -4666,7 +4650,7 @@
"arguments": {
"typename": "intel-iommu"
},
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -4701,7 +4685,7 @@
"type": "bool"
}
],
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -4709,7 +4693,7 @@
"arguments": {
"typename": "mch"
},
"id": "libvirt-40"
"id": "libvirt-39"
}
{
......@@ -4752,12 +4736,12 @@
"type": "int32"
}
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"execute": "query-machines",
"id": "libvirt-41"
"id": "libvirt-40"
}
{
......@@ -4946,12 +4930,12 @@
"cpu-max": 288
}
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -5265,24 +5249,24 @@
"migration-safe": true
}
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"execute": "query-tpm-models",
"id": "libvirt-43"
"id": "libvirt-42"
}
{
"return": [
"tpm-tis"
],
"id": "libvirt-43"
"id": "libvirt-42"
}
{
"execute": "query-tpm-types",
"id": "libvirt-44"
"id": "libvirt-43"
}
{
......@@ -5290,12 +5274,12 @@
"passthrough",
"emulator"
],
"id": "libvirt-44"
"id": "libvirt-43"
}
{
"execute": "query-command-line-options",
"id": "libvirt-45"
"id": "libvirt-44"
}
{
......@@ -6590,12 +6574,12 @@
"option": "drive"
}
],
"id": "libvirt-45"
"id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-46"
"id": "libvirt-45"
}
{
......@@ -6653,12 +6637,12 @@
"capability": "x-multifd"
}
],
"id": "libvirt-46"
"id": "libvirt-45"
}
{
"execute": "query-qmp-schema",
"id": "libvirt-47"
"id": "libvirt-46"
}
{
......@@ -16526,7 +16510,7 @@
"meta-type": "object"
}
],
"id": "libvirt-47"
"id": "libvirt-46"
}
{
......@@ -16537,7 +16521,7 @@
"name": "host"
}
},
"id": "libvirt-48"
"id": "libvirt-47"
}
{
......@@ -16717,7 +16701,7 @@
}
}
},
"id": "libvirt-48"
"id": "libvirt-47"
}
{
......@@ -16899,7 +16883,7 @@
}
}
},
"id": "libvirt-49"
"id": "libvirt-48"
}
{
......@@ -17144,7 +17128,7 @@
}
}
},
"id": "libvirt-49"
"id": "libvirt-48"
}
{
......@@ -17158,7 +17142,7 @@
}
}
},
"id": "libvirt-50"
"id": "libvirt-49"
}
{
......@@ -17338,7 +17322,7 @@
}
}
},
"id": "libvirt-50"
"id": "libvirt-49"
}
{
......@@ -17520,7 +17504,7 @@
}
}
},
"id": "libvirt-51"
"id": "libvirt-50"
}
{
......@@ -17765,7 +17749,7 @@
}
}
},
"id": "libvirt-51"
"id": "libvirt-50"
}
{
......
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
浏览文件 @ 22d8f55b
......@@ -209,7 +209,7 @@
<flag name='egl-headless'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>371455</microcodeVersion>
<microcodeVersion>371242</microcodeVersion>
<package> (v2.11.0)</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
......
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
浏览文件 @ 22d8f55b
......@@ -540,25 +540,9 @@
"id": "libvirt-5"
}
{
"execute": "block-commit",
"arguments": {
"device": "bogus"
},
"id": "libvirt-6"
}
{
"id": "libvirt-6",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'bogus' not found"
}
}
{
"execute": "query-kvm",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -566,12 +550,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "query-events",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -694,12 +678,12 @@
"name": "SHUTDOWN"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
"execute": "qom-list-types",
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -3517,7 +3501,7 @@
"parent": "rng-backend"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -3525,7 +3509,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -3757,7 +3741,7 @@
"type": "str"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -3765,7 +3749,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -4060,7 +4044,7 @@
"type": "uint16"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -4068,7 +4052,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -4233,7 +4217,7 @@
"type": "str"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -4241,11 +4225,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
"id": "libvirt-13"
"id": "libvirt-12"
}
{
"id": "libvirt-13",
"id": "libvirt-12",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
......@@ -4257,11 +4241,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
"id": "libvirt-14"
"id": "libvirt-13"
}
{
"id": "libvirt-14",
"id": "libvirt-13",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
......@@ -4273,11 +4257,11 @@
"arguments": {
"typename": "virtio-net-s390"
},
"id": "libvirt-15"
"id": "libvirt-14"
}
{
"id": "libvirt-15",
"id": "libvirt-14",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-s390' not found"
......@@ -4289,11 +4273,11 @@
"arguments": {
"typename": "pci-assign"
},
"id": "libvirt-16"
"id": "libvirt-15"
}
{
"id": "libvirt-16",
"id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'pci-assign' not found"
......@@ -4305,11 +4289,11 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
"id": "libvirt-17",
"id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pci-assign' not found"
......@@ -4321,7 +4305,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -4447,7 +4431,7 @@
"type": "str"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -4455,7 +4439,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -4569,7 +4553,7 @@
"type": "uint64"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -4577,7 +4561,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -4653,7 +4637,7 @@
"type": "uint16"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -4661,11 +4645,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
"id": "libvirt-21",
"id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
......@@ -4677,7 +4661,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -4746,7 +4730,7 @@
"type": "uint32"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -4754,7 +4738,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -4785,7 +4769,7 @@
"type": "uint32"
}
],
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -4793,11 +4777,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
"id": "libvirt-24",
"id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
......@@ -4809,11 +4793,11 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
"id": "libvirt-25",
"id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
......@@ -4825,7 +4809,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -4898,7 +4882,7 @@
"type": "uint16"
}
],
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -4906,11 +4890,11 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
"id": "libvirt-27",
"id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
......@@ -4922,7 +4906,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -4979,7 +4963,7 @@
"type": "int32"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -4987,7 +4971,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -5138,7 +5122,7 @@
"type": "str"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -5146,7 +5130,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -5193,7 +5177,7 @@
"type": "size"
}
],
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -5201,11 +5185,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
"id": "libvirt-31",
"id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
......@@ -5217,7 +5201,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -5360,7 +5344,7 @@
"type": "str"
}
],
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -5368,11 +5352,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
"id": "libvirt-33",
"id": "libvirt-32",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -5384,7 +5368,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -5428,7 +5412,7 @@
"type": "bool"
}
],
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -5436,7 +5420,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -5516,7 +5500,7 @@
"type": "uint32"
}
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -5524,7 +5508,7 @@
"arguments": {
"typename": "memory-backend-file"
},
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -5578,7 +5562,7 @@
"type": "string"
}
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -5586,11 +5570,11 @@
"arguments": {
"typename": "spapr-machine"
},
"id": "libvirt-37"
"id": "libvirt-36"
}
{
"id": "libvirt-37",
"id": "libvirt-36",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
......@@ -5599,7 +5583,7 @@
{
"execute": "query-machines",
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -5896,12 +5880,12 @@
"cpu-max": 1
}
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -6077,35 +6061,35 @@
"static": false
}
],
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"execute": "query-tpm-models",
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"return": [
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"execute": "query-tpm-types",
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"return": [
"emulator"
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-command-line-options",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -7266,12 +7250,12 @@
"option": "drive"
}
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......@@ -7333,12 +7317,12 @@
"capability": "dirty-bitmaps"
}
],
"id": "libvirt-43"
"id": "libvirt-42"
}
{
"execute": "query-qmp-schema",
"id": "libvirt-44"
"id": "libvirt-43"
}
{
......@@ -18706,12 +18690,12 @@
"meta-type": "object"
}
],
"id": "libvirt-44"
"id": "libvirt-43"
}
{
"execute": "query-gic-capabilities",
"id": "libvirt-45"
"id": "libvirt-44"
}
{
......@@ -18727,7 +18711,7 @@
"kernel": false
}
],
"id": "libvirt-45"
"id": "libvirt-44"
}
{
......
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
浏览文件 @ 22d8f55b
......@@ -172,7 +172,7 @@
<flag name='vfio-pci.display'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>347550</microcodeVersion>
<microcodeVersion>347337</microcodeVersion>
<package>v2.12.0-rc0</package>
<arch>aarch64</arch>
<cpu type='kvm' name='pxa262'/>
......
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
浏览文件 @ 22d8f55b
......@@ -537,25 +537,9 @@
"id": "libvirt-5"
}
{
"execute": "block-commit",
"arguments": {
"device": "bogus"
},
"id": "libvirt-6"
}
{
"id": "libvirt-6",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'bogus' not found"
}
}
{
"execute": "query-kvm",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -563,12 +547,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "query-events",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -691,12 +675,12 @@
"name": "SHUTDOWN"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
"execute": "qom-list-types",
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -3506,7 +3490,7 @@
"parent": "e500v2-family-powerpc64-cpu"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -3514,7 +3498,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -3746,7 +3730,7 @@
"type": "str"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -3754,7 +3738,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -4049,7 +4033,7 @@
"type": "uint16"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -4057,7 +4041,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -4222,7 +4206,7 @@
"type": "str"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -4230,11 +4214,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
"id": "libvirt-13"
"id": "libvirt-12"
}
{
"id": "libvirt-13",
"id": "libvirt-12",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
......@@ -4246,11 +4230,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
"id": "libvirt-14"
"id": "libvirt-13"
}
{
"id": "libvirt-14",
"id": "libvirt-13",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
......@@ -4262,11 +4246,11 @@
"arguments": {
"typename": "virtio-net-s390"
},
"id": "libvirt-15"
"id": "libvirt-14"
}
{
"id": "libvirt-15",
"id": "libvirt-14",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-s390' not found"
......@@ -4278,11 +4262,11 @@
"arguments": {
"typename": "pci-assign"
},
"id": "libvirt-16"
"id": "libvirt-15"
}
{
"id": "libvirt-16",
"id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'pci-assign' not found"
......@@ -4294,11 +4278,11 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
"id": "libvirt-17",
"id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pci-assign' not found"
......@@ -4310,7 +4294,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -4436,7 +4420,7 @@
"type": "str"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -4444,7 +4428,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -4558,7 +4542,7 @@
"type": "uint64"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -4566,7 +4550,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -4642,7 +4626,7 @@
"type": "uint16"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -4650,11 +4634,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
"id": "libvirt-21",
"id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
......@@ -4666,7 +4650,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -4735,7 +4719,7 @@
"type": "uint32"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -4743,7 +4727,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -4774,7 +4758,7 @@
"type": "uint32"
}
],
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -4782,11 +4766,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
"id": "libvirt-24",
"id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
......@@ -4798,11 +4782,11 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
"id": "libvirt-25",
"id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
......@@ -4814,7 +4798,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -4887,7 +4871,7 @@
"type": "uint16"
}
],
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -4895,11 +4879,11 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
"id": "libvirt-27",
"id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
......@@ -4911,7 +4895,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -4968,7 +4952,7 @@
"type": "int32"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -4976,7 +4960,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -5127,7 +5111,7 @@
"type": "str"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -5135,7 +5119,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -5182,7 +5166,7 @@
"type": "size"
}
],
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -5190,11 +5174,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
"id": "libvirt-31",
"id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
......@@ -5206,7 +5190,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -5349,7 +5333,7 @@
"type": "str"
}
],
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -5357,11 +5341,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
"id": "libvirt-33",
"id": "libvirt-32",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -5373,7 +5357,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -5417,7 +5401,7 @@
"type": "bool"
}
],
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -5425,7 +5409,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -5505,7 +5489,7 @@
"type": "uint32"
}
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -5513,7 +5497,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -5571,7 +5555,7 @@
"type": "uint32"
}
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -5579,7 +5563,7 @@
"arguments": {
"typename": "memory-backend-file"
},
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -5633,7 +5617,7 @@
"type": "string"
}
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -5641,7 +5625,7 @@
"arguments": {
"typename": "spapr-machine"
},
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -5802,12 +5786,12 @@
"type": "bool"
}
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"execute": "query-machines",
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -5945,12 +5929,12 @@
"cpu-max": 1
}
],
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-40"
"id": "libvirt-39"
}
{
......@@ -8146,35 +8130,35 @@
"static": false
}
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"execute": "query-tpm-models",
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"return": [
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-tpm-types",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"return": [
"emulator"
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"execute": "query-command-line-options",
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......@@ -9330,12 +9314,12 @@
"option": "drive"
}
],
"id": "libvirt-43"
"id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-44"
"id": "libvirt-43"
}
{
......@@ -9397,12 +9381,12 @@
"capability": "dirty-bitmaps"
}
],
"id": "libvirt-44"
"id": "libvirt-43"
}
{
"execute": "query-qmp-schema",
"id": "libvirt-45"
"id": "libvirt-44"
}
{
......@@ -20770,7 +20754,7 @@
"meta-type": "object"
}
],
"id": "libvirt-45"
"id": "libvirt-44"
}
{
......
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
浏览文件 @ 22d8f55b
......@@ -170,7 +170,7 @@
<flag name='vfio-pci.display'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>428334</microcodeVersion>
<microcodeVersion>428121</microcodeVersion>
<package>v2.12.0-rc0</package>
<arch>ppc64</arch>
<cpu type='kvm' name='default'/>
......
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
浏览文件 @ 22d8f55b
......@@ -136,7 +136,7 @@
<flag name='vfio-pci.display'/>
<version>2012000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>375999</microcodeVersion>
<microcodeVersion>375786</microcodeVersion>
<package></package>
<arch>s390x</arch>
<hostCPU type='kvm' model='z14-base' migratability='no'>
......
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
浏览文件 @ 22d8f55b
......@@ -214,7 +214,7 @@
<flag name='vfio-pci.display'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>416196</microcodeVersion>
<microcodeVersion>415983</microcodeVersion>
<package>v2.12.0-rc0</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
......
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
浏览文件 @ 22d8f55b
......@@ -164,7 +164,7 @@
<flag name='mch'/>
<version>2005000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>221513</microcodeVersion>
<microcodeVersion>221300</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
......
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
浏览文件 @ 22d8f55b
......@@ -145,7 +145,7 @@
<flag name='hda-output'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>232358</microcodeVersion>
<microcodeVersion>232145</microcodeVersion>
<package></package>
<arch>aarch64</arch>
<cpu type='kvm' name='pxa262'/>
......
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
浏览文件 @ 22d8f55b
......@@ -140,7 +140,7 @@
<flag name='hda-output'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>267184</microcodeVersion>
<microcodeVersion>266971</microcodeVersion>
<package></package>
<arch>ppc64</arch>
<cpu type='kvm' name='default'/>
......
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
浏览文件 @ 22d8f55b
......@@ -176,7 +176,7 @@
<flag name='mch'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>232317</microcodeVersion>
<microcodeVersion>232104</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
......
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
浏览文件 @ 22d8f55b
......@@ -108,7 +108,7 @@
<flag name='sdl-gl'/>
<version>2007000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>220792</microcodeVersion>
<microcodeVersion>220579</microcodeVersion>
<package></package>
<arch>s390x</arch>
<cpu type='kvm' name='host'/>
......
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
浏览文件 @ 22d8f55b
......@@ -181,7 +181,7 @@
<flag name='mch'/>
<version>2007000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>244005</microcodeVersion>
<microcodeVersion>243792</microcodeVersion>
<package> (v2.7.0)</package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
......
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
浏览文件 @ 22d8f55b
......@@ -111,7 +111,7 @@
<flag name='vhost-vsock'/>
<version>2007093</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>246206</microcodeVersion>
<microcodeVersion>245993</microcodeVersion>
<package></package>
<arch>s390x</arch>
<hostCPU type='kvm' model='zEC12.2-base' migratability='no'>
......
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
浏览文件 @ 22d8f55b
......@@ -184,7 +184,7 @@
<flag name='mch'/>
<version>2008000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>260660</microcodeVersion>
<microcodeVersion>260447</microcodeVersion>
<package> (v2.8.0)</package>
<arch>x86_64</arch>
<cpu type='kvm' name='host' usable='yes'/>
......
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
浏览文件 @ 22d8f55b
......@@ -151,7 +151,7 @@
<flag name='vhost-vsock'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>350708</microcodeVersion>
<microcodeVersion>350495</microcodeVersion>
<package> (v2.9.0)</package>
<arch>ppc64</arch>
<cpu type='kvm' name='default'/>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或