These changes are the raw update to qemu-2.6.

Collission happened in the following patches:

migration: do cleanup operation after completion(738df5b9)
Bug fix.(1750c932f86)
kvmclock: add a new function to update env->tsc.(b52baab2)

The code provided by the patches was already in the upstreamed
version.

Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>

1 files changed, 0 insertions, 177 deletions

diff --git a/qemu/roms/ipxe/src/tests/cbc_test.c b/qemu/roms/ipxe/src/tests/cbc_test.c
deleted file mode 100644
index cb0f7bdea..000000000
--- a/qemu/roms/ipxe/src/tests/cbc_test.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2012 Michael Brown <mbrown@fensystems.co.uk>.
- *
- * 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 2 of the
- * License, or 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-/** @file
- *
- * CBC self-tests
- *
- */
-
-/* Forcibly enable assertions */
-#undef NDEBUG
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <ipxe/crypto.h>
-#include <ipxe/profile.h>
-#include "cbc_test.h"
-
-/** Number of sample iterations for profiling */
-#define PROFILE_COUNT 16
-
-/**
- * Test CBC encryption
- *
- * @v cipher			Cipher algorithm
- * @v key			Key
- * @v key_len			Length of key
- * @v iv			Initialisation vector
- * @v plaintext			Plaintext data
- * @v expected_ciphertext	Expected ciphertext data
- * @v len			Length of data
- * @ret ok			Ciphertext is as expected
- */
-int cbc_test_encrypt ( struct cipher_algorithm *cipher, const void *key,
-		       size_t key_len, const void *iv, const void *plaintext,
-		       const void *expected_ciphertext, size_t len ) {
-	uint8_t ctx[cipher->ctxsize];
-	uint8_t ciphertext[len];
-	int rc;
-
-	/* Initialise cipher */
-	rc = cipher_setkey ( cipher, ctx, key, key_len );
-	assert ( rc == 0 );
-	cipher_setiv ( cipher, ctx, iv );
-
-	/* Perform encryption */
-	cipher_encrypt ( cipher, ctx, plaintext, ciphertext, len );
-
-	/* Verify result */
-	return ( memcmp ( ciphertext, expected_ciphertext, len ) == 0 );
-}
-
-/**
- * Test CBC decryption
- *
- * @v cipher			Cipher algorithm
- * @v key			Key
- * @v key_len			Length of key
- * @v iv			Initialisation vector
- * @v ciphertext		Ciphertext data
- * @v expected_plaintext	Expected plaintext data
- * @v len			Length of data
- * @ret ok			Plaintext is as expected
- */
-int cbc_test_decrypt ( struct cipher_algorithm *cipher, const void *key,
-		       size_t key_len, const void *iv, const void *ciphertext,
-		       const void *expected_plaintext, size_t len ) {
-	uint8_t ctx[cipher->ctxsize];
-	uint8_t plaintext[len];
-	int rc;
-
-	/* Initialise cipher */
-	rc = cipher_setkey ( cipher, ctx, key, key_len );
-	assert ( rc == 0 );
-	cipher_setiv ( cipher, ctx, iv );
-
-	/* Perform encryption */
-	cipher_decrypt ( cipher, ctx, ciphertext, plaintext, len );
-
-	/* Verify result */
-	return ( memcmp ( plaintext, expected_plaintext, len ) == 0 );
-}
-
-/**
- * Calculate CBC encryption or decryption cost
- *
- * @v cipher			Cipher algorithm
- * @v key_len			Length of key
- * @v op			Encryption or decryption operation
- * @ret cost			Cost (in cycles per byte)
- */
-static unsigned long cbc_cost ( struct cipher_algorithm *cipher,
-				size_t key_len,
-				void ( * op ) ( struct cipher_algorithm *cipher,
-						void *ctx, const void *src,
-						void *dst, size_t len ) ) {
-	static uint8_t random[8192]; /* Too large for stack */
-	uint8_t key[key_len];
-	uint8_t iv[cipher->blocksize];
-	uint8_t ctx[cipher->ctxsize];
-	struct profiler profiler;
-	unsigned long cost;
-	unsigned int i;
-	int rc;
-
-	/* Fill buffer with pseudo-random data */
-	srand ( 0x1234568 );
-	for ( i = 0 ; i < sizeof ( random ) ; i++ )
-		random[i] = rand();
-	for ( i = 0 ; i < sizeof ( key ) ; i++ )
-		key[i] = rand();
-	for ( i = 0 ; i < sizeof ( iv ) ; i++ )
-		iv[i] = rand();
-
-	/* Initialise cipher */
-	rc = cipher_setkey ( cipher, ctx, key, key_len );
-	assert ( rc == 0 );
-	cipher_setiv ( cipher, ctx, iv );
-
-	/* Profile cipher operation */
-	memset ( &profiler, 0, sizeof ( profiler ) );
-	for ( i = 0 ; i < PROFILE_COUNT ; i++ ) {
-		profile_start ( &profiler );
-		op ( cipher, ctx, random, random, sizeof ( random ) );
-		profile_stop ( &profiler );
-	}
-
-	/* Round to nearest whole number of cycles per byte */
-	cost = ( ( profile_mean ( &profiler ) + ( sizeof ( random ) / 2 ) ) /
-		 sizeof ( random ) );
-
-	return cost;
-}
-
-/**
- * Calculate CBC encryption cost
- *
- * @v cipher			Cipher algorithm
- * @v key_len			Length of key
- * @ret cost			Cost (in cycles per byte)
- */
-unsigned long cbc_cost_encrypt ( struct cipher_algorithm *cipher,
-				 size_t key_len ) {
-	return cbc_cost ( cipher, key_len, cipher_encrypt );
-}
-
-/**
- * Calculate CBC decryption cost
- *
- * @v cipher			Cipher algorithm
- * @v key_len			Length of key
- * @ret cost			Cost (in cycles per byte)
- */
-unsigned long cbc_cost_decrypt ( struct cipher_algorithm *cipher,
-				 size_t key_len ) {
-	return cbc_cost ( cipher, key_len, cipher_decrypt );
-}