These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / roms / ipxe / src / tests / pixbuf_test.c

diff --git a/qemu/roms/ipxe/src/tests/pixbuf_test.c b/qemu/roms/ipxe/src/tests/pixbuf_test.c
index 15cd33d..aaa516b 100644 (file)
--- a/qemu/roms/ipxe/src/tests/pixbuf_test.c
+++ b/qemu/roms/ipxe/src/tests/pixbuf_test.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** @file
  *
@@ -53,8 +57,8 @@ void pixbuf_okx ( struct pixel_buffer_test *test, const char *file,
        /* Correct image data pointer */
        test->image->data = virt_to_user ( ( void * ) test->image->data );
 
-       /* Check that image is detected as PNM */
-       okx ( image_probe ( test->image ) == 0, file, line );
+       /* Check that image is detected as correct type */
+       okx ( register_image ( test->image ) == 0, file, line );
        okx ( test->image->type == test->type, file, line );
 
        /* Check that a pixel buffer can be created from the image */
@@ -73,4 +77,7 @@ void pixbuf_okx ( struct pixel_buffer_test *test, const char *file,
 
                pixbuf_put ( pixbuf );
        }
+
+       /* Unregister image */
+       unregister_image ( test->image );
 }