You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2019/07/26 06:48:37 UTC

[GitHub] [cloudstack] rhtyd commented on a change in pull request #3524: [WIP DO NOT MERGE] Fix VR bootstrapping/connection state in KVM

rhtyd commented on a change in pull request #3524: [WIP DO NOT MERGE] Fix VR bootstrapping/connection state in KVM
URL: https://github.com/apache/cloudstack/pull/3524#discussion_r307608158
 
 

 ##########
 File path: systemvm/debian/opt/cloud/bin/setup/bootstrap.sh
 ##########
 @@ -85,12 +85,18 @@ config_guest() {
           sed -i "s/%/ /g" $CMDLINE
           ;;
      kvm)
-          # Configure hot-plug
-          modprobe acpiphp || true
-          modprobe pci_hotplug || true
+          # Configure kvm hotplug support
+          if grep -E 'CONFIG_HOTPLUG_PCI=y|CONFIG_HOTPLUG_PCI_ACPI=y' /boot/config-`uname -r`; then
+            log_it "acpiphp and pci_hotplug module already compiled in"
+          else
+            modprobe acpiphp 2> /dev/null && log_it "acpiphp module loaded" || true
+            modprobe pci_hotplug 2> /dev/null && log_it "pci_hotplug module loaded" || true
+          fi
+
           sed -i -e "/^s0:2345:respawn.*/d" /etc/inittab
           sed -i -e "/6:23:respawn/a\s0:2345:respawn:/sbin/getty -L 115200 ttyS0 vt102" /etc/inittab
-          systemctl enable --now qemu-guest-agent
 
 Review comment:
   Minor nit: The `--now` does the same, enables and starts it.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services