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

On 04/11/09 19:05, Daniel P. Berrange wrote: > On Wed, Nov 04, 2009 at 04:21:59PM +0000, 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 ? I see where you're coming from now. No it doesn't, because -chardev isn't in qemu 0.11: it's only in git. The current upstream outputs a single line under Debug/Expert options. I have submitted a documentation patch (not yet accepted afaict) which substantially expands this. However, both should work.