From 582d5e7db59ec7897dc0a2a78823860963be9855 Mon Sep 17 00:00:00 2001 Message-Id: <582d5e7db59ec7897dc0a2a78823860963be9855@dist-git> From: Michal Privoznik Date: Thu, 27 Jun 2019 14:44:45 +0200 Subject: [PATCH] qemu: Drop "user-" prefix for guestfwd netdev Introduced by d86c876a66e3. There is no real need to have "user-" prefix for chardev. Signed-off-by: Michal Privoznik Reviewed-by: John Ferlan (cherry picked from commit 18b8f677456714f04b87525602fa2b62cd4224e1) https://bugzilla.redhat.com/show_bug.cgi?id=1624204 Signed-off-by: Michal Privoznik Message-Id: Reviewed-by: Jiri Denemark --- src/qemu/qemu_command.c | 2 +- tests/qemuxml2argvdata/channel-guestfwd.args | 2 +- tests/qemuxml2argvdata/name-escape.args | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b5c0588e3c..2b885e98dd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10737,7 +10737,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, port = virSocketAddrGetPort(chr->target.addr); if (virAsprintf(deviceStr, - "user,guestfwd=tcp:%s:%i-chardev:char%s,id=user-%s", + "user,guestfwd=tcp:%s:%i-chardev:char%s,id=%s", addr, port, chr->info.alias, chr->info.alias) < 0) goto cleanup; break; diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args index 6a660f7796..b4c857a6d7 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -25,5 +25,5 @@ server,nowait \ -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 pipe,id=charchannel0,path=/tmp/guestfwd \ --netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \ +-netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvdata/name-escape.args index 382b8a1a9e..cbf594e808 100644 --- a/tests/qemuxml2argvdata/name-escape.args +++ b/tests/qemuxml2argvdata/name-escape.args @@ -37,7 +37,7 @@ cert3=cert3,db=/etc/pki/nssdb,,foo,id=smartcard0,bus=ccid0.0 \ -chardev file,id=charserial1,path=/tmp/serial.log,,foo,append=on \ -device isa-serial,chardev=charserial1,id=serial1 \ -chardev pipe,id=charchannel0,path=/tmp/guestfwd,,foo \ --netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \ +-netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \ -vnc unix:/tmp/lib/domain--1-foo=1,,bar=2/vnc.sock \ -spice unix,addr=/tmp/lib/domain--1-foo=1,,bar=2/spice.sock,gl=on,\ rendernode=/dev/dri/foo,,bar \ -- 2.22.0