Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fwcfg: fix wmic query to ensure windbg installation for fwcfg cases #4181

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

heywji
Copy link
Contributor

@heywji heywji commented Oct 21, 2024

The issue with WinDbg not being found was caused by incorrect WMIC queries.

ID: 1770
Signed-off-by: wji [email protected]

@heywji heywji force-pushed the fix_fwcfg_windbg branch 2 times, most recently from 03313b7 to 1b13681 Compare October 21, 2024 09:00
@heywji heywji changed the title The issue with WinDbg not being found was caused by incorrect WMIC qu… fwcfg: fix wmic query issue to ensure windbg installation for fwcfg feature Oct 21, 2024
@heywji heywji force-pushed the fix_fwcfg_windbg branch 2 times, most recently from 827c3a3 to ec972ec Compare October 21, 2024 09:03
@heywji heywji changed the title fwcfg: fix wmic query issue to ensure windbg installation for fwcfg feature fwcfg: fix wmic query to ensure windbg installation for fwcfg cases Oct 21, 2024
@heywji
Copy link
Contributor Author

heywji commented Oct 21, 2024

Test Result:

14-Host_RHEL.m10.u0.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win11.x86_64.io-github-autotest-qemu.fwcfg.q35 Finshed 2024-10-20 16:27:03 2024-10-20 16:50:16 PASS 1392.831781
15-Host_RHEL.m10.u0.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2022.x86_64.io-github-autotest-qemu.fwcfg.q35 Finshed 2024-10-20 16:50:16 2024-10-20 17:12:04 PASS 1307.751003
16-Host_RHEL.m10.u0.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.fwcfg.q35 Finshed 2024-10-20 17:12:05 2024-10-20 17:44:04 PASS 1918.881459

@heywji
Copy link
Contributor Author

heywji commented Oct 21, 2024

@xiagao Could you help review this patch since our windbg tools not problem has been fixed?

This is not urgent, thanks for your time :)

if status == 1:
time.sleep(30)
else:
LOG_JOB.info("windbg tool installation completed")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the original utils_misc.wait_for() function is better, extending the timeout value could cover your requirement.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree with you. We can only modify the WMIC queries part and keep the current timeout value.

@heywji heywji force-pushed the fix_fwcfg_windbg branch 12 times, most recently from 7600459 to 48df467 Compare October 25, 2024 07:39
@heywji
Copy link
Contributor Author

heywji commented Oct 28, 2024

Test Result:
Summary:
Finshed=66, PASS=66

01-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.i386.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35 Finshed 2024-10-25 22:58:25 2024-10-25 23:20:17 PASS 1312.769413
02-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.i386.io-github-autotest-qemu.disable_win_update.q35 Finshed 2024-10-25 23:20:18 2024-10-25 23:24:44 PASS 265.81168
03-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.i386.io-github-autotest-qemu.single_driver_install.with_fwcfg.virtio_win_iso_media.q35 Finshed 2024-10-25 23:24:44 2024-10-25 23:32:38 PASS 473.344261
04-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35 Finshed 2024-10-25 23:32:38 2024-10-25 23:57:40 PASS 1501.914957
05-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.x86_64.io-github-autotest-qemu.disable_win_update.q35 Finshed 2024-10-25 23:57:42 2024-10-26 00:01:31 PASS 228.622411
06-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.x86_64.io-github-autotest-qemu.single_driver_install.with_fwcfg.virtio_win_iso_media.q35 Finshed 2024-10-26 00:01:31 2024-10-26 00:08:57 PASS 445.995981
07-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2016.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35 Finshed 2024-10-26 00:08:58 2024-10-26 00:22:54 PASS 836.007108
08-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2016.x86_64.io-github-autotest-qemu.disable_win_update.q35 Finshed 2024-10-26 00:22:54 2024-10-26 00:26:09 PASS 194.99891
09-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2016.x86_64.io-github-autotest-qemu.single_driver_install.with_fwcfg.virtio_win_iso_media.q35 Finshed 2024-10-26 00:26:10 2024-10-26 00:32:25 PASS 374.377801
10-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2019.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35 Finshed 2024-10-26 00:32:25 2024-10-26 00:51:01 PASS 1115.405036
11-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2019.x86_64.io-github-autotest-qemu.disable_win_update.q35 Finshed 2024-10-26 00:51:02 2024-10-26 00:55:19 PASS 256.652177
12-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2019.x86_64.io-github-autotest-qemu.single_driver_install.with_fwcfg.virtio_win_iso_media.q35 Finshed 2024-10-26 00:55:20 2024-10-26 01:01:35 PASS 375.750175
13-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2022.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35 Finshed 2024-10-26 01:01:36 2024-10-26 01:26:33 PASS 1497.01062
14-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2022.x86_64.io-github-autotest-qemu.disable_win_update.q35 Finshed 2024-10-26 01:26:34 2024-10-26 01:30:01 PASS 207.082678
15-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2022.x86_64.io-github-autotest-qemu.single_driver_install.with_fwcfg.virtio_win_iso_media.q35 Finshed 2024-10-26 01:30:01 2024-10-26 01:36:20 PASS 378.334311
16-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35 Finshed 2024-10-26 01:36:20 2024-10-26 02:15:04 PASS 2323.868434
17-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.disable_win_update.q35 Finshed 2024-10-26 02:15:05 2024-10-26 02:19:25 PASS 259.973766
18-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.single_driver_install.with_fwcfg.virtio_win_iso_media.q35 Finshed 2024-10-26 02:19:25 2024-10-26 02:25:26 PASS 360.653
19-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.i386.io-github-autotest-qemu.fwcfg.q35 Finshed 2024-10-26 02:25:27 2024-10-26 02:36:00 PASS 633.183122
20-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.x86_64.io-github-autotest-qemu.fwcfg.q35 Finshed 2024-10-26 02:36:01 2024-10-26 02:51:56 PASS 955.055946
21-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2016.x86_64.io-github-autotest-qemu.fwcfg.q35 Finshed 2024-10-26 02:51:56 2024-10-26 03:06:34 PASS 877.958218
22-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2019.x86_64.io-github-autotest-qemu.fwcfg.q35 Finshed 2024-10-26 03:06:35 2024-10-26 03:20:35 PASS 840.267711
23-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2022.x86_64.io-github-autotest-qemu.fwcfg.q35 Finshed 2024-10-26 03:20:37 2024-10-26 03:36:20 PASS 943.867918
24-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.fwcfg.q35 Finshed 2024-10-26 03:36:22 2024-10-26 03:50:38 PASS 856.386421
25-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.i386.io-github-autotest-qemu.fwcfg_enable.with_shutdown.q35 Finshed 2024-10-26 03:50:39 2024-10-26 04:00:35 PASS 595.319137
26-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.i386.io-github-autotest-qemu.fwcfg_enable.with_reboot.q35 Finshed 2024-10-26 04:00:35 2024-10-26 04:12:30 PASS 714.867962
27-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.i386.io-github-autotest-qemu.fwcfg_enable.with_system_reset.q35 Finshed 2024-10-26 04:12:31 2024-10-26 04:22:33 PASS 602.17447
28-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.i386.io-github-autotest-qemu.fwcfg_enable.with_live_migration.q35 Finshed 2024-10-26 04:22:34 2024-10-26 04:31:54 PASS 560.061492
29-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.x86_64.io-github-autotest-qemu.fwcfg_enable.with_shutdown.q35 Finshed 2024-10-26 04:31:54 2024-10-26 04:48:56 PASS 1021.208735
30-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.x86_64.io-github-autotest-qemu.fwcfg_enable.with_reboot.q35 Finshed 2024-10-26 04:48:56 2024-10-26 05:06:48 PASS 1072.160064
31-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.x86_64.io-github-autotest-qemu.fwcfg_enable.with_system_reset.q35 Finshed 2024-10-26 05:06:50 2024-10-26 05:24:02 PASS 1032.773143
32-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.x86_64.io-github-autotest-qemu.fwcfg_enable.with_live_migration.q35 Finshed 2024-10-26 05:24:08 2024-10-26 05:41:53 PASS 1064.492144
33-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2016.x86_64.io-github-autotest-qemu.fwcfg_enable.with_shutdown.q35 Finshed 2024-10-26 05:41:54 2024-10-26 05:53:34 PASS 699.858967
34-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2016.x86_64.io-github-autotest-qemu.fwcfg_enable.with_reboot.q35 Finshed 2024-10-26 05:53:35 2024-10-26 06:07:04 PASS 808.573438
35-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2016.x86_64.io-github-autotest-qemu.fwcfg_enable.with_system_reset.q35 Finshed 2024-10-26 06:07:05 2024-10-26 06:14:11 PASS 425.89918
36-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2016.x86_64.io-github-autotest-qemu.fwcfg_enable.with_live_migration.q35 Finshed 2024-10-26 06:14:11 2024-10-26 06:27:28 PASS 797.081724
37-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2019.x86_64.io-github-autotest-qemu.fwcfg_enable.with_shutdown.q35 Finshed 2024-10-26 06:27:29 2024-10-26 06:41:15 PASS 826.091759
38-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2019.x86_64.io-github-autotest-qemu.fwcfg_enable.with_reboot.q35 Finshed 2024-10-26 06:41:17 2024-10-26 06:55:42 PASS 865.595992
39-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2019.x86_64.io-github-autotest-qemu.fwcfg_enable.with_system_reset.q35 Finshed 2024-10-26 06:55:43 2024-10-26 07:09:43 PASS 839.403996
40-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2019.x86_64.io-github-autotest-qemu.fwcfg_enable.with_live_migration.q35 Finshed 2024-10-26 07:09:44 2024-10-26 07:23:38 PASS 834.159173
41-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2022.x86_64.io-github-autotest-qemu.fwcfg_enable.with_shutdown.q35 Finshed 2024-10-26 07:23:39 2024-10-26 07:37:23 PASS 823.536364
42-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2022.x86_64.io-github-autotest-qemu.fwcfg_enable.with_reboot.q35 Finshed 2024-10-26 07:37:24 2024-10-26 07:53:21 PASS 957.058806
43-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2022.x86_64.io-github-autotest-qemu.fwcfg_enable.with_system_reset.q35 Finshed 2024-10-26 07:53:22 2024-10-26 08:08:09 PASS 886.664632
44-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2022.x86_64.io-github-autotest-qemu.fwcfg_enable.with_live_migration.q35 Finshed 2024-10-26 08:08:09 2024-10-26 08:22:38 PASS 868.370145
45-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.fwcfg_enable.with_shutdown.q35 Finshed 2024-10-26 08:22:39 2024-10-26 08:37:41 PASS 901.516722
46-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.fwcfg_enable.with_reboot.q35 Finshed 2024-10-26 08:37:42 2024-10-26 08:53:14 PASS 931.970436
47-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.fwcfg_enable.with_system_reset.q35 Finshed 2024-10-26 08:53:15 2024-10-26 09:09:42 PASS 986.535905
48-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.fwcfg_enable.with_live_migration.q35 Finshed 2024-10-26 09:09:43 2024-10-26 09:26:33 PASS 1010.15488
49-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.i386.io-github-autotest-qemu.win_virtio_driver_update_test.with_fwcfg.before_bg_test.uninstall_install.q35 Finshed 2024-10-26 09:26:35 2024-10-26 09:40:36 PASS 841.725212
50-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.x86_64.io-github-autotest-qemu.win_virtio_driver_update_test.with_fwcfg.before_bg_test.uninstall_install.q35 Finshed 2024-10-26 09:40:37 2024-10-26 10:00:59 PASS 1222.223954
51-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2016.x86_64.io-github-autotest-qemu.win_virtio_driver_update_test.with_fwcfg.before_bg_test.uninstall_install.q35 Finshed 2024-10-26 10:01:00 2024-10-26 10:17:30 PASS 989.673955
52-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2019.x86_64.io-github-autotest-qemu.win_virtio_driver_update_test.with_fwcfg.before_bg_test.uninstall_install.q35 Finshed 2024-10-26 10:17:31 2024-10-26 10:35:07 PASS 1055.155659
53-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2022.x86_64.io-github-autotest-qemu.win_virtio_driver_update_test.with_fwcfg.before_bg_test.uninstall_install.q35 Finshed 2024-10-26 10:35:08 2024-10-26 10:53:23 PASS 1094.786486
54-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.win_virtio_driver_update_test.with_fwcfg.before_bg_test.uninstall_install.q35 Finshed 2024-10-26 10:53:24 2024-10-26 11:16:35 PASS 1390.363161
55-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.i386.io-github-autotest-qemu.qemu_img_check.q35 Finshed 2024-10-26 11:16:36 2024-10-26 11:16:42 PASS 5.226222
56-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.i386.io-github-autotest-qemu.windows_info.q35 Finshed 2024-10-26 11:16:42 2024-10-26 11:19:07 PASS 144.393604
57-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.x86_64.io-github-autotest-qemu.qemu_img_check.q35 Finshed 2024-10-26 11:19:07 2024-10-26 11:19:11 PASS 4.167949
58-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win10.x86_64.io-github-autotest-qemu.windows_info.q35 Finshed 2024-10-26 11:19:12 2024-10-26 11:22:09 PASS 176.414056
59-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2016.x86_64.io-github-autotest-qemu.qemu_img_check.q35 Finshed 2024-10-26 11:22:09 2024-10-26 11:22:13 PASS 4.11084
60-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2016.x86_64.io-github-autotest-qemu.windows_info.q35 Finshed 2024-10-26 11:22:14 2024-10-26 11:24:23 PASS 128.916004
61-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2019.x86_64.io-github-autotest-qemu.qemu_img_check.q35 Finshed 2024-10-26 11:24:24 2024-10-26 11:24:28 PASS 3.957508
62-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2019.x86_64.io-github-autotest-qemu.windows_info.q35 Finshed 2024-10-26 11:24:29 2024-10-26 11:26:51 PASS 142.212478
63-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2022.x86_64.io-github-autotest-qemu.qemu_img_check.q35 Finshed 2024-10-26 11:26:51 2024-10-26 11:26:55 PASS 4.007185
64-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2022.x86_64.io-github-autotest-qemu.windows_info.q35 Finshed 2024-10-26 11:26:56 2024-10-26 11:29:35 PASS 158.80367
65-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.qemu_img_check.q35 Finshed 2024-10-26 11:29:36 2024-10-26 11:29:40 PASS 3.810637
66-Host_RHEL.m9.u6.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.windows_info.q35 Finshed 2024-10-26 11:29:40 2024-10-26 11:33:12 PASS 211.719946

@heywji
Copy link
Contributor Author

heywji commented Oct 28, 2024

Hi @xiagao, Could you help review this patch again? It has passed for the all guests.

The issue with WinDbg not being found was caused by incorrect WMIC queries.

Signed-off-by: wji <[email protected]>
@@ -19,21 +19,17 @@
image_name_stg = "images/storage"
remove_image_stg = yes
no ppc64 ppc64le aarch64
chk_windbg_cmd = 'wmic product get name,version | find /i "SDK Debuggers"'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As WMIC would be deprecated gradually, it is superseded by windows powershell for WMI.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants