Re: [libvirt] [PATCHv3 4/5] qemu: implement debugcon chardev

From: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com&gt; Format the device on QEMU command line. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com&gt; Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_command.c | 2 +- .../isa-serial-debugcon.x86_64-latest.args | 30 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/isa-serial-debugcon.x86_64-latest.args diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 17237e4fc6..7b7abc7aed 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -197,7 +197,7 @@ VIR_ENUM_IMPL(qemuDomainChrSerialTargetModel, "sclpconsole", "sclplmconsole", "", /* 16550a is not user-instantiable */ - "", /* debugcon */ + "isa-debugcon", ); diff --git a/tests/qemuxml2argvdata/isa-serial-debugcon.x86_64-latest.args b/tests/qemuxml2argvdata/isa-serial-debugcon.x86_64-latest.args new file mode 100644 index 0000000000..f6a68277c4 --- /dev/null +++ b/tests/qemuxml2argvdata/isa-serial-debugcon.x86_64-latest.args @@ -0,0 +1,30 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-chardev pipe,id=charserial0,path=/tmp/debugcon \ +-device isa-debugcon,chardev=charserial0,id=serial0,iobase=0x402 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index dd4f73a5fb..178e36ad36 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1419,6 +1419,7 @@ mymain(void) QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("pci-serial-dev-chardev", QEMU_CAPS_DEVICE_PCI_SERIAL); + DO_TEST_CAPS_LATEST("isa-serial-debugcon"); DO_TEST("channel-guestfwd", NONE); DO_TEST_CAPS_VER("channel-unix-guestfwd", "2.5.0");