diff options
author | 2016-05-18 13:18:31 +0300 | |
---|---|---|
committer | 2016-05-18 13:42:15 +0300 | |
commit | 437fd90c0250dee670290f9b714253671a990160 (patch) | |
tree | b871786c360704244a07411c69fb58da9ead4a06 /qemu/roms/ipxe/src/include/usr | |
parent | 5bbd6fe9b8bab2a93e548c5a53b032d1939eec05 (diff) |
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>
Diffstat (limited to 'qemu/roms/ipxe/src/include/usr')
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/autoboot.h | 4 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/dhcpmgmt.h | 2 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/fcmgmt.h | 2 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/ifmgmt.h | 2 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/imgmgmt.h | 2 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/imgtrust.h | 2 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/ipstat.h | 2 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/lotest.h | 2 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/neighmgmt.h | 2 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/pingmgmt.h | 2 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/profstat.h | 2 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/prompt.h | 2 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/route.h | 2 | ||||
-rw-r--r-- | qemu/roms/ipxe/src/include/usr/sync.h | 2 |
14 files changed, 15 insertions, 15 deletions
diff --git a/qemu/roms/ipxe/src/include/usr/autoboot.h b/qemu/roms/ipxe/src/include/usr/autoboot.h index bc51aae79..4db226b9c 100644 --- a/qemu/roms/ipxe/src/include/usr/autoboot.h +++ b/qemu/roms/ipxe/src/include/usr/autoboot.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <ipxe/device.h> @@ -35,7 +35,7 @@ extern int uriboot ( struct uri *filename, struct uri *root_path, int drive, extern struct uri * fetch_next_server_and_filename ( struct settings *settings ); extern int netboot ( struct net_device *netdev ); -extern void ipxe ( struct net_device *netdev ); +extern int ipxe ( struct net_device *netdev ); extern int pxe_menu_boot ( struct net_device *netdev ); diff --git a/qemu/roms/ipxe/src/include/usr/dhcpmgmt.h b/qemu/roms/ipxe/src/include/usr/dhcpmgmt.h index af1eceb17..ed669eb9d 100644 --- a/qemu/roms/ipxe/src/include/usr/dhcpmgmt.h +++ b/qemu/roms/ipxe/src/include/usr/dhcpmgmt.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); struct net_device; diff --git a/qemu/roms/ipxe/src/include/usr/fcmgmt.h b/qemu/roms/ipxe/src/include/usr/fcmgmt.h index 9441cefb4..eb568fd20 100644 --- a/qemu/roms/ipxe/src/include/usr/fcmgmt.h +++ b/qemu/roms/ipxe/src/include/usr/fcmgmt.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); struct fc_port; struct fc_peer; diff --git a/qemu/roms/ipxe/src/include/usr/ifmgmt.h b/qemu/roms/ipxe/src/include/usr/ifmgmt.h index db77f1f1b..5c386327b 100644 --- a/qemu/roms/ipxe/src/include/usr/ifmgmt.h +++ b/qemu/roms/ipxe/src/include/usr/ifmgmt.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); struct net_device; struct net_device_configurator; diff --git a/qemu/roms/ipxe/src/include/usr/imgmgmt.h b/qemu/roms/ipxe/src/include/usr/imgmgmt.h index 5e25c562b..806df0bfb 100644 --- a/qemu/roms/ipxe/src/include/usr/imgmgmt.h +++ b/qemu/roms/ipxe/src/include/usr/imgmgmt.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <ipxe/image.h> diff --git a/qemu/roms/ipxe/src/include/usr/imgtrust.h b/qemu/roms/ipxe/src/include/usr/imgtrust.h index f47105af0..414e07a80 100644 --- a/qemu/roms/ipxe/src/include/usr/imgtrust.h +++ b/qemu/roms/ipxe/src/include/usr/imgtrust.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <ipxe/image.h> diff --git a/qemu/roms/ipxe/src/include/usr/ipstat.h b/qemu/roms/ipxe/src/include/usr/ipstat.h index 5ff8b40c3..803254bcb 100644 --- a/qemu/roms/ipxe/src/include/usr/ipstat.h +++ b/qemu/roms/ipxe/src/include/usr/ipstat.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); extern void ipstat ( void ); diff --git a/qemu/roms/ipxe/src/include/usr/lotest.h b/qemu/roms/ipxe/src/include/usr/lotest.h index aa4bbac4d..ce0fe5eda 100644 --- a/qemu/roms/ipxe/src/include/usr/lotest.h +++ b/qemu/roms/ipxe/src/include/usr/lotest.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); extern int loopback_test ( struct net_device *sender, struct net_device *receiver, size_t mtu ); diff --git a/qemu/roms/ipxe/src/include/usr/neighmgmt.h b/qemu/roms/ipxe/src/include/usr/neighmgmt.h index 3c2b704af..06f03716e 100644 --- a/qemu/roms/ipxe/src/include/usr/neighmgmt.h +++ b/qemu/roms/ipxe/src/include/usr/neighmgmt.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); extern void nstat ( void ); diff --git a/qemu/roms/ipxe/src/include/usr/pingmgmt.h b/qemu/roms/ipxe/src/include/usr/pingmgmt.h index d4c2d6cd5..c7a8434be 100644 --- a/qemu/roms/ipxe/src/include/usr/pingmgmt.h +++ b/qemu/roms/ipxe/src/include/usr/pingmgmt.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <stdint.h> diff --git a/qemu/roms/ipxe/src/include/usr/profstat.h b/qemu/roms/ipxe/src/include/usr/profstat.h index 06ea251a0..b7812ca7f 100644 --- a/qemu/roms/ipxe/src/include/usr/profstat.h +++ b/qemu/roms/ipxe/src/include/usr/profstat.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); extern void profstat ( void ); diff --git a/qemu/roms/ipxe/src/include/usr/prompt.h b/qemu/roms/ipxe/src/include/usr/prompt.h index 57e43d2dc..8d3eeee3c 100644 --- a/qemu/roms/ipxe/src/include/usr/prompt.h +++ b/qemu/roms/ipxe/src/include/usr/prompt.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); extern int prompt ( const char *text, unsigned long timeout, int key ); diff --git a/qemu/roms/ipxe/src/include/usr/route.h b/qemu/roms/ipxe/src/include/usr/route.h index b914f4b84..7ec4a3509 100644 --- a/qemu/roms/ipxe/src/include/usr/route.h +++ b/qemu/roms/ipxe/src/include/usr/route.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <ipxe/tables.h> diff --git a/qemu/roms/ipxe/src/include/usr/sync.h b/qemu/roms/ipxe/src/include/usr/sync.h index 0047d4ed9..b6f12ad6e 100644 --- a/qemu/roms/ipxe/src/include/usr/sync.h +++ b/qemu/roms/ipxe/src/include/usr/sync.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); extern int sync ( unsigned long timeout ); |