From 9f5b96adeb6d072008161948dc5236d2d9d7404b Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Sun, 13 Aug 2023 21:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=89=E8=A3=85Windows11?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=88=E5=8F=AA=E9=99=90VirtualBox?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .qtc_clangd/compile_commands.json | 34 +++++++++++++++---------------- buildvbox.cpp | 24 ++++++++++++++++++---- mainwindow.cpp | 6 ++++++ mainwindow.ui | 5 +++++ 4 files changed, 48 insertions(+), 21 deletions(-) diff --git a/.qtc_clangd/compile_commands.json b/.qtc_clangd/compile_commands.json index 35e14b0..5f143b5 100644 --- a/.qtc_clangd/compile_commands.json +++ b/.qtc_clangd/compile_commands.json @@ -7,7 +7,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -77,7 +77,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -147,7 +147,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -217,7 +217,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -287,7 +287,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -357,7 +357,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -427,7 +427,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -497,7 +497,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -567,7 +567,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -637,7 +637,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -707,7 +707,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -777,7 +777,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -847,7 +847,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -917,7 +917,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -987,7 +987,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -1057,7 +1057,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", @@ -1127,7 +1127,7 @@ "-I", "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU", + "/tmp/QtCreator-NXqKOr/clang-uiheader-YSsUJt", "-nostdinc", "-nostdinc++", "-pipe", diff --git a/buildvbox.cpp b/buildvbox.cpp index 89202c4..62694fb 100644 --- a/buildvbox.cpp +++ b/buildvbox.cpp @@ -110,15 +110,24 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){ switch (id) { case 0: vm.Create("Windows7"); + vm.SetDisplayMemory(32); break; case 1: vm.Create("Windows7_64"); + vm.SetDisplayMemory(32); break; case 2: vm.Create("WindowsNT_64"); + vm.SetDisplayMemory(32); break; case 3: vm.Create("WindowsNT_64"); + vm.SetDisplayMemory(32); + vm.EnabledUEFI(true); + break; + case 4: + vm.Create("Windows11_64"); + vm.SetDisplayMemory(128); vm.EnabledUEFI(true); break; } @@ -158,7 +167,6 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){ infoUtils::memoryRate(memory, memoryAll, swap, swapAll); //memoryRate(memory, memoryAll, swap, swapAll); vm.SetMemory(memoryAll / 3 / 1024); - vm.SetDisplayMemory(32); vm.SetNetBridge(net); vm.EnabledAudio(); vm.EnabledClipboardMode(); @@ -180,16 +188,25 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){ switch (id) { case 0: vm.Create("Windows7"); + vm.SetDisplayMemory(32); break; case 1: vm.Create("Windows7_64"); + vm.SetDisplayMemory(32); break; case 2: vm.Create("WindowsNT_64"); + vm.SetDisplayMemory(32); break; case 3: vm.Create("WindowsNT_64"); vm.EnabledUEFI(true); + vm.SetDisplayMemory(32); + break; + case 4: + vm.Create("Windows11_64"); + vm.SetDisplayMemory(128); + vm.EnabledUEFI(true); break; } QDir dir("/home/gfdgd_xi/Qemu/Windows/"); @@ -213,8 +230,8 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){ if(QFile::exists("/usr/share/virtualbox/VBoxGuestAdditions.iso")){ vm.MountISO("/usr/share/virtualbox/VBoxGuestAdditions.iso", "storage_controller_1", 1, 1); } - - vm.SetCPU(get_nprocs(), GetCPUSocket(), GetCPUCore()); + // VirtualBox 的 CPU 数量设置方法和 Qemu 不一样 + vm.SetCPU(GetCPUCore(), GetCPUSocket(), GetCPUCore()); long memory = 0; long memoryAll = 0; long swap = 0; @@ -222,7 +239,6 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){ infoUtils::memoryRate(memory, memoryAll, swap, swapAll); //memoryRate(memory, memoryAll, swap, swapAll); vm.SetMemory(memoryAll / 3 / 1024); - vm.SetDisplayMemory(32); vm.SetNetBridge(net); vm.EnabledAudio(); vm.EnabledClipboardMode(); diff --git a/mainwindow.cpp b/mainwindow.cpp index be4eeea..526fa15 100755 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -196,6 +196,12 @@ void MainWindow::on_install_clicked() file.close(); } break; + case 4: + if(ui->vmChooser->currentIndex() == 0){ + QMessageBox::warning(this, "提示", "Qemu 不支持该选项！"); + return; + } + break; default: if(ui->vmChooser->currentIndex() == 0 && QFile::exists(QDir::homePath() + "/.config/deepin-wine-runner/QEMU-EFI")){ QFile::remove(QDir::homePath() + "/.config/deepin-wine-runner/QEMU-EFI"); diff --git a/mainwindow.ui b/mainwindow.ui index 1adc960..2a0102f 100755 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -94,6 +94,11 @@ 其他 Windows 系统（不支持自动安装，UEFI 启动，推荐 Windows 8 及以上） + + + 安装 WIndows 11（不支持自动安装） + +