diff --git a/ChangeLog b/ChangeLog
index bc59835b817dda7bfea91532b7c391db4c4aa626..2fac3de21e7d1a5cb30c42276a15b586cd6c0249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue, 4 Nov 2008 14:58:30 +0100 Jim Meyering <meyering@redhat.com>
+
+	add a test for today's fix
+	* tests/cpuset: New script.  Test for today's fix.
+	* tests/Makefile.am (test_scripts): Add cpuset.
+
 Mon Nov  3 17:12:21 CET 2008 Daniel Veillard <veillard@redhat.com>
 
 	* AUTHORS: added Guido Günther as new commiter, Dan Smith was missing
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 02b7970f9c849ef682ed732ef40a49441b594da3..ea577df4c5ea92ad80de7faee97854f89ffd674a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -48,6 +48,7 @@ test_scripts = domainschematest
 if WITH_LIBVIRTD
 test_scripts += \
 	test_conf.sh \
+	cpuset \
 	daemon-conf \
 	int-overflow \
 	read-bufsiz \
diff --git a/tests/cpuset b/tests/cpuset
new file mode 100755
index 0000000000000000000000000000000000000000..8722c81a348b59b468f2b997e8e2c50c00de7743
--- /dev/null
+++ b/tests/cpuset
@@ -0,0 +1,45 @@
+#!/bin/sh
+# ensure that defining with an invalid vCPU cpuset elicits a diagnostic
+
+# Copyright (C) 2008 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  virsh --version
+fi
+
+. $srcdir/test-lib.sh
+
+fail=0
+
+# generate input
+virsh --connect test:///default dumpxml 1 > xml || fail=1
+
+# require the presence of the string we'll transform
+grep '<vcpu>' xml > /dev/null || fail=1
+
+sed "s/vcpu>/vcpu cpuset='aaa'>/" xml > xml-invalid || fail=1
+
+# Require failure and a diagnostic.
+virsh --connect test:///default define xml-invalid > out 2>&1 && fail=1
+cat <<\EOF > exp || fail=1
+libvir: Domain Config error : failed Xen syscall topology cpuset syntax error
+error: Failed to define domain from xml-invalid
+
+EOF
+compare out exp || fail=1
+
+(exit $fail); exit $fail