From 3cacb8e6861526efa3e7bbf0ad9ce9b26da9ee11 Mon Sep 17 00:00:00 2001 From: Reto Achermann Date: Wed, 8 May 2019 09:05:08 +0200 Subject: [PATCH] gitlab-ci: adding test that there are no unmerged files Signed-off-by: Reto Achermann --- .gitlab-ci.yml | 7 +++++++ usr/vmkitmon/guest.c | 40 ---------------------------------------- 2 files changed, 7 insertions(+), 40 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d50ce6d..5fa7e52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,13 @@ commithook-signedoff: script: - "! git log --since='2018-01-01' --invert-grep --grep='Signed-off-by' | tee 'commits_not_signed.txt' | grep 'commit' -A 5" + +commithook-merged: + stage: commithooks + image: achreto/barrelfish-ci + script: + - "! grep -r '^<<<<<<< '" + ############################################################################## diff --git a/usr/vmkitmon/guest.c b/usr/vmkitmon/guest.c index b202567..a990a24 100644 --- a/usr/vmkitmon/guest.c +++ b/usr/vmkitmon/guest.c @@ -2409,13 +2409,8 @@ handle_vmexit_msr (struct guest *g) { printf("MSR: unhandeled MSR write access to %x\n", msr); return handle_vmexit_unhandeled(g); #else -<<<<<<< HEAD - case 0x8b: // IA32_BIOS_SIGN_ID - break; -======= case X86_MSR_BIOS_SIGN_ID: break; ->>>>>>> master default: msr_index = vmx_guest_msr_index(msr); if (msr_index == -1) { @@ -2491,40 +2486,6 @@ handle_vmexit_msr (struct guest *g) { printf("MSR: unhandeled MSR read access to %x\n", msr); return handle_vmexit_unhandeled(g); #else -<<<<<<< HEAD - case 0x1b: - val = 0x0; - break; - case 0x8b: - val = 0x0; - break; - case 0xfe: - val = 0x0; - break; - case 0x179: - val = 0x0; - break; - case 0x17a: - val = 0x0; - break; - case 0x1a0: // IA32_MISC_ENABLE - val = 0x1; // Fast-Strings Enable - break; - case 0x277: - val = 0x0; - break; - case 0x2ff: - val = 0x0; - break; - default: - msr_index = vmx_guest_msr_index(msr); - if (msr_index == -1) { - printf("MSR: unhandeled MSR read access to %x\n", msr); - return handle_vmexit_unhandeled(g); - } - val = guest_msr_area[msr_index].val; - break; -======= case X86_MSR_APIC_BASE: case X86_MSR_BIOS_SIGN_ID: case X86_MSR_MTRRCAP: @@ -2545,7 +2506,6 @@ handle_vmexit_msr (struct guest *g) { } val = guest_msr_area[msr_index].val; break; ->>>>>>> master #endif } -- 1.7.2.5