Skip to content

L
libvirt

openeuler / libvirt

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

qemu: capabilities: Always assume QEMU_CAPS_ADD_FD 

The capability was usable since qemu 1.3 so we can remove all the
detection code.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>
上级 3411fd4d
展开全部 隐藏空白更改
内联 并排
Showing with 2403 addition and 2964 deletion
src/qemu/qemu_capabilities.c
浏览文件 @ f2019083
......@@ -1009,7 +1009,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
{ "query-vnc", QEMU_CAPS_VNC },
{ "drive-mirror", QEMU_CAPS_DRIVE_MIRROR },
{ "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT },
{ "add-fd", QEMU_CAPS_ADD_FD },
{ "nbd-server-start", QEMU_CAPS_NBD_SERVER },
{ "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE },
{ "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION },
......@@ -2148,22 +2147,6 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps,
ncommands, commands);
virStringListFreeCount(commands, ncommands);
/* QMP add-fd was introduced in 1.2, but did not support
* management control of set numbering, and did not have a
* counterpart -add-fd command line option. We require the
* add-fd features from 1.3 or later. */
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) {
int fd = open("/dev/null", O_RDONLY);
if (fd < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("unable to probe for add-fd"));
return -1;
}
if (qemuMonitorAddFd(mon, 0, fd, "/dev/null") < 0)
virQEMUCapsClear(qemuCaps, QEMU_CAPS_ADD_FD);
VIR_FORCE_CLOSE(fd);
}
/* 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) &&
......
src/qemu/qemu_capabilities.h
浏览文件 @ f2019083
......@@ -225,7 +225,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 125 */
QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */
QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */
QEMU_CAPS_ADD_FD, /* -add-fd */
X_QEMU_CAPS_ADD_FD, /* -add-fd */
QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */
QEMU_CAPS_DEVICE_VIRTIO_RNG, /* virtio-rng device */
......
src/qemu/qemu_command.c
浏览文件 @ f2019083
......@@ -9724,7 +9724,9 @@ qemuBuildTPMBackendStr(const virDomainDef *def,
const virDomainTPMDef *tpm = def->tpm;
virBuffer buf = VIR_BUFFER_INITIALIZER;
const char *type = NULL;
char *cancel_path = NULL, *devset = NULL;
char *cancel_path = NULL;
char *devset = NULL;
char *cancelset = NULL;
const char *tpmdev;
*tpmfd = -1;
......@@ -9750,28 +9752,24 @@ qemuBuildTPMBackendStr(const virDomainDef *def,
if (!(cancel_path = virTPMCreateCancelPath(tpmdev)))
goto error;
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) {
if (qemuBuildTPMOpenBackendFDs(tpmdev, cancel_path, tpmfd, cancelfd) < 0)
goto error;
if (qemuBuildTPMOpenBackendFDs(tpmdev, cancel_path, tpmfd, cancelfd) < 0)
goto error;
virCommandPassFD(cmd, *tpmfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
virCommandPassFD(cmd, *cancelfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
devset = qemuVirCommandGetDevSet(cmd, *tpmfd);
if (devset == NULL)
goto error;
virCommandPassFD(cmd, *tpmfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
virCommandPassFD(cmd, *cancelfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
if (!(devset = qemuVirCommandGetDevSet(cmd, *tpmfd)) ||
!(cancelset = qemuVirCommandGetDevSet(cmd, *cancelfd)))
goto error;
VIR_FREE(cancel_path);
cancel_path = qemuVirCommandGetDevSet(cmd, *cancelfd);
if (cancel_path == NULL)
goto error;
}
virBufferAddLit(&buf, ",path=");
virQEMUBuildBufferEscapeComma(&buf, devset ? devset : tpmdev);
virQEMUBuildBufferEscapeComma(&buf, devset);
virBufferAddLit(&buf, ",cancel-path=");
virQEMUBuildBufferEscapeComma(&buf, cancel_path);
virQEMUBuildBufferEscapeComma(&buf, cancelset);
VIR_FREE(devset);
VIR_FREE(cancelset);
VIR_FREE(cancel_path);
break;
......
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
浏览文件 @ f2019083
......@@ -331,33 +331,16 @@
"id": "libvirt-4"
}
{
"execute": "add-fd",
"arguments": {
"fdset-id": 0,
"opaque": "/dev/null"
},
"id": "libvirt-5"
}
{
"return": {
"fd": 13,
"fdset-id": 0
},
"id": "libvirt-5"
}
{
"execute": "block-commit",
"arguments": {
"device": "bogus"
},
"id": "libvirt-6"
"id": "libvirt-5"
}
{
"id": "libvirt-6",
"id": "libvirt-5",
"error": {
"class": "GenericError",
"desc": "Parameter 'top' is missing"
......@@ -366,7 +349,7 @@
{
"execute": "query-kvm",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -374,12 +357,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "query-events",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -463,12 +446,12 @@
"name": "SHUTDOWN"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
"execute": "qom-list-types",
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1044,7 +1027,7 @@
"name": "VGA"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1052,7 +1035,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -1154,7 +1137,7 @@
"type": "hex32"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -1162,7 +1145,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -1308,7 +1291,7 @@
"type": "on/off"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -1316,7 +1299,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -1378,7 +1361,7 @@
"type": "on/off"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -1386,11 +1369,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"
......@@ -1402,11 +1385,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"
......@@ -1418,11 +1401,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"
......@@ -1434,11 +1417,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"
......@@ -1450,7 +1433,7 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -1496,7 +1479,7 @@
"type": "pci-host-devaddr"
}
],
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -1504,7 +1487,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -1546,7 +1529,7 @@
"type": "pci-host-devaddr"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -1554,7 +1537,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -1628,7 +1611,7 @@
"type": "drive"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -1636,7 +1619,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -1690,7 +1673,7 @@
"type": "drive"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -1698,7 +1681,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -1740,7 +1723,7 @@
"type": "uint32"
}
],
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -1748,7 +1731,7 @@
"arguments": {
"typename": "usb-redir"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -1778,7 +1761,7 @@
"type": "chr"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -1786,7 +1769,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -1840,7 +1823,7 @@
"type": "uint32"
}
],
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -1848,7 +1831,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -1874,7 +1857,7 @@
"type": "drive"
}
],
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -1882,13 +1865,13 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
"return": [
],
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -1896,7 +1879,7 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -1906,7 +1889,7 @@
"type": "uint64"
}
],
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -1914,7 +1897,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -1964,7 +1947,7 @@
"type": "drive"
}
],
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -1972,7 +1955,7 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -1986,7 +1969,7 @@
"type": "hex32"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -1994,7 +1977,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -2028,7 +2011,7 @@
"type": "uint32"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -2036,7 +2019,7 @@
"arguments": {
"typename": "vmware-svga"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -2066,7 +2049,7 @@
"type": "uint32"
}
],
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -2074,7 +2057,7 @@
"arguments": {
"typename": "qxl"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -2144,7 +2127,7 @@
"type": "uint32"
}
],
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -2152,11 +2135,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
"id": "libvirt-32",
"id": "libvirt-31",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
......@@ -2168,7 +2151,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -2206,7 +2189,7 @@
"type": "on/off"
}
],
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -2214,11 +2197,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
"id": "libvirt-34",
"id": "libvirt-33",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -2230,13 +2213,13 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
"return": [
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -2244,7 +2227,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -2294,7 +2277,7 @@
"type": "on/off"
}
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -2302,7 +2285,7 @@
"arguments": {
"typename": "mch"
},
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -2328,12 +2311,12 @@
"type": "pci-devfn"
}
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
"execute": "query-machines",
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -2406,12 +2389,12 @@
"cpu-max": 1
}
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -2489,34 +2472,34 @@
"name": "qemu64"
}
],
"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": [
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-command-line-options",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -3217,12 +3200,12 @@
"option": "drive"
}
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......@@ -3232,7 +3215,7 @@
"capability": "xbzrle"
}
],
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
浏览文件 @ f2019083
......@@ -60,7 +60,6 @@
<flag name='vmware-svga'/>
<flag name='usb-serial'/>
<flag name='usb-net'/>
<flag name='add-fd'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
......@@ -109,7 +108,7 @@
<flag name='mch'/>
<version>1005003</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>51089</microcodeVersion>
<microcodeVersion>50896</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
......
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
浏览文件 @ f2019083
......@@ -337,33 +337,16 @@
"id": "libvirt-4"
}
{
"execute": "add-fd",
"arguments": {
"fdset-id": 0,
"opaque": "/dev/null"
},
"id": "libvirt-5"
}
{
"return": {
"fd": 13,
"fdset-id": 0
},
"id": "libvirt-5"
}
{
"execute": "block-commit",
"arguments": {
"device": "bogus"
},
"id": "libvirt-6"
"id": "libvirt-5"
}
{
"id": "libvirt-6",
"id": "libvirt-5",
"error": {
"class": "GenericError",
"desc": "Parameter 'top' is missing"
......@@ -372,7 +355,7 @@
{
"execute": "query-kvm",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -380,12 +363,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "query-events",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -472,12 +455,12 @@
"name": "SHUTDOWN"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
"execute": "qom-list-types",
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1065,7 +1048,7 @@
"name": "VGA"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1073,7 +1056,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -1175,7 +1158,7 @@
"type": "hex32"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -1183,7 +1166,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -1337,7 +1320,7 @@
"type": "on/off"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -1345,7 +1328,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -1407,7 +1390,7 @@
"type": "on/off"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -1415,11 +1398,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"
......@@ -1431,11 +1414,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"
......@@ -1447,11 +1430,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"
......@@ -1463,11 +1446,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"
......@@ -1479,7 +1462,7 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -1525,7 +1508,7 @@
"type": "pci-host-devaddr"
}
],
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -1533,7 +1516,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -1575,7 +1558,7 @@
"type": "pci-host-devaddr"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -1583,7 +1566,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -1657,7 +1640,7 @@
"type": "drive"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -1665,7 +1648,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -1719,7 +1702,7 @@
"type": "drive"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -1727,7 +1710,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -1769,7 +1752,7 @@
"type": "uint32"
}
],
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -1777,7 +1760,7 @@
"arguments": {
"typename": "usb-redir"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -1811,7 +1794,7 @@
"type": "chr"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -1819,7 +1802,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -1877,7 +1860,7 @@
"type": "uint32"
}
],
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -1885,7 +1868,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -1911,7 +1894,7 @@
"type": "drive"
}
],
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -1919,7 +1902,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -1929,7 +1912,7 @@
"type": "size"
}
],
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -1937,7 +1920,7 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -1951,7 +1934,7 @@
"type": "uint64"
}
],
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -1959,7 +1942,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -2009,7 +1992,7 @@
"type": "drive"
}
],
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -2017,7 +2000,7 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -2031,7 +2014,7 @@
"type": "hex32"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -2039,7 +2022,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -2073,7 +2056,7 @@
"type": "uint32"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -2081,7 +2064,7 @@
"arguments": {
"typename": "vmware-svga"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -2111,7 +2094,7 @@
"type": "uint32"
}
],
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -2119,7 +2102,7 @@
"arguments": {
"typename": "qxl"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -2189,7 +2172,7 @@
"type": "uint32"
}
],
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -2197,11 +2180,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
"id": "libvirt-32",
"id": "libvirt-31",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
......@@ -2213,7 +2196,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -2251,7 +2234,7 @@
"type": "on/off"
}
],
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -2259,11 +2242,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
"id": "libvirt-34",
"id": "libvirt-33",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -2275,13 +2258,13 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
"return": [
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -2289,7 +2272,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -2339,7 +2322,7 @@
"type": "on/off"
}
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -2347,7 +2330,7 @@
"arguments": {
"typename": "mch"
},
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -2373,12 +2356,12 @@
"type": "pci-devfn"
}
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
"execute": "query-machines",
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -2459,12 +2442,12 @@
"cpu-max": 1
}
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -2542,34 +2525,34 @@
"name": "qemu64"
}
],
"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": [
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-command-line-options",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -3172,12 +3155,12 @@
"option": "drive"
}
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......@@ -3199,7 +3182,7 @@
"capability": "zero-blocks"
}
],
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
浏览文件 @ f2019083
......@@ -61,7 +61,6 @@
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='usb-net'/>
<flag name='add-fd'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
......@@ -114,7 +113,7 @@
<flag name='mch'/>
<version>1006000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>49318</microcodeVersion>
<microcodeVersion>49125</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
......
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
浏览文件 @ f2019083
......@@ -346,33 +346,16 @@
"id": "libvirt-4"
}
{
"execute": "add-fd",
"arguments": {
"fdset-id": 0,
"opaque": "/dev/null"
},
"id": "libvirt-5"
}
{
"return": {
"fd": 13,
"fdset-id": 0
},
"id": "libvirt-5"
}
{
"execute": "block-commit",
"arguments": {
"device": "bogus"
},
"id": "libvirt-6"
"id": "libvirt-5"
}
{
"id": "libvirt-6",
"id": "libvirt-5",
"error": {
"class": "GenericError",
"desc": "Parameter 'top' is missing"
......@@ -381,7 +364,7 @@
{
"execute": "query-kvm",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -389,12 +372,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "query-events",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -484,12 +467,12 @@
"name": "SHUTDOWN"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
"execute": "qom-list-types",
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1074,7 +1057,7 @@
"name": "VGA"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1082,7 +1065,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -1184,7 +1167,7 @@
"type": "hex32"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -1192,7 +1175,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -1346,7 +1329,7 @@
"type": "on/off"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -1354,7 +1337,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -1416,7 +1399,7 @@
"type": "on/off"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -1424,11 +1407,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"
......@@ -1440,11 +1423,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"
......@@ -1456,11 +1439,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"
......@@ -1472,11 +1455,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"
......@@ -1488,7 +1471,7 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -1534,7 +1517,7 @@
"type": "pci-host-devaddr"
}
],
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -1542,7 +1525,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -1584,7 +1567,7 @@
"type": "pci-host-devaddr"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -1592,7 +1575,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -1666,7 +1649,7 @@
"type": "drive"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -1674,7 +1657,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -1728,7 +1711,7 @@
"type": "drive"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -1736,7 +1719,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -1778,7 +1761,7 @@
"type": "uint32"
}
],
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -1786,7 +1769,7 @@
"arguments": {
"typename": "usb-redir"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -1820,7 +1803,7 @@
"type": "chr"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -1828,7 +1811,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -1886,7 +1869,7 @@
"type": "uint32"
}
],
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -1894,7 +1877,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -1920,7 +1903,7 @@
"type": "drive"
}
],
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -1928,7 +1911,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -1942,7 +1925,7 @@
"type": "size"
}
],
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -1950,7 +1933,7 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -1968,7 +1951,7 @@
"type": "uint64"
}
],
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -1976,7 +1959,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -2026,7 +2009,7 @@
"type": "drive"
}
],
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -2034,7 +2017,7 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -2048,7 +2031,7 @@
"type": "hex32"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -2056,7 +2039,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -2090,7 +2073,7 @@
"type": "uint32"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -2098,7 +2081,7 @@
"arguments": {
"typename": "vmware-svga"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -2128,7 +2111,7 @@
"type": "uint32"
}
],
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -2136,7 +2119,7 @@
"arguments": {
"typename": "qxl"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -2206,7 +2189,7 @@
"type": "uint32"
}
],
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -2214,11 +2197,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
"id": "libvirt-32",
"id": "libvirt-31",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
......@@ -2230,7 +2213,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -2268,7 +2251,7 @@
"type": "on/off"
}
],
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -2276,11 +2259,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
"id": "libvirt-34",
"id": "libvirt-33",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -2292,13 +2275,13 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
"return": [
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -2306,7 +2289,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -2356,7 +2339,7 @@
"type": "on/off"
}
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -2364,7 +2347,7 @@
"arguments": {
"typename": "mch"
},
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -2390,12 +2373,12 @@
"type": "pci-devfn"
}
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
"execute": "query-machines",
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -2484,12 +2467,12 @@
"cpu-max": 1
}
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -2567,34 +2550,34 @@
"name": "qemu64"
}
],
"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": [
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-command-line-options",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -3387,12 +3370,12 @@
"option": "drive"
}
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......@@ -3414,7 +3397,7 @@
"capability": "zero-blocks"
}
],
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
浏览文件 @ f2019083
......@@ -61,7 +61,6 @@
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='usb-net'/>
<flag name='add-fd'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
......@@ -116,7 +115,7 @@
<flag name='mch'/>
<version>1007000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>54762</microcodeVersion>
<microcodeVersion>54569</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
......
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
浏览文件 @ f2019083
......@@ -379,33 +379,16 @@
"id": "libvirt-4"
}
{
"execute": "add-fd",
"arguments": {
"fdset-id": 0,
"opaque": "/dev/null"
},
"id": "libvirt-5"
}
{
"return": {
"fd": 13,
"fdset-id": 0
},
"id": "libvirt-5"
}
{
"execute": "block-commit",
"arguments": {
"device": "bogus"
},
"id": "libvirt-6"
"id": "libvirt-5"
}
{
"id": "libvirt-6",
"id": "libvirt-5",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'bogus' not found"
......@@ -414,7 +397,7 @@
{
"execute": "query-kvm",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -422,12 +405,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "query-events",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -529,12 +512,12 @@
"name": "BLOCK_IMAGE_CORRUPTED"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
"execute": "qom-list-types",
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1317,7 +1300,7 @@
"name": "fusbh200-ehci-usb"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1325,7 +1308,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -1435,7 +1418,7 @@
"type": "uint32"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -1443,7 +1426,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -1605,7 +1588,7 @@
"type": "on/off"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -1613,7 +1596,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -1683,7 +1666,7 @@
"type": "on/off"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -1691,11 +1674,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"
......@@ -1707,11 +1690,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"
......@@ -1723,11 +1706,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"
......@@ -1739,11 +1722,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"
......@@ -1755,7 +1738,7 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -1801,7 +1784,7 @@
"type": "pci-host-devaddr"
}
],
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -1809,7 +1792,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -1851,7 +1834,7 @@
"type": "pci-host-devaddr"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -1859,7 +1842,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -1945,7 +1928,7 @@
"type": "drive"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -1953,7 +1936,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -2007,7 +1990,7 @@
"type": "drive"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -2015,7 +1998,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -2065,7 +2048,7 @@
"type": "uint32"
}
],
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -2073,7 +2056,7 @@
"arguments": {
"typename": "usb-redir"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -2111,7 +2094,7 @@
"type": "chr"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -2119,7 +2102,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -2181,7 +2164,7 @@
"type": "uint32"
}
],
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -2189,7 +2172,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -2215,7 +2198,7 @@
"type": "drive"
}
],
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -2223,7 +2206,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -2261,7 +2244,7 @@
"type": "size"
}
],
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -2269,7 +2252,7 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -2319,7 +2302,7 @@
"type": "uint64"
}
],
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -2327,7 +2310,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -2381,7 +2364,7 @@
"type": "drive"
}
],
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -2389,7 +2372,7 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -2403,7 +2386,7 @@
"type": "uint32"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -2411,7 +2394,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -2445,7 +2428,7 @@
"type": "uint32"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -2453,7 +2436,7 @@
"arguments": {
"typename": "vmware-svga"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -2483,7 +2466,7 @@
"type": "uint32"
}
],
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -2491,7 +2474,7 @@
"arguments": {
"typename": "qxl"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -2561,7 +2544,7 @@
"type": "uint32"
}
],
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -2569,7 +2552,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -2623,7 +2606,7 @@
"type": "pci-devfn"
}
],
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -2631,7 +2614,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -2681,7 +2664,7 @@
"type": "uint32"
}
],
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -2689,11 +2672,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
"id": "libvirt-34",
"id": "libvirt-33",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -2705,13 +2688,13 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
"return": [
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -2719,7 +2702,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -2773,7 +2756,7 @@
"type": "on/off"
}
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -2781,7 +2764,7 @@
"arguments": {
"typename": "mch"
},
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -2807,12 +2790,12 @@
"type": "pci-devfn"
}
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
"execute": "query-machines",
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -2917,12 +2900,12 @@
"cpu-max": 255
}
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -3003,36 +2986,36 @@
"name": "qemu64"
}
],
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"execute": "query-tpm-models",
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"return": [
"tpm-tis"
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"execute": "query-tpm-types",
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"return": [
"passthrough"
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-command-line-options",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -3892,12 +3875,12 @@
"option": "drive"
}
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......@@ -3919,7 +3902,7 @@
"capability": "zero-blocks"
}
],
"id": "libvirt-43"
"id": "libvirt-42"
}
{
......
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
浏览文件 @ f2019083
......@@ -61,7 +61,6 @@
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='usb-net'/>
<flag name='add-fd'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
......@@ -132,7 +131,7 @@
<flag name='mch'/>
<version>2001001</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>63558</microcodeVersion>
<microcodeVersion>63365</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
浏览文件 @ f2019083
......@@ -490,26 +490,9 @@
"id": "libvirt-4"
}
{
"execute": "add-fd",
"arguments": {
"fdset-id": 0,
"opaque": "/dev/null"
},
"id": "libvirt-5"
}
{
"return": {
"fd": 17,
"fdset-id": 0
},
"id": "libvirt-5"
}
{
"execute": "query-kvm",
"id": "libvirt-6"
"id": "libvirt-5"
}
{
......@@ -517,12 +500,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-6"
"id": "libvirt-5"
}
{
"execute": "query-events",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -639,12 +622,12 @@
"name": "ACPI_DEVICE_OST"
}
],
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "qom-list-types",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -3214,7 +3197,7 @@
"parent": "rng-backend"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -3222,7 +3205,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -3450,7 +3433,7 @@
"type": "str"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -3458,7 +3441,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -3745,7 +3728,7 @@
"type": "uint16"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -3753,7 +3736,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -3914,7 +3897,7 @@
"type": "str"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -3922,11 +3905,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
"id": "libvirt-12",
"id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
......@@ -3938,11 +3921,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
"id": "libvirt-13"
"id": "libvirt-12"
}
{
"id": "libvirt-13",
"id": "libvirt-12",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
......@@ -3954,11 +3937,11 @@
"arguments": {
"typename": "virtio-net-s390"
},
"id": "libvirt-14"
"id": "libvirt-13"
}
{
"id": "libvirt-14",
"id": "libvirt-13",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-s390' not found"
......@@ -3970,11 +3953,11 @@
"arguments": {
"typename": "pci-assign"
},
"id": "libvirt-15"
"id": "libvirt-14"
}
{
"id": "libvirt-15",
"id": "libvirt-14",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'pci-assign' not found"
......@@ -3986,11 +3969,11 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-16"
"id": "libvirt-15"
}
{
"id": "libvirt-16",
"id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pci-assign' not found"
......@@ -4002,7 +3985,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -4109,7 +4092,7 @@
"type": "bool"
}
],
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -4117,7 +4100,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -4231,7 +4214,7 @@
"type": "uint64"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -4239,7 +4222,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -4315,7 +4298,7 @@
"type": "uint16"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -4323,11 +4306,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
"id": "libvirt-20",
"id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
......@@ -4339,7 +4322,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -4408,7 +4391,7 @@
"type": "uint32"
}
],
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -4416,7 +4399,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -4443,7 +4426,7 @@
"type": "uint32"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -4451,11 +4434,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
"id": "libvirt-23",
"id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
......@@ -4467,11 +4450,11 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
"id": "libvirt-24",
"id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
......@@ -4483,7 +4466,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -4556,7 +4539,7 @@
"type": "uint16"
}
],
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -4564,11 +4547,11 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
"id": "libvirt-26",
"id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
......@@ -4580,7 +4563,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -4637,7 +4620,7 @@
"type": "int32"
}
],
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -4645,7 +4628,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -4796,7 +4779,7 @@
"type": "str"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -4804,7 +4787,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -4851,7 +4834,7 @@
"type": "size"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -4859,11 +4842,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"
......@@ -4875,7 +4858,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -5018,7 +5001,7 @@
"type": "str"
}
],
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -5026,11 +5009,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
"id": "libvirt-32",
"id": "libvirt-31",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -5042,7 +5025,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -5086,7 +5069,7 @@
"type": "bool"
}
],
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -5094,7 +5077,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -5174,12 +5157,12 @@
"type": "uint32"
}
],
"id": "libvirt-34"
"id": "libvirt-33"
}
{
"execute": "query-machines",
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -5446,12 +5429,12 @@
"cpu-max": 1
}
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -5617,34 +5600,34 @@
"static": false
}
],
"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"
}
{
......@@ -6789,12 +6772,12 @@
"option": "drive"
}
],
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-40"
"id": "libvirt-39"
}
{
......@@ -6844,12 +6827,12 @@
"capability": "return-path"
}
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"execute": "query-qmp-schema",
"id": "libvirt-41"
"id": "libvirt-40"
}
{
......@@ -16572,12 +16555,12 @@
"meta-type": "object"
}
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-gic-capabilities",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -16593,7 +16576,7 @@
"kernel": true
}
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
浏览文件 @ f2019083
......@@ -46,7 +46,6 @@
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='usb-net'/>
<flag name='add-fd'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
......@@ -161,7 +160,7 @@
<flag name='egl-headless'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>307434</microcodeVersion>
<microcodeVersion>307241</microcodeVersion>
<package> (v2.10.0)</package>
<arch>aarch64</arch>
<cpu type='kvm' name='pxa262'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
浏览文件 @ f2019083
......@@ -487,26 +487,9 @@
"id": "libvirt-4"
}
{
"execute": "add-fd",
"arguments": {
"fdset-id": 0,
"opaque": "/dev/null"
},
"id": "libvirt-5"
}
{
"return": {
"fd": 16,
"fdset-id": 0
},
"id": "libvirt-5"
}
{
"execute": "query-kvm",
"id": "libvirt-6"
"id": "libvirt-5"
}
{
......@@ -514,12 +497,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-6"
"id": "libvirt-5"
}
{
"execute": "query-events",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -636,12 +619,12 @@
"name": "ACPI_DEVICE_OST"
}
],
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "qom-list-types",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -3315,7 +3298,7 @@
"parent": "7455-family-powerpc64-cpu"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -3323,7 +3306,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -3551,7 +3534,7 @@
"type": "str"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -3559,7 +3542,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -3846,7 +3829,7 @@
"type": "uint16"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -3854,7 +3837,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -4015,7 +3998,7 @@
"type": "str"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -4023,11 +4006,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
"id": "libvirt-12",
"id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
......@@ -4039,11 +4022,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
"id": "libvirt-13"
"id": "libvirt-12"
}
{
"id": "libvirt-13",
"id": "libvirt-12",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
......@@ -4055,11 +4038,11 @@
"arguments": {
"typename": "virtio-net-s390"
},
"id": "libvirt-14"
"id": "libvirt-13"
}
{
"id": "libvirt-14",
"id": "libvirt-13",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-s390' not found"
......@@ -4071,11 +4054,11 @@
"arguments": {
"typename": "pci-assign"
},
"id": "libvirt-15"
"id": "libvirt-14"
}
{
"id": "libvirt-15",
"id": "libvirt-14",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'pci-assign' not found"
......@@ -4087,11 +4070,11 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-16"
"id": "libvirt-15"
}
{
"id": "libvirt-16",
"id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pci-assign' not found"
......@@ -4103,7 +4086,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -4210,7 +4193,7 @@
"type": "bool"
}
],
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -4218,7 +4201,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -4332,7 +4315,7 @@
"type": "uint64"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -4340,7 +4323,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -4416,7 +4399,7 @@
"type": "uint16"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -4424,11 +4407,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
"id": "libvirt-20",
"id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
......@@ -4440,7 +4423,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -4509,7 +4492,7 @@
"type": "uint32"
}
],
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -4517,7 +4500,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -4544,7 +4527,7 @@
"type": "uint32"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -4552,11 +4535,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
"id": "libvirt-23",
"id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
......@@ -4568,11 +4551,11 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
"id": "libvirt-24",
"id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
......@@ -4584,7 +4567,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -4657,7 +4640,7 @@
"type": "uint16"
}
],
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -4665,11 +4648,11 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
"id": "libvirt-26",
"id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
......@@ -4681,7 +4664,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -4738,7 +4721,7 @@
"type": "int32"
}
],
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -4746,7 +4729,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -4897,7 +4880,7 @@
"type": "str"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -4905,7 +4888,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -4952,7 +4935,7 @@
"type": "size"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -4960,11 +4943,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"
......@@ -4976,7 +4959,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -5119,7 +5102,7 @@
"type": "str"
}
],
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -5127,11 +5110,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
"id": "libvirt-32",
"id": "libvirt-31",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -5143,7 +5126,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -5187,7 +5170,7 @@
"type": "bool"
}
],
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -5195,7 +5178,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -5275,7 +5258,7 @@
"type": "uint32"
}
],
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -5283,7 +5266,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -5369,12 +5352,12 @@
"type": "uint32"
}
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
"execute": "query-machines",
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -5492,12 +5475,12 @@
"cpu-max": 1
}
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -7673,34 +7656,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"
}
{
......@@ -8840,12 +8823,12 @@
"option": "drive"
}
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-41"
"id": "libvirt-40"
}
{
......@@ -8895,12 +8878,12 @@
"capability": "return-path"
}
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......@@ -18623,7 +18606,7 @@
"meta-type": "object"
}
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
......
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
浏览文件 @ f2019083
......@@ -45,7 +45,6 @@
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='usb-net'/>
<flag name='add-fd'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
......@@ -160,7 +159,7 @@
<flag name='egl-headless'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>386779</microcodeVersion>
<microcodeVersion>386586</microcodeVersion>
<package> (v2.10.0)</package>
<arch>ppc64</arch>
<cpu type='kvm' name='default'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
浏览文件 @ f2019083
......@@ -499,26 +499,9 @@
"id": "libvirt-4"
}
{
"execute": "add-fd",
"arguments": {
"fdset-id": 0,
"opaque": "/dev/null"
},
"id": "libvirt-5"
}
{
"return": {
"fd": 15,
"fdset-id": 0
},
"id": "libvirt-5"
}
{
"execute": "query-kvm",
"id": "libvirt-6"
"id": "libvirt-5"
}
{
......@@ -526,12 +509,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-6"
"id": "libvirt-5"
}
{
"execute": "query-events",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -648,12 +631,12 @@
"name": "ACPI_DEVICE_OST"
}
],
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "qom-list-types",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -1555,7 +1538,7 @@
"parent": "virtio-device"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -1563,7 +1546,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1791,7 +1774,7 @@
"type": "str"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -1799,7 +1782,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -2086,7 +2069,7 @@
"type": "uint16"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -2094,7 +2077,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -2255,7 +2238,7 @@
"type": "str"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -2263,7 +2246,7 @@
"arguments": {
"typename": "virtio-blk-ccw"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -2401,7 +2384,7 @@
"type": "uint32"
}
],
"id": "libvirt-12"
"id": "libvirt-11"
}
{
......@@ -2409,7 +2392,7 @@
"arguments": {
"typename": "virtio-net-ccw"
},
"id": "libvirt-13"
"id": "libvirt-12"
}
{
......@@ -2610,7 +2593,7 @@
"type": "uint16"
}
],
"id": "libvirt-13"
"id": "libvirt-12"
}
{
......@@ -2618,7 +2601,7 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
"id": "libvirt-14"
"id": "libvirt-13"
}
{
......@@ -2693,7 +2676,7 @@
"type": "uint32"
}
],
"id": "libvirt-14"
"id": "libvirt-13"
}
{
......@@ -2701,11 +2684,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"
......@@ -2717,11 +2700,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"
......@@ -2733,11 +2716,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"
......@@ -2749,7 +2732,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -2856,7 +2839,7 @@
"type": "bool"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -2864,7 +2847,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -2978,7 +2961,7 @@
"type": "uint64"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -2986,11 +2969,11 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
"id": "libvirt-20",
"id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
......@@ -3002,11 +2985,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"
......@@ -3018,11 +3001,11 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
"id": "libvirt-22",
"id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
......@@ -3034,7 +3017,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -3061,7 +3044,7 @@
"type": "uint32"
}
],
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -3069,11 +3052,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"
......@@ -3085,11 +3068,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"
......@@ -3101,11 +3084,11 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
"id": "libvirt-26",
"id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
......@@ -3117,7 +3100,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -3268,7 +3251,7 @@
"type": "str"
}
],
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -3276,7 +3259,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -3323,7 +3306,7 @@
"type": "size"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -3331,11 +3314,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
"id": "libvirt-29",
"id": "libvirt-28",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
......@@ -3347,7 +3330,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -3490,7 +3473,7 @@
"type": "str"
}
],
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -3498,7 +3481,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -3560,7 +3543,7 @@
"type": "uint32"
}
],
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -3568,7 +3551,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -3612,7 +3595,7 @@
"type": "bool"
}
],
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -3620,7 +3603,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -3630,12 +3613,12 @@
"type": "bool"
}
],
"id": "libvirt-33"
"id": "libvirt-32"
}
{
"execute": "query-machines",
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -3683,12 +3666,12 @@
"cpu-max": 248
}
],
"id": "libvirt-34"
"id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-35"
"id": "libvirt-34"
}
{
......@@ -4222,34 +4205,34 @@
"migration-safe": true
}
],
"id": "libvirt-35"
"id": "libvirt-34"
}
{
"execute": "query-tpm-models",
"id": "libvirt-36"
"id": "libvirt-35"
}
{
"return": [
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
"execute": "query-tpm-types",
"id": "libvirt-37"
"id": "libvirt-36"
}
{
"return": [
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
"execute": "query-command-line-options",
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -5354,12 +5337,12 @@
"option": "drive"
}
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -5409,12 +5392,12 @@
"capability": "return-path"
}
],
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"execute": "query-qmp-schema",
"id": "libvirt-40"
"id": "libvirt-39"
}
{
......@@ -15137,7 +15120,7 @@
"meta-type": "object"
}
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
......@@ -15148,7 +15131,7 @@
"name": "host"
}
},
"id": "libvirt-41"
"id": "libvirt-40"
}
{
......@@ -15188,7 +15171,7 @@
}
}
},
"id": "libvirt-41"
"id": "libvirt-40"
}
{
......@@ -15202,11 +15185,11 @@
}
}
},
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"id": "libvirt-42",
"id": "libvirt-41",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
......
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
浏览文件 @ f2019083
......@@ -28,7 +28,6 @@
<flag name='blockdev-snapshot-sync'/>
<flag name='device-video-primary'/>
<flag name='s390-sclp'/>
<flag name='add-fd'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
......@@ -121,7 +120,7 @@
<flag name='egl-headless'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>307686</microcodeVersion>
<microcodeVersion>307493</microcodeVersion>
<package></package>
<arch>s390x</arch>
<hostCPU type='kvm' model='z14-base' migratability='no'>
......
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
浏览文件 @ f2019083
......@@ -496,26 +496,9 @@
"id": "libvirt-4"
}
{
"execute": "add-fd",
"arguments": {
"fdset-id": 0,
"opaque": "/dev/null"
},
"id": "libvirt-5"
}
{
"return": {
"fd": 15,
"fdset-id": 0
},
"id": "libvirt-5"
}
{
"execute": "query-kvm",
"id": "libvirt-6"
"id": "libvirt-5"
}
{
......@@ -523,12 +506,12 @@
"enabled": true,
"present": true
},
"id": "libvirt-6"
"id": "libvirt-5"
}
{
"execute": "query-events",
"id": "libvirt-7"
"id": "libvirt-6"
}
{
......@@ -645,12 +628,12 @@
"name": "ACPI_DEVICE_OST"
}
],
"id": "libvirt-7"
"id": "libvirt-6"
}
{
"execute": "qom-list-types",
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -2192,7 +2175,7 @@
"parent": "virtio-input-hid-pci"
}
],
"id": "libvirt-8"
"id": "libvirt-7"
}
{
......@@ -2200,7 +2183,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -2428,7 +2411,7 @@
"type": "str"
}
],
"id": "libvirt-9"
"id": "libvirt-8"
}
{
......@@ -2436,7 +2419,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -2723,7 +2706,7 @@
"type": "uint16"
}
],
"id": "libvirt-10"
"id": "libvirt-9"
}
{
......@@ -2731,7 +2714,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -2892,7 +2875,7 @@
"type": "str"
}
],
"id": "libvirt-11"
"id": "libvirt-10"
}
{
......@@ -2900,11 +2883,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
"id": "libvirt-12"
"id": "libvirt-11"
}
{
"id": "libvirt-12",
"id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
......@@ -2916,11 +2899,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
"id": "libvirt-13"
"id": "libvirt-12"
}
{
"id": "libvirt-13",
"id": "libvirt-12",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
......@@ -2932,11 +2915,11 @@
"arguments": {
"typename": "virtio-net-s390"
},
"id": "libvirt-14"
"id": "libvirt-13"
}
{
"id": "libvirt-14",
"id": "libvirt-13",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-s390' not found"
......@@ -2948,11 +2931,11 @@
"arguments": {
"typename": "pci-assign"
},
"id": "libvirt-15"
"id": "libvirt-14"
}
{
"id": "libvirt-15",
"id": "libvirt-14",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'pci-assign' not found"
......@@ -2964,7 +2947,7 @@
"arguments": {
"typename": "kvm-pci-assign"
},
"id": "libvirt-16"
"id": "libvirt-15"
}
{
......@@ -3026,7 +3009,7 @@
"type": "bool"
}
],
"id": "libvirt-16"
"id": "libvirt-15"
}
{
......@@ -3034,7 +3017,7 @@
"arguments": {
"typename": "vfio-pci"
},
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -3141,7 +3124,7 @@
"type": "bool"
}
],
"id": "libvirt-17"
"id": "libvirt-16"
}
{
......@@ -3149,7 +3132,7 @@
"arguments": {
"typename": "scsi-disk"
},
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -3263,7 +3246,7 @@
"type": "uint64"
}
],
"id": "libvirt-18"
"id": "libvirt-17"
}
{
......@@ -3271,7 +3254,7 @@
"arguments": {
"typename": "ide-drive"
},
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -3347,7 +3330,7 @@
"type": "uint16"
}
],
"id": "libvirt-19"
"id": "libvirt-18"
}
{
......@@ -3355,7 +3338,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -3418,7 +3401,7 @@
"type": "int32"
}
],
"id": "libvirt-20"
"id": "libvirt-19"
}
{
......@@ -3426,7 +3409,7 @@
"arguments": {
"typename": "usb-redir"
},
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -3475,7 +3458,7 @@
"type": "bool"
}
],
"id": "libvirt-21"
"id": "libvirt-20"
}
{
......@@ -3483,7 +3466,7 @@
"arguments": {
"typename": "usb-host"
},
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -3552,7 +3535,7 @@
"type": "uint32"
}
],
"id": "libvirt-22"
"id": "libvirt-21"
}
{
......@@ -3560,7 +3543,7 @@
"arguments": {
"typename": "scsi-generic"
},
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -3587,7 +3570,7 @@
"type": "uint32"
}
],
"id": "libvirt-23"
"id": "libvirt-22"
}
{
......@@ -3595,7 +3578,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -3633,7 +3616,7 @@
"type": "child<qemu:memory-region>"
}
],
"id": "libvirt-24"
"id": "libvirt-23"
}
{
......@@ -3641,7 +3624,7 @@
"arguments": {
"typename": "q35-pcihost"
},
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -3719,7 +3702,7 @@
"type": "uint64"
}
],
"id": "libvirt-25"
"id": "libvirt-24"
}
{
......@@ -3727,7 +3710,7 @@
"arguments": {
"typename": "usb-storage"
},
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -3800,7 +3783,7 @@
"type": "uint16"
}
],
"id": "libvirt-26"
"id": "libvirt-25"
}
{
......@@ -3808,7 +3791,7 @@
"arguments": {
"typename": "kvm-pit"
},
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -3822,7 +3805,7 @@
"type": "LostTickPolicy"
}
],
"id": "libvirt-27"
"id": "libvirt-26"
}
{
......@@ -3830,7 +3813,7 @@
"arguments": {
"typename": "VGA"
},
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -3887,7 +3870,7 @@
"type": "int32"
}
],
"id": "libvirt-28"
"id": "libvirt-27"
}
{
......@@ -3895,7 +3878,7 @@
"arguments": {
"typename": "vmware-svga"
},
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -3938,7 +3921,7 @@
"type": "int32"
}
],
"id": "libvirt-29"
"id": "libvirt-28"
}
{
......@@ -3946,7 +3929,7 @@
"arguments": {
"typename": "qxl"
},
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -4041,7 +4024,7 @@
"type": "uint32"
}
],
"id": "libvirt-30"
"id": "libvirt-29"
}
{
......@@ -4049,7 +4032,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -4210,7 +4193,7 @@
"type": "str"
}
],
"id": "libvirt-31"
"id": "libvirt-30"
}
{
......@@ -4218,7 +4201,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -4275,7 +4258,7 @@
"type": "size"
}
],
"id": "libvirt-32"
"id": "libvirt-31"
}
{
......@@ -4283,7 +4266,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -4379,7 +4362,7 @@
"type": "uint32"
}
],
"id": "libvirt-33"
"id": "libvirt-32"
}
{
......@@ -4387,7 +4370,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -4530,7 +4513,7 @@
"type": "str"
}
],
"id": "libvirt-34"
"id": "libvirt-33"
}
{
......@@ -4538,11 +4521,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
"id": "libvirt-35"
"id": "libvirt-34"
}
{
"id": "libvirt-35",
"id": "libvirt-34",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
......@@ -4554,7 +4537,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -4598,7 +4581,7 @@
"type": "bool"
}
],
"id": "libvirt-36"
"id": "libvirt-35"
}
{
......@@ -4606,7 +4589,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -4686,7 +4669,7 @@
"type": "uint32"
}
],
"id": "libvirt-37"
"id": "libvirt-36"
}
{
......@@ -4694,7 +4677,7 @@
"arguments": {
"typename": "intel-iommu"
},
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -4729,7 +4712,7 @@
"type": "bool"
}
],
"id": "libvirt-38"
"id": "libvirt-37"
}
{
......@@ -4737,7 +4720,7 @@
"arguments": {
"typename": "mch"
},
"id": "libvirt-39"
"id": "libvirt-38"
}
{
......@@ -4763,12 +4746,12 @@
"type": "pci-devfn"
}
],
"id": "libvirt-39"
"id": "libvirt-38"
}
{
"execute": "query-machines",
"id": "libvirt-40"
"id": "libvirt-39"
}
{
......@@ -4957,12 +4940,12 @@
"alias": "q35"
}
],
"id": "libvirt-40"
"id": "libvirt-39"
}
{
"execute": "query-cpu-definitions",
"id": "libvirt-41"
"id": "libvirt-40"
}
{
......@@ -5297,36 +5280,36 @@
"migration-safe": true
}
],
"id": "libvirt-41"
"id": "libvirt-40"
}
{
"execute": "query-tpm-models",
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"return": [
"tpm-tis"
],
"id": "libvirt-42"
"id": "libvirt-41"
}
{
"execute": "query-tpm-types",
"id": "libvirt-43"
"id": "libvirt-42"
}
{
"return": [
"passthrough"
],
"id": "libvirt-43"
"id": "libvirt-42"
}
{
"execute": "query-command-line-options",
"id": "libvirt-44"
"id": "libvirt-43"
}
{
......@@ -6605,12 +6588,12 @@
"option": "drive"
}
],
"id": "libvirt-44"
"id": "libvirt-43"
}
{
"execute": "query-migrate-capabilities",
"id": "libvirt-45"
"id": "libvirt-44"
}
{
......@@ -6660,12 +6643,12 @@
"capability": "return-path"
}
],
"id": "libvirt-45"
"id": "libvirt-44"
}
{
"execute": "query-qmp-schema",
"id": "libvirt-46"
"id": "libvirt-45"
}
{
......@@ -16388,7 +16371,7 @@
"meta-type": "object"
}
],
"id": "libvirt-46"
"id": "libvirt-45"
}
{
......@@ -16399,7 +16382,7 @@
"name": "host"
}
},
"id": "libvirt-47"
"id": "libvirt-46"
}
{
......@@ -16578,7 +16561,7 @@
}
}
},
"id": "libvirt-47"
"id": "libvirt-46"
}
{
......@@ -16759,7 +16742,7 @@
}
}
},
"id": "libvirt-48"
"id": "libvirt-47"
}
{
......@@ -17002,7 +16985,7 @@
}
}
},
"id": "libvirt-48"
"id": "libvirt-47"
}
{
......@@ -17016,7 +16999,7 @@
}
}
},
"id": "libvirt-49"
"id": "libvirt-48"
}
{
......@@ -17195,7 +17178,7 @@
}
}
},
"id": "libvirt-49"
"id": "libvirt-48"
}
{
......@@ -17376,7 +17359,7 @@
}
}
},
"id": "libvirt-50"
"id": "libvirt-49"
}
{
......@@ -17619,7 +17602,7 @@
}
}
},
"id": "libvirt-50"
"id": "libvirt-49"
}
{
......
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
浏览文件 @ f2019083
......@@ -61,7 +61,6 @@
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='usb-net'/>
<flag name='add-fd'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
......@@ -205,7 +204,7 @@
<flag name='egl-headless'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>367782</microcodeVersion>
<microcodeVersion>367589</microcodeVersion>
<package> (v2.10.0)</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
......
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
浏览文件 @ f2019083
......@@ -28,7 +28,6 @@
<flag name='blockdev-snapshot-sync'/>
<flag name='device-video-primary'/>
<flag name='s390-sclp'/>
<flag name='add-fd'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
......@@ -128,7 +127,7 @@
<flag name='egl-headless'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>346538</microcodeVersion>
<microcodeVersion>346345</microcodeVersion>
<package></package>
<arch>s390x</arch>
<hostCPU type='kvm' model='z14-base' migratability='no'>
......
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
浏览文件 @ f2019083
......@@ -59,7 +59,6 @@
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='usb-net'/>
<flag name='add-fd'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
......@@ -209,7 +208,7 @@
<flag name='egl-headless'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>371242</microcodeVersion>
<microcodeVersion>371049</microcodeVersion>
<package> (v2.11.0)</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
......
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
浏览文件 @ f2019083
......@@ -46,7 +46,6 @@
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='usb-net'/>
<flag name='add-fd'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
......@@ -172,7 +171,7 @@
<flag name='vfio-pci.display'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>347337</microcodeVersion>
<microcodeVersion>347144</microcodeVersion>
<package>v2.12.0-rc0</package>
<arch>aarch64</arch>
<cpu type='kvm' name='pxa262'/>
......
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
浏览文件 @ f2019083
......@@ -20,7 +20,6 @@
<flag name='drive-mirror'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='device-video-primary'/>
<flag name='add-fd'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
......
tests/qemuxml2argvtest.c
浏览文件 @ f2019083
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或