diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 0de4056de9..8dfcf5f578 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -716,6 +716,7 @@ VIR_ENUM_IMPL(virDomainChr,
"spiceport",
"nmdm",
"qemu-vdagent",
+ "dbus",
);
VIR_ENUM_IMPL(virDomainChrTcpProtocol,
@@ -2712,6 +2713,7 @@ virDomainChrSourceDefGetPath(virDomainChrSourceDef *chr)
case VIR_DOMAIN_CHR_TYPE_SPICEVMC:
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT:
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
case VIR_DOMAIN_CHR_TYPE_LAST:
return NULL;
}
@@ -2755,6 +2757,10 @@ virDomainChrSourceDefClear(virDomainChrSourceDef *def)
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
VIR_FREE(def->data.spiceport.channel);
break;
+
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
+ VIR_FREE(def->data.dbus.channel);
+ break;
}
VIR_FREE(def->logfile);
@@ -2826,6 +2832,10 @@ virDomainChrSourceDefCopy(virDomainChrSourceDef *dest,
dest->data.qemuVdagent.mouse = src->data.qemuVdagent.mouse;
break;
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
+ dest->data.dbus.channel = g_strdup(src->data.dbus.channel);
+ break;
+
case VIR_DOMAIN_CHR_TYPE_NULL:
case VIR_DOMAIN_CHR_TYPE_VC:
case VIR_DOMAIN_CHR_TYPE_STDIO:
@@ -2910,6 +2920,12 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src,
case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT:
return src->data.qemuVdagent.clipboard == tgt->data.qemuVdagent.clipboard &&
src->data.qemuVdagent.mouse == tgt->data.qemuVdagent.mouse;
+ break;
+
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
+ return STREQ_NULLABLE(src->data.dbus.channel,
+ tgt->data.dbus.channel);
+ break;
case VIR_DOMAIN_CHR_TYPE_NULL:
case VIR_DOMAIN_CHR_TYPE_VC:
@@ -11343,6 +11359,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
def->data.spiceport.channel = virXMLPropString(sources[0], "channel");
break;
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
+ def->data.dbus.channel = virXMLPropString(sources[0], "channel");
+ break;
+
case VIR_DOMAIN_CHR_TYPE_NMDM:
def->data.nmdm.master = virXMLPropString(sources[0], "master");
def->data.nmdm.slave = virXMLPropString(sources[0], "slave");
@@ -25210,6 +25230,11 @@ virDomainChrSourceDefFormat(virBuffer *buf,
virBufferEscapeString(buf, "\n",
def->data.spiceport.channel);
break;
+
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
+ virBufferEscapeString(buf, "\n",
+ def->data.dbus.channel);
+ break;
}
if (def->logfile) {
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index a7dfbe0b83..f325bfb51e 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1242,6 +1242,7 @@ typedef enum {
VIR_DOMAIN_CHR_TYPE_SPICEPORT,
VIR_DOMAIN_CHR_TYPE_NMDM,
VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT,
+ VIR_DOMAIN_CHR_TYPE_DBUS,
VIR_DOMAIN_CHR_TYPE_LAST
} virDomainChrType;
@@ -1321,6 +1322,9 @@ struct _virDomainChrSourceDef {
virDomainMouseMode mouse;
virTristateBool clipboard;
} qemuVdagent;
+ struct {
+ char *channel;
+ } dbus;
} data;
char *logfile;
virTristateSwitch logappend;
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index ba474ee8c0..627c366fe9 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -909,6 +909,24 @@ virDomainDiskDefValidate(const virDomainDef *def,
#define SERIAL_CHANNEL_NAME_CHARS \
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-."
+
+static int
+virDomainChrSourceDefValidateChannelName(const char *name)
+{
+ if (!name) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("Missing source channel attribute for char device"));
+ return -1;
+ }
+ if (strspn(name, SERIAL_CHANNEL_NAME_CHARS) < strlen(name)) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("Invalid character in source channel for char device"));
+ return -1;
+ }
+
+ return 0;
+}
+
static int
virDomainChrSourceDefValidate(const virDomainChrSourceDef *src_def,
const virDomainChrDef *chr_def,
@@ -995,17 +1013,13 @@ virDomainChrSourceDefValidate(const virDomainChrSourceDef *src_def,
break;
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
- if (!src_def->data.spiceport.channel) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("Missing source channel attribute for char device"));
+ if (virDomainChrSourceDefValidateChannelName(src_def->data.spiceport.channel) < 0)
return -1;
- }
- if (strspn(src_def->data.spiceport.channel,
- SERIAL_CHANNEL_NAME_CHARS) < strlen(src_def->data.spiceport.channel)) {
- virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("Invalid character in source channel for char device"));
+ break;
+
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
+ if (virDomainChrSourceDefValidateChannelName(src_def->data.dbus.channel) < 0)
return -1;
- }
break;
}
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 94eab03d76..7bef4910e1 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -4569,6 +4569,7 @@
spiceport
nmdm
qemu-vdagent
+ dbus
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 06c54eb3a0..9c04b77527 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1443,6 +1443,7 @@ qemuBuildChardevStr(const virDomainChrSourceDef *dev,
}
break;
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
case VIR_DOMAIN_CHR_TYPE_NMDM:
case VIR_DOMAIN_CHR_TYPE_LAST:
default:
@@ -1531,6 +1532,7 @@ qemuBuildChardevCommand(virCommand *cmd,
case VIR_DOMAIN_CHR_TYPE_SPICEVMC:
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT:
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
break;
case VIR_DOMAIN_CHR_TYPE_NMDM:
@@ -8684,6 +8686,7 @@ qemuInterfaceVhostuserConnect(virCommand *cmd,
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
case VIR_DOMAIN_CHR_TYPE_NMDM:
case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT:
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
case VIR_DOMAIN_CHR_TYPE_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR,
_("vhost-user type '%s' not supported"),
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 523a4326da..fe99787352 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -6811,6 +6811,7 @@ qemuMonitorJSONAttachCharDevGetProps(const char *chrID,
break;
}
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
case VIR_DOMAIN_CHR_TYPE_PIPE:
case VIR_DOMAIN_CHR_TYPE_STDIO:
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 8e22a7fb60..033d3d5bc6 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6890,6 +6890,7 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
case VIR_DOMAIN_CHR_TYPE_SPICEVMC:
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT:
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
break;
case VIR_DOMAIN_CHR_TYPE_FILE: {
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index be6b2c508b..9b6245e6d7 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -2015,6 +2015,7 @@ qemuValidateDomainChrSourceDef(const virDomainChrSourceDef *def,
case VIR_DOMAIN_CHR_TYPE_STDIO:
case VIR_DOMAIN_CHR_TYPE_UDP:
case VIR_DOMAIN_CHR_TYPE_NMDM:
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
case VIR_DOMAIN_CHR_TYPE_LAST:
break;
}
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 5b840f4225..69c462de8b 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -1556,6 +1556,7 @@ virSecurityDACSetChardevLabelHelper(virSecurityManager *mgr,
case VIR_DOMAIN_CHR_TYPE_SPICEVMC:
case VIR_DOMAIN_CHR_TYPE_NMDM:
case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT:
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
case VIR_DOMAIN_CHR_TYPE_LAST:
break;
}
@@ -1641,6 +1642,7 @@ virSecurityDACRestoreChardevLabelHelper(virSecurityManager *mgr,
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
case VIR_DOMAIN_CHR_TYPE_NMDM:
case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT:
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
case VIR_DOMAIN_CHR_TYPE_LAST:
break;
}
diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.xml b/tests/qemuxml2argvdata/graphics-dbus-chardev.xml
new file mode 100644
index 0000000000..d2ca208bd9
--- /dev/null
+++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.xml
@@ -0,0 +1,43 @@
+
+ QEMUGuest1
+ c7a5fdbd-edaf-9455-926a-d65c16db1809
+ 219100
+ 219100
+ 1
+
+ hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/bin/qemu-system-i386
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-chardev.xml b/tests/qemuxml2xmloutdata/graphics-dbus-chardev.xml
new file mode 120000
index 0000000000..85dabfad76
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-dbus-chardev.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/graphics-dbus-chardev.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 0c303bd823..bef8c4e010 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -416,6 +416,9 @@ mymain(void)
QEMU_CAPS_DEVICE_CIRRUS_VGA,
QEMU_CAPS_DISPLAY_DBUS,
QEMU_CAPS_AUDIODEV);
+ DO_TEST("graphics-dbus-chardev",
+ QEMU_CAPS_DEVICE_CIRRUS_VGA,
+ QEMU_CAPS_DISPLAY_DBUS);
DO_TEST_CAPS_ARCH_LATEST("default-video-type-aarch64", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("default-video-type-ppc64", "ppc64");
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 7ae88c9b8d..004c7cf1d6 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -1056,6 +1056,7 @@ testQemuPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
case VIR_DOMAIN_CHR_TYPE_SPICEVMC:
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT:
+ case VIR_DOMAIN_CHR_TYPE_DBUS:
break;
case VIR_DOMAIN_CHR_TYPE_FILE: