Jul 16, 2009 - 0.11.0-rc0 Upstream 9359d0e

Woohoo!
gdwnldsKSC · Mar 1, 2024 · bda429f · bda429f
1 parent 172ab04
commit bda429f
Show file tree

Hide file tree

Showing 23 changed files with 480 additions and 615 deletions.
diff --git a/ReadMe.md b/ReadMe.md
@@ -1,5 +1,5 @@
 Currently VS2022! TESTFILES build was created via fully updated
-VS2022 17.9.1 Windows 11 26058 with the latest 26058 SDK.
+VS2022 17.9.2 Windows 11 26063 with the Windows 10 20348 SDK.
 
 All code that currently compiles and executes matches an upstream tree now, with 
 just MSVC compatibiilty fixes so that building from this repo for GCC/Linux should
@@ -12,7 +12,12 @@ into the project and built alongside the entire solution.
 
 WinQemu buils the dll, WinQemuTest builds the exe to actually use it
 
-Hardcoded to use D:\Images\ for files.
+Hardcoded to use D:\Images\ for files. - this is not exactly true anymore as we now have
+functional parameters for everything. -L specifies where vgabios.bin is, -bios where... 
+the main bios is, and -hda where the disk image is. small.ffs is NetBSD 1.2
+
+Check "WinQemuTest.exe -help" for BIOS options, as by default it skips boot menu 
+per default configuration from upstream codebase. 
 
 # Building instructions
 
@@ -61,7 +66,7 @@ in MSVC C Preprocessor currently.
 Folder TESTFILES contains working bios image and 'small' BSD disk with not much on it
 but works with these. VGABIOS project for VGA BIOS, and a SeaBIOS image.
 
-QEMU BIOS - build: 05/22/09
+QEMU BIOS - build: 07/11/09
 VGABIOS - "current-cvs 17 Dec 2008"
 
 Working startup commandline:

diff --git a/TESTFILES/WinQemu.dll b/TESTFILES/WinQemu.dll
diff --git a/TESTFILES/WinQemu.pdb b/TESTFILES/WinQemu.pdb
diff --git a/TESTFILES/WinQemuTest.exe b/TESTFILES/WinQemuTest.exe
diff --git a/TESTFILES/WinQemuTest.pdb b/TESTFILES/WinQemuTest.pdb
diff --git a/WinQemu.vcxproj b/WinQemu.vcxproj
@@ -18,7 +18,7 @@
     <ProjectGuid>{043CD6CD-5932-4FFE-A2E5-173B7682D109}</ProjectGuid>
     <RootNamespace>WinQemu</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

diff --git a/WinQemuTest/WinQemuTest.vcxproj b/WinQemuTest/WinQemuTest.vcxproj
@@ -18,7 +18,7 @@
     <ProjectGuid>{37B9A41C-2460-44D8-BA57-955D25D76A4F}</ProjectGuid>
     <RootNamespace>WinQemuTest</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

diff --git a/qemu/Makefile b/qemu/Makefile
@@ -16,10 +16,6 @@ endif
 
 VPATH=$(SRC_PATH):$(SRC_PATH)/hw
 
-
-CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS)
-LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS)
-
 CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
 CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 CPPFLAGS += -U_FORTIFY_SOURCE
@@ -67,23 +63,25 @@ recurse-all: $(SUBDIR_RULES)
 # block-obj-y is code used by both qemu system emulation and qemu-img
 
 block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o
-block-obj-y += block/cow.o block/qcow.o aes.o block/vmdk.o block/cloop.o
-block-obj-y += block/dmg.o block/bochs.o block/vpc.o block/vvfat.o
-block-obj-y += block/qcow2.o block/qcow2-refcount.o block/qcow2-cluster.o
-block-obj-y += block/qcow2-snapshot.o
-block-obj-y += block/parallels.o block/nbd.o
-block-obj-y += nbd.o block.o aio.o
+block-obj-y += nbd.o block.o aio.o aes.o
+
+block-nested-y += cow.o qcow.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o
+block-nested-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o
+block-nested-y += parallels.o nbd.o
+
 
 ifdef CONFIG_WIN32
-block-obj-y += block/raw-win32.o
+block-nested-y += raw-win32.o
 else
 ifdef CONFIG_AIO
 block-obj-y += posix-aio-compat.o
 endif
-block-obj-y += block/raw-posix.o
+block-nested-y += raw-posix.o
 endif
 
-block-obj-$(CONFIG_CURL) += block/curl.o
+block-nested-$(CONFIG_CURL) += curl.o
+
+block-obj-y +=  $(addprefix block/, $(block-nested-y))
 
 ######################################################################
 # libqemu_common.a: Target independent part of system emulation. The
@@ -106,7 +104,7 @@ obj-y += sd.o ssi-sd.o
 obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
 obj-y += bt-hci-csr.o
 obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o
-obj-y += qemu-char.o aio.o net-checksum.o savevm.o cache-utils.o
+obj-y += qemu-char.o aio.o net-checksum.o savevm.o
 obj-y += msmouse.o ps2.o
 obj-y += qdev.o qdev-properties.o ssi.o
 

diff --git a/qemu/Makefile.hw b/qemu/Makefile.hw
@@ -8,9 +8,6 @@ include $(SRC_PATH)/rules.mak
 
 VPATH=$(SRC_PATH):$(SRC_PATH)/hw
 
-CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS)
-LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS)
-
 CPPFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
 CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 CPPFLAGS+=-I$(SRC_PATH)/fpu