@samitouri / QOSamiQemu / commits / 5be66f90bd

target/i386: SEV: Remove use of __func__

Remove all usages of __func__ in target/i386/sev.c to align with the general QEMU preference, and replace those with "SEV:" prefix. Suggested-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Naveen N Rao (AMD) <naveen@kernel.org> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Link: https://lore.kernel.org/r/20260626070010.1955433-1-naveen@kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Naveen N Rao (AMD) committed Jun 26, 2026 at 12:30 UTC 5be66f90bdf180d70a3f5d4ab2de399b5190a851
1 file changed +69 -86
target/i386/sev.c
+69 -86
@@ -363,8 +363,8 @@ sev_ram_block_added(RAMBlockNotifier *n, void *host, size_t size,
363 trace_kvm_memcrypt_register_region(host, max_size);
364 r = kvm_vm_ioctl(kvm_state, KVM_MEMORY_ENCRYPT_REG_REGION, &range);
365 if (r) {
366 - error_report("%s: failed to register region (%p+%#zx) error '%s'",
367 - __func__, host, max_size, strerror(errno));
366 + error_report("SEV: Failed to register region (%p+%#zx) error '%s'",
367 + host, max_size, strerror(errno));
368 exit(1);
369 }
370 }
@@ -393,8 +393,8 @@ sev_ram_block_removed(RAMBlockNotifier *n, void *host, size_t size,
393 trace_kvm_memcrypt_unregister_region(host, max_size);
394 r = kvm_vm_ioctl(kvm_state, KVM_MEMORY_ENCRYPT_UNREG_REGION, &range);
395 if (r) {
396 - error_report("%s: failed to unregister region (%p+%#zx)",
397 - __func__, host, max_size);
396 + error_report("SEV: Failed to unregister region (%p+%#zx)",
397 + host, max_size);
398 }
399 }
400
@@ -518,44 +518,39 @@ static int check_sev_features(SevCommonState *sev_common, uint64_t sev_features,
518 {
519 if (sev_features && !sev_es_enabled()) {
520 error_setg(errp,
521 - "%s: SEV features require either SEV-ES or SEV-SNP to be enabled",
522 - __func__);
521 + "SEV: SEV features require either SEV-ES or SEV-SNP to be enabled");
522 return -1;
523 }
524
525 if (sev_features & ~sev_common->supported_sev_features) {
526 error_setg(errp,
528 - "%s: VMSA contains unsupported sev_features: %lX, "
527 + "SEV: VMSA contains unsupported sev_features: %lX, "
528 "supported features: %lX",
530 - __func__, sev_features, sev_common->supported_sev_features);
529 + sev_features, sev_common->supported_sev_features);
530 return -1;
531 }
532
533 if (sev_snp_enabled()) {
534 if (!(sev_features & SVM_SEV_FEAT_SNP_ACTIVE)) {
535 error_setg(errp,
537 - "%s: SEV_SNP is enabled but is not enabled in VMSA sev_features",
538 - __func__);
536 + "SEV: SEV_SNP is enabled but is not enabled in VMSA sev_features");
537 return -1;
538 }
539 if (SEV_SNP_GUEST(sev_common)->tsc_khz &&
540 !(sev_features & SVM_SEV_FEAT_SECURE_TSC)) {
541 error_setg(errp,
544 - "%s: TSC frequency can only be set if Secure TSC is enabled",
545 - __func__);
542 + "SEV: TSC frequency can only be set if Secure TSC is enabled");
543 return -1;
544 }
545 } else {
546 if (sev_features && sev_es_enabled()) {
547 error_setg(errp,
551 - "%s: SEV features are not supported with SEV-ES at this time",
552 - __func__);
548 + "SEV: SEV features are not supported with SEV-ES at this time");
549 return -1;
550 }
551 if (sev_features & SVM_SEV_FEAT_SNP_ACTIVE) {
552 error_setg(errp,
557 - "%s: SEV_SNP is not enabled but is enabled in VMSA sev_features",
558 - __func__);
553 + "SEV: SEV_SNP is not enabled but is enabled in VMSA sev_features");
554 return -1;
555 }
556 }
@@ -578,8 +573,8 @@ static int check_vmsa_supported(SevCommonState *sev_common, hwaddr gpa,
573 */
574 if (gpa != KVM_VMSA_GPA) {
575 error_setg(errp,
581 - "%s: The VMSA GPA must be %lX but is specified as %lX",
582 - __func__, KVM_VMSA_GPA, gpa);
576 + "SEV: The VMSA GPA must be %lX but is specified as %lX",
577 + KVM_VMSA_GPA, gpa);
578 return -1;
579 }
580
@@ -634,11 +629,10 @@ static int check_vmsa_supported(SevCommonState *sev_common, hwaddr gpa,
629
630 if (!buffer_is_zero(&vmsa_check, sizeof(vmsa_check))) {
631 error_setg(errp,
637 - "%s: The VMSA contains fields that are not "
632 + "SEV: The VMSA contains fields that are not "
633 "synchronized with KVM. Continuing would result in "
634 "either unpredictable guest behavior, or a "
640 - "mismatched launch measurement.",
641 - __func__);
635 + "mismatched launch measurement.");
636 return -1;
637 }
638 return 0;
@@ -1115,8 +1109,8 @@ sev_snp_launch_start(SevCommonState *sev_common)
1109 rc = kvm_vm_ioctl(kvm_state, KVM_SET_TSC_KHZ, sev_snp_guest->tsc_khz);
1110 }
1111 if (rc < 0) {
1118 - error_report("%s: Unable to set Secure TSC frequency to %u kHz ret=%d",
1119 - __func__, sev_snp_guest->tsc_khz, rc);
1112 + error_report("SEV: Unable to set Secure TSC frequency to %u kHz ret=%d",
1113 + sev_snp_guest->tsc_khz, rc);
1114 return 1;
1115 }
1116 }
@@ -1124,8 +1118,8 @@ sev_snp_launch_start(SevCommonState *sev_common)
1118 rc = sev_ioctl(sev_common->sev_fd, KVM_SEV_SNP_LAUNCH_START,
1119 start, &fw_error);
1120 if (rc < 0) {
1127 - error_report("%s: SNP_LAUNCH_START ret=%d fw_error=%d '%s'",
1128 - __func__, rc, fw_error, fw_error_to_str(fw_error));
1121 + error_report("SEV: SNP_LAUNCH_START ret=%d fw_error=%d '%s'",
1122 + rc, fw_error, fw_error_to_str(fw_error));
1123 return 1;
1124 }
1125
@@ -1167,8 +1161,8 @@ sev_launch_start(SevCommonState *sev_common)
1161 trace_kvm_sev_launch_start(start.policy, session, dh_cert);
1162 rc = sev_ioctl(sev_common->sev_fd, KVM_SEV_LAUNCH_START, &start, &fw_error);
1163 if (rc < 0) {
1170 - error_report("%s: LAUNCH_START ret=%d fw_error=%d '%s'",
1171 - __func__, ret, fw_error, fw_error_to_str(fw_error));
1164 + error_report("SEV: LAUNCH_START ret=%d fw_error=%d '%s'",
1165 + ret, fw_error, fw_error_to_str(fw_error));
1166 goto out;
1167 }
1168
@@ -1341,7 +1335,7 @@ static int sev_launch_update_data(SevCommonState *sev_common, hwaddr gpa,
1335 ret = sev_ioctl(sev_common->sev_fd, KVM_SEV_LAUNCH_UPDATE_DATA,
1336 &update, &fw_error);
1337 if (ret) {
1344 - error_setg(errp, "%s: LAUNCH_UPDATE ret=%d fw_error=%d '%s'", __func__,
1338 + error_setg(errp, "SEV: LAUNCH_UPDATE ret=%d fw_error=%d '%s'",
1339 ret, fw_error, fw_error_to_str(fw_error));
1340 }
1341
@@ -1366,8 +1360,8 @@ sev_launch_update_vmsa(SevGuestState *sev_guest)
1360 ret = sev_ioctl(SEV_COMMON(sev_guest)->sev_fd, KVM_SEV_LAUNCH_UPDATE_VMSA,
1361 NULL, &fw_error);
1362 if (ret) {
1369 - error_report("%s: LAUNCH_UPDATE_VMSA ret=%d fw_error=%d '%s'",
1370 - __func__, ret, fw_error, fw_error_to_str(fw_error));
1363 + error_report("SEV: LAUNCH_UPDATE_VMSA ret=%d fw_error=%d '%s'",
1364 + ret, fw_error, fw_error_to_str(fw_error));
1365 }
1366
1367 return ret;
@@ -1399,8 +1393,8 @@ sev_launch_get_measure(Notifier *notifier, void *unused)
1393 ret = sev_ioctl(sev_common->sev_fd, KVM_SEV_LAUNCH_MEASURE,
1394 &measurement, &error);
1395 if (!measurement.len) {
1402 - error_report("%s: LAUNCH_MEASURE ret=%d fw_error=%d '%s'",
1403 - __func__, ret, error, fw_error_to_str(errno));
1396 + error_report("SEV: LAUNCH_MEASURE ret=%d fw_error=%d '%s'",
1397 + ret, error, fw_error_to_str(errno));
1398 return;
1399 }
1400
@@ -1411,8 +1405,8 @@ sev_launch_get_measure(Notifier *notifier, void *unused)
1405 ret = sev_ioctl(sev_common->sev_fd, KVM_SEV_LAUNCH_MEASURE,
1406 &measurement, &error);
1407 if (ret) {
1414 - error_report("%s: LAUNCH_MEASURE ret=%d fw_error=%d '%s'",
1415 - __func__, ret, error, fw_error_to_str(errno));
1408 + error_report("SEV: LAUNCH_MEASURE ret=%d fw_error=%d '%s'",
1409 + ret, error, fw_error_to_str(errno));
1410 return;
1411 }
1412
@@ -1467,8 +1461,8 @@ sev_launch_finish(SevCommonState *sev_common)
1461 ret = sev_ioctl(sev_common->sev_fd, KVM_SEV_LAUNCH_FINISH, 0,
1462 &error);
1463 if (ret) {
1470 - error_report("%s: LAUNCH_FINISH ret=%d fw_error=%d '%s'",
1471 - __func__, ret, error, fw_error_to_str(error));
1464 + error_report("SEV: LAUNCH_FINISH ret=%d fw_error=%d '%s'",
1465 + ret, error, fw_error_to_str(error));
1466 exit(1);
1467 }
1468
@@ -1627,8 +1621,8 @@ snp_populate_metadata_pages(SevSnpGuestState *sev_snp,
1621
1622 hva = gpa2hva(&mr, desc->base, desc->len, NULL);
1623 if (!hva) {
1630 - error_report("%s: Failed to get HVA for GPA 0x%x sz 0x%x",
1631 - __func__, desc->base, desc->len);
1624 + error_report("SEV: Failed to get HVA for GPA 0x%x sz 0x%x",
1625 + desc->base, desc->len);
1626 exit(1);
1627 }
1628
@@ -1644,8 +1638,8 @@ snp_populate_metadata_pages(SevSnpGuestState *sev_snp,
1638 }
1639
1640 if (ret) {
1647 - error_report("%s: Failed to add metadata page gpa 0x%x+%x type %d",
1648 - __func__, desc->base, desc->len, desc->type);
1641 + error_report("SEV: Failed to add metadata page gpa 0x%x+%x type %d",
1642 + desc->base, desc->len, desc->type);
1643 exit(1);
1644 }
1645 }
@@ -1674,7 +1668,7 @@ sev_snp_launch_finish(SevCommonState *sev_common)
1668 */
1669 metadata = pc_system_get_ovmf_sev_metadata_ptr();
1670 if (metadata == NULL) {
1677 - error_report("%s: Failed to locate SEV metadata header", __func__);
1671 + error_report("SEV: SNP_LAUNCH_FINISH failed to locate SEV metadata header");
1672 exit(1);
1673 }
1674
@@ -1812,8 +1806,7 @@ static int sev_init_supported_features(ConfidentialGuestSupport *cgs,
1806 .addr = (unsigned long)&sev_common->supported_sev_features,
1807 };
1808 if (kvm_ioctl(kvm_state, KVM_GET_DEVICE_ATTR, &attr) < 0) {
1815 - error_setg(errp, "%s: failed to query supported sev_features",
1816 - __func__);
1809 + error_setg(errp, "SEV: failed to query supported sev_features");
1810 return -1;
1811 }
1812 if (sev_snp_enabled()) {
@@ -1851,8 +1844,8 @@ static int sev_common_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
1844 * comparison against the host value accomplishes that.
1845 */
1846 if (host_cbitpos != sev_common->cbitpos) {
1854 - error_setg(errp, "%s: cbitpos check failed, host '%d' requested '%d'",
1855 - __func__, host_cbitpos, sev_common->cbitpos);
1847 + error_setg(errp, "SEV: cbitpos check failed, host '%d' requested '%d'",
1848 + host_cbitpos, sev_common->cbitpos);
1849 return -1;
1850 }
1851
@@ -1863,9 +1856,9 @@ static int sev_common_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
1856 */
1857 if (sev_common->reduced_phys_bits < 1 ||
1858 sev_common->reduced_phys_bits > 63) {
1866 - error_setg(errp, "%s: reduced_phys_bits check failed,"
1859 + error_setg(errp, "SEV: reduced_phys_bits check failed,"
1860 " it should be in the range of 1 to 63, requested '%d'",
1868 - __func__, sev_common->reduced_phys_bits);
1861 + sev_common->reduced_phys_bits);
1862 return -1;
1863 }
1864
@@ -1881,8 +1874,8 @@ static int sev_common_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
1874 ret = sev_platform_ioctl(sev_common->sev_fd, SEV_PLATFORM_STATUS, &status,
1875 &fw_error);
1876 if (ret) {
1884 - error_setg(errp, "%s: failed to get platform status ret=%d "
1885 - "fw_error='%d: %s'", __func__, ret, fw_error,
1877 + error_setg(errp, "SEV: failed to get platform status ret=%d "
1878 + "fw_error='%d: %s'", ret, fw_error,
1879 fw_error_to_str(fw_error));
1880 return -1;
1881 }
@@ -1892,17 +1885,15 @@ static int sev_common_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
1885
1886 if (sev_es_enabled()) {
1887 if (!kvm_kernel_irqchip_allowed()) {
1895 - error_setg(errp, "%s: SEV-ES guests require in-kernel irqchip"
1896 - "support", __func__);
1888 + error_setg(errp, "SEV: SEV-ES guests require in-kernel irqchip support");
1889 return -1;
1890 }
1891 }
1892
1893 if (sev_es_enabled() && !sev_snp_enabled()) {
1894 if (!(status.flags & SEV_STATUS_FLAGS_CONFIG_ES)) {
1903 - error_setg(errp, "%s: guest policy requires SEV-ES, but "
1904 - "host SEV-ES support unavailable",
1905 - __func__);
1895 + error_setg(errp, "SEV: guest policy requires SEV-ES, but "
1896 + "host SEV-ES support unavailable");
1897 return -1;
1898 }
1899 }
@@ -1949,8 +1940,7 @@ static int sev_common_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
1940 */
1941 if (sev_common->sev_features & ~SVM_SEV_FEAT_SNP_ACTIVE) {
1942 error_setg(errp,
1952 - "%s: SEV features can't be specified when using IGVM files",
1953 - __func__);
1943 + "SEV: SEV features can't be specified when using IGVM files");
1944 return -1;
1945 }
1946 if (IGVM_CFG_GET_CLASS(x86machine->igvm)
@@ -1974,21 +1964,20 @@ static int sev_common_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
1964 break;
1965 }
1966 default:
1977 - error_setg(errp, "%s: host kernel does not support the requested SEV configuration.",
1978 - __func__);
1967 + error_setg(errp, "SEV: host kernel does not support the requested SEV configuration.");
1968 return -1;
1969 }
1970
1971 if (ret) {
1983 - error_setg(errp, "%s: failed to initialize ret=%d fw_error=%d '%s'",
1984 - __func__, ret, fw_error, fw_error_to_str(fw_error));
1972 + error_setg(errp, "SEV: failed to initialize ret=%d fw_error=%d '%s'",
1973 + ret, fw_error, fw_error_to_str(fw_error));
1974 return -1;
1975 }
1976
1977 ret = klass->launch_start(sev_common);
1978
1979 if (ret) {
1991 - error_setg(errp, "%s: failed to create encryption context", __func__);
1980 + error_setg(errp, "SEV: failed to create encryption context");
1981 return -1;
1982 }
1983
@@ -2016,7 +2005,7 @@ static int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
2005 */
2006 ret = ram_block_discard_disable(true);
2007 if (ret) {
2019 - error_setg(errp, "%s: cannot disable RAM discard", __func__);
2008 + error_setg(errp, "SEV: cannot disable RAM discard");
2009 return -1;
2010 }
2011
@@ -2620,8 +2609,7 @@ static int cgs_set_guest_state(hwaddr gpa, uint8_t *ptr, uint64_t len,
2609 const struct sev_es_save_area *sa =
2610 (const struct sev_es_save_area *)ptr;
2611 if (len < sizeof(*sa)) {
2623 - error_setg(errp, "%s: invalid VMSA length encountered",
2624 - __func__);
2612 + error_setg(errp, "SEV: invalid VMSA length encountered");
2613 return -1;
2614 }
2615 sev_common->sev_features = sa->sev_features;
@@ -2630,8 +2618,8 @@ static int cgs_set_guest_state(hwaddr gpa, uint8_t *ptr, uint64_t len,
2618 }
2619
2620 if (!sev_enabled()) {
2633 - error_setg(errp, "%s: attempt to configure guest memory, but SEV "
2634 - "is not enabled", __func__);
2621 + error_setg(errp, "SEV: attempt to configure guest memory, but SEV "
2622 + "is not enabled");
2623 return -1;
2624 }
2625
@@ -2643,9 +2631,8 @@ static int cgs_set_guest_state(hwaddr gpa, uint8_t *ptr, uint64_t len,
2631 case CGS_PAGE_TYPE_VMSA:
2632 if (!sev_es_enabled()) {
2633 error_setg(errp,
2646 - "%s: attempt to configure initial VMSA, but SEV-ES "
2647 - "is not supported",
2648 - __func__);
2634 + "SEV: attempt to configure initial VMSA, but SEV-ES "
2635 + "is not supported");
2636 return -1;
2637 }
2638 if (check_vmsa_supported(sev_common, gpa,
@@ -2666,9 +2653,8 @@ static int cgs_set_guest_state(hwaddr gpa, uint8_t *ptr, uint64_t len,
2653 case CGS_PAGE_TYPE_SECRETS:
2654 if (!sev_snp_enabled()) {
2655 error_setg(errp,
2669 - "%s: attempt to configure secrets page, but SEV-SNP "
2670 - "is not supported",
2671 - __func__);
2656 + "SEV: attempt to configure secrets page, but SEV-SNP "
2657 + "is not supported");
2658 return -1;
2659 }
2660 return snp_launch_update_data(gpa, ptr, len,
@@ -2678,8 +2664,8 @@ static int cgs_set_guest_state(hwaddr gpa, uint8_t *ptr, uint64_t len,
2664 if (kvm_convert_memory(gpa, len, true) < 0) {
2665 error_setg(
2666 errp,
2681 - "%s: failed to configure required memory. gpa: %lX, type: %d",
2682 - __func__, gpa, memory_type);
2667 + "SEV: failed to configure required memory. gpa: %lX, type: %d",
2668 + gpa, memory_type);
2669 return -1;
2670 }
2671 return 0;
@@ -2687,14 +2673,13 @@ static int cgs_set_guest_state(hwaddr gpa, uint8_t *ptr, uint64_t len,
2673 case CGS_PAGE_TYPE_CPUID:
2674 if (!sev_snp_enabled()) {
2675 error_setg(errp,
2690 - "%s: attempt to configure CPUID page, but SEV-SNP "
2691 - "is not supported",
2692 - __func__);
2676 + "SEV: attempt to configure CPUID page, but SEV-SNP "
2677 + "is not supported");
2678 return -1;
2679 }
2680 return snp_launch_update_cpuid(gpa, ptr, len, errp);
2681 }
2697 - error_setg(errp, "%s: failed to update guest. gpa: %lX, type: %d", __func__,
2682 + error_setg(errp, "SEV: failed to update guest. gpa: %lX, type: %d",
2683 gpa, memory_type);
2684 return -1;
2685 }
@@ -2750,8 +2735,8 @@ static int cgs_set_guest_policy(ConfidentialGuestPolicyType policy_type,
2735 }
2736
2737 if (policy_type != GUEST_POLICY_SEV) {
2753 - error_setg(errp, "%s: Invalid guest policy type provided for SEV: %d",
2754 - __func__, policy_type);
2738 + error_setg(errp, "SEV: Invalid guest policy type provided for SEV: %d",
2739 + policy_type);
2740 return -1;
2741 }
2742 /*
@@ -2784,14 +2769,12 @@ static int cgs_set_guest_policy(ConfidentialGuestPolicyType policy_type,
2769 (struct sev_snp_id_authentication *)policy_data2;
2770
2771 if (policy_data1_size != KVM_SEV_SNP_ID_BLOCK_SIZE) {
2787 - error_setg(errp, "%s: Invalid SEV-SNP ID block: incorrect size",
2788 - __func__);
2772 + error_setg(errp, "SEV: Invalid SEV-SNP ID block: incorrect size");
2773 return -1;
2774 }
2775 if (policy_data2_size != KVM_SEV_SNP_ID_AUTH_SIZE) {
2776 error_setg(errp,
2793 - "%s: Invalid SEV-SNP ID auth block: incorrect size",
2794 - __func__);
2777 + "SEV: Invalid SEV-SNP ID auth block: incorrect size");
2778 return -1;
2779 }
2780 assert(policy_data1 != NULL);
@@ -2821,8 +2804,8 @@ static int cgs_set_guest_policy(ConfidentialGuestPolicyType policy_type,
2804 SevGuestState *sev_guest = SEV_GUEST(MACHINE(qdev_get_machine())->cgs);
2805 /* Only the policy flags are supported for SEV and SEV-ES */
2806 if ((policy_data1_size > 0) || (policy_data2_size > 0) || !sev_guest) {
2824 - error_setg(errp, "%s: An ID block/ID auth block has been provided "
2825 - "but SEV-SNP is not enabled", __func__);
2807 + error_setg(errp, "SEV: An ID block/ID auth block has been provided "
2808 + "but SEV-SNP is not enabled");
2809 return -1;
2810 }
2811