From 0fb67af46557146adf6d0b04f434876d3445e458 Mon Sep 17 00:00:00 2001 From: Chang Hyun Park Date: Tue, 4 Jul 2017 22:06:11 +0900 Subject: [PATCH 1/2] Adds a gitignore file Adds a gitignore file to ignore files that should not be tracked. Especially the generated files (.o, .d files and the resulting binaries). Also: Ignores some generated files of the command `$ ./configure`. Ignores the symbolic links in the QEMU/hw directory --- .gitignore | 48 ++++++++++++++++++++++++++++++ QEMU/config-host.h | 30 ------------------- QEMU/config-host.mak | 53 ---------------------------------- QEMU/libhw32/Makefile | 1 - QEMU/libhw64/Makefile | 1 - QEMU/x86_64-softmmu/config.mak | 17 ----------- 6 files changed, 48 insertions(+), 102 deletions(-) create mode 100644 .gitignore delete mode 100644 QEMU/config-host.h delete mode 100755 QEMU/config-host.mak delete mode 120000 QEMU/libhw32/Makefile delete mode 120000 QEMU/libhw64/Makefile delete mode 100755 QEMU/x86_64-softmmu/config.mak diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c98282e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,48 @@ + +*.sw? +*.o +*.d +*.iso +*.ISO +*.a +*.img +*.bin + +tags +QEMU/x86_64-softmmu/* + +#To be built by qmake +MONITOR/SSD_MONITOR_PM/moc_monitorform.cpp +MONITOR/SSD_MONITOR_PM/Makefile +MONITOR/SSD_MONITOR_PM/ssd_monitor_p +MONITOR/SSD_MONITOR_PM/ui_monitorform.h + +#To be built by QEMU configure +QEMU/Makefile.target +QEMU/config-host.h +QEMU/config-host.mak +QEMU/libhw32/Makefile +QEMU/libhw64/Makefile + +#To be built by QEMU make +QEMU/qemu-img +QEMU/qemu-img-cmds.h +QEMU/qemu-io +QEMU/qemu-nbd + +#symbolic links under QEMU/hw +QEMU/hw/common.h +QEMU/hw/firm_buffer_manager.? +QEMU/hw/ftl.? +QEMU/hw/ftl_cache.? +QEMU/hw/ftl_gc_manager.? +QEMU/hw/ftl_inverse_mapping_manager.? +QEMU/hw/ftl_mapping_manager.? +QEMU/hw/ftl_perf_manager.? +QEMU/hw/ftl_type.h +QEMU/hw/ssd.? +QEMU/hw/ssd_io_manager.? +QEMU/hw/ssd_log_manager.? +QEMU/hw/ssd_trim_manager.? +QEMU/hw/ssd_util.h +QEMU/hw/vssim_config_manager.? diff --git a/QEMU/config-host.h b/QEMU/config-host.h deleted file mode 100644 index 28ed90d5..00000000 --- a/QEMU/config-host.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Automatically generated by configure - do not modify */ -#define CONFIG_QEMU_SHAREDIR "/usr/local/share/qemu" -#define HOST_X86_64 1 -#define HOST_LONG_BITS 64 -#define HAVE_BYTESWAP_H 1 -#define CONFIG_SLIRP 1 -#define CONFIG_AC97 1 -#define CONFIG_ES1370 1 -#define CONFIG_SB16 1 -#define AUDIO_DRIVERS \ - &oss_audio_driver, \ - -#define CONFIG_VNC_TLS 1 -#define HAVE_FNMATCH_H 1 -#define QEMU_VERSION "0.11.0" -#define QEMU_PKGVERSION " (qemu-kvm-0.11.0)" -#define CONFIG_SDL 1 -#define CONFIG_CURSES 1 -#define CONFIG_ATFILE 1 -#define CONFIG_UTIMENSAT 1 -#define CONFIG_PIPE2 1 -#define CONFIG_SPLICE 1 -#define CONFIG_INOTIFY 1 -#define CONFIG_CURL 1 -#define CONFIG_AIO 1 -#define HAVE_IOVEC 1 -#define HAVE_PREADV 1 -#define CONFIG_signalfd 1 -#define CONFIG_eventfd 1 -#define CONFIG_UNAME_RELEASE "" diff --git a/QEMU/config-host.mak b/QEMU/config-host.mak deleted file mode 100755 index c7ac0c15..00000000 --- a/QEMU/config-host.mak +++ /dev/null @@ -1,53 +0,0 @@ -# Automatically generated by configure - do not modify -# Configured with: './configure' -prefix=/usr/local -bindir=${prefix}/bin -mandir=${prefix}/share/man -datadir=${prefix}/share/qemu -docdir=${prefix}/share/doc/qemu -MAKE=make -INSTALL=install -INSTALL_DIR=install -d -m0755 -p -INSTALL_DATA=install -m0644 -p -INSTALL_PROG=install -m0755 -p -CC=gcc -HOST_CC=gcc -AR=ar -OBJCOPY=objcopy -LD=ld -CFLAGS= -g -fno-strict-aliasing -O2 -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -m64 -LDFLAGS= -g -Wl,--warn-common -m64 -EXESUF= -PTHREADLIBS=-lpthread -CLOCKLIBS=-lrt -ARCH=x86_64 -STRIP_OPT=-s -CONFIG_SLIRP=y -CONFIG_AC97=y -CONFIG_ES1370=y -CONFIG_SB16=y -CONFIG_OSS=y -CONFIG_OSS_LIB= -CONFIG_VNC_TLS=y -CONFIG_VNC_TLS_CFLAGS= -CONFIG_VNC_TLS_LIBS=-lgnutls -VERSION=0.11.0 -SRC_PATH=/home/jedisty/VSSIM_private/QEMU -TARGET_DIRS=x86_64-softmmu -CONFIG_SDL=y -SDL_LIBS=-L/usr/lib -lSDL -lX11 -SDL_CFLAGS=-I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include -CONFIG_CURSES=y -CURSES_LIBS=-lncurses -CONFIG_CURL=y -CURL_LIBS=-lcurl -CONFIG_AIO=y -INSTALL_BLOBS=yes -HOST_USB=linux -ARLIBS_BEGIN=-Wl,--whole-archive -ARLIBS_END=-Wl,--no-whole-archive -KVM_CFLAGS=-I/home/jedisty/VSSIM_private/QEMU/kvm/include -I/home/jedisty/VSSIM_private/QEMU/kvm/include/x86 -KVM_KMOD=no -TOOLS=qemu-nbd$(EXESUF) qemu-io$(EXESUF) qemu-img$(EXESUF) -ROMS=optionrom -subdir-x86_64-softmmu: subdir-libhw64 diff --git a/QEMU/libhw32/Makefile b/QEMU/libhw32/Makefile deleted file mode 120000 index 21c8f109..00000000 --- a/QEMU/libhw32/Makefile +++ /dev/null @@ -1 +0,0 @@ -/home/jedisty/VSSIM_private/QEMU/Makefile.hw \ No newline at end of file diff --git a/QEMU/libhw64/Makefile b/QEMU/libhw64/Makefile deleted file mode 120000 index 21c8f109..00000000 --- a/QEMU/libhw64/Makefile +++ /dev/null @@ -1 +0,0 @@ -/home/jedisty/VSSIM_private/QEMU/Makefile.hw \ No newline at end of file diff --git a/QEMU/x86_64-softmmu/config.mak b/QEMU/x86_64-softmmu/config.mak deleted file mode 100755 index 5ae63e4e..00000000 --- a/QEMU/x86_64-softmmu/config.mak +++ /dev/null @@ -1,17 +0,0 @@ -# Automatically generated by configure - do not modify -include ../config-host.mak -CONFIG_QEMU_PREFIX="/usr/gnemul/qemu-x86_64" -TARGET_ARCH=x86_64 -TARGET_ARCH2=x86_64 -TARGET_BASE_ARCH=i386 -TARGET_ABI_DIR=x86_64 -CONFIG_KVM=y -KVM_CFLAGS=-I/home/jedisty/VSSIM_private/QEMU/kvm/include -I/home/jedisty/VSSIM_private/QEMU/kvm/include/x86 -CONFIG_KVM=y -KVM_CFLAGS=-I/home/jedisty/VSSIM_private/QEMU/kvm/include -I/home/jedisty/VSSIM_private/QEMU/kvm/include/x86 -USE_KVM_PIT=1 -USE_KVM_DEVICE_ASSIGNMENT=1 -HWLIB=../libhw64/libqemuhw64.a -TARGET_PHYS_ADDR_BITS=64 -CONFIG_SOFTMMU=y -TARGET_XML_FILES= From e456e66d0f813f765826653b50c380ca26e26bbd Mon Sep 17 00:00:00 2001 From: Chang Hyun Park Date: Tue, 4 Jul 2017 22:42:30 +0900 Subject: [PATCH 2/2] Deletes QEMU/hw/] Deletes the `config_manager.h` file that was mistakenly saved as `]` under QEMU/hw --- QEMU/hw/] | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100755 QEMU/hw/] diff --git a/QEMU/hw/] b/QEMU/hw/] deleted file mode 100755 index 596cb727..00000000 --- a/QEMU/hw/] +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef _CONFIG_MANAGER_H_ -#define _CONFIG_MANAGER_H_ - -#include "common.h" - -//extern FILE * v_FP; - -extern int PAGE_SIZE; -extern int PAGE_NB; -extern int SECTOR_SIZE; -extern int FLASH_NB; -extern int BLOCK_NB; -extern int PLANES_PER_FLASH; -extern int PAGES_PER_FLASH; - -extern int64_t SECTOR_NB; -extern int64_t PAGE_MAPPING_ENTRY_NB; // added by js -extern int64_t BLOCK_MAPPING_ENTRY_NB; // added by js -extern int64_t EACH_EMPTY_BLOCK_ENTRY_NB; // added by js - -extern int EMPTY_BLOCK_TABLE_NB; - -extern int DATA_BLOCK_NB; -extern int LOG_RAND_BLOCK_NB; -extern int LOG_SEQ_BLOCK_NB; -extern int LOG_BLOCK_NB; - -extern int SECTORS_PER_PAGE; - -extern int REG_WRITE_DELAY; -extern int CELL_PROGRAM_DELAY; -extern int REG_READ_DELAY; -extern int CELL_READ_DELAY; -extern int BLOCK_ERASE_DELAY; -extern int CHANNEL_SWITCH_DELAY_R; -extern int CHANNEL_SWITCH_DELAY_W; - -extern int DSM_TRIM_ENABLE; -extern int IO_PARALLELISM; - -extern int FTL_BUFFER_SIZE; -extern int SSD_BUFFER_SIZE; - -extern int CHANNEL_NB; - -void INIT_SSD_CONFIG(void); -int64_t GET_SECTOR_NB(void); -char* GET_FILE_NAME(void); - -#endif