# HG changeset patch
# User tobaru
# Date 1516952569 -32400
# Node ID 2617849843ecdb554f6167990c61dc3282827854
# Parent  f8ce1013b84d1313c253d2ff2f4b4f35235146ba
fedore virsh edit file

diff -r f8ce1013b84d -r 2617849843ec edit_xv6arm7
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/edit_xv6arm7	Fri Jan 26 16:42:49 2018 +0900
@@ -0,0 +1,101 @@
+<domain type='kvm'>
+  <name>xv6arm7</name>
+  <uuid>80ddbab5-a467-4964-8eb1-0475512522ee</uuid>
+  <memory unit='KiB'>131072</memory>
+  <currentMemory unit='KiB'>131072</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc-i440fx-rhel7.4.0'>hvm</type>
+    <kernel>/mnt/dalmore-home/one/src/xv6-rpi/src/kernel.elf</kernel>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <vmport state='off'/>
+  </features>
+  <cpu mode='custom' match='exact'>
+    <model fallback='allow'>Haswell-noTSX</model>
+  </cpu>
+  <clock offset='utc'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <pm>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/libexec/qemu-kvm</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/mnt/dalmore-home/one/src/xv6-rpi/src/build/fs.img'/>
+      <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0' model='ich9-ehci1'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci1'>
+      <master startport='0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci2'>
+      <master startport='2'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci3'>
+      <master startport='4'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <controller type='ide' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+    </controller>
+    <interface type='user'>
+      <mac address='52:54:00:42:94:60'/>
+      <model type='rtl8139'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </interface>
+    <serial type='pty'>
+      <target port='0'/>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='spice' autoport='yes'>
+      <listen type='address'/>
+      <image compression='off'/>
+    </graphics>
+    <sound model='ich6'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+    </sound>
+    <video>
+      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </video>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='1'/>
+    </redirdev>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='2'/>
+    </redirdev>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>
+
diff -r f8ce1013b84d -r 2617849843ec src/makefile.inc
--- a/src/makefile.inc	Thu Jan 25 19:33:40 2018 +0900
+++ b/src/makefile.inc	Fri Jan 26 16:42:49 2018 +0900
@@ -1,5 +1,5 @@
 # Cross-compiling (e.g., on Mac OS X, install arm-none-eabi-gcc with MacPorts)
-CROSSCOMPILE := arm-none-eabi-
+CROSSCOMPILE := arm-linux-gnu-
 
 CC = $(CROSSCOMPILE)gcc
 AS = $(CROSSCOMPILE)as
diff -r f8ce1013b84d -r 2617849843ec src/trap.c
--- a/src/trap.c	Thu Jan 25 19:33:40 2018 +0900
+++ b/src/trap.c	Fri Jan 26 16:42:49 2018 +0900
@@ -152,3 +152,5 @@
     cprintf ("    r12: 0x%x\n", tf->r12);
     cprintf ("     pc: 0x%x\n", tf->pc);
 }
+void raise()
+{}
diff -r f8ce1013b84d -r 2617849843ec src/usr/ulib.c
--- a/src/usr/ulib.c	Thu Jan 25 19:33:40 2018 +0900
+++ b/src/usr/ulib.c	Fri Jan 26 16:42:49 2018 +0900
@@ -129,3 +129,7 @@
         *dst++ = *src++;
     return vdst;
 }
+
+void
+raise()
+{}