Re: [PATCH 3/5] qemu: add support for logging chardev output to a file

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 02/23/2016 11:41 AM, Daniel P. Berrange wrote:
> Honour the <log file='...'/> element in chardevs to output
> data to a file. This requires QEMU >= 2.6
> 
> Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
> ---
>  src/qemu/qemu_capabilities.c                       |  2 ++
>  src/qemu/qemu_capabilities.h                       |  1 +
>  src/qemu/qemu_command.c                            | 19 +++++++++++
>  .../qemuxml2argv-serial-file-log.args              | 25 ++++++++++++++
>  .../qemuxml2argv-serial-file-log.xml               | 39 ++++++++++++++++++++++
>  tests/qemuxml2argvtest.c                           |  2 ++
>  6 files changed, 88 insertions(+)
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.xml
> 

Seems reasonable - although as a heads up you could have conflicts with
Pavel's vram64 series...


John
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 2b953ea..c8f41a3 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -315,6 +315,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
>                "vserport-change-event", /* 210 */
>                "virtio-balloon-pci.deflate-on-oom",
>                "mptsas1068",
> +              "chardev-logfile",
>      );
>  
>  
> @@ -2627,6 +2628,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
>      { "machine", "aes-key-wrap", QEMU_CAPS_AES_KEY_WRAP },
>      { "machine", "dea-key-wrap", QEMU_CAPS_DEA_KEY_WRAP },
>      { "chardev", "append", QEMU_CAPS_CHARDEV_FILE_APPEND },
> +    { "chardev", "logfile", QEMU_CAPS_CHARDEV_LOGFILE },
>  };
>  
>  static int
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index b73c529..ea2e723 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -344,6 +344,7 @@ typedef enum {
>      QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}.
>                                             * deflate-on-oom */
>      QEMU_CAPS_SCSI_MPTSAS1068, /* -device mptsas1068 */
> +    QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */
>  
>      QEMU_CAPS_LAST /* this must always be the last item */
>  } virQEMUCapsFlags;
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 78423e7..dee7208 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -3967,6 +3967,19 @@ qemuBuildChrChardevStr(const virDomainChrSourceDef *dev,
>          goto error;
>      }
>  
> +    if (dev->logfile) {
> +        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_LOGFILE)) {
> +            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> +                           _("logfile not supported in this QEMU binary"));
> +            goto error;
> +        }
> +        virBufferAsprintf(&buf, ",logfile=%s", dev->logfile);
> +        if (dev->logappend != VIR_TRISTATE_SWITCH_ABSENT) {
> +            virBufferAsprintf(&buf, ",logappend=%s",
> +                              virTristateSwitchTypeToString(dev->logappend));
> +        }
> +    }
> +
>      if (virBufferCheckError(&buf) < 0)
>          goto error;
>  
> @@ -3984,6 +3997,12 @@ qemuBuildChrArgStr(const virDomainChrSourceDef *dev,
>  {
>      virBuffer buf = VIR_BUFFER_INITIALIZER;
>  
> +    if (dev->logfile) {
> +        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> +                       _("logfile not supported in this QEMU binary"));
> +        goto error;
> +    }
> +
>      if (prefix)
>          virBufferAdd(&buf, prefix, strlen(prefix));
>  
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args
> new file mode 100644
> index 0000000..de313e5
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args
> @@ -0,0 +1,25 @@
> +LC_ALL=C \
> +PATH=/bin \
> +HOME=/home/test \
> +USER=test \
> +LOGNAME=test \
> +QEMU_AUDIO_DRV=none \
> +/usr/bin/qemu \
> +-name QEMUGuest1 \
> +-S \
> +-M pc \
> +-m 214 \
> +-smp 1 \
> +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
> +-nographic \
> +-nodefaults \
> +-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
> +-mon chardev=charmonitor,id=monitor,mode=readline \
> +-no-acpi \
> +-boot c \
> +-usb \
> +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
> +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
> +-chardev file,id=charserial0,path=/tmp/serial.log,\
> +logfile=/var/lib/libvirt/qemu/demo-serial.log,logappend=off \
> +-device isa-serial,chardev=charserial0,id=serial0
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.xml
> new file mode 100644
> index 0000000..adb3b78
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.xml
> @@ -0,0 +1,39 @@
> +<domain type='qemu'>
> +  <name>QEMUGuest1</name>
> +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> +  <memory unit='KiB'>219136</memory>
> +  <currentMemory unit='KiB'>219136</currentMemory>
> +  <vcpu placement='static'>1</vcpu>
> +  <os>
> +    <type arch='i686' machine='pc'>hvm</type>
> +    <boot dev='hd'/>
> +  </os>
> +  <clock offset='utc'/>
> +  <on_poweroff>destroy</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>destroy</on_crash>
> +  <devices>
> +    <emulator>/usr/bin/qemu</emulator>
> +    <disk type='block' device='disk'>
> +      <driver name='qemu' type='raw'/>
> +      <source dev='/dev/HostVG/QEMUGuest1'/>
> +      <target dev='hda' bus='ide'/>
> +      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
> +    </disk>
> +    <controller type='usb' index='0'/>
> +    <controller type='ide' index='0'/>
> +    <controller type='pci' index='0' model='pci-root'/>
> +    <serial type='file'>
> +      <source path='/tmp/serial.log'/>
> +      <log file='/var/lib/libvirt/qemu/demo-serial.log' append='off'/>
> +      <target port='0'/>
> +    </serial>
> +    <console type='file'>
> +      <source path='/tmp/serial.log'/>
> +      <target type='serial' port='0'/>
> +    </console>
> +    <input type='mouse' bus='ps2'/>
> +    <input type='keyboard' bus='ps2'/>
> +    <memballoon model='none'/>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index 854623d..624639e 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -1026,6 +1026,8 @@ mymain(void)
>      DO_TEST("serial-pty", NONE);
>      DO_TEST("serial-dev", NONE);
>      DO_TEST("serial-file", NONE);
> +    DO_TEST("serial-file-log", QEMU_CAPS_CHARDEV, QEMU_CAPS_CHARDEV_FILE_APPEND,
> +            QEMU_CAPS_CHARDEV_LOGFILE);
>      DO_TEST("serial-unix", NONE);
>      DO_TEST("serial-tcp", NONE);
>      DO_TEST("serial-udp", NONE);
> 

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



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]