[libvirt PATCH 01/12] qemu: assume QEMU_CAPS_CHARDEV_FILE_APPEND
Introduced in QEMU 2.6
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_process.c | 5 +----
src/qemu/qemu_validate.c | 10 +---------
tests/qemuxml2argvtest.c | 4 +---
3 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 32f03ff79a..aaf51e019a 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6571,10 +6571,7 @@ qemuProcessPrepareDomain(virQEMUDriver *driver,
/* Whether we should use virtlogd as stdio handler for character
* devices source backend. */
- if (cfg->stdioLogD &&
- virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FILE_APPEND)) {
- priv->chardevStdioLogd = true;
- }
+ priv->chardevStdioLogd = cfg->stdioLogD;
/* Track if this domain remembers original owner */
priv->rememberOwner = cfg->rememberOwner;
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 6403266559..245b953c86 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -2194,15 +2194,6 @@ qemuValidateDomainChrSourceDef(const virDomainChrSourceDef *def,
return -1;
break;
- case VIR_DOMAIN_CHR_TYPE_FILE:
- if (def->data.file.append != VIR_TRISTATE_SWITCH_ABSENT &&
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FILE_APPEND)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("append not supported in this QEMU binary"));
- return -1;
- }
- break;
-
case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_QEMU_VDAGENT)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -2226,6 +2217,7 @@ qemuValidateDomainChrSourceDef(const virDomainChrSourceDef *def,
case VIR_DOMAIN_CHR_TYPE_VC:
case VIR_DOMAIN_CHR_TYPE_PTY:
case VIR_DOMAIN_CHR_TYPE_DEV:
+ case VIR_DOMAIN_CHR_TYPE_FILE:
case VIR_DOMAIN_CHR_TYPE_PIPE:
case VIR_DOMAIN_CHR_TYPE_STDIO:
case VIR_DOMAIN_CHR_TYPE_UDP:
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 303292c788..bedd190cb1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1579,7 +1579,6 @@ mymain(void)
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST("serial-file-log",
- QEMU_CAPS_CHARDEV_FILE_APPEND,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_CHARDEV_LOGFILE);
DO_TEST("serial-spiceport",
@@ -1601,8 +1600,7 @@ mymain(void)
DO_TEST("serial-dev-chardev-iobase",
QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST("serial-file-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL,
- QEMU_CAPS_CHARDEV_FILE_APPEND);
+ QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST("serial-unix-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST_CAPS_LATEST("serial-file-log");
--
2.37.1