提交 d125685a 编写于 作者: J John Ferlan

qemu: Add capability bit for qemu secret object

Add a capability bit for the qemu secret object.

Adjust the 2.6.0-1 caps/replies to add the secret object. For the
.replies it's take from the '{"execute":"qom-list-types"}' output.
上级 2fbf29a5
...@@ -321,6 +321,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, ...@@ -321,6 +321,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"qxl-vga.vram64_size_mb", /* 215 */ "qxl-vga.vram64_size_mb", /* 215 */
"chardev-logfile", "chardev-logfile",
"debug-threads", "debug-threads",
"secret",
); );
...@@ -1575,6 +1576,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { ...@@ -1575,6 +1576,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "virtio-input-host-device", QEMU_CAPS_VIRTIO_INPUT_HOST }, { "virtio-input-host-device", QEMU_CAPS_VIRTIO_INPUT_HOST },
{ "virtio-input-host-pci", QEMU_CAPS_VIRTIO_INPUT_HOST }, { "virtio-input-host-pci", QEMU_CAPS_VIRTIO_INPUT_HOST },
{ "mptsas1068", QEMU_CAPS_SCSI_MPTSAS1068 }, { "mptsas1068", QEMU_CAPS_SCSI_MPTSAS1068 },
{ "secret", QEMU_CAPS_OBJECT_SECRET },
}; };
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {
......
...@@ -351,6 +351,7 @@ typedef enum { ...@@ -351,6 +351,7 @@ typedef enum {
QEMU_CAPS_QXL_VGA_VRAM64, /* -device qxl-vga.vram64_size_mb */ QEMU_CAPS_QXL_VGA_VRAM64, /* -device qxl-vga.vram64_size_mb */
QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */ QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */
QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */ QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
QEMU_CAPS_OBJECT_SECRET, /* -object secret */
QEMU_CAPS_LAST /* this must always be the last item */ QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags; } virQEMUCapsFlags;
......
...@@ -178,4 +178,5 @@ ...@@ -178,4 +178,5 @@
<flag name='qxl.vram64_size_mb'/> <flag name='qxl.vram64_size_mb'/>
<flag name='qxl-vga.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/>
<flag name='debug-threads'/> <flag name='debug-threads'/>
<flag name='secret'/>
</qemuCaps> </qemuCaps>
...@@ -1223,6 +1223,9 @@ ...@@ -1223,6 +1223,9 @@
{ {
"name": "kvm-accel" "name": "kvm-accel"
}, },
{
"name": "secret"
},
{ {
"name": "i82559c" "name": "i82559c"
}, },
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册