diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-05-18 13:18:31 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-05-18 13:42:15 +0300 |
| commit | 437fd90c0250dee670290f9b714253671a990160 (patch) | |
| tree | b871786c360704244a07411c69fb58da9ead4a06 /qemu/roms/ipxe/src/config/qemu | |
| 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/config/qemu')
| -rw-r--r-- | qemu/roms/ipxe/src/config/qemu/colour.h | 0 | ||||
| -rw-r--r-- | qemu/roms/ipxe/src/config/qemu/console.h | 0 | ||||
| -rw-r--r-- | qemu/roms/ipxe/src/config/qemu/crypto.h | 0 | ||||
| -rw-r--r-- | qemu/roms/ipxe/src/config/qemu/general.h | 10 | ||||
| -rw-r--r-- | qemu/roms/ipxe/src/config/qemu/serial.h | 0 | ||||
| -rw-r--r-- | qemu/roms/ipxe/src/config/qemu/settings.h | 0 | ||||
| -rw-r--r-- | qemu/roms/ipxe/src/config/qemu/sideband.h | 0 | ||||
| -rw-r--r-- | qemu/roms/ipxe/src/config/qemu/usb.h | 0 |
8 files changed, 10 insertions, 0 deletions
diff --git a/qemu/roms/ipxe/src/config/qemu/colour.h b/qemu/roms/ipxe/src/config/qemu/colour.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qemu/roms/ipxe/src/config/qemu/colour.h diff --git a/qemu/roms/ipxe/src/config/qemu/console.h b/qemu/roms/ipxe/src/config/qemu/console.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qemu/roms/ipxe/src/config/qemu/console.h diff --git a/qemu/roms/ipxe/src/config/qemu/crypto.h b/qemu/roms/ipxe/src/config/qemu/crypto.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qemu/roms/ipxe/src/config/qemu/crypto.h diff --git a/qemu/roms/ipxe/src/config/qemu/general.h b/qemu/roms/ipxe/src/config/qemu/general.h new file mode 100644 index 000000000..30f60d3f7 --- /dev/null +++ b/qemu/roms/ipxe/src/config/qemu/general.h @@ -0,0 +1,10 @@ +/* Disable entry during POST */ +#undef ROM_BANNER_TIMEOUT +#define ROM_BANNER_TIMEOUT 0 + +/* Extend banner timeout */ +#undef BANNER_TIMEOUT +#define BANNER_TIMEOUT 30 + +/* Work around missing EFI_PXE_BASE_CODE_PROTOCOL */ +#define EFI_DOWNGRADE_UX diff --git a/qemu/roms/ipxe/src/config/qemu/serial.h b/qemu/roms/ipxe/src/config/qemu/serial.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qemu/roms/ipxe/src/config/qemu/serial.h diff --git a/qemu/roms/ipxe/src/config/qemu/settings.h b/qemu/roms/ipxe/src/config/qemu/settings.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qemu/roms/ipxe/src/config/qemu/settings.h diff --git a/qemu/roms/ipxe/src/config/qemu/sideband.h b/qemu/roms/ipxe/src/config/qemu/sideband.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qemu/roms/ipxe/src/config/qemu/sideband.h diff --git a/qemu/roms/ipxe/src/config/qemu/usb.h b/qemu/roms/ipxe/src/config/qemu/usb.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qemu/roms/ipxe/src/config/qemu/usb.h |