Make stuff run

Author: marijnvdwerf

CMakeLists.txt

@@ -3,13 +3,13 @@ project(qemu_dev)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
-file(GLOB_RECURSE src "*.c")
+file(GLOB_RECURSE src "*.c" ".h")
 
 set(SOURCES
     ${src})
 
-include_directories(include)
 
-add_custom_target(qemu_dev COMMAND make
-        CLION_EXE_DIR=${PROJECT_BINARY_DIR})
+add_executable(qemu_dev ${SOURCES})
+target_compile_options(qemu_dev PRIVATE -iquote "${CMAKE_CURRENT_SOURCE_DIR}/include")
+#target_include_directories(qemu_dev PRIVATE include)
 

Makefile

@@ -494,7 +494,6 @@ qemu-version.h: FORCE
 
 config-host.h: config-host.h-timestamp
 config-host.h-timestamp: config-host.mak
-<<<<<<< HEAD
 qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@")
 
@@ -511,27 +510,6 @@ $(SOFTMMU_ALL_RULES): config-all-devices.mak
 ifdef DECOMPRESS_EDK2_BLOBS
 $(SOFTMMU_ALL_RULES): $(edk2-decompressed)
 endif
-=======
-qemu-options.def: $(SRC_PATH)/qemu-options.hx
-	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
-
-SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
-SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))
-
-$(SOFTMMU_SUBDIR_RULES): $(block-obj-y)
-$(SOFTMMU_SUBDIR_RULES): $(crypto-obj-y)
-$(SOFTMMU_SUBDIR_RULES): $(qom-obj-y)
-$(SOFTMMU_SUBDIR_RULES): config-all-devices.mak
-
-subdir-%:
-	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,)
-
-subdir-pixman: pixman/Makefile
-	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,)
-
-pixman/Makefile: $(SRC_PATH)/pixman/configure
-	(cd pixman; CFLAGS="$(CFLAGS) -fPIC $(extra_cflags) $(extra_ldflags)" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static)
->>>>>>> 919b29ba7d... Pebble Qemu
 
 SOFTMMU_FUZZ_RULES=$(filter %-softmmu/fuzz, $(TARGET_DIRS_RULES))
 $(SOFTMMU_FUZZ_RULES): $(authz-obj-y)

Makefile.objs

@@ -1,14 +1,8 @@
 #######################################################################
 # Common libraries for tools and emulators
 stub-obj-y = stubs/
-<<<<<<< HEAD
 util-obj-y = crypto/ util/ qobject/ qapi/
 qom-obj-y = qom/
-=======
-util-obj-y = util/ qobject/ qapi/
-util-obj-y += crypto/
-util-obj-y += qmp-introspect.o qapi-types.o qapi-visit.o qapi-event.o
->>>>>>> 919b29ba7d... Pebble Qemu
 
 #######################################################################
 # code used by both qemu system emulation and qemu-img

README.rst

@@ -1,77 +1,6 @@
-<<<<<<< HEAD:README.rst
 ===========
 QEMU README
 ===========
-=======
-QEMU with STM32 Microcontroller Implementation
-
-Official Homepage: http://beckus.github.io/qemu_stm32/
-
-OVERVIEW
-This is a copy of QEMU that has been modified to include an implementation
-of the STM32 microcontroller.  It also implements an Olimex STM32_P103
-developmentvboard.  This project runs the demos located in the
-stm32_p103_demos project located at: https://github.com/beckus/stm32_p103_demos .
-
-Commands for a typical build:
-./configure --enable-debug --target-list="arm-softmmu"
-make
-
-Useful make commands when rebuilding:
-    make defconfig
-    make clean
-
-The generated executable is arm-softmmu/qemu-system-arm .
-
-Other configure options which control the STM32 implementation:
-
-    --extra-cflags=-DDEBUG_CLKTREE
-        Print out clock tree debug statements.
-
-    --extra-cflags=-DDEBUG_STM32_RCC
-        Print RCC debug statements.
-
-    --extra-cflags=-DDEBUG_STM32_UART
-        Print UART debug statements.
-
-    --extra-cflags=-DSTM32_UART_NO_BAUD_DELAY
-        Disable the BAUD rate timing simulation
-        (i.e. the UART will transmit or receive as fast as possible, rather than
-        using a realistic delay).
-
-    --extra-cflags=-DSTM32_UART_ENABLE_OVERRUN
-        Enable setting of the overrun flag if a character is
-        received before the last one is processed.  If this is not set, the UART
-        will not receive the next character until the previous one is read by
-        software.  Although less realisitic, this is safer in case the VM is
-        running slow.
-
-Other QEMU configure options which are useful for troubleshooting:
-    --extra-cflags=-DDEBUG_GIC
-
-qemu-system-arm options which are useful for trobuleshooting:
-    -d ?
-        To see available log levels
-
-    -d cpu,in_asm
-        Enable logging to view the CPU state during execution and the ARM
-        instructions which are being executed.  I believe --enable-debug must be
-        used for this to work.
-        By default, you can find the output in /tmp/qemu.log:
-
-UNIT TESTING
-Unit test scripts are included for the STM32 implementation.
-These test will be executed when running "make" with the standard
-check targets (see tests/Makefile for documentation of QEMU's unit
-testing features):
-    make check
-    make check-qtest-arm
-
-
-
-The original QEMU README follows:
-
->>>>>>> 919b29ba7d... Pebble Qemu:README
 
 QEMU is a generic and open source machine & userspace emulator and
 virtualizer.

VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0
-=======
-2.5.0-pebble4
->>>>>>> 919b29ba7d... Pebble Qemu

block/qcow2-cache.c

@@ -308,12 +308,8 @@ int qcow2_cache_empty(BlockDriverState *bs, Qcow2Cache *c)
         c->entries[i].offset = 0;
         c->entries[i].lru_counter = 0;
     }
-<<<<<<< HEAD
 
     qcow2_cache_table_release(c, 0, c->size);
-=======
-    qcow2_cache_table_release(bs, c, 0, c->size);
->>>>>>> 919b29ba7d... Pebble Qemu
 
     c->lru_counter = 0;
 

block/qcow2.c

@@ -1253,11 +1253,7 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
     Error *local_err = NULL;
     uint64_t ext_end;
     uint64_t l1_vm_state_index;
-<<<<<<< HEAD
     bool update_header = false;
-=======
-    uint64_t l2_cache_size, refcount_cache_size;
->>>>>>> 919b29ba7d... Pebble Qemu
 
     ret = bdrv_pread(bs->file, 0, &header, sizeof(header));
     if (ret < 0) {
@@ -1520,11 +1516,6 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
     if (ret < 0) {
         goto fail;
     }
-    if (s->l2_table_cache == NULL || s->refcount_block_cache == NULL) {
-        error_setg(errp, "Could not allocate metadata caches");
-        ret = -ENOMEM;
-        goto fail;
-    }
 
     s->flags = flags;
 

block/quorum.c

@@ -929,7 +929,6 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     s->threshold = qemu_opt_get_number(opts, QUORUM_OPT_VOTE_THRESHOLD, 0);
-<<<<<<< HEAD
     /* and validate it against s->num_children */
     ret = quorum_valid_threshold(s->threshold, s->num_children, &local_err);
     if (ret < 0) {
@@ -943,9 +942,6 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags,
         ret = qapi_enum_parse(&QuorumReadPattern_lookup, pattern_str,
                               -EINVAL, NULL);
     }
-=======
-    ret = parse_read_pattern(qemu_opt_get(opts, QUORUM_OPT_READ_PATTERN));
->>>>>>> 919b29ba7d... Pebble Qemu
     if (ret < 0) {
         error_setg(&local_err, "Please set read-pattern as fifo or quorum");
         goto exit;