Adding qemu as a submodule of KVMFORNFV

This Patch includes the changes to add qemu as a submodule to
kvmfornfv repo and make use of the updated latest qemu for the
execution of all testcase
Change-Id: I1280af507a857675c7f81d30c95255635667bdd7
Signed-off-by:RajithaY<rajithax.yerrumsetty@intel.com>

1 files changed, 0 insertions, 207 deletions

diff --git a/qemu/tests/boot-order-test.c b/qemu/tests/boot-order-test.c
deleted file mode 100644
index a6d8bd5cb..000000000
--- a/qemu/tests/boot-order-test.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Boot order test cases.
- *
- * Copyright (c) 2013 Red Hat Inc.
- *
- * Authors:
- *  Markus Armbruster <armbru@redhat.com>,
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#include "qemu/osdep.h"
-#include <glib.h>
-#include "libqos/fw_cfg.h"
-#include "libqtest.h"
-
-#include "hw/nvram/fw_cfg_keys.h"
-
-typedef struct {
-    const char *args;
-    uint64_t expected_boot;
-    uint64_t expected_reboot;
-} boot_order_test;
-
-static void test_a_boot_order(const char *machine,
-                              const char *test_args,
-                              uint64_t (*read_boot_order)(void),
-                              uint64_t expected_boot,
-                              uint64_t expected_reboot)
-{
-    char *args;
-    uint64_t actual;
-
-    args = g_strdup_printf("-nodefaults%s%s %s",
-                           machine ? " -M " : "",
-                           machine ?: "",
-                           test_args);
-    qtest_start(args);
-    actual = read_boot_order();
-    g_assert_cmphex(actual, ==, expected_boot);
-    qmp_discard_response("{ 'execute': 'system_reset' }");
-    /*
-     * system_reset only requests reset.  We get a RESET event after
-     * the actual reset completes.  Need to wait for that.
-     */
-    qmp_discard_response("");   /* HACK: wait for event */
-    actual = read_boot_order();
-    g_assert_cmphex(actual, ==, expected_reboot);
-    qtest_quit(global_qtest);
-    g_free(args);
-}
-
-static void test_boot_orders(const char *machine,
-                             uint64_t (*read_boot_order)(void),
-                             const boot_order_test *tests)
-{
-    int i;
-
-    for (i = 0; tests[i].args; i++) {
-        test_a_boot_order(machine, tests[i].args,
-                          read_boot_order,
-                          tests[i].expected_boot,
-                          tests[i].expected_reboot);
-    }
-}
-
-static uint8_t read_mc146818(uint16_t port, uint8_t reg)
-{
-    outb(port, reg);
-    return inb(port + 1);
-}
-
-static uint64_t read_boot_order_pc(void)
-{
-    uint8_t b1 = read_mc146818(0x70, 0x38);
-    uint8_t b2 = read_mc146818(0x70, 0x3d);
-
-    return b1 | (b2 << 8);
-}
-
-static const boot_order_test test_cases_pc[] = {
-    { "",
-      0x1230, 0x1230 },
-    { "-no-fd-bootchk",
-      0x1231, 0x1231 },
-    { "-boot c",
-      0x0200, 0x0200 },
-    { "-boot nda",
-      0x3410, 0x3410 },
-    { "-boot order=",
-      0, 0 },
-    { "-boot order= -boot order=c",
-      0x0200, 0x0200 },
-    { "-boot once=a",
-      0x0100, 0x1230 },
-    { "-boot once=a -no-fd-bootchk",
-      0x0101, 0x1231 },
-    { "-boot once=a,order=c",
-      0x0100, 0x0200 },
-    { "-boot once=d -boot order=nda",
-      0x0300, 0x3410 },
-    { "-boot once=a -boot once=b -boot once=c",
-      0x0200, 0x1230 },
-    {}
-};
-
-static void test_pc_boot_order(void)
-{
-    test_boot_orders(NULL, read_boot_order_pc, test_cases_pc);
-}
-
-static uint8_t read_m48t59(uint64_t addr, uint16_t reg)
-{
-    writeb(addr, reg & 0xff);
-    writeb(addr + 1, reg >> 8);
-    return readb(addr + 3);
-}
-
-static uint64_t read_boot_order_prep(void)
-{
-    return read_m48t59(0x80000000 + 0x74, 0x34);
-}
-
-static const boot_order_test test_cases_prep[] = {
-    { "", 'c', 'c' },
-    { "-boot c", 'c', 'c' },
-    { "-boot d", 'd', 'd' },
-    {}
-};
-
-static void test_prep_boot_order(void)
-{
-    test_boot_orders("prep", read_boot_order_prep, test_cases_prep);
-}
-
-static uint64_t read_boot_order_pmac(void)
-{
-    QFWCFG *fw_cfg = mm_fw_cfg_init(0xf0000510);
-
-    return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE);
-}
-
-static const boot_order_test test_cases_fw_cfg[] = {
-    { "", 'c', 'c' },
-    { "-boot c", 'c', 'c' },
-    { "-boot d", 'd', 'd' },
-    { "-boot once=d,order=c", 'd', 'c' },
-    {}
-};
-
-static void test_pmac_oldworld_boot_order(void)
-{
-    test_boot_orders("g3beige", read_boot_order_pmac, test_cases_fw_cfg);
-}
-
-static void test_pmac_newworld_boot_order(void)
-{
-    test_boot_orders("mac99", read_boot_order_pmac, test_cases_fw_cfg);
-}
-
-static uint64_t read_boot_order_sun4m(void)
-{
-    QFWCFG *fw_cfg = mm_fw_cfg_init(0xd00000510ULL);
-
-    return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE);
-}
-
-static void test_sun4m_boot_order(void)
-{
-    test_boot_orders("SS-5", read_boot_order_sun4m, test_cases_fw_cfg);
-}
-
-static uint64_t read_boot_order_sun4u(void)
-{
-    QFWCFG *fw_cfg = io_fw_cfg_init(0x510);
-
-    return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE);
-}
-
-static void test_sun4u_boot_order(void)
-{
-    test_boot_orders("sun4u", read_boot_order_sun4u, test_cases_fw_cfg);
-}
-
-int main(int argc, char *argv[])
-{
-    const char *arch = qtest_get_arch();
-
-    g_test_init(&argc, &argv, NULL);
-
-    if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
-        qtest_add_func("boot-order/pc", test_pc_boot_order);
-    } else if (strcmp(arch, "ppc") == 0 || strcmp(arch, "ppc64") == 0) {
-        qtest_add_func("boot-order/prep", test_prep_boot_order);
-        qtest_add_func("boot-order/pmac_oldworld",
-                       test_pmac_oldworld_boot_order);
-        qtest_add_func("boot-order/pmac_newworld",
-                       test_pmac_newworld_boot_order);
-    } else if (strcmp(arch, "sparc") == 0) {
-        qtest_add_func("boot-order/sun4m", test_sun4m_boot_order);
-    } else if (strcmp(arch, "sparc64") == 0) {
-        qtest_add_func("boot-order/sun4u", test_sun4u_boot_order);
-    }
-
-    return g_test_run();
-}