Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 f480a87a 编写于 作者: P Pavel Hrdina
浏览文件
操作

caps: introduce new QEMU capability for vgamem_mb device property 

Allow setting vgamem size for video devices.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1076098Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
上级 c32cfc6d
隐藏空白更改
内联 并排
Showing with 1530 addition and 49 deletion
src/qemu/qemu_capabilities.c
浏览文件 @ f480a87a
...@@ -272,6 +272,11 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, ...@@ -272,6 +272,11 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"migrate-rdma", "migrate-rdma",
"ivshmem", "ivshmem",
"drive-iotune-max", "drive-iotune-max",
"VGA.vgamem_mb", /* 180 */
"vmware-svga.vgamem_mb",
"qxl.vgamem_mb",
"qxl-vga.vgamem_mb",
); );
...@@ -1581,6 +1586,22 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsKVMPit[] = { ...@@ -1581,6 +1586,22 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsKVMPit[] = {
{ "lost_tick_policy", QEMU_CAPS_KVM_PIT_TICK_POLICY }, { "lost_tick_policy", QEMU_CAPS_KVM_PIT_TICK_POLICY },
}; };
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVGA[] = {
{ "vgamem_mb", QEMU_CAPS_VGA_VGAMEM },
};
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVmwareSvga[] = {
{ "vgamem_mb", QEMU_CAPS_VMWARE_SVGA_VGAMEM },
};
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = {
{ "vgamem_mb", QEMU_CAPS_QXL_VGAMEM },
};
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxlVga[] = {
{ "vgamem_mb", QEMU_CAPS_QXL_VGA_VGAMEM },
};
struct virQEMUCapsObjectTypeProps { struct virQEMUCapsObjectTypeProps {
const char *type; const char *type;
struct virQEMUCapsStringFlags *props; struct virQEMUCapsStringFlags *props;
...@@ -1626,6 +1647,14 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { ...@@ -1626,6 +1647,14 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBStorage) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBStorage) },
{ "kvm-pit", virQEMUCapsObjectPropsKVMPit, { "kvm-pit", virQEMUCapsObjectPropsKVMPit,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit) },
{ "VGA", virQEMUCapsObjectPropsVGA,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVGA) },
{ "vmware-svga", virQEMUCapsObjectPropsVmwareSvga,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVmwareSvga) },
{ "qxl", virQEMUCapsObjectPropsQxl,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxl) },
{ "qxl-vga", virQEMUCapsObjectPropsQxlVga,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxlVga) },
}; };
...@@ -1817,6 +1846,10 @@ virQEMUCapsExtractDeviceStr(const char *qemu, ...@@ -1817,6 +1846,10 @@ virQEMUCapsExtractDeviceStr(const char *qemu,
"-device", "usb-host,?", "-device", "usb-host,?",
"-device", "scsi-generic,?", "-device", "scsi-generic,?",
"-device", "usb-storage,?", "-device", "usb-storage,?",
"-device", "VGA,?",
"-device", "vmware-svga,?",
"-device", "qxl,?",
"-device", "qxl-vga,?",
NULL); NULL);
/* qemu -help goes to stdout, but qemu -device ? goes to stderr. */ /* qemu -help goes to stdout, but qemu -device ? goes to stderr. */
virCommandSetErrorBuffer(cmd, &output); virCommandSetErrorBuffer(cmd, &output);
......
src/qemu/qemu_capabilities.h
浏览文件 @ f480a87a
...@@ -219,6 +219,10 @@ typedef enum { ...@@ -219,6 +219,10 @@ typedef enum {
QEMU_CAPS_MIGRATE_RDMA = 177, /* have rdma migration */ QEMU_CAPS_MIGRATE_RDMA = 177, /* have rdma migration */
QEMU_CAPS_DEVICE_IVSHMEM = 178, /* -device ivshmem */ QEMU_CAPS_DEVICE_IVSHMEM = 178, /* -device ivshmem */
QEMU_CAPS_DRIVE_IOTUNE_MAX = 179, /* -drive bps_max= and friends */ QEMU_CAPS_DRIVE_IOTUNE_MAX = 179, /* -drive bps_max= and friends */
QEMU_CAPS_VGA_VGAMEM = 180, /* -device VGA.vgamem_mb */
QEMU_CAPS_VMWARE_SVGA_VGAMEM = 181, /* -device vmware-svga.vgamem_mb */
QEMU_CAPS_QXL_VGAMEM = 182, /* -device qxl.vgamem_mb */
QEMU_CAPS_QXL_VGA_VGAMEM = 183, /* -device qxl-vga.vgamem_mb */
QEMU_CAPS_LAST, /* this must always be the last item */ QEMU_CAPS_LAST, /* this must always be the last item */
} virQEMUCapsFlags; } virQEMUCapsFlags;
......
tests/qemucapabilitiesdata/caps_1.2.2-1.caps
浏览文件 @ f480a87a
...@@ -116,4 +116,8 @@ ...@@ -116,4 +116,8 @@
<flag name='host-pci-multidomain'/> <flag name='host-pci-multidomain'/>
<flag name='usb-audio'/> <flag name='usb-audio'/>
<flag name='ivshmem'/> <flag name='ivshmem'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
<flag name='qxl-vga.vgamem_mb'/>
</qemuCaps> </qemuCaps>
tests/qemucapabilitiesdata/caps_1.2.2-1.replies
浏览文件 @ f480a87a
...@@ -1405,6 +1405,198 @@ ...@@ -1405,6 +1405,198 @@
"id": "libvirt-26" "id": "libvirt-26"
} }
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-27"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-28"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-29"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-30"
}
{ {
"return": [ "return": [
{ {
...@@ -1449,7 +1641,7 @@ ...@@ -1449,7 +1641,7 @@
"name": "none" "name": "none"
} }
], ],
"id": "libvirt-26" "id": "libvirt-31"
} }
{ {
...@@ -1521,7 +1713,7 @@ ...@@ -1521,7 +1713,7 @@
"name": "Opteron_G4" "name": "Opteron_G4"
} }
], ],
"id": "libvirt-27" "id": "libvirt-32"
} }
{ {
...@@ -1529,11 +1721,11 @@ ...@@ -1529,11 +1721,11 @@
"enabled": false, "enabled": false,
"present": true "present": true
}, },
"id": "libvirt-28" "id": "libvirt-33"
} }
{ {
"id": "libvirt-29", "id": "libvirt-34",
"error": { "error": {
"class": "CommandNotFound", "class": "CommandNotFound",
"desc": "The command query-tpm-models has not been found" "desc": "The command query-tpm-models has not been found"
...@@ -1541,7 +1733,7 @@ ...@@ -1541,7 +1733,7 @@
} }
{ {
"id": "libvirt-30", "id": "libvirt-35",
"error": { "error": {
"class": "CommandNotFound", "class": "CommandNotFound",
"desc": "The command query-tpm-types has not been found" "desc": "The command query-tpm-types has not been found"
...@@ -1549,7 +1741,7 @@ ...@@ -1549,7 +1741,7 @@
} }
{ {
"id": "libvirt-31", "id": "libvirt-36",
"error": { "error": {
"class": "CommandNotFound", "class": "CommandNotFound",
"desc": "The command query-command-line-options has not been found" "desc": "The command query-command-line-options has not been found"
...@@ -1563,5 +1755,5 @@ ...@@ -1563,5 +1755,5 @@
"state": false "state": false
} }
], ],
"id": "libvirt-32" "id": "libvirt-37"
} }
tests/qemucapabilitiesdata/caps_1.3.1-1.caps
浏览文件 @ f480a87a
...@@ -130,4 +130,8 @@ ...@@ -130,4 +130,8 @@
<flag name='host-pci-multidomain'/> <flag name='host-pci-multidomain'/>
<flag name='usb-audio'/> <flag name='usb-audio'/>
<flag name='ivshmem'/> <flag name='ivshmem'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
<flag name='qxl-vga.vgamem_mb'/>
</qemuCaps> </qemuCaps>
tests/qemucapabilitiesdata/caps_1.3.1-1.replies
浏览文件 @ f480a87a
...@@ -1572,6 +1572,210 @@ ...@@ -1572,6 +1572,210 @@
"id": "libvirt-27" "id": "libvirt-27"
} }
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "mmio",
"type": "on/off"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-28"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-29"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "surfaces",
"type": "int32"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-30"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "surfaces",
"type": "int32"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-31"
}
{ {
"return": [ "return": [
{ {
...@@ -1623,7 +1827,7 @@ ...@@ -1623,7 +1827,7 @@
"name": "none" "name": "none"
} }
], ],
"id": "libvirt-28" "id": "libvirt-32"
} }
{ {
...@@ -1701,7 +1905,7 @@ ...@@ -1701,7 +1905,7 @@
"name": "Opteron_G5" "name": "Opteron_G5"
} }
], ],
"id": "libvirt-29" "id": "libvirt-33"
} }
{ {
...@@ -1709,11 +1913,11 @@ ...@@ -1709,11 +1913,11 @@
"enabled": false, "enabled": false,
"present": true "present": true
}, },
"id": "libvirt-30" "id": "libvirt-34"
} }
{ {
"id": "libvirt-31", "id": "libvirt-35",
"error": { "error": {
"class": "CommandNotFound", "class": "CommandNotFound",
"desc": "The command query-tpm-models has not been found" "desc": "The command query-tpm-models has not been found"
...@@ -1721,7 +1925,7 @@ ...@@ -1721,7 +1925,7 @@
} }
{ {
"id": "libvirt-32", "id": "libvirt-36",
"error": { "error": {
"class": "CommandNotFound", "class": "CommandNotFound",
"desc": "The command query-tpm-types has not been found" "desc": "The command query-tpm-types has not been found"
...@@ -1729,7 +1933,7 @@ ...@@ -1729,7 +1933,7 @@
} }
{ {
"id": "libvirt-33", "id": "libvirt-37",
"error": { "error": {
"class": "CommandNotFound", "class": "CommandNotFound",
"desc": "The command query-command-line-options has not been found" "desc": "The command query-command-line-options has not been found"
...@@ -1743,5 +1947,5 @@ ...@@ -1743,5 +1947,5 @@
"state": false "state": false
} }
], ],
"id": "libvirt-34" "id": "libvirt-38"
} }
tests/qemucapabilitiesdata/caps_1.4.2-1.caps
浏览文件 @ f480a87a
...@@ -131,4 +131,8 @@ ...@@ -131,4 +131,8 @@
<flag name='host-pci-multidomain'/> <flag name='host-pci-multidomain'/>
<flag name='usb-audio'/> <flag name='usb-audio'/>
<flag name='ivshmem'/> <flag name='ivshmem'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
<flag name='qxl-vga.vgamem_mb'/>
</qemuCaps> </qemuCaps>
tests/qemucapabilitiesdata/caps_1.4.2-1.replies
浏览文件 @ f480a87a
...@@ -1619,6 +1619,210 @@ ...@@ -1619,6 +1619,210 @@
"id": "libvirt-27" "id": "libvirt-27"
} }
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "mmio",
"type": "on/off"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-28"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-29"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "surfaces",
"type": "int32"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-30"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "surfaces",
"type": "int32"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-31"
}
{ {
"return": [ "return": [
{ {
...@@ -1673,7 +1877,7 @@ ...@@ -1673,7 +1877,7 @@
"name": "none" "name": "none"
} }
], ],
"id": "libvirt-28" "id": "libvirt-32"
} }
{ {
...@@ -1751,7 +1955,7 @@ ...@@ -1751,7 +1955,7 @@
"name": "qemu64" "name": "qemu64"
} }
], ],
"id": "libvirt-29" "id": "libvirt-33"
} }
{ {
...@@ -1759,11 +1963,11 @@ ...@@ -1759,11 +1963,11 @@
"enabled": false, "enabled": false,
"present": true "present": true
}, },
"id": "libvirt-30" "id": "libvirt-34"
} }
{ {
"id": "libvirt-31", "id": "libvirt-35",
"error": { "error": {
"class": "CommandNotFound", "class": "CommandNotFound",
"desc": "The command query-tpm-models has not been found" "desc": "The command query-tpm-models has not been found"
...@@ -1771,7 +1975,7 @@ ...@@ -1771,7 +1975,7 @@
} }
{ {
"id": "libvirt-32", "id": "libvirt-36",
"error": { "error": {
"class": "CommandNotFound", "class": "CommandNotFound",
"desc": "The command query-tpm-types has not been found" "desc": "The command query-tpm-types has not been found"
...@@ -1779,7 +1983,7 @@ ...@@ -1779,7 +1983,7 @@
} }
{ {
"id": "libvirt-33", "id": "libvirt-37",
"error": { "error": {
"class": "CommandNotFound", "class": "CommandNotFound",
"desc": "The command query-command-line-options has not been found" "desc": "The command query-command-line-options has not been found"
...@@ -1793,5 +1997,5 @@ ...@@ -1793,5 +1997,5 @@
"state": false "state": false
} }
], ],
"id": "libvirt-34" "id": "libvirt-38"
} }
tests/qemucapabilitiesdata/caps_1.5.3-1.caps
浏览文件 @ f480a87a
...@@ -140,4 +140,8 @@ ...@@ -140,4 +140,8 @@
<flag name='usb-audio'/> <flag name='usb-audio'/>
<flag name='splash-timeout'/> <flag name='splash-timeout'/>
<flag name='ivshmem'/> <flag name='ivshmem'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
<flag name='qxl-vga.vgamem_mb'/>
</qemuCaps> </qemuCaps>
tests/qemucapabilitiesdata/caps_1.5.3-1.replies
浏览文件 @ f480a87a
...@@ -1693,6 +1693,210 @@ ...@@ -1693,6 +1693,210 @@
"id": "libvirt-27" "id": "libvirt-27"
} }
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "mmio",
"type": "on/off"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-28"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-29"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "surfaces",
"type": "int32"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-30"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "surfaces",
"type": "int32"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-31"
}
{ {
"return": [ "return": [
{ {
...@@ -1763,7 +1967,7 @@ ...@@ -1763,7 +1967,7 @@
"cpu-max": 1 "cpu-max": 1
} }
], ],
"id": "libvirt-28" "id": "libvirt-32"
} }
{ {
...@@ -1841,7 +2045,7 @@ ...@@ -1841,7 +2045,7 @@
"name": "qemu64" "name": "qemu64"
} }
], ],
"id": "libvirt-29" "id": "libvirt-33"
} }
{ {
...@@ -1849,19 +2053,19 @@ ...@@ -1849,19 +2053,19 @@
"enabled": false, "enabled": false,
"present": true "present": true
}, },
"id": "libvirt-30" "id": "libvirt-34"
} }
{ {
"return": [ "return": [
], ],
"id": "libvirt-31" "id": "libvirt-35"
} }
{ {
"return": [ "return": [
], ],
"id": "libvirt-32" "id": "libvirt-36"
} }
{ {
...@@ -2537,7 +2741,7 @@ ...@@ -2537,7 +2741,7 @@
"option": "drive" "option": "drive"
} }
], ],
"id": "libvirt-33" "id": "libvirt-37"
} }
{ {
...@@ -2547,5 +2751,5 @@ ...@@ -2547,5 +2751,5 @@
"state": false "state": false
} }
], ],
"id": "libvirt-34" "id": "libvirt-38"
} }
tests/qemucapabilitiesdata/caps_1.6.0-1.caps
浏览文件 @ f480a87a
...@@ -146,4 +146,8 @@ ...@@ -146,4 +146,8 @@
<flag name='usb-audio'/> <flag name='usb-audio'/>
<flag name='splash-timeout'/> <flag name='splash-timeout'/>
<flag name='ivshmem'/> <flag name='ivshmem'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
<flag name='qxl-vga.vgamem_mb'/>
</qemuCaps> </qemuCaps>
tests/qemucapabilitiesdata/caps_1.6.0-1.replies
浏览文件 @ f480a87a
...@@ -1755,6 +1755,210 @@ ...@@ -1755,6 +1755,210 @@
"id": "libvirt-27" "id": "libvirt-27"
} }
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "mmio",
"type": "on/off"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-28"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-29"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "surfaces",
"type": "int32"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-30"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "surfaces",
"type": "int32"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-31"
}
{ {
"return": [ "return": [
{ {
...@@ -1841,7 +2045,7 @@ ...@@ -1841,7 +2045,7 @@
"cpu-max": 1 "cpu-max": 1
} }
], ],
"id": "libvirt-28" "id": "libvirt-32"
} }
{ {
...@@ -1919,7 +2123,7 @@ ...@@ -1919,7 +2123,7 @@
"name": "qemu64" "name": "qemu64"
} }
], ],
"id": "libvirt-29" "id": "libvirt-33"
} }
{ {
...@@ -1927,19 +2131,19 @@ ...@@ -1927,19 +2131,19 @@
"enabled": false, "enabled": false,
"present": true "present": true
}, },
"id": "libvirt-30" "id": "libvirt-34"
} }
{ {
"return": [ "return": [
], ],
"id": "libvirt-31" "id": "libvirt-35"
} }
{ {
"return": [ "return": [
], ],
"id": "libvirt-32" "id": "libvirt-36"
} }
{ {
...@@ -2517,7 +2721,7 @@ ...@@ -2517,7 +2721,7 @@
"option": "drive" "option": "drive"
} }
], ],
"id": "libvirt-33" "id": "libvirt-37"
} }
{ {
...@@ -2539,5 +2743,5 @@ ...@@ -2539,5 +2743,5 @@
"state": false "state": false
} }
], ],
"id": "libvirt-34" "id": "libvirt-38"
} }
tests/qemucapabilitiesdata/caps_1.6.50-1.caps
浏览文件 @ f480a87a
...@@ -146,4 +146,8 @@ ...@@ -146,4 +146,8 @@
<flag name='usb-audio'/> <flag name='usb-audio'/>
<flag name='splash-timeout'/> <flag name='splash-timeout'/>
<flag name='ivshmem'/> <flag name='ivshmem'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
<flag name='qxl-vga.vgamem_mb'/>
</qemuCaps> </qemuCaps>
tests/qemucapabilitiesdata/caps_1.6.50-1.replies
浏览文件 @ f480a87a
...@@ -1719,6 +1719,210 @@ ...@@ -1719,6 +1719,210 @@
"id": "libvirt-27" "id": "libvirt-27"
} }
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "mmio",
"type": "on/off"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-28"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-29"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "surfaces",
"type": "int32"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-30"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "surfaces",
"type": "int32"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-31"
}
{ {
"return": [ "return": [
{ {
...@@ -1813,7 +2017,7 @@ ...@@ -1813,7 +2017,7 @@
"cpu-max": 1 "cpu-max": 1
} }
], ],
"id": "libvirt-28" "id": "libvirt-32"
} }
{ {
...@@ -1891,7 +2095,7 @@ ...@@ -1891,7 +2095,7 @@
"name": "qemu64" "name": "qemu64"
} }
], ],
"id": "libvirt-29" "id": "libvirt-33"
} }
{ {
...@@ -1899,19 +2103,19 @@ ...@@ -1899,19 +2103,19 @@
"enabled": false, "enabled": false,
"present": true "present": true
}, },
"id": "libvirt-30" "id": "libvirt-34"
} }
{ {
"return": [ "return": [
], ],
"id": "libvirt-31" "id": "libvirt-35"
} }
{ {
"return": [ "return": [
], ],
"id": "libvirt-32" "id": "libvirt-36"
} }
{ {
...@@ -2499,7 +2703,7 @@ ...@@ -2499,7 +2703,7 @@
"option": "drive" "option": "drive"
} }
], ],
"id": "libvirt-33" "id": "libvirt-37"
} }
{ {
...@@ -2521,5 +2725,5 @@ ...@@ -2521,5 +2725,5 @@
"state": false "state": false
} }
], ],
"id": "libvirt-34" "id": "libvirt-38"
} }
tests/qemucapabilitiesdata/caps_2.1.1-1.caps
浏览文件 @ f480a87a
...@@ -161,4 +161,8 @@ ...@@ -161,4 +161,8 @@
<flag name='migrate-rdma'/> <flag name='migrate-rdma'/>
<flag name='ivshmem'/> <flag name='ivshmem'/>
<flag name='drive-iotune-max'/> <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
<flag name='qxl-vga.vgamem_mb'/>
</qemuCaps> </qemuCaps>
tests/qemucapabilitiesdata/caps_2.1.1-1.replies
浏览文件 @ f480a87a
...@@ -2165,6 +2165,210 @@ ...@@ -2165,6 +2165,210 @@
"id": "libvirt-27" "id": "libvirt-27"
} }
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "mmio",
"type": "on/off"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-28"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "vgamem_mb",
"type": "uint32"
}
],
"id": "libvirt-29"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "surfaces",
"type": "int32"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-30"
}
{
"return": [
{
"name": "command_serr_enable",
"type": "on/off"
},
{
"name": "multifunction",
"type": "on/off"
},
{
"name": "rombar",
"type": "uint32"
},
{
"name": "romfile",
"type": "string"
},
{
"name": "addr",
"type": "pci-devfn"
},
{
"name": "surfaces",
"type": "int32"
},
{
"name": "vgamem_mb",
"type": "uint32"
},
{
"name": "vram64_size_mb",
"type": "uint32"
},
{
"name": "vram_size_mb",
"type": "uint32"
},
{
"name": "ram_size_mb",
"type": "uint32"
},
{
"name": "cmdlog",
"type": "uint32"
},
{
"name": "guestdebug",
"type": "uint32"
},
{
"name": "debug",
"type": "uint32"
},
{
"name": "revision",
"type": "uint32"
},
{
"name": "vram_size",
"type": "uint32"
},
{
"name": "ram_size",
"type": "uint32"
}
],
"id": "libvirt-31"
}
{ {
"return": [ "return": [
{ {
...@@ -2275,7 +2479,7 @@ ...@@ -2275,7 +2479,7 @@
"cpu-max": 255 "cpu-max": 255
} }
], ],
"id": "libvirt-28" "id": "libvirt-32"
} }
{ {
...@@ -2356,7 +2560,7 @@ ...@@ -2356,7 +2560,7 @@
"name": "qemu64" "name": "qemu64"
} }
], ],
"id": "libvirt-29" "id": "libvirt-33"
} }
{ {
...@@ -2364,21 +2568,21 @@ ...@@ -2364,21 +2568,21 @@
"enabled": false, "enabled": false,
"present": true "present": true
}, },
"id": "libvirt-30" "id": "libvirt-34"
} }
{ {
"return": [ "return": [
"tpm-tis" "tpm-tis"
], ],
"id": "libvirt-31" "id": "libvirt-35"
} }
{ {
"return": [ "return": [
"passthrough" "passthrough"
], ],
"id": "libvirt-32" "id": "libvirt-36"
} }
{ {
...@@ -3238,7 +3442,7 @@ ...@@ -3238,7 +3442,7 @@
"option": "drive" "option": "drive"
} }
], ],
"id": "libvirt-33" "id": "libvirt-37"
} }
{ {
...@@ -3260,5 +3464,5 @@ ...@@ -3260,5 +3464,5 @@
"capability": "zero-blocks" "capability": "zero-blocks"
} }
], ],
"id": "libvirt-34" "id": "libvirt-38"
} }
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或