提交 7d24c8a4 编写于 作者: M Marc-André Lureau 提交者: Michal Privoznik

tests: add slirp-helper qemuxml2argv test

Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
上级 8021b53f
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 \
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-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-overcommit mem-lock=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 \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev socket,fd=42,id=hostnet0 \
-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\
addr=0x2 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
# include "qemu/qemu_domain.h" # include "qemu/qemu_domain.h"
# include "qemu/qemu_migration.h" # include "qemu/qemu_migration.h"
# include "qemu/qemu_process.h" # include "qemu/qemu_process.h"
# include "qemu/qemu_slirp.h"
# include "datatypes.h" # include "datatypes.h"
# include "conf/storage_conf.h" # include "conf/storage_conf.h"
# include "cpu/cpu_map.h" # include "cpu/cpu_map.h"
...@@ -398,6 +399,7 @@ testCheckExclusiveFlags(int flags) ...@@ -398,6 +399,7 @@ testCheckExclusiveFlags(int flags)
FLAG_FIPS | FLAG_FIPS |
FLAG_REAL_CAPS | FLAG_REAL_CAPS |
FLAG_SKIP_LEGACY_CPUS | FLAG_SKIP_LEGACY_CPUS |
FLAG_SLIRP_HELPER |
0, -1); 0, -1);
VIR_EXCLUSIVE_FLAGS_RET(FLAG_REAL_CAPS, FLAG_SKIP_LEGACY_CPUS, -1); VIR_EXCLUSIVE_FLAGS_RET(FLAG_REAL_CAPS, FLAG_SKIP_LEGACY_CPUS, -1);
...@@ -526,6 +528,19 @@ testCompareXMLToArgv(const void *data) ...@@ -526,6 +528,19 @@ testCompareXMLToArgv(const void *data)
} }
} }
if (flags & FLAG_SLIRP_HELPER) {
for (i = 0; i < vm->def->nnets; i++) {
virDomainNetDefPtr net = vm->def->nets[i];
if (net->type == VIR_DOMAIN_NET_TYPE_USER &&
virQEMUCapsGet(info->qemuCaps, QEMU_CAPS_NET_SOCKET_DGRAM)) {
qemuSlirpPtr slirp = qemuSlirpNew();
slirp->fd[0] = 42;
QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp = slirp;
}
}
}
if (!(cmd = qemuProcessCreatePretendCmd(&driver, vm, migrateURI, if (!(cmd = qemuProcessCreatePretendCmd(&driver, vm, migrateURI,
(flags & FLAG_FIPS), false, (flags & FLAG_FIPS), false,
VIR_QEMU_PROCESS_START_COLD))) { VIR_QEMU_PROCESS_START_COLD))) {
...@@ -1284,6 +1299,7 @@ mymain(void) ...@@ -1284,6 +1299,7 @@ mymain(void)
DO_TEST_FAILURE("net-vhostuser-fail", DO_TEST_FAILURE("net-vhostuser-fail",
QEMU_CAPS_VHOSTUSER_MULTIQUEUE); QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
DO_TEST("net-user", NONE); DO_TEST("net-user", NONE);
DO_TEST_CAPS_ARCH_VER_FULL("net-user", "x86_64", "4.0.0", ARG_FLAGS, FLAG_SLIRP_HELPER);
DO_TEST("net-user-addr", NONE); DO_TEST("net-user-addr", NONE);
DO_TEST("net-virtio", NONE); DO_TEST("net-virtio", NONE);
DO_TEST("net-virtio-device", DO_TEST("net-virtio-device",
......
...@@ -51,6 +51,7 @@ typedef enum { ...@@ -51,6 +51,7 @@ typedef enum {
FLAG_FIPS = 1 << 2, FLAG_FIPS = 1 << 2,
FLAG_REAL_CAPS = 1 << 3, FLAG_REAL_CAPS = 1 << 3,
FLAG_SKIP_LEGACY_CPUS = 1 << 4, FLAG_SKIP_LEGACY_CPUS = 1 << 4,
FLAG_SLIRP_HELPER = 1 << 5,
} testQemuInfoFlags; } testQemuInfoFlags;
struct testQemuInfo { struct testQemuInfo {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册