diff --git a/TODO b/TODO
index 247f98a1f..362a79e19 100644
--- a/TODO
+++ b/TODO
@@ -514,3 +514,18 @@ necessarily care about ongoing data integrity while writing, as long
 as data is reliably written out when g.sync or g.close return.  Also
 in libguestfs we effectively control the whole stack, so we can ensure
 write barriers happen when we want.
+
+libvirt attach-method
+---------------------
+
+Since libguestfs 1.19.24 this mostly works.  Here are some suggested
+items to work on:
+
+ - SELinux labelling of guestfsd.sock, console.sock
+   https://bugzilla.redhat.com/show_bug.cgi?id=842307
+   Once this is fixed, remove <seclabel type=none> from libvirt XML
+
+ - Check feature parity between src/launch-appliance.c and
+   src/launch-libvirt.c.
+
+ - Remote support.  (This requires work on libvirt)
diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
index 2574b6a9e..649c809bc 100644
--- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c
@@ -16,24 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/* To do (XXX):
- *
- * - Need to query libvirt to find out if virtio-scsi is supported.
- *   This code assumes it.
- *
- * - SELinux labelling of guestfsd.sock, console.sock
- *
- * - Set qemu binary to non-standard (g->qemu).
- *
- * - Check for feature parity with src/launch-appliance.c
- *
- * - Environment variable $LIBGUESTFS_ATTACH_METHOD
- *
- * - ./configure override default
- *
- * - Remote support.
- */
-
 #include <config.h>
 
 #include <stdio.h>