podvm: update qemu for rhel s390x

Packer is picking qemu-system-x86 instead of s390x as qemu binaries

Fixes: confidential-containers#1740

Signed-off-by: Saripalli Lavanya <Saripalli.Lavanya@ibm.com>

podvm/Makefile

@@ -50,7 +50,14 @@ endif
 
 endif
 else ifeq ($(PODVM_DISTRO),rhel)
+	@echo defined
 	$(eval OPTS := -var disk_size=11144)
+ifeq ($(ARCH),s390x)
+	$(eval OPTS += -var machine_type=${QEMU_MACHINE_TYPE_${ARCH}})
+ifndef QEMU_BINARY
+	$(eval OPTS += -var qemu_binary=qemu-system-${ARCH})
+endif
+endif
 else
 	$(error PODVM_DISTRO is invalid or not defined)
 endif

podvm/qcow2/rhel/qemu-rhel.pkr.hcl

@@ -14,12 +14,13 @@ source "qemu" "rhel" {
   iso_checksum     = "${var.cloud_image_checksum}"
   iso_url          = "${var.cloud_image_url}"
   output_directory = "output"
-  qemuargs         = [["-m", "${var.memory}"], ["-smp", "cpus=${var.cpus}"], ["-cdrom", "${var.cloud_init_image}"], ["-serial", "mon:stdio"], ["-cpu", "Cascadelake-Server"]]
+  qemuargs         = [["-m", "${var.memory}"], ["-smp", "cpus=${var.cpus}"], ["-cdrom", "${var.cloud_init_image}"], ["-serial", "mon:stdio"]]
   ssh_password     = "${var.ssh_password}"
   ssh_port         = 22
   ssh_username     = "${var.ssh_username}"
   ssh_timeout      = "${var.ssh_timeout}"
   boot_wait        = "${var.boot_wait}"
+  qemu_binary      = "${var.qemu_binary}"
   vm_name          = "${var.qemu_image_name}"
   shutdown_command = "sudo shutdown -h now"
   machine_type     = "${local.machine_type}"

podvm/qcow2/rhel/variables.pkr.hcl

@@ -43,6 +43,11 @@ variable "ssh_username" {
   default = "peerpod"
 }
 
+variable "qemu_binary" {
+  type    = string
+  default = "qemu-system-x86_64"
+}
+
 variable "ssh_timeout" {
   type    = string
   default = "15m"