Re: [libvirt] [PATCH v2 1/4] qemu: Add capability bit for qemu secret object

[Daniel P. Berrange]

On Tue, Mar 29, 2016 at 07:11:33PM -0400, John Ferlan wrote:
> 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.
> 
> Signed-off-by: John Ferlan 
> ---
>  src/qemu/qemu_capabilities.c| 2 ++
>  src/qemu/qemu_capabilities.h| 1 +
>  tests/qemucapabilitiesdata/caps_2.6.0-1.caps| 1 +
>  tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 3 +++
>  4 files changed, 7 insertions(+)

ACK


Regards,
Daniel
-- 
|: http://berrange.com  -o-http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org  -o- http://virt-manager.org :|
|: http://autobuild.org   -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org   -o-   http://live.gnome.org/gtk-vnc :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v2 1/4] qemu: Add capability bit for qemu secret object

[John Ferlan]

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.

Signed-off-by: John Ferlan 
---
 src/qemu/qemu_capabilities.c| 2 ++
 src/qemu/qemu_capabilities.h| 1 +
 tests/qemucapabilitiesdata/caps_2.6.0-1.caps| 1 +
 tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 3 +++
 4 files changed, 7 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2823843..5d09dc8 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -321,6 +321,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
   "qxl-vga.vram64_size_mb", /* 215 */
   "chardev-logfile",
   "debug-threads",
+  "secret",
 );
 
 
@@ -1575,6 +1576,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
 { "virtio-input-host-device", QEMU_CAPS_VIRTIO_INPUT_HOST },
 { "virtio-input-host-pci", QEMU_CAPS_VIRTIO_INPUT_HOST },
 { "mptsas1068", QEMU_CAPS_SCSI_MPTSAS1068 },
+{ "secret", QEMU_CAPS_OBJECT_SECRET },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index caf3d1b..ae0d9b3 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -351,6 +351,7 @@ typedef enum {
 QEMU_CAPS_QXL_VGA_VRAM64, /* -device qxl-vga.vram64_size_mb */
 QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile= */
 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 */
 } virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps 
b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
index 549759c..a43293d 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
@@ -178,4 +178,5 @@
 
 
 
+
   
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.replies 
b/tests/qemucapabilitiesdata/caps_2.6.0-1.replies
index d2b58b5..7590b5b 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.replies
@@ -1224,6 +1224,9 @@
   "name": "kvm-accel"
 },
 {
+  "name": "secret"
+},
+{
   "name": "i82559c"
 },
 {
-- 
2.5.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list