$OpenBSD: patch-src_machines_machine_test_cc,v 1.1 2018/04/07 10:55:54 espie Exp $

Index: src/machines/machine_test.cc
--- src/machines/machine_test.cc.orig
+++ src/machines/machine_test.cc
@@ -106,37 +106,37 @@ static void default_test(struct machine *machine, stru
 	snprintf(base_irq, sizeof(base_irq), "%s.cpu[%i]%s",
 	    machine->path, machine->bootstrap_cpu, end_of_base_irq);
 
-	snprintf(tmpstr, sizeof(tmpstr), "irqc addr=0x%"PRIx64" irq=%s",
+	snprintf(tmpstr, sizeof(tmpstr), "irqc addr=0x%" PRIx64" irq=%s",
 	    (uint64_t) DEV_IRQC_ADDRESS, base_irq);
 	device_add(machine, tmpstr);
 
 
 	/*  Now, add the other devices:  */
 
-	snprintf(tmpstr, sizeof(tmpstr), "cons addr=0x%"PRIx64
+	snprintf(tmpstr, sizeof(tmpstr), "cons addr=0x%" PRIx64
 	    " irq=%s.irqc.2 in_use=%i",
 	    (uint64_t) DEV_CONS_ADDRESS, base_irq, machine->arch != ARCH_SH);
 	machine->main_console_handle = (size_t)device_add(machine, tmpstr);
 
-	snprintf(tmpstr, sizeof(tmpstr), "mp addr=0x%"PRIx64" irq=%s%sirqc.6",
+	snprintf(tmpstr, sizeof(tmpstr), "mp addr=0x%" PRIx64" irq=%s%sirqc.6",
 	    (uint64_t) DEV_MP_ADDRESS,
 	    end_of_base_irq[0]? end_of_base_irq + 1 : "",
 	    end_of_base_irq[0]? "." : "");
 	device_add(machine, tmpstr);
 
-	snprintf(tmpstr, sizeof(tmpstr), "fbctrl addr=0x%"PRIx64,
+	snprintf(tmpstr, sizeof(tmpstr), "fbctrl addr=0x%" PRIx64,
 	    (uint64_t) DEV_FBCTRL_ADDRESS);
 	device_add(machine, tmpstr);
 
-	snprintf(tmpstr, sizeof(tmpstr), "disk addr=0x%"PRIx64,
+	snprintf(tmpstr, sizeof(tmpstr), "disk addr=0x%" PRIx64,
 	    (uint64_t) DEV_DISK_ADDRESS);
 	device_add(machine, tmpstr);
 
-	snprintf(tmpstr, sizeof(tmpstr), "ether addr=0x%"PRIx64" irq=%s.irqc.3",
+	snprintf(tmpstr, sizeof(tmpstr), "ether addr=0x%" PRIx64" irq=%s.irqc.3",
 	    (uint64_t) DEV_ETHER_ADDRESS, base_irq);
 	device_add(machine, tmpstr);
 
-	snprintf(tmpstr, sizeof(tmpstr), "rtc addr=0x%"PRIx64" irq=%s.irqc.4",
+	snprintf(tmpstr, sizeof(tmpstr), "rtc addr=0x%" PRIx64" irq=%s.irqc.4",
 	    (uint64_t) DEV_RTC_ADDRESS, base_irq);
 	device_add(machine, tmpstr);
 }
@@ -279,29 +279,29 @@ MACHINE_SETUP(oldtestmips)
 	machine->machine_name = strdup("MIPS test machine");
 	cpu->byte_order = EMUL_BIG_ENDIAN;
 
-	snprintf(tmpstr, sizeof(tmpstr), "cons addr=0x%"PRIx64" irq=%s."
+	snprintf(tmpstr, sizeof(tmpstr), "cons addr=0x%" PRIx64" irq=%s."
 	    "cpu[%i].2", (uint64_t) DEV_CONS_ADDRESS, machine->path,
 	    machine->bootstrap_cpu);
 	machine->main_console_handle = (size_t)device_add(machine, tmpstr);
 
-	snprintf(tmpstr, sizeof(tmpstr), "mp addr=0x%"PRIx64" irq=6",
+	snprintf(tmpstr, sizeof(tmpstr), "mp addr=0x%" PRIx64" irq=6",
 	    (uint64_t) DEV_MP_ADDRESS);
 	device_add(machine, tmpstr);
 
-	snprintf(tmpstr, sizeof(tmpstr), "fbctrl addr=0x%"PRIx64,
+	snprintf(tmpstr, sizeof(tmpstr), "fbctrl addr=0x%" PRIx64,
 	    (uint64_t) DEV_FBCTRL_ADDRESS);
 	device_add(machine, tmpstr);
 
-	snprintf(tmpstr, sizeof(tmpstr), "disk addr=0x%"PRIx64,
+	snprintf(tmpstr, sizeof(tmpstr), "disk addr=0x%" PRIx64,
 	    (uint64_t) DEV_DISK_ADDRESS);
 	device_add(machine, tmpstr);
 
-	snprintf(tmpstr, sizeof(tmpstr), "ether addr=0x%"PRIx64" irq=%s."
+	snprintf(tmpstr, sizeof(tmpstr), "ether addr=0x%" PRIx64" irq=%s."
 	    "cpu[%i].3", (uint64_t) DEV_ETHER_ADDRESS, machine->path,
 	    machine->bootstrap_cpu);
 	device_add(machine, tmpstr);
 
-	snprintf(tmpstr, sizeof(tmpstr), "rtc addr=0x%"PRIx64" irq=%s."
+	snprintf(tmpstr, sizeof(tmpstr), "rtc addr=0x%" PRIx64" irq=%s."
 	    "cpu[%i].4", (uint64_t) DEV_RTC_ADDRESS, machine->path,
 	    machine->bootstrap_cpu);
 	device_add(machine, tmpstr);
