From 437fd90c0250dee670290f9b714253671a990160 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Wed, 18 May 2016 13:18:31 +0300 Subject: These changes are the raw update to qemu-2.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- qemu/roms/ipxe/src/config/vbox/general.h | 8 -------- qemu/roms/ipxe/src/config/vbox/usb.h | 0 2 files changed, 8 deletions(-) create mode 100644 qemu/roms/ipxe/src/config/vbox/usb.h (limited to 'qemu/roms/ipxe/src/config/vbox') diff --git a/qemu/roms/ipxe/src/config/vbox/general.h b/qemu/roms/ipxe/src/config/vbox/general.h index 27d15daf2..06b45f1a8 100644 --- a/qemu/roms/ipxe/src/config/vbox/general.h +++ b/qemu/roms/ipxe/src/config/vbox/general.h @@ -1,25 +1,17 @@ /* Disabled from config/defaults/pcbios.h */ -#undef IMAGE_ELF #undef SANBOOT_PROTO_ISCSI #undef SANBOOT_PROTO_AOE #undef SANBOOT_PROTO_IB_SRP #undef SANBOOT_PROTO_FCP -#undef REBOOT_CMD -#undef CPUID_CMD /* Disabled from config/general.h */ -#undef DOWNLOAD_PROTO_HTTP #undef CRYPTO_80211_WEP #undef CRYPTO_80211_WPA #undef CRYPTO_80211_WPA2 #undef IWMGMT_CMD -#undef FCMGMT_CMD -#undef SANBOOT_CMD #undef MENU_CMD -#undef LOGIN_CMD -#undef SYNC_CMD /* Ensure ROM banner is not displayed */ diff --git a/qemu/roms/ipxe/src/config/vbox/usb.h b/qemu/roms/ipxe/src/config/vbox/usb.h new file mode 100644 index 000000000..e69de29bb -- cgit 1.2.3-korg