From d0e40a75352b60644f7f95fa8eb74583797a9ac0 Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <natechancellor@gmail.com>
Date: Sun, 26 Apr 2020 19:33:32 -0700
Subject: [PATCH 1/3] README.txt: Add x86

This was missed in #9.

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
 README.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.txt b/README.txt
index f5080c8..3b4e70e 100644
--- a/README.txt
+++ b/README.txt
@@ -14,6 +14,7 @@ Required parameters:
        * ppc32
        * ppc64
        * ppc64le
+       * x86
        * x86_64
 
   -k | --kbuild-folder:

From b2c59b2f50ae32055d0cf609234edfd563a35f1e Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <natechancellor@gmail.com>
Date: Sun, 26 Apr 2020 19:37:06 -0700
Subject: [PATCH 2/3] boot-qemu.sh: Set QEMU_RAM default in invoke_qemu

QEMU_RAM's default definition was moved into each switch case to appease
shellcheck, which complained about a default assignment parameter
expanstion.

We can avoid both the warning and the duplication by using a regular
'-z' check before QEMU_RAM is actually used.

Link: https://github.com/ClangBuiltLinux/boot-utils/runs/611466476
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
 boot-qemu.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/boot-qemu.sh b/boot-qemu.sh
index 07c30b3..5cb33bc 100755
--- a/boot-qemu.sh
+++ b/boot-qemu.sh
@@ -112,7 +112,6 @@ function setup_qemu_args() {
                 -dtb "${KBUILD_DIR}"/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dtb
                 -machine palmetto-bmc
                 -no-reboot)
-            QEMU_RAM=512m
             QEMU=(qemu-system-arm)
             ;;
 
@@ -122,7 +121,6 @@ function setup_qemu_args() {
                 -dtb "${KBUILD_DIR}"/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dtb
                 -machine romulus-bmc
                 -no-reboot)
-            QEMU_RAM=512m
             QEMU=(qemu-system-arm)
             ;;
 
@@ -131,7 +129,6 @@ function setup_qemu_args() {
             QEMU_ARCH_ARGS=(-append "console=ttyAMA0${RDINIT}"
                 -machine virt
                 -no-reboot)
-            QEMU_RAM=512m
             QEMU=(qemu-system-arm)
             ;;
 
@@ -140,7 +137,6 @@ function setup_qemu_args() {
             QEMU_ARCH_ARGS=(-append "console=ttyAMA0${RDINIT}"
                 -cpu cortex-a57
                 -machine virt)
-            QEMU_RAM=512m
             QEMU=(qemu-system-aarch64)
             ;;
 
@@ -149,7 +145,6 @@ function setup_qemu_args() {
             QEMU_ARCH_ARGS=("${APPEND_RDINIT[@]}"
                 -cpu 24Kf
                 -machine malta)
-            QEMU_RAM=512m
             QEMU=(qemu-system-"${ARCH}")
             ARCH=mips
             ;;
@@ -191,7 +186,6 @@ function setup_qemu_args() {
             # Use KVM if the processor supports it (first part) and the KVM module is loaded (second part)
             [[ $(grep -c -E 'vmx|svm' /proc/cpuinfo) -gt 0 && $(lsmod 2>/dev/null | grep -c kvm) -gt 0 ]] &&
                 QEMU_ARCH_ARGS=("${QEMU_ARCH_ARGS[@]}" -cpu host -d "unimp,guest_errors" -enable-kvm)
-            QEMU_RAM=512m
             QEMU=(qemu-system-x86_64)
             ;;
     esac
@@ -205,6 +199,7 @@ function setup_qemu_args() {
 # Invoke QEMU
 function invoke_qemu() {
     ${INTERACTIVE} || QEMU=(timeout "${TIMEOUT:=3m}" unbuffer "${QEMU[@]}")
+    [[ -z ${QEMU_RAM} ]] && QEMU_RAM=512m
     if ${GDB:=false}; then
         while true; do
             if lsof -i:1234 &>/dev/null; then

From b76079a493a823a357c0330a097f77f881042802 Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <natechancellor@gmail.com>
Date: Sun, 26 Apr 2020 19:42:19 -0700
Subject: [PATCH 3/3] github: Add CODEOWNERS

So that people get auto added to review pull requests.

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..28ad0d6
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @msfjarvis @nathanchance @nickdesaulniers @tpimh