Test rebase

resources/chroot.sh

@@ -11,7 +11,7 @@ PS4='+\t '
 
 cp -ruv $rootfs/* /
 
-packages="udev systemd-sysv openssh-server iproute2 curl socat python3-minimal iperf3 iputils-ping fio kmod tmux hwloc-nox vim-tiny trace-cmd linuxptp strace python3-boto3"
+packages="udev systemd-sysv openssh-server iproute2 curl socat python3-minimal iperf3 iputils-ping fio kmod tmux hwloc-nox vim-tiny trace-cmd linuxptp strace python3-boto3 pciutils"
 
 # msr-tools is only supported on x86-64.
 arch=$(uname -m)
@@ -64,6 +64,10 @@ rm -vf /etc/systemd/system/timers.target.wants/*
 
 systemctl enable var-lib-systemd.mount
 
+# disable Predictable Network Interface Names to keep ethN names
+# even with PCI enabled
+ln -s /dev/null /etc/systemd/network/99-default.link
+
 #### trim image https://wiki.ubuntu.com/ReducingDiskFootprint
 # this does not save much, but oh well
 rm -rf /usr/share/{doc,man,info,locale}

resources/guest_configs/pcie.config

@@ -0,0 +1,8 @@
+CONFIG_BLK_MQ_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_MSI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y

resources/overlay/etc/systemd/system/fcnet.service

@@ -1,5 +1,6 @@
 [Service]
 Type=oneshot
+ExecStartPre=/usr/bin/udevadm settle
 ExecStart=/usr/local/bin/fcnet-setup.sh
 [Install]
 WantedBy=sshd.service

resources/overlay/usr/local/bin/init.c

@@ -13,7 +13,7 @@
 // Position on the bus is defined by MMIO_LEN increments, where MMIO_LEN is
 // defined as 0x1000 in vmm/src/device_manager/mmio.rs.
 #ifdef __x86_64__
-#define MAGIC_MMIO_SIGNAL_GUEST_BOOT_COMPLETE 0xd0000000
+#define MAGIC_MMIO_SIGNAL_GUEST_BOOT_COMPLETE 0xc0000000
 #endif
 #ifdef __aarch64__
 #define MAGIC_MMIO_SIGNAL_GUEST_BOOT_COMPLETE 0x40000000