From bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 Mon Sep 17 00:00:00 2001
From: RajithaY <rajithax.yerrumsetty@intel.com>
Date: Tue, 25 Apr 2017 03:31:15 -0700
Subject: 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>
---
 qemu/roms/seabios/src/resume.c | 161 -----------------------------------------
 1 file changed, 161 deletions(-)
 delete mode 100644 qemu/roms/seabios/src/resume.c

(limited to 'qemu/roms/seabios/src/resume.c')

diff --git a/qemu/roms/seabios/src/resume.c b/qemu/roms/seabios/src/resume.c
deleted file mode 100644
index a5465d877..000000000
--- a/qemu/roms/seabios/src/resume.c
+++ /dev/null
@@ -1,161 +0,0 @@
-// Code for handling calls to "post" that are resume related.
-//
-// Copyright (C) 2008,2009  Kevin O'Connor <kevin@koconnor.net>
-//
-// This file may be distributed under the terms of the GNU LGPLv3 license.
-
-#include "bregs.h" // struct bregs
-#include "config.h" // CONFIG_*
-#include "farptr.h" // FLATPTR_TO_SEGOFF
-#include "hw/pci.h" // pci_reboot
-#include "hw/pic.h" // pic_eoi2
-#include "hw/ps2port.h" // i8042_reboot
-#include "hw/rtc.h" // rtc_read
-#include "output.h" // dprintf
-#include "stacks.h" // farcall16big
-#include "std/bda.h" // struct bios_data_area_s
-#include "string.h" // memset
-#include "util.h" // dma_setup
-#include "tcgbios.h" // tpm_s3_resume
-
-// Handler for post calls that look like a resume.
-void VISIBLE16
-handle_resume(void)
-{
-    ASSERT16();
-    int status = rtc_read(CMOS_RESET_CODE);
-    rtc_write(CMOS_RESET_CODE, 0);
-    dprintf(1, "In resume (status=%d)\n", status);
-
-    dma_setup();
-
-    switch (status) {
-    case 0x01 ... 0x04:
-    case 0x06 ... 0x09:
-        panic("Unimplemented shutdown status: %02x\n", status);
-
-    case 0x05:
-        // flush keyboard (issue EOI) and jump via 40h:0067h
-        pic_eoi2();
-        // NO BREAK
-    case 0x0a:
-#define BDA_JUMP (((struct bios_data_area_s *)0)->jump)
-        // resume execution by jump via 40h:0067h
-        asm volatile(
-            "movw %w1, %%ds\n"
-            "ljmpw *%0\n"
-            : : "m"(BDA_JUMP), "r"(SEG_BDA)
-            );
-        break;
-
-    case 0x0b:
-        // resume execution via IRET via 40h:0067h
-        asm volatile(
-            "movw %w1, %%ds\n"
-            "lssw %0, %%sp\n"
-            "iretw\n"
-            : : "m"(BDA_JUMP), "r"(SEG_BDA)
-            );
-        break;
-
-    case 0x0c:
-        // resume execution via RETF via 40h:0067h
-        asm volatile(
-            "movw %w1, %%ds\n"
-            "lssw %0, %%sp\n"
-            "lretw\n"
-            : : "m"(BDA_JUMP), "r"(SEG_BDA)
-            );
-        break;
-
-    default:
-        break;
-    }
-
-    // Not a 16bit resume - do remaining checks in 32bit mode
-    asm volatile(
-        "movw %w1, %%ss\n"
-        "movl %0, %%esp\n"
-        "movl $_cfunc32flat_handle_resume32, %%edx\n"
-        "jmp transition32\n"
-        : : "i"(BUILD_S3RESUME_STACK_ADDR), "r"(0), "a"(status)
-        );
-}
-
-// Handle an S3 resume event
-static void
-s3_resume(void)
-{
-    if (!CONFIG_S3_RESUME)
-        return;
-
-    u32 s3_resume_vector = find_resume_vector();
-    if (!s3_resume_vector) {
-        dprintf(1, "No resume vector set!\n");
-        return;
-    }
-
-    pic_setup();
-    smm_setup();
-
-    pci_resume();
-
-    /* resume TPM before we may measure option roms */
-    tpm_s3_resume();
-    s3_resume_vga();
-
-    make_bios_readonly();
-
-    // Invoke the resume vector.
-    struct bregs br;
-    memset(&br, 0, sizeof(br));
-    dprintf(1, "Jump to resume vector (%x)\n", s3_resume_vector);
-    br.code = FLATPTR_TO_SEGOFF((void*)s3_resume_vector);
-    farcall16big(&br);
-}
-
-u8 HaveAttemptedReboot VARLOW;
-
-// Attempt to invoke a hard-reboot.
-static void
-tryReboot(void)
-{
-    if (HaveAttemptedReboot) {
-        // Hard reboot has failed - try to shutdown machine.
-        dprintf(1, "Unable to hard-reboot machine - attempting shutdown.\n");
-        apm_shutdown();
-    }
-    HaveAttemptedReboot = 1;
-
-    dprintf(1, "Attempting a hard reboot\n");
-
-    // Setup for reset on qemu.
-    qemu_prep_reset();
-
-    // Reboot using ACPI RESET_REG
-    acpi_reboot();
-
-    // Try keyboard controller reboot.
-    i8042_reboot();
-
-    // Try PCI 0xcf9 reboot
-    pci_reboot();
-
-    // Try triple fault
-    asm volatile("int3");
-
-    panic("Could not reboot");
-}
-
-void VISIBLE32FLAT
-handle_resume32(int status)
-{
-    ASSERT32FLAT();
-    dprintf(1, "In 32bit resume\n");
-
-    if (status == 0xfe)
-        s3_resume();
-
-    // Must be a soft reboot - invoke a hard reboot.
-    tryReboot();
-}
-- 
cgit 1.2.3-korg