[libvirt PATCH v2 13/15] qemu: add -chardev dbus support
From: Marc-André Lureau <marcandre.lureau(a)redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com>
---
src/qemu/qemu_command.c | 8 +++++
src/qemu/qemu_monitor_json.c | 9 ++++++
.../graphics-dbus-chardev.args | 32 +++++++++++++++++++
tests/qemuxml2argvtest.c | 4 +++
4 files changed, 53 insertions(+)
create mode 100644 tests/qemuxml2argvdata/graphics-dbus-chardev.args
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 308ccbf72a1a..582f41ada9ee 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5298,6 +5298,14 @@ qemuBuildChrChardevStr(virLogManager *logManager,
break;
case VIR_DOMAIN_CHR_TYPE_DBUS:
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("D-Bus chardev is not supported"));
+ }
+ virBufferAsprintf(&buf, "dbus,id=%s,name=%s", charAlias,
+ dev->data.dbus.channel);
+ break;
+
case VIR_DOMAIN_CHR_TYPE_NMDM:
case VIR_DOMAIN_CHR_TYPE_LAST:
default:
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index c0906fe70f8f..ada987d0a4d5 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -6773,6 +6773,15 @@ qemuMonitorJSONAttachCharDevGetProps(const char *chrID,
break;
case VIR_DOMAIN_CHR_TYPE_DBUS:
+ backendType = "dbus";
+
+ if (virJSONValueObjectAdd(&backendData,
+ "s:name", chr->data.dbus.channel,
+ NULL) < 0)
+ return NULL;
+
+ break;
+
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
case VIR_DOMAIN_CHR_TYPE_PIPE:
case VIR_DOMAIN_CHR_TYPE_STDIO:
diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.args
b/tests/qemuxml2argvdata/graphics-dbus-chardev.args
new file mode 100644
index 000000000000..98debbbfa775
--- /dev/null
+++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.args
@@ -0,0 +1,32 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
+-machine pc,usb=off,dump-guest-core=off \
+-accel tcg \
+-m 214 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-no-user-config \
+-nodefaults \
+-chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-usb \
+-chardev dbus,id=charserial0,name=org.qemu.console.serial.0 \
+-device isa-serial,chardev=charserial0,id=serial0 \
+-display dbus,p2p=on \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index fc8f11d268d0..aed30080b7a5 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1525,6 +1525,10 @@ mymain(void)
QEMU_CAPS_DEVICE_CIRRUS_VGA,
QEMU_CAPS_DISPLAY_DBUS,
QEMU_CAPS_CHARDEV_VDAGENT);
+ DO_TEST("graphics-dbus-chardev",
+ QEMU_CAPS_DEVICE_ISA_SERIAL,
+ QEMU_CAPS_DEVICE_CIRRUS_VGA,
+ QEMU_CAPS_DISPLAY_DBUS);
DO_TEST_NOCAPS("input-usbmouse");
DO_TEST_NOCAPS("input-usbtablet");
--
2.34.1.8.g35151cf07204