|
 |
43fe83 |
From fe2d3ff5afa8c3c25a55a03690ebe844344d4636 Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <fe2d3ff5afa8c3c25a55a03690ebe844344d4636.1379193141.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
43fe83 |
Date: Thu, 12 Sep 2013 11:05:22 +0200
|
|
|
43fe83 |
Subject: [PATCH] Add test for the nodemask double free crash
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1006722
|
|
|
43fe83 |
|
|
|
43fe83 |
Commit ef5d51d fixed a crash for numatune with auto placement and
|
|
|
43fe83 |
nodeset specified:
|
|
|
43fe83 |
<numatune>
|
|
|
43fe83 |
<memory mode='preferred' placement='auto' nodeset='0'/>
|
|
|
43fe83 |
</numatune>
|
|
|
43fe83 |
(cherry picked from commit fd72440a356bcfc205afcf5ab988e774610b2499)
|
|
|
43fe83 |
|
|
|
43fe83 |
Commit a216e64 qemu: Set QEMU_AUDIO_DRV=none with -nographic
|
|
|
43fe83 |
is not backported.
|
|
|
43fe83 |
---
|
|
|
43fe83 |
...qemuxml2argv-numatune-auto-nodeset-invalid.args | 4 +++
|
|
|
43fe83 |
.../qemuxml2argv-numatune-auto-nodeset-invalid.xml | 31 ++++++++++++++++++++++
|
|
|
43fe83 |
tests/qemuxml2argvtest.c | 1 +
|
|
|
43fe83 |
3 files changed, 36 insertions(+)
|
|
|
43fe83 |
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args
|
|
|
43fe83 |
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.xml
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args
|
|
|
43fe83 |
new file mode 100644
|
|
|
43fe83 |
index 0000000..11db342
|
|
|
43fe83 |
--- /dev/null
|
|
|
43fe83 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args
|
|
|
43fe83 |
@@ -0,0 +1,4 @@
|
|
|
43fe83 |
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
|
|
|
43fe83 |
+/usr/bin/qemu -S -M pc -m 214 -smp 2 -nographic \
|
|
|
43fe83 |
+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
|
|
|
43fe83 |
+-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
|
|
|
43fe83 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.xml b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.xml
|
|
|
43fe83 |
new file mode 100644
|
|
|
43fe83 |
index 0000000..d2315b4
|
|
|
43fe83 |
--- /dev/null
|
|
|
43fe83 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.xml
|
|
|
43fe83 |
@@ -0,0 +1,31 @@
|
|
|
43fe83 |
+<domain type='qemu'>
|
|
|
43fe83 |
+ <name>QEMUGuest1</name>
|
|
|
43fe83 |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
43fe83 |
+ <memory unit='KiB'>219136</memory>
|
|
|
43fe83 |
+ <currentMemory unit='KiB'>219136</currentMemory>
|
|
|
43fe83 |
+ <vcpu placement='static' cpuset='0-1'>2</vcpu>
|
|
|
43fe83 |
+ <numatune>
|
|
|
43fe83 |
+ <memory mode='preferred' placement='auto' nodeset="0-5,^4"/>
|
|
|
43fe83 |
+ </numatune>
|
|
|
43fe83 |
+ <os>
|
|
|
43fe83 |
+ <type arch='i686' machine='pc'>hvm</type>
|
|
|
43fe83 |
+ <boot dev='hd'/>
|
|
|
43fe83 |
+ </os>
|
|
|
43fe83 |
+ <cpu>
|
|
|
43fe83 |
+ <topology sockets='2' cores='1' threads='1'/>
|
|
|
43fe83 |
+ </cpu>
|
|
|
43fe83 |
+ <clock offset='utc'/>
|
|
|
43fe83 |
+ <on_poweroff>destroy</on_poweroff>
|
|
|
43fe83 |
+ <on_reboot>restart</on_reboot>
|
|
|
43fe83 |
+ <on_crash>destroy</on_crash>
|
|
|
43fe83 |
+ <devices>
|
|
|
43fe83 |
+ <emulator>/usr/bin/qemu</emulator>
|
|
|
43fe83 |
+ <disk type='block' device='disk'>
|
|
|
43fe83 |
+ <source dev='/dev/HostVG/QEMUGuest1'/>
|
|
|
43fe83 |
+ <target dev='hda' bus='ide'/>
|
|
|
43fe83 |
+ <address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
|
|
43fe83 |
+ </disk>
|
|
|
43fe83 |
+ <controller type='ide' index='0'/>
|
|
|
43fe83 |
+ <memballoon model='virtio'/>
|
|
|
43fe83 |
+ </devices>
|
|
|
43fe83 |
+</domain>
|
|
|
43fe83 |
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
|
43fe83 |
index 3a3c304..ca72947 100644
|
|
|
43fe83 |
--- a/tests/qemuxml2argvtest.c
|
|
|
43fe83 |
+++ b/tests/qemuxml2argvtest.c
|
|
|
43fe83 |
@@ -902,6 +902,7 @@ mymain(void)
|
|
|
43fe83 |
DO_TEST("blkiotune-device", QEMU_CAPS_NAME);
|
|
|
43fe83 |
DO_TEST("cputune", QEMU_CAPS_NAME);
|
|
|
43fe83 |
DO_TEST("numatune-memory", NONE);
|
|
|
43fe83 |
+ DO_TEST("numatune-auto-nodeset-invalid", NONE);
|
|
|
43fe83 |
DO_TEST("numad", NONE);
|
|
|
43fe83 |
DO_TEST("numad-auto-vcpu-static-numatune", NONE);
|
|
|
43fe83 |
DO_TEST("numad-auto-memory-vcpu-cpuset", NONE);
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.3.2
|
|
|
43fe83 |
|