[libvirt] [PATCH 2/5] Detect availability of QEMU -chardev command line option

2009-11-04 Thread Matthew Booth
---
 src/qemu/qemu_conf.c |2 ++
 src/qemu/qemu_conf.h |1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 19b2d36..2981b51 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -894,6 +894,8 @@ static unsigned int qemudComputeCmdFlags(const char *help,
 flags |= QEMUD_CMD_FLAG_PCIDEVICE;
 if (strstr(help, -mem-path))
 flags |= QEMUD_CMD_FLAG_MEM_PATH;
+if (strstr(help, -chardev))
+flags |= QEMUD_CMD_FLAG_CHARDEV;
 
 if (version = 9000)
 flags |= QEMUD_CMD_FLAG_VNC_COLON;
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 53835cf..0f82c68 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -73,6 +73,7 @@ enum qemud_cmd_flags {
 QEMUD_CMD_FLAG_DRIVE_SERIAL  = (1  19), /* -driver serial=  available */
 QEMUD_CMD_FLAG_XEN_DOMID = (1  20), /* -xen-domid (new style xen 
integration) */
 QEMUD_CMD_FLAG_MIGRATE_QEMU_UNIX = (1  21), /* Does qemu support unix 
domain sockets for migration? */
+QEMUD_CMD_FLAG_CHARDEV   = (1  22), /* Is the new -chardev arg 
available */
 };
 
 /* Main driver state */
-- 
1.6.2.5

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


Re: [libvirt] [PATCH 2/5] Detect availability of QEMU -chardev command line option

2009-11-04 Thread Daniel P. Berrange
On Wed, Nov 04, 2009 at 04:21:59PM +, Matthew Booth wrote:
 ---
  src/qemu/qemu_conf.c |2 ++
  src/qemu/qemu_conf.h |1 +
  2 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
 index 19b2d36..2981b51 100644
 --- a/src/qemu/qemu_conf.c
 +++ b/src/qemu/qemu_conf.c
 @@ -894,6 +894,8 @@ static unsigned int qemudComputeCmdFlags(const char *help,
  flags |= QEMUD_CMD_FLAG_PCIDEVICE;
  if (strstr(help, -mem-path))
  flags |= QEMUD_CMD_FLAG_MEM_PATH;
 +if (strstr(help, -chardev))
 +flags |= QEMUD_CMD_FLAG_CHARDEV;
  
  if (version = 9000)
  flags |= QEMUD_CMD_FLAG_VNC_COLON;
 diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
 index 53835cf..0f82c68 100644
 --- a/src/qemu/qemu_conf.h
 +++ b/src/qemu/qemu_conf.h
 @@ -73,6 +73,7 @@ enum qemud_cmd_flags {
  QEMUD_CMD_FLAG_DRIVE_SERIAL  = (1  19), /* -driver serial=  available 
 */
  QEMUD_CMD_FLAG_XEN_DOMID = (1  20), /* -xen-domid (new style xen 
 integration) */
  QEMUD_CMD_FLAG_MIGRATE_QEMU_UNIX = (1  21), /* Does qemu support unix 
 domain sockets for migration? */
 +QEMUD_CMD_FLAG_CHARDEV   = (1  22), /* Is the new -chardev arg 
 available */
  };
  
  /* Main driver state */

Does this not cause a failure in the qemuhelptest  test case ?


Daniel
-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org   -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

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