diff --git a/Makefile b/Makefile index 5a6024a7..1c475d8d 100644 --- a/Makefile +++ b/Makefile @@ -3,19 +3,6 @@ include /usr/share/dpkg/default.mk PACKAGE=qemu-server BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM) -DESTDIR= -PREFIX=/usr -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/$(PACKAGE) -MANDIR=$(PREFIX)/share/man -DOCDIR=$(PREFIX)/share/doc -MAN1DIR=$(MANDIR)/man1/ -MAN5DIR=$(MANDIR)/man5/ -BASHCOMPLDIR=$(PREFIX)/share/bash-completion/completions/ -ZSHCOMPLDIR=$(PREFIX)/share/zsh/vendor-completions/ -export PERLDIR=$(PREFIX)/share/perl5 -PERLINCDIR=$(PERLDIR)/asm-x86_64 - GITVERSION:=$(shell git rev-parse HEAD) DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb @@ -24,8 +11,6 @@ DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc DEBS=$(DEB) $(DBG_DEB) --include /usr/share/pve-doc-generator/pve-doc-generator.mk - all: .PHONY: tidy @@ -36,57 +21,12 @@ tidy: dinstall: deb dpkg -i $(DEB) -qm.bash-completion: - PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_bash_completions();" >$@.tmp - mv $@.tmp $@ - -qmrestore.bash-completion: - PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_bash_completions();" >$@.tmp - mv $@.tmp $@ - -qm.zsh-completion: - PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_zsh_completions();" >$@.tmp - mv $@.tmp $@ - -qmrestore.zsh-completion: - PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_zsh_completions();" >$@.tmp - mv $@.tmp $@ - -PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract qm.conf.5 qm.bash-completion qmrestore.bash-completion \ - qm.zsh-completion qmrestore.zsh-completion cpu-models.conf.5 - -.PHONY: install -install: $(PKGSOURCES) - install -d $(DESTDIR)/$(SBINDIR) - install -d $(DESTDIR)$(LIBDIR) - install -d $(DESTDIR)/$(MAN1DIR) - install -d $(DESTDIR)/$(MAN5DIR) - install -d $(DESTDIR)/usr/share/$(PACKAGE) - install -m 0644 -D qm.bash-completion $(DESTDIR)/$(BASHCOMPLDIR)/qm - install -m 0644 -D qmrestore.bash-completion $(DESTDIR)/$(BASHCOMPLDIR)/qmrestore - install -m 0644 -D qm.zsh-completion $(DESTDIR)/$(ZSHCOMPLDIR)/_qm - install -m 0644 -D qmrestore.zsh-completion $(DESTDIR)/$(ZSHCOMPLDIR)/_qmrestore - install -m 0644 -D bootsplash.jpg $(DESTDIR)/usr/share/$(PACKAGE) - $(MAKE) -C PVE install - $(MAKE) -C qmeventd install - $(MAKE) -C query-machine-capabilities install - $(MAKE) -C qemu-configs install - $(MAKE) -C vm-network-scripts install - install -m 0755 qm $(DESTDIR)$(SBINDIR) - install -m 0755 qmrestore $(DESTDIR)$(SBINDIR) - install -D -m 0644 modules-load.conf $(DESTDIR)/etc/modules-load.d/qemu-server.conf - install -m 0755 qmextract $(DESTDIR)$(LIBDIR) - install -m 0644 qm.1 $(DESTDIR)/$(MAN1DIR) - install -m 0644 qmrestore.1 $(DESTDIR)/$(MAN1DIR) - install -m 0644 cpu-models.conf.5 $(DESTDIR)/$(MAN5DIR) - install -m 0644 qm.conf.5 $(DESTDIR)/$(MAN5DIR) - cd $(DESTDIR)/$(MAN5DIR); ln -s -f qm.conf.5.gz vm.conf.5.gz - $(BUILDDIR): - rm -rf $(BUILDDIR) $(BUILDDIR).tmp - rsync -a * $(BUILDDIR).tmp - echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR).tmp/debian/SOURCE - mv $(BUILDDIR).tmp $(BUILDDIR) + rm -rf $@ $@.tmp + cp -a src $@.tmp + cp -a debian $@.tmp/ + echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE + mv $@.tmp $@ .PHONY: deb deb: $(DEBS) @@ -104,11 +44,6 @@ $(DSC): $(BUILDDIR) sbuild: $(DSC) sbuild $(DSC) -.PHONY: test -test: - PVE_GENERATING_DOCS=1 perl -I. ./qm verifyapi - $(MAKE) -C test - .PHONY: upload upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION) upload: $(DEB) @@ -116,9 +51,7 @@ upload: $(DEB) .PHONY: clean clean: - $(MAKE) -C test $@ rm -rf $(PACKAGE)-*/ *.deb *.build *.buildinfo *.changes *.dsc $(PACKAGE)_*.tar.?z - rm -f *.xml.tmp *.1 *.5 *.8 *{synopsis,opts}.adoc docinfo.xml .PHONY: distclean diff --git a/PVE/API2/Makefile b/PVE/API2/Makefile deleted file mode 100644 index e64cf1c2..00000000 --- a/PVE/API2/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -.PHONY: install -install: - install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE/API2 - install -D -m 0644 Qemu.pm ${DESTDIR}${PERLDIR}/PVE/API2/Qemu.pm - $(MAKE) -C Qemu install diff --git a/PVE/API2/Qemu/Makefile b/PVE/API2/Qemu/Makefile deleted file mode 100644 index 5d4abda6..00000000 --- a/PVE/API2/Qemu/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -SOURCES=Agent.pm CPU.pm Machine.pm - -.PHONY: install -install: - install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE/API2/Qemu - for i in ${SOURCES}; do install -D -m 0644 $$i ${DESTDIR}${PERLDIR}/PVE/API2/Qemu/$$i; done diff --git a/PVE/CLI/Makefile b/PVE/CLI/Makefile deleted file mode 100644 index 2fec8e5e..00000000 --- a/PVE/CLI/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -SOURCES=qm.pm qmrestore.pm - -.PHONY: install -install: ${SOURCES} - install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE/CLI - for i in ${SOURCES}; do install -D -m 0644 $$i ${DESTDIR}${PERLDIR}/PVE/CLI/$$i; done - - diff --git a/PVE/QemuConfig/Makefile b/PVE/QemuConfig/Makefile deleted file mode 100644 index c3a0d277..00000000 --- a/PVE/QemuConfig/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES=NoWrite.pm - -.PHONY: install -install: ${SOURCES} - for i in ${SOURCES}; do install -D -m 0644 $$i ${DESTDIR}${PERLDIR}/PVE/QemuConfig/$$i; done diff --git a/PVE/VZDump/Makefile b/PVE/VZDump/Makefile deleted file mode 100644 index 8599a9db..00000000 --- a/PVE/VZDump/Makefile +++ /dev/null @@ -1,4 +0,0 @@ - -.PHONY: install -install: - install -D -m 0644 QemuServer.pm ${DESTDIR}${PERLDIR}/PVE/VZDump/QemuServer.pm diff --git a/qemu-configs/Makefile b/qemu-configs/Makefile deleted file mode 100644 index f55e9bef..00000000 --- a/qemu-configs/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -DESTDIR= -USRSHAREDIR=$(DESTDIR)/usr/share/qemu-server - -.PHONY: install -install: pve-usb.cfg pve-q35.cfg pve-q35-4.0.cfg - install -d $(USRSHAREDIR) - install -m 0644 pve-usb.cfg $(USRSHAREDIR) - install -m 0644 pve-q35.cfg $(USRSHAREDIR) - install -m 0644 pve-q35-4.0.cfg $(USRSHAREDIR) - -.PHONY: clean -clean: diff --git a/qmeventd/Makefile b/qmeventd/Makefile deleted file mode 100644 index 9c00a36d..00000000 --- a/qmeventd/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -DESTDIR= -PREFIX=/usr -SBINDIR=${PREFIX}/sbin -SERVICEDIR=/lib/systemd/system -MANDIR=${PREFIX}/share/man - -export NOVIEW=1 -include /usr/share/pve-doc-generator/pve-doc-generator.mk - -CC ?= gcc -CFLAGS += -O2 -Werror -Wall -Wextra -Wpedantic -Wtype-limits -Wl,-z,relro -std=gnu11 -CFLAGS += $(shell pkg-config --cflags json-c glib-2.0) -LDFLAGS += $(shell pkg-config --libs json-c glib-2.0) - -qmeventd: qmeventd.c - $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) - -docs: qmeventd.8 - -.PHONY: install -install: qmeventd docs - install -d ${DESTDIR}/${SBINDIR} - install -d ${DESTDIR}${SERVICEDIR} - install -d ${DESTDIR}${MANDIR}/man8 - install -m 0644 qmeventd.service ${DESTDIR}${SERVICEDIR} - install -m 0755 qmeventd ${DESTDIR}${SBINDIR} - install -m 0644 qmeventd.8 ${DESTDIR}/${MANDIR}/man8 - -.PHONY: clean -clean: - $(MAKE) cleanup-docgen - rm -rf qmeventd diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 00000000..f8e9a2d9 --- /dev/null +++ b/src/Makefile @@ -0,0 +1,22 @@ +all: + +.PHONY: install +install: + $(MAKE) -C PVE install + $(MAKE) -C bin install + $(MAKE) -C qmeventd install + $(MAKE) -C query-machine-capabilities install + $(MAKE) -C usr install + +.PHONY: test +test: + $(MAKE) -C test + $(MAKE) -C bin $@ + +.PHONY: clean +clean: + $(MAKE) -C test $@ + $(MAKE) -C bin $@ + +.PHONY: distclean +distclean: clean diff --git a/src/PVE/API2/Makefile b/src/PVE/API2/Makefile new file mode 100644 index 00000000..f8fce567 --- /dev/null +++ b/src/PVE/API2/Makefile @@ -0,0 +1,9 @@ +DESTDIR= +PREFIX=/usr +PERLDIR=$(PREFIX)/share/perl5 + +.PHONY: install +install: + install -d -m 0755 $(DESTDIR)$(PERLDIR)/PVE/API2 + install -D -m 0644 Qemu.pm $(DESTDIR)$(PERLDIR)/PVE/API2/Qemu.pm + $(MAKE) -C Qemu install diff --git a/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm similarity index 100% rename from PVE/API2/Qemu.pm rename to src/PVE/API2/Qemu.pm diff --git a/PVE/API2/Qemu/Agent.pm b/src/PVE/API2/Qemu/Agent.pm similarity index 100% rename from PVE/API2/Qemu/Agent.pm rename to src/PVE/API2/Qemu/Agent.pm diff --git a/PVE/API2/Qemu/CPU.pm b/src/PVE/API2/Qemu/CPU.pm similarity index 100% rename from PVE/API2/Qemu/CPU.pm rename to src/PVE/API2/Qemu/CPU.pm diff --git a/PVE/API2/Qemu/Machine.pm b/src/PVE/API2/Qemu/Machine.pm similarity index 100% rename from PVE/API2/Qemu/Machine.pm rename to src/PVE/API2/Qemu/Machine.pm diff --git a/src/PVE/API2/Qemu/Makefile b/src/PVE/API2/Qemu/Makefile new file mode 100644 index 00000000..e64aa278 --- /dev/null +++ b/src/PVE/API2/Qemu/Makefile @@ -0,0 +1,10 @@ +DESTDIR= +PREFIX=/usr +PERLDIR=$(PREFIX)/share/perl5 + +SOURCES=Agent.pm CPU.pm Machine.pm + +.PHONY: install +install: + install -d -m 0755 $(DESTDIR)$(PERLDIR)/PVE/API2/Qemu + for i in $(SOURCES); do install -D -m 0644 $$i $(DESTDIR)$(PERLDIR)/PVE/API2/Qemu/$$i; done diff --git a/src/PVE/CLI/Makefile b/src/PVE/CLI/Makefile new file mode 100644 index 00000000..37166299 --- /dev/null +++ b/src/PVE/CLI/Makefile @@ -0,0 +1,12 @@ +DESTDIR= +PREFIX=/usr +PERLDIR=$(PREFIX)/share/perl5 + +SOURCES=qm.pm qmrestore.pm + +.PHONY: install +install: $(SOURCES) + install -d -m 0755 $(DESTDIR)$(PERLDIR)/PVE/CLI + for i in $(SOURCES); do install -D -m 0644 $$i $(DESTDIR)$(PERLDIR)/PVE/CLI/$$i; done + + diff --git a/PVE/CLI/qm.pm b/src/PVE/CLI/qm.pm similarity index 100% rename from PVE/CLI/qm.pm rename to src/PVE/CLI/qm.pm diff --git a/PVE/CLI/qmrestore.pm b/src/PVE/CLI/qmrestore.pm similarity index 100% rename from PVE/CLI/qmrestore.pm rename to src/PVE/CLI/qmrestore.pm diff --git a/PVE/Makefile b/src/PVE/Makefile similarity index 63% rename from PVE/Makefile rename to src/PVE/Makefile index 440fbe77..01cf9df6 100644 --- a/PVE/Makefile +++ b/src/PVE/Makefile @@ -1,3 +1,7 @@ +DESTDIR= +PREFIX=/usr +PERLDIR=$(PREFIX)/share/perl5 + PERLSOURCE = \ QemuServer.pm \ QemuMigrate.pm \ @@ -6,8 +10,8 @@ PERLSOURCE = \ .PHONY: install install: - install -d ${DESTDIR}${PERLDIR}/PVE - install -m 0644 ${PERLSOURCE} ${DESTDIR}${PERLDIR}/PVE/ + install -d $(DESTDIR)$(PERLDIR)/PVE + install -m 0644 $(PERLSOURCE) $(DESTDIR)$(PERLDIR)/PVE/ $(MAKE) -C VZDump install $(MAKE) -C API2 install $(MAKE) -C CLI install diff --git a/PVE/QMPClient.pm b/src/PVE/QMPClient.pm similarity index 100% rename from PVE/QMPClient.pm rename to src/PVE/QMPClient.pm diff --git a/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm similarity index 100% rename from PVE/QemuConfig.pm rename to src/PVE/QemuConfig.pm diff --git a/src/PVE/QemuConfig/Makefile b/src/PVE/QemuConfig/Makefile new file mode 100644 index 00000000..d7d9a3ef --- /dev/null +++ b/src/PVE/QemuConfig/Makefile @@ -0,0 +1,9 @@ +DESTDIR= +PREFIX=/usr +PERLDIR=$(PREFIX)/share/perl5 + +SOURCES=NoWrite.pm + +.PHONY: install +install: $(SOURCES) + for i in $(SOURCES); do install -D -m 0644 $$i $(DESTDIR)$(PERLDIR)/PVE/QemuConfig/$$i; done diff --git a/PVE/QemuConfig/NoWrite.pm b/src/PVE/QemuConfig/NoWrite.pm similarity index 100% rename from PVE/QemuConfig/NoWrite.pm rename to src/PVE/QemuConfig/NoWrite.pm diff --git a/PVE/QemuMigrate.pm b/src/PVE/QemuMigrate.pm similarity index 100% rename from PVE/QemuMigrate.pm rename to src/PVE/QemuMigrate.pm diff --git a/PVE/QemuServer.pm b/src/PVE/QemuServer.pm similarity index 100% rename from PVE/QemuServer.pm rename to src/PVE/QemuServer.pm diff --git a/PVE/QemuServer/Agent.pm b/src/PVE/QemuServer/Agent.pm similarity index 100% rename from PVE/QemuServer/Agent.pm rename to src/PVE/QemuServer/Agent.pm diff --git a/PVE/QemuServer/CGroup.pm b/src/PVE/QemuServer/CGroup.pm similarity index 100% rename from PVE/QemuServer/CGroup.pm rename to src/PVE/QemuServer/CGroup.pm diff --git a/PVE/QemuServer/CPUConfig.pm b/src/PVE/QemuServer/CPUConfig.pm similarity index 100% rename from PVE/QemuServer/CPUConfig.pm rename to src/PVE/QemuServer/CPUConfig.pm diff --git a/PVE/QemuServer/Cloudinit.pm b/src/PVE/QemuServer/Cloudinit.pm similarity index 100% rename from PVE/QemuServer/Cloudinit.pm rename to src/PVE/QemuServer/Cloudinit.pm diff --git a/PVE/QemuServer/Drive.pm b/src/PVE/QemuServer/Drive.pm similarity index 100% rename from PVE/QemuServer/Drive.pm rename to src/PVE/QemuServer/Drive.pm diff --git a/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm similarity index 100% rename from PVE/QemuServer/Helpers.pm rename to src/PVE/QemuServer/Helpers.pm diff --git a/PVE/QemuServer/ImportDisk.pm b/src/PVE/QemuServer/ImportDisk.pm similarity index 100% rename from PVE/QemuServer/ImportDisk.pm rename to src/PVE/QemuServer/ImportDisk.pm diff --git a/PVE/QemuServer/Machine.pm b/src/PVE/QemuServer/Machine.pm similarity index 100% rename from PVE/QemuServer/Machine.pm rename to src/PVE/QemuServer/Machine.pm diff --git a/PVE/QemuServer/Makefile b/src/PVE/QemuServer/Makefile similarity index 59% rename from PVE/QemuServer/Makefile rename to src/PVE/QemuServer/Makefile index 8bcd484e..57ebfae5 100644 --- a/PVE/QemuServer/Makefile +++ b/src/PVE/QemuServer/Makefile @@ -1,3 +1,7 @@ +DESTDIR= +PREFIX=/usr +PERLDIR=$(PREFIX)/share/perl5 + SOURCES=PCI.pm \ RNG.pm \ USB.pm \ @@ -16,5 +20,5 @@ SOURCES=PCI.pm \ Virtiofs.pm .PHONY: install -install: ${SOURCES} - for i in ${SOURCES}; do install -D -m 0644 $$i ${DESTDIR}${PERLDIR}/PVE/QemuServer/$$i; done +install: $(SOURCES) + for i in $(SOURCES); do install -D -m 0644 $$i $(DESTDIR)$(PERLDIR)/PVE/QemuServer/$$i; done diff --git a/PVE/QemuServer/Memory.pm b/src/PVE/QemuServer/Memory.pm similarity index 100% rename from PVE/QemuServer/Memory.pm rename to src/PVE/QemuServer/Memory.pm diff --git a/PVE/QemuServer/MetaInfo.pm b/src/PVE/QemuServer/MetaInfo.pm similarity index 100% rename from PVE/QemuServer/MetaInfo.pm rename to src/PVE/QemuServer/MetaInfo.pm diff --git a/PVE/QemuServer/Monitor.pm b/src/PVE/QemuServer/Monitor.pm similarity index 100% rename from PVE/QemuServer/Monitor.pm rename to src/PVE/QemuServer/Monitor.pm diff --git a/PVE/QemuServer/PCI.pm b/src/PVE/QemuServer/PCI.pm similarity index 100% rename from PVE/QemuServer/PCI.pm rename to src/PVE/QemuServer/PCI.pm diff --git a/PVE/QemuServer/QMPHelpers.pm b/src/PVE/QemuServer/QMPHelpers.pm similarity index 100% rename from PVE/QemuServer/QMPHelpers.pm rename to src/PVE/QemuServer/QMPHelpers.pm diff --git a/PVE/QemuServer/RNG.pm b/src/PVE/QemuServer/RNG.pm similarity index 100% rename from PVE/QemuServer/RNG.pm rename to src/PVE/QemuServer/RNG.pm diff --git a/PVE/QemuServer/USB.pm b/src/PVE/QemuServer/USB.pm similarity index 100% rename from PVE/QemuServer/USB.pm rename to src/PVE/QemuServer/USB.pm diff --git a/PVE/QemuServer/Virtiofs.pm b/src/PVE/QemuServer/Virtiofs.pm similarity index 100% rename from PVE/QemuServer/Virtiofs.pm rename to src/PVE/QemuServer/Virtiofs.pm diff --git a/src/PVE/VZDump/Makefile b/src/PVE/VZDump/Makefile new file mode 100644 index 00000000..f6ecfdb9 --- /dev/null +++ b/src/PVE/VZDump/Makefile @@ -0,0 +1,7 @@ +DESTDIR= +PREFIX=/usr +PERLDIR=$(PREFIX)/share/perl5 + +.PHONY: install +install: + install -D -m 0644 QemuServer.pm $(DESTDIR)$(PERLDIR)/PVE/VZDump/QemuServer.pm diff --git a/PVE/VZDump/QemuServer.pm b/src/PVE/VZDump/QemuServer.pm similarity index 100% rename from PVE/VZDump/QemuServer.pm rename to src/PVE/VZDump/QemuServer.pm diff --git a/src/bin/Makefile b/src/bin/Makefile new file mode 100644 index 00000000..fdc514e5 --- /dev/null +++ b/src/bin/Makefile @@ -0,0 +1,67 @@ +PACKAGE ?= qemu-server + +DESTDIR= +PREFIX=/usr +SBINDIR=$(PREFIX)/sbin +LIBDIR=$(PREFIX)/lib/$(PACKAGE) +MANDIR=$(PREFIX)/share/man +MAN1DIR=$(MANDIR)/man1/ +MAN5DIR=$(MANDIR)/man5/ +BASHCOMPLDIR=$(PREFIX)/share/bash-completion/completions/ +ZSHCOMPLDIR=$(PREFIX)/share/zsh/vendor-completions/ + +PERL_DOC_INC_DIRS=.. +-include /usr/share/pve-doc-generator/pve-doc-generator.mk + +all: + + +qm.bash-completion: + PVE_GENERATING_DOCS=1 perl -I.. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_bash_completions();" >$@.tmp + mv $@.tmp $@ + +qmrestore.bash-completion: + PVE_GENERATING_DOCS=1 perl -I.. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_bash_completions();" >$@.tmp + mv $@.tmp $@ + +qm.zsh-completion: + PVE_GENERATING_DOCS=1 perl -I.. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_zsh_completions();" >$@.tmp + mv $@.tmp $@ + +qmrestore.zsh-completion: + PVE_GENERATING_DOCS=1 perl -I.. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_zsh_completions();" >$@.tmp + mv $@.tmp $@ + +PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract qm.conf.5 qm.bash-completion qmrestore.bash-completion \ + qm.zsh-completion qmrestore.zsh-completion cpu-models.conf.5 + +.PHONY: install +install: $(PKGSOURCES) + install -d $(DESTDIR)/$(SBINDIR) + install -d $(DESTDIR)$(LIBDIR) + install -d $(DESTDIR)/$(MAN1DIR) + install -d $(DESTDIR)/$(MAN5DIR) + install -d $(DESTDIR)/usr/share/$(PACKAGE) + install -m 0644 -D qm.bash-completion $(DESTDIR)/$(BASHCOMPLDIR)/qm + install -m 0644 -D qmrestore.bash-completion $(DESTDIR)/$(BASHCOMPLDIR)/qmrestore + install -m 0644 -D qm.zsh-completion $(DESTDIR)/$(ZSHCOMPLDIR)/_qm + install -m 0644 -D qmrestore.zsh-completion $(DESTDIR)/$(ZSHCOMPLDIR)/_qmrestore + install -m 0755 qm $(DESTDIR)$(SBINDIR) + install -m 0755 qmrestore $(DESTDIR)$(SBINDIR) + install -m 0755 qmextract $(DESTDIR)$(LIBDIR) + install -m 0644 qm.1 $(DESTDIR)/$(MAN1DIR) + install -m 0644 qmrestore.1 $(DESTDIR)/$(MAN1DIR) + install -m 0644 cpu-models.conf.5 $(DESTDIR)/$(MAN5DIR) + install -m 0644 qm.conf.5 $(DESTDIR)/$(MAN5DIR) + cd $(DESTDIR)/$(MAN5DIR); ln -s -f qm.conf.5.gz vm.conf.5.gz + +.PHONY: test +test: + PVE_GENERATING_DOCS=1 perl -I.. ./qm verifyapi + +.PHONY: clean +clean: + rm -f *.xml.tmp *.1 *.5 *.8 *{synopsis,opts}.adoc docinfo.xml + +.PHONY: distclean +distclean: clean diff --git a/qm b/src/bin/qm similarity index 100% rename from qm rename to src/bin/qm diff --git a/qmextract b/src/bin/qmextract similarity index 100% rename from qmextract rename to src/bin/qmextract diff --git a/qmrestore b/src/bin/qmrestore similarity index 100% rename from qmrestore rename to src/bin/qmrestore diff --git a/qmeventd/.clang-format b/src/qmeventd/.clang-format similarity index 100% rename from qmeventd/.clang-format rename to src/qmeventd/.clang-format diff --git a/src/qmeventd/Makefile b/src/qmeventd/Makefile new file mode 100644 index 00000000..da1e5f4f --- /dev/null +++ b/src/qmeventd/Makefile @@ -0,0 +1,31 @@ +DESTDIR= +PREFIX=/usr +SBINDIR=$(PREFIX)/sbin +SERVICEDIR=$(PREFIX)/lib/systemd/system +MANDIR=$(PREFIX)/share/man + +-include /usr/share/pve-doc-generator/pve-doc-generator.mk + +CC ?= gcc +CFLAGS += -O2 -Werror -Wall -Wextra -Wpedantic -Wtype-limits -Wl,-z,relro -std=gnu11 +CFLAGS += $(shell pkg-config --cflags json-c glib-2.0) +LDFLAGS += $(shell pkg-config --libs json-c glib-2.0) + +qmeventd: qmeventd.c + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) + +docs: qmeventd.8 + +.PHONY: install +install: qmeventd docs + install -d $(DESTDIR)/$(SBINDIR) + install -m 0755 qmeventd $(DESTDIR)/$(SBINDIR) + install -d $(DESTDIR)/$(SERVICEDIR) + install -m 0644 qmeventd.service $(DESTDIR)/$(SERVICEDIR) + install -d $(DESTDIR)/$(MANDIR)/man8 + install -m 0644 qmeventd.8 $(DESTDIR)/$(MANDIR)/man8 + +.PHONY: clean +clean: + $(MAKE) cleanup-docgen + rm -rf qmeventd diff --git a/qmeventd/qmeventd.c b/src/qmeventd/qmeventd.c similarity index 100% rename from qmeventd/qmeventd.c rename to src/qmeventd/qmeventd.c diff --git a/qmeventd/qmeventd.h b/src/qmeventd/qmeventd.h similarity index 100% rename from qmeventd/qmeventd.h rename to src/qmeventd/qmeventd.h diff --git a/qmeventd/qmeventd.service b/src/qmeventd/qmeventd.service similarity index 100% rename from qmeventd/qmeventd.service rename to src/qmeventd/qmeventd.service diff --git a/query-machine-capabilities/Makefile b/src/query-machine-capabilities/Makefile similarity index 53% rename from query-machine-capabilities/Makefile rename to src/query-machine-capabilities/Makefile index 5db2bf97..da9076fb 100644 --- a/query-machine-capabilities/Makefile +++ b/src/query-machine-capabilities/Makefile @@ -1,7 +1,7 @@ DESTDIR= PREFIX=/usr -BINDIR=${PREFIX}/libexec/qemu-server -SERVICEDIR=/lib/systemd/system +BINDIR=$(PREFIX)/libexec/qemu-server +SERVICEDIR=$(PREFIX)/lib/systemd/system CC ?= gcc CFLAGS += -O2 -fanalyzer -Werror -Wall -Wextra -Wpedantic -Wtype-limits -Wl,-z,relro -std=gnu11 @@ -11,9 +11,10 @@ query-machine-capabilities: query-machine-capabilities.c .PHONY: install install: query-machine-capabilities - install -d ${DESTDIR}/${BINDIR} - install -m 0755 query-machine-capabilities ${DESTDIR}${BINDIR} - install -m 0644 pve-query-machine-capabilities.service ${DESTDIR}${SERVICEDIR} + install -d $(DESTDIR)/$(BINDIR) + install -m 0755 query-machine-capabilities $(DESTDIR)$(BINDIR) + install -d $(DESTDIR)/$(SERVICEDIR) + install -m 0644 pve-query-machine-capabilities.service $(DESTDIR)$(SERVICEDIR) .PHONY: clean clean: diff --git a/query-machine-capabilities/pve-query-machine-capabilities.service b/src/query-machine-capabilities/pve-query-machine-capabilities.service similarity index 100% rename from query-machine-capabilities/pve-query-machine-capabilities.service rename to src/query-machine-capabilities/pve-query-machine-capabilities.service diff --git a/query-machine-capabilities/query-machine-capabilities.c b/src/query-machine-capabilities/query-machine-capabilities.c similarity index 100% rename from query-machine-capabilities/query-machine-capabilities.c rename to src/query-machine-capabilities/query-machine-capabilities.c diff --git a/test/Makefile b/src/test/Makefile similarity index 100% rename from test/Makefile rename to src/test/Makefile diff --git a/test/MigrationTest/QemuMigrateMock.pm b/src/test/MigrationTest/QemuMigrateMock.pm similarity index 100% rename from test/MigrationTest/QemuMigrateMock.pm rename to src/test/MigrationTest/QemuMigrateMock.pm diff --git a/test/MigrationTest/QmMock.pm b/src/test/MigrationTest/QmMock.pm similarity index 100% rename from test/MigrationTest/QmMock.pm rename to src/test/MigrationTest/QmMock.pm diff --git a/test/MigrationTest/Shared.pm b/src/test/MigrationTest/Shared.pm similarity index 100% rename from test/MigrationTest/Shared.pm rename to src/test/MigrationTest/Shared.pm diff --git a/test/cfg2cmd/README.adoc b/src/test/cfg2cmd/README.adoc similarity index 100% rename from test/cfg2cmd/README.adoc rename to src/test/cfg2cmd/README.adoc diff --git a/test/cfg2cmd/aio.conf b/src/test/cfg2cmd/aio.conf similarity index 100% rename from test/cfg2cmd/aio.conf rename to src/test/cfg2cmd/aio.conf diff --git a/test/cfg2cmd/aio.conf.cmd b/src/test/cfg2cmd/aio.conf.cmd similarity index 100% rename from test/cfg2cmd/aio.conf.cmd rename to src/test/cfg2cmd/aio.conf.cmd diff --git a/test/cfg2cmd/bootorder-empty.conf b/src/test/cfg2cmd/bootorder-empty.conf similarity index 100% rename from test/cfg2cmd/bootorder-empty.conf rename to src/test/cfg2cmd/bootorder-empty.conf diff --git a/test/cfg2cmd/bootorder-empty.conf.cmd b/src/test/cfg2cmd/bootorder-empty.conf.cmd similarity index 100% rename from test/cfg2cmd/bootorder-empty.conf.cmd rename to src/test/cfg2cmd/bootorder-empty.conf.cmd diff --git a/test/cfg2cmd/bootorder-legacy.conf b/src/test/cfg2cmd/bootorder-legacy.conf similarity index 100% rename from test/cfg2cmd/bootorder-legacy.conf rename to src/test/cfg2cmd/bootorder-legacy.conf diff --git a/test/cfg2cmd/bootorder-legacy.conf.cmd b/src/test/cfg2cmd/bootorder-legacy.conf.cmd similarity index 100% rename from test/cfg2cmd/bootorder-legacy.conf.cmd rename to src/test/cfg2cmd/bootorder-legacy.conf.cmd diff --git a/test/cfg2cmd/bootorder.conf b/src/test/cfg2cmd/bootorder.conf similarity index 100% rename from test/cfg2cmd/bootorder.conf rename to src/test/cfg2cmd/bootorder.conf diff --git a/test/cfg2cmd/bootorder.conf.cmd b/src/test/cfg2cmd/bootorder.conf.cmd similarity index 100% rename from test/cfg2cmd/bootorder.conf.cmd rename to src/test/cfg2cmd/bootorder.conf.cmd diff --git a/test/cfg2cmd/cputype-icelake-client-deprecation.conf b/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf similarity index 100% rename from test/cfg2cmd/cputype-icelake-client-deprecation.conf rename to src/test/cfg2cmd/cputype-icelake-client-deprecation.conf diff --git a/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd b/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd similarity index 100% rename from test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd rename to src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd diff --git a/test/cfg2cmd/custom-cpu-model-defaults.conf b/src/test/cfg2cmd/custom-cpu-model-defaults.conf similarity index 100% rename from test/cfg2cmd/custom-cpu-model-defaults.conf rename to src/test/cfg2cmd/custom-cpu-model-defaults.conf diff --git a/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd b/src/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd similarity index 100% rename from test/cfg2cmd/custom-cpu-model-defaults.conf.cmd rename to src/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd diff --git a/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf b/src/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf similarity index 100% rename from test/cfg2cmd/custom-cpu-model-host-phys-bits.conf rename to src/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf diff --git a/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd b/src/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd similarity index 100% rename from test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd rename to src/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd diff --git a/test/cfg2cmd/custom-cpu-model.conf b/src/test/cfg2cmd/custom-cpu-model.conf similarity index 100% rename from test/cfg2cmd/custom-cpu-model.conf rename to src/test/cfg2cmd/custom-cpu-model.conf diff --git a/test/cfg2cmd/custom-cpu-model.conf.cmd b/src/test/cfg2cmd/custom-cpu-model.conf.cmd similarity index 100% rename from test/cfg2cmd/custom-cpu-model.conf.cmd rename to src/test/cfg2cmd/custom-cpu-model.conf.cmd diff --git a/test/cfg2cmd/efi-raw-old.conf b/src/test/cfg2cmd/efi-raw-old.conf similarity index 100% rename from test/cfg2cmd/efi-raw-old.conf rename to src/test/cfg2cmd/efi-raw-old.conf diff --git a/test/cfg2cmd/efi-raw-old.conf.cmd b/src/test/cfg2cmd/efi-raw-old.conf.cmd similarity index 100% rename from test/cfg2cmd/efi-raw-old.conf.cmd rename to src/test/cfg2cmd/efi-raw-old.conf.cmd diff --git a/test/cfg2cmd/efi-raw-template.conf b/src/test/cfg2cmd/efi-raw-template.conf similarity index 100% rename from test/cfg2cmd/efi-raw-template.conf rename to src/test/cfg2cmd/efi-raw-template.conf diff --git a/test/cfg2cmd/efi-raw-template.conf.cmd b/src/test/cfg2cmd/efi-raw-template.conf.cmd similarity index 100% rename from test/cfg2cmd/efi-raw-template.conf.cmd rename to src/test/cfg2cmd/efi-raw-template.conf.cmd diff --git a/test/cfg2cmd/efi-raw.conf b/src/test/cfg2cmd/efi-raw.conf similarity index 100% rename from test/cfg2cmd/efi-raw.conf rename to src/test/cfg2cmd/efi-raw.conf diff --git a/test/cfg2cmd/efi-raw.conf.cmd b/src/test/cfg2cmd/efi-raw.conf.cmd similarity index 100% rename from test/cfg2cmd/efi-raw.conf.cmd rename to src/test/cfg2cmd/efi-raw.conf.cmd diff --git a/test/cfg2cmd/efi-secboot-and-tpm-q35.conf b/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf similarity index 100% rename from test/cfg2cmd/efi-secboot-and-tpm-q35.conf rename to src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf diff --git a/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd b/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd similarity index 100% rename from test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd rename to src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd diff --git a/test/cfg2cmd/efi-secboot-and-tpm.conf b/src/test/cfg2cmd/efi-secboot-and-tpm.conf similarity index 100% rename from test/cfg2cmd/efi-secboot-and-tpm.conf rename to src/test/cfg2cmd/efi-secboot-and-tpm.conf diff --git a/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd b/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd similarity index 100% rename from test/cfg2cmd/efi-secboot-and-tpm.conf.cmd rename to src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd diff --git a/test/cfg2cmd/efidisk-on-rbd.conf b/src/test/cfg2cmd/efidisk-on-rbd.conf similarity index 100% rename from test/cfg2cmd/efidisk-on-rbd.conf rename to src/test/cfg2cmd/efidisk-on-rbd.conf diff --git a/test/cfg2cmd/efidisk-on-rbd.conf.cmd b/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd similarity index 100% rename from test/cfg2cmd/efidisk-on-rbd.conf.cmd rename to src/test/cfg2cmd/efidisk-on-rbd.conf.cmd diff --git a/test/cfg2cmd/i440fx-viommu-intel.conf b/src/test/cfg2cmd/i440fx-viommu-intel.conf similarity index 100% rename from test/cfg2cmd/i440fx-viommu-intel.conf rename to src/test/cfg2cmd/i440fx-viommu-intel.conf diff --git a/test/cfg2cmd/i440fx-viommu-virtio.conf b/src/test/cfg2cmd/i440fx-viommu-virtio.conf similarity index 100% rename from test/cfg2cmd/i440fx-viommu-virtio.conf rename to src/test/cfg2cmd/i440fx-viommu-virtio.conf diff --git a/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd b/src/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd similarity index 100% rename from test/cfg2cmd/i440fx-viommu-virtio.conf.cmd rename to src/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd diff --git a/test/cfg2cmd/i440fx-win10-hostpci.conf b/src/test/cfg2cmd/i440fx-win10-hostpci.conf similarity index 100% rename from test/cfg2cmd/i440fx-win10-hostpci.conf rename to src/test/cfg2cmd/i440fx-win10-hostpci.conf diff --git a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd b/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd similarity index 100% rename from test/cfg2cmd/i440fx-win10-hostpci.conf.cmd rename to src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd diff --git a/test/cfg2cmd/ide-no-media-error.conf b/src/test/cfg2cmd/ide-no-media-error.conf similarity index 100% rename from test/cfg2cmd/ide-no-media-error.conf rename to src/test/cfg2cmd/ide-no-media-error.conf diff --git a/test/cfg2cmd/ide.conf b/src/test/cfg2cmd/ide.conf similarity index 100% rename from test/cfg2cmd/ide.conf rename to src/test/cfg2cmd/ide.conf diff --git a/test/cfg2cmd/ide.conf.cmd b/src/test/cfg2cmd/ide.conf.cmd similarity index 100% rename from test/cfg2cmd/ide.conf.cmd rename to src/test/cfg2cmd/ide.conf.cmd diff --git a/test/cfg2cmd/memory-hotplug-hugepages.conf b/src/test/cfg2cmd/memory-hotplug-hugepages.conf similarity index 100% rename from test/cfg2cmd/memory-hotplug-hugepages.conf rename to src/test/cfg2cmd/memory-hotplug-hugepages.conf diff --git a/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd b/src/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd similarity index 100% rename from test/cfg2cmd/memory-hotplug-hugepages.conf.cmd rename to src/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd diff --git a/test/cfg2cmd/memory-hotplug.conf b/src/test/cfg2cmd/memory-hotplug.conf similarity index 100% rename from test/cfg2cmd/memory-hotplug.conf rename to src/test/cfg2cmd/memory-hotplug.conf diff --git a/test/cfg2cmd/memory-hotplug.conf.cmd b/src/test/cfg2cmd/memory-hotplug.conf.cmd similarity index 100% rename from test/cfg2cmd/memory-hotplug.conf.cmd rename to src/test/cfg2cmd/memory-hotplug.conf.cmd diff --git a/test/cfg2cmd/memory-hugepages-1g.conf b/src/test/cfg2cmd/memory-hugepages-1g.conf similarity index 100% rename from test/cfg2cmd/memory-hugepages-1g.conf rename to src/test/cfg2cmd/memory-hugepages-1g.conf diff --git a/test/cfg2cmd/memory-hugepages-1g.conf.cmd b/src/test/cfg2cmd/memory-hugepages-1g.conf.cmd similarity index 100% rename from test/cfg2cmd/memory-hugepages-1g.conf.cmd rename to src/test/cfg2cmd/memory-hugepages-1g.conf.cmd diff --git a/test/cfg2cmd/memory-hugepages-2m.conf b/src/test/cfg2cmd/memory-hugepages-2m.conf similarity index 100% rename from test/cfg2cmd/memory-hugepages-2m.conf rename to src/test/cfg2cmd/memory-hugepages-2m.conf diff --git a/test/cfg2cmd/memory-hugepages-2m.conf.cmd b/src/test/cfg2cmd/memory-hugepages-2m.conf.cmd similarity index 100% rename from test/cfg2cmd/memory-hugepages-2m.conf.cmd rename to src/test/cfg2cmd/memory-hugepages-2m.conf.cmd diff --git a/test/cfg2cmd/minimal-defaults-to-new-machine.conf b/src/test/cfg2cmd/minimal-defaults-to-new-machine.conf similarity index 100% rename from test/cfg2cmd/minimal-defaults-to-new-machine.conf rename to src/test/cfg2cmd/minimal-defaults-to-new-machine.conf diff --git a/test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf b/src/test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf similarity index 100% rename from test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf rename to src/test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf diff --git a/test/cfg2cmd/minimal-defaults.conf b/src/test/cfg2cmd/minimal-defaults.conf similarity index 100% rename from test/cfg2cmd/minimal-defaults.conf rename to src/test/cfg2cmd/minimal-defaults.conf diff --git a/test/cfg2cmd/minimal-defaults.conf.cmd b/src/test/cfg2cmd/minimal-defaults.conf.cmd similarity index 100% rename from test/cfg2cmd/minimal-defaults.conf.cmd rename to src/test/cfg2cmd/minimal-defaults.conf.cmd diff --git a/test/cfg2cmd/netdev-7.0-multiqueues.conf b/src/test/cfg2cmd/netdev-7.0-multiqueues.conf similarity index 100% rename from test/cfg2cmd/netdev-7.0-multiqueues.conf rename to src/test/cfg2cmd/netdev-7.0-multiqueues.conf diff --git a/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd b/src/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd similarity index 100% rename from test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd rename to src/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd diff --git a/test/cfg2cmd/netdev-7.1-multiqueues.conf b/src/test/cfg2cmd/netdev-7.1-multiqueues.conf similarity index 100% rename from test/cfg2cmd/netdev-7.1-multiqueues.conf rename to src/test/cfg2cmd/netdev-7.1-multiqueues.conf diff --git a/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd b/src/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd similarity index 100% rename from test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd rename to src/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd diff --git a/test/cfg2cmd/netdev-7.1.conf b/src/test/cfg2cmd/netdev-7.1.conf similarity index 100% rename from test/cfg2cmd/netdev-7.1.conf rename to src/test/cfg2cmd/netdev-7.1.conf diff --git a/test/cfg2cmd/netdev-7.1.conf.cmd b/src/test/cfg2cmd/netdev-7.1.conf.cmd similarity index 100% rename from test/cfg2cmd/netdev-7.1.conf.cmd rename to src/test/cfg2cmd/netdev-7.1.conf.cmd diff --git a/test/cfg2cmd/netdev.conf b/src/test/cfg2cmd/netdev.conf similarity index 100% rename from test/cfg2cmd/netdev.conf rename to src/test/cfg2cmd/netdev.conf diff --git a/test/cfg2cmd/netdev.conf.cmd b/src/test/cfg2cmd/netdev.conf.cmd similarity index 100% rename from test/cfg2cmd/netdev.conf.cmd rename to src/test/cfg2cmd/netdev.conf.cmd diff --git a/test/cfg2cmd/old-qemu.conf b/src/test/cfg2cmd/old-qemu.conf similarity index 100% rename from test/cfg2cmd/old-qemu.conf rename to src/test/cfg2cmd/old-qemu.conf diff --git a/test/cfg2cmd/ostype-usb13-error.conf b/src/test/cfg2cmd/ostype-usb13-error.conf similarity index 100% rename from test/cfg2cmd/ostype-usb13-error.conf rename to src/test/cfg2cmd/ostype-usb13-error.conf diff --git a/test/cfg2cmd/pinned-version-pxe-pve.conf b/src/test/cfg2cmd/pinned-version-pxe-pve.conf similarity index 100% rename from test/cfg2cmd/pinned-version-pxe-pve.conf rename to src/test/cfg2cmd/pinned-version-pxe-pve.conf diff --git a/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd b/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd similarity index 100% rename from test/cfg2cmd/pinned-version-pxe-pve.conf.cmd rename to src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd diff --git a/test/cfg2cmd/pinned-version-pxe.conf b/src/test/cfg2cmd/pinned-version-pxe.conf similarity index 100% rename from test/cfg2cmd/pinned-version-pxe.conf rename to src/test/cfg2cmd/pinned-version-pxe.conf diff --git a/test/cfg2cmd/pinned-version-pxe.conf.cmd b/src/test/cfg2cmd/pinned-version-pxe.conf.cmd similarity index 100% rename from test/cfg2cmd/pinned-version-pxe.conf.cmd rename to src/test/cfg2cmd/pinned-version-pxe.conf.cmd diff --git a/test/cfg2cmd/pinned-version.conf b/src/test/cfg2cmd/pinned-version.conf similarity index 100% rename from test/cfg2cmd/pinned-version.conf rename to src/test/cfg2cmd/pinned-version.conf diff --git a/test/cfg2cmd/pinned-version.conf.cmd b/src/test/cfg2cmd/pinned-version.conf.cmd similarity index 100% rename from test/cfg2cmd/pinned-version.conf.cmd rename to src/test/cfg2cmd/pinned-version.conf.cmd diff --git a/test/cfg2cmd/q35-ide.conf b/src/test/cfg2cmd/q35-ide.conf similarity index 100% rename from test/cfg2cmd/q35-ide.conf rename to src/test/cfg2cmd/q35-ide.conf diff --git a/test/cfg2cmd/q35-ide.conf.cmd b/src/test/cfg2cmd/q35-ide.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-ide.conf.cmd rename to src/test/cfg2cmd/q35-ide.conf.cmd diff --git a/test/cfg2cmd/q35-linux-hostpci-mapping.conf b/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf similarity index 100% rename from test/cfg2cmd/q35-linux-hostpci-mapping.conf rename to src/test/cfg2cmd/q35-linux-hostpci-mapping.conf diff --git a/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd rename to src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd diff --git a/test/cfg2cmd/q35-linux-hostpci-multifunction.conf b/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf similarity index 100% rename from test/cfg2cmd/q35-linux-hostpci-multifunction.conf rename to src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf diff --git a/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd rename to src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd diff --git a/test/cfg2cmd/q35-linux-hostpci-template.conf b/src/test/cfg2cmd/q35-linux-hostpci-template.conf similarity index 100% rename from test/cfg2cmd/q35-linux-hostpci-template.conf rename to src/test/cfg2cmd/q35-linux-hostpci-template.conf diff --git a/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-linux-hostpci-template.conf.cmd rename to src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd diff --git a/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf b/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf similarity index 100% rename from test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf rename to src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf diff --git a/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd rename to src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd diff --git a/test/cfg2cmd/q35-linux-hostpci.conf b/src/test/cfg2cmd/q35-linux-hostpci.conf similarity index 100% rename from test/cfg2cmd/q35-linux-hostpci.conf rename to src/test/cfg2cmd/q35-linux-hostpci.conf diff --git a/test/cfg2cmd/q35-linux-hostpci.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-linux-hostpci.conf.cmd rename to src/test/cfg2cmd/q35-linux-hostpci.conf.cmd diff --git a/test/cfg2cmd/q35-simple-6.0.conf b/src/test/cfg2cmd/q35-simple-6.0.conf similarity index 100% rename from test/cfg2cmd/q35-simple-6.0.conf rename to src/test/cfg2cmd/q35-simple-6.0.conf diff --git a/test/cfg2cmd/q35-simple-6.0.conf.cmd b/src/test/cfg2cmd/q35-simple-6.0.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-simple-6.0.conf.cmd rename to src/test/cfg2cmd/q35-simple-6.0.conf.cmd diff --git a/test/cfg2cmd/q35-simple-7.0.conf b/src/test/cfg2cmd/q35-simple-7.0.conf similarity index 100% rename from test/cfg2cmd/q35-simple-7.0.conf rename to src/test/cfg2cmd/q35-simple-7.0.conf diff --git a/test/cfg2cmd/q35-simple-7.0.conf.cmd b/src/test/cfg2cmd/q35-simple-7.0.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-simple-7.0.conf.cmd rename to src/test/cfg2cmd/q35-simple-7.0.conf.cmd diff --git a/test/cfg2cmd/q35-simple-pinned-6.1.conf b/src/test/cfg2cmd/q35-simple-pinned-6.1.conf similarity index 100% rename from test/cfg2cmd/q35-simple-pinned-6.1.conf rename to src/test/cfg2cmd/q35-simple-pinned-6.1.conf diff --git a/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd b/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd rename to src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd diff --git a/test/cfg2cmd/q35-simple.conf b/src/test/cfg2cmd/q35-simple.conf similarity index 100% rename from test/cfg2cmd/q35-simple.conf rename to src/test/cfg2cmd/q35-simple.conf diff --git a/test/cfg2cmd/q35-simple.conf.cmd b/src/test/cfg2cmd/q35-simple.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-simple.conf.cmd rename to src/test/cfg2cmd/q35-simple.conf.cmd diff --git a/test/cfg2cmd/q35-usb13-error.conf b/src/test/cfg2cmd/q35-usb13-error.conf similarity index 100% rename from test/cfg2cmd/q35-usb13-error.conf rename to src/test/cfg2cmd/q35-usb13-error.conf diff --git a/test/cfg2cmd/q35-usb2.conf b/src/test/cfg2cmd/q35-usb2.conf similarity index 100% rename from test/cfg2cmd/q35-usb2.conf rename to src/test/cfg2cmd/q35-usb2.conf diff --git a/test/cfg2cmd/q35-usb2.conf.cmd b/src/test/cfg2cmd/q35-usb2.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-usb2.conf.cmd rename to src/test/cfg2cmd/q35-usb2.conf.cmd diff --git a/test/cfg2cmd/q35-usb3.conf b/src/test/cfg2cmd/q35-usb3.conf similarity index 100% rename from test/cfg2cmd/q35-usb3.conf rename to src/test/cfg2cmd/q35-usb3.conf diff --git a/test/cfg2cmd/q35-usb3.conf.cmd b/src/test/cfg2cmd/q35-usb3.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-usb3.conf.cmd rename to src/test/cfg2cmd/q35-usb3.conf.cmd diff --git a/test/cfg2cmd/q35-viommu-intel.conf b/src/test/cfg2cmd/q35-viommu-intel.conf similarity index 100% rename from test/cfg2cmd/q35-viommu-intel.conf rename to src/test/cfg2cmd/q35-viommu-intel.conf diff --git a/test/cfg2cmd/q35-viommu-intel.conf.cmd b/src/test/cfg2cmd/q35-viommu-intel.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-viommu-intel.conf.cmd rename to src/test/cfg2cmd/q35-viommu-intel.conf.cmd diff --git a/test/cfg2cmd/q35-viommu-virtio.conf b/src/test/cfg2cmd/q35-viommu-virtio.conf similarity index 100% rename from test/cfg2cmd/q35-viommu-virtio.conf rename to src/test/cfg2cmd/q35-viommu-virtio.conf diff --git a/test/cfg2cmd/q35-viommu-virtio.conf.cmd b/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-viommu-virtio.conf.cmd rename to src/test/cfg2cmd/q35-viommu-virtio.conf.cmd diff --git a/test/cfg2cmd/q35-win10-hostpci.conf b/src/test/cfg2cmd/q35-win10-hostpci.conf similarity index 100% rename from test/cfg2cmd/q35-win10-hostpci.conf rename to src/test/cfg2cmd/q35-win10-hostpci.conf diff --git a/test/cfg2cmd/q35-win10-hostpci.conf.cmd b/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-win10-hostpci.conf.cmd rename to src/test/cfg2cmd/q35-win10-hostpci.conf.cmd diff --git a/test/cfg2cmd/q35-windows-pinning.conf b/src/test/cfg2cmd/q35-windows-pinning.conf similarity index 100% rename from test/cfg2cmd/q35-windows-pinning.conf rename to src/test/cfg2cmd/q35-windows-pinning.conf diff --git a/test/cfg2cmd/q35-windows-pinning.conf.cmd b/src/test/cfg2cmd/q35-windows-pinning.conf.cmd similarity index 100% rename from test/cfg2cmd/q35-windows-pinning.conf.cmd rename to src/test/cfg2cmd/q35-windows-pinning.conf.cmd diff --git a/test/cfg2cmd/qemu-xhci-7.1.conf b/src/test/cfg2cmd/qemu-xhci-7.1.conf similarity index 100% rename from test/cfg2cmd/qemu-xhci-7.1.conf rename to src/test/cfg2cmd/qemu-xhci-7.1.conf diff --git a/test/cfg2cmd/qemu-xhci-7.1.conf.cmd b/src/test/cfg2cmd/qemu-xhci-7.1.conf.cmd similarity index 100% rename from test/cfg2cmd/qemu-xhci-7.1.conf.cmd rename to src/test/cfg2cmd/qemu-xhci-7.1.conf.cmd diff --git a/test/cfg2cmd/qemu-xhci-q35-7.1.conf b/src/test/cfg2cmd/qemu-xhci-q35-7.1.conf similarity index 100% rename from test/cfg2cmd/qemu-xhci-q35-7.1.conf rename to src/test/cfg2cmd/qemu-xhci-q35-7.1.conf diff --git a/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd b/src/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd similarity index 100% rename from test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd rename to src/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd diff --git a/test/cfg2cmd/seabios_serial.conf b/src/test/cfg2cmd/seabios_serial.conf similarity index 100% rename from test/cfg2cmd/seabios_serial.conf rename to src/test/cfg2cmd/seabios_serial.conf diff --git a/test/cfg2cmd/seabios_serial.conf.cmd b/src/test/cfg2cmd/seabios_serial.conf.cmd similarity index 100% rename from test/cfg2cmd/seabios_serial.conf.cmd rename to src/test/cfg2cmd/seabios_serial.conf.cmd diff --git a/test/cfg2cmd/sev-es.conf b/src/test/cfg2cmd/sev-es.conf similarity index 100% rename from test/cfg2cmd/sev-es.conf rename to src/test/cfg2cmd/sev-es.conf diff --git a/test/cfg2cmd/sev-es.conf.cmd b/src/test/cfg2cmd/sev-es.conf.cmd similarity index 100% rename from test/cfg2cmd/sev-es.conf.cmd rename to src/test/cfg2cmd/sev-es.conf.cmd diff --git a/test/cfg2cmd/sev-snp.conf b/src/test/cfg2cmd/sev-snp.conf similarity index 100% rename from test/cfg2cmd/sev-snp.conf rename to src/test/cfg2cmd/sev-snp.conf diff --git a/test/cfg2cmd/sev-snp.conf.cmd b/src/test/cfg2cmd/sev-snp.conf.cmd similarity index 100% rename from test/cfg2cmd/sev-snp.conf.cmd rename to src/test/cfg2cmd/sev-snp.conf.cmd diff --git a/test/cfg2cmd/sev-std.conf b/src/test/cfg2cmd/sev-std.conf similarity index 100% rename from test/cfg2cmd/sev-std.conf rename to src/test/cfg2cmd/sev-std.conf diff --git a/test/cfg2cmd/sev-std.conf.cmd b/src/test/cfg2cmd/sev-std.conf.cmd similarity index 100% rename from test/cfg2cmd/sev-std.conf.cmd rename to src/test/cfg2cmd/sev-std.conf.cmd diff --git a/test/cfg2cmd/simple-balloon-free-page-reporting.conf b/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf similarity index 100% rename from test/cfg2cmd/simple-balloon-free-page-reporting.conf rename to src/test/cfg2cmd/simple-balloon-free-page-reporting.conf diff --git a/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd b/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd similarity index 100% rename from test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd rename to src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd diff --git a/test/cfg2cmd/simple-btrfs.conf b/src/test/cfg2cmd/simple-btrfs.conf similarity index 100% rename from test/cfg2cmd/simple-btrfs.conf rename to src/test/cfg2cmd/simple-btrfs.conf diff --git a/test/cfg2cmd/simple-btrfs.conf.cmd b/src/test/cfg2cmd/simple-btrfs.conf.cmd similarity index 100% rename from test/cfg2cmd/simple-btrfs.conf.cmd rename to src/test/cfg2cmd/simple-btrfs.conf.cmd diff --git a/test/cfg2cmd/simple-cifs.conf b/src/test/cfg2cmd/simple-cifs.conf similarity index 100% rename from test/cfg2cmd/simple-cifs.conf rename to src/test/cfg2cmd/simple-cifs.conf diff --git a/test/cfg2cmd/simple-cifs.conf.cmd b/src/test/cfg2cmd/simple-cifs.conf.cmd similarity index 100% rename from test/cfg2cmd/simple-cifs.conf.cmd rename to src/test/cfg2cmd/simple-cifs.conf.cmd diff --git a/test/cfg2cmd/simple-disk-passthrough.conf b/src/test/cfg2cmd/simple-disk-passthrough.conf similarity index 100% rename from test/cfg2cmd/simple-disk-passthrough.conf rename to src/test/cfg2cmd/simple-disk-passthrough.conf diff --git a/test/cfg2cmd/simple-disk-passthrough.conf.cmd b/src/test/cfg2cmd/simple-disk-passthrough.conf.cmd similarity index 100% rename from test/cfg2cmd/simple-disk-passthrough.conf.cmd rename to src/test/cfg2cmd/simple-disk-passthrough.conf.cmd diff --git a/test/cfg2cmd/simple-lvm.conf b/src/test/cfg2cmd/simple-lvm.conf similarity index 100% rename from test/cfg2cmd/simple-lvm.conf rename to src/test/cfg2cmd/simple-lvm.conf diff --git a/test/cfg2cmd/simple-lvm.conf.cmd b/src/test/cfg2cmd/simple-lvm.conf.cmd similarity index 100% rename from test/cfg2cmd/simple-lvm.conf.cmd rename to src/test/cfg2cmd/simple-lvm.conf.cmd diff --git a/test/cfg2cmd/simple-lvmthin.conf b/src/test/cfg2cmd/simple-lvmthin.conf similarity index 100% rename from test/cfg2cmd/simple-lvmthin.conf rename to src/test/cfg2cmd/simple-lvmthin.conf diff --git a/test/cfg2cmd/simple-lvmthin.conf.cmd b/src/test/cfg2cmd/simple-lvmthin.conf.cmd similarity index 100% rename from test/cfg2cmd/simple-lvmthin.conf.cmd rename to src/test/cfg2cmd/simple-lvmthin.conf.cmd diff --git a/test/cfg2cmd/simple-rbd.conf b/src/test/cfg2cmd/simple-rbd.conf similarity index 100% rename from test/cfg2cmd/simple-rbd.conf rename to src/test/cfg2cmd/simple-rbd.conf diff --git a/test/cfg2cmd/simple-rbd.conf.cmd b/src/test/cfg2cmd/simple-rbd.conf.cmd similarity index 100% rename from test/cfg2cmd/simple-rbd.conf.cmd rename to src/test/cfg2cmd/simple-rbd.conf.cmd diff --git a/test/cfg2cmd/simple-virtio-blk.conf b/src/test/cfg2cmd/simple-virtio-blk.conf similarity index 100% rename from test/cfg2cmd/simple-virtio-blk.conf rename to src/test/cfg2cmd/simple-virtio-blk.conf diff --git a/test/cfg2cmd/simple-virtio-blk.conf.cmd b/src/test/cfg2cmd/simple-virtio-blk.conf.cmd similarity index 100% rename from test/cfg2cmd/simple-virtio-blk.conf.cmd rename to src/test/cfg2cmd/simple-virtio-blk.conf.cmd diff --git a/test/cfg2cmd/simple-zfs-over-iscsi.conf b/src/test/cfg2cmd/simple-zfs-over-iscsi.conf similarity index 100% rename from test/cfg2cmd/simple-zfs-over-iscsi.conf rename to src/test/cfg2cmd/simple-zfs-over-iscsi.conf diff --git a/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd b/src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd similarity index 100% rename from test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd rename to src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd diff --git a/test/cfg2cmd/simple1-template.conf b/src/test/cfg2cmd/simple1-template.conf similarity index 100% rename from test/cfg2cmd/simple1-template.conf rename to src/test/cfg2cmd/simple1-template.conf diff --git a/test/cfg2cmd/simple1-template.conf.cmd b/src/test/cfg2cmd/simple1-template.conf.cmd similarity index 100% rename from test/cfg2cmd/simple1-template.conf.cmd rename to src/test/cfg2cmd/simple1-template.conf.cmd diff --git a/test/cfg2cmd/simple1.conf b/src/test/cfg2cmd/simple1.conf similarity index 100% rename from test/cfg2cmd/simple1.conf rename to src/test/cfg2cmd/simple1.conf diff --git a/test/cfg2cmd/simple1.conf.cmd b/src/test/cfg2cmd/simple1.conf.cmd similarity index 100% rename from test/cfg2cmd/simple1.conf.cmd rename to src/test/cfg2cmd/simple1.conf.cmd diff --git a/test/cfg2cmd/spice-enhancments.conf b/src/test/cfg2cmd/spice-enhancments.conf similarity index 100% rename from test/cfg2cmd/spice-enhancments.conf rename to src/test/cfg2cmd/spice-enhancments.conf diff --git a/test/cfg2cmd/spice-enhancments.conf.cmd b/src/test/cfg2cmd/spice-enhancments.conf.cmd similarity index 100% rename from test/cfg2cmd/spice-enhancments.conf.cmd rename to src/test/cfg2cmd/spice-enhancments.conf.cmd diff --git a/test/cfg2cmd/spice-linux-4.1.conf b/src/test/cfg2cmd/spice-linux-4.1.conf similarity index 100% rename from test/cfg2cmd/spice-linux-4.1.conf rename to src/test/cfg2cmd/spice-linux-4.1.conf diff --git a/test/cfg2cmd/spice-linux-4.1.conf.cmd b/src/test/cfg2cmd/spice-linux-4.1.conf.cmd similarity index 100% rename from test/cfg2cmd/spice-linux-4.1.conf.cmd rename to src/test/cfg2cmd/spice-linux-4.1.conf.cmd diff --git a/test/cfg2cmd/spice-usb3.conf b/src/test/cfg2cmd/spice-usb3.conf similarity index 100% rename from test/cfg2cmd/spice-usb3.conf rename to src/test/cfg2cmd/spice-usb3.conf diff --git a/test/cfg2cmd/spice-usb3.conf.cmd b/src/test/cfg2cmd/spice-usb3.conf.cmd similarity index 100% rename from test/cfg2cmd/spice-usb3.conf.cmd rename to src/test/cfg2cmd/spice-usb3.conf.cmd diff --git a/test/cfg2cmd/spice-win.conf b/src/test/cfg2cmd/spice-win.conf similarity index 100% rename from test/cfg2cmd/spice-win.conf rename to src/test/cfg2cmd/spice-win.conf diff --git a/test/cfg2cmd/spice-win.conf.cmd b/src/test/cfg2cmd/spice-win.conf.cmd similarity index 100% rename from test/cfg2cmd/spice-win.conf.cmd rename to src/test/cfg2cmd/spice-win.conf.cmd diff --git a/test/cfg2cmd/unsupported-storage-content-type.conf b/src/test/cfg2cmd/unsupported-storage-content-type.conf similarity index 100% rename from test/cfg2cmd/unsupported-storage-content-type.conf rename to src/test/cfg2cmd/unsupported-storage-content-type.conf diff --git a/test/cfg2cmd/usb13-error.conf b/src/test/cfg2cmd/usb13-error.conf similarity index 100% rename from test/cfg2cmd/usb13-error.conf rename to src/test/cfg2cmd/usb13-error.conf diff --git a/test/cfg2cmd/vnc-clipboard-spice.conf b/src/test/cfg2cmd/vnc-clipboard-spice.conf similarity index 100% rename from test/cfg2cmd/vnc-clipboard-spice.conf rename to src/test/cfg2cmd/vnc-clipboard-spice.conf diff --git a/test/cfg2cmd/vnc-clipboard-spice.conf.cmd b/src/test/cfg2cmd/vnc-clipboard-spice.conf.cmd similarity index 100% rename from test/cfg2cmd/vnc-clipboard-spice.conf.cmd rename to src/test/cfg2cmd/vnc-clipboard-spice.conf.cmd diff --git a/test/cfg2cmd/vnc-clipboard-std.conf b/src/test/cfg2cmd/vnc-clipboard-std.conf similarity index 100% rename from test/cfg2cmd/vnc-clipboard-std.conf rename to src/test/cfg2cmd/vnc-clipboard-std.conf diff --git a/test/cfg2cmd/vnc-clipboard-std.conf.cmd b/src/test/cfg2cmd/vnc-clipboard-std.conf.cmd similarity index 100% rename from test/cfg2cmd/vnc-clipboard-std.conf.cmd rename to src/test/cfg2cmd/vnc-clipboard-std.conf.cmd diff --git a/test/parse-config-expected/cloudinit-snapshot.conf b/src/test/parse-config-expected/cloudinit-snapshot.conf similarity index 100% rename from test/parse-config-expected/cloudinit-snapshot.conf rename to src/test/parse-config-expected/cloudinit-snapshot.conf diff --git a/test/parse-config-expected/cloudinit-snapshot.conf.strict.error b/src/test/parse-config-expected/cloudinit-snapshot.conf.strict.error similarity index 100% rename from test/parse-config-expected/cloudinit-snapshot.conf.strict.error rename to src/test/parse-config-expected/cloudinit-snapshot.conf.strict.error diff --git a/test/parse-config-expected/duplicate-sections.conf b/src/test/parse-config-expected/duplicate-sections.conf similarity index 100% rename from test/parse-config-expected/duplicate-sections.conf rename to src/test/parse-config-expected/duplicate-sections.conf diff --git a/test/parse-config-expected/duplicate-sections.conf.strict.error b/src/test/parse-config-expected/duplicate-sections.conf.strict.error similarity index 100% rename from test/parse-config-expected/duplicate-sections.conf.strict.error rename to src/test/parse-config-expected/duplicate-sections.conf.strict.error diff --git a/test/parse-config-expected/unknown-sections.conf b/src/test/parse-config-expected/unknown-sections.conf similarity index 100% rename from test/parse-config-expected/unknown-sections.conf rename to src/test/parse-config-expected/unknown-sections.conf diff --git a/test/parse-config-expected/unknown-sections.conf.strict.error b/src/test/parse-config-expected/unknown-sections.conf.strict.error similarity index 100% rename from test/parse-config-expected/unknown-sections.conf.strict.error rename to src/test/parse-config-expected/unknown-sections.conf.strict.error diff --git a/test/parse-config-expected/verify-snapshot.conf b/src/test/parse-config-expected/verify-snapshot.conf similarity index 100% rename from test/parse-config-expected/verify-snapshot.conf rename to src/test/parse-config-expected/verify-snapshot.conf diff --git a/test/parse-config-expected/verify-snapshot.conf.strict.error b/src/test/parse-config-expected/verify-snapshot.conf.strict.error similarity index 100% rename from test/parse-config-expected/verify-snapshot.conf.strict.error rename to src/test/parse-config-expected/verify-snapshot.conf.strict.error diff --git a/test/parse-config-input/cloudinit-snapshot.conf b/src/test/parse-config-input/cloudinit-snapshot.conf similarity index 100% rename from test/parse-config-input/cloudinit-snapshot.conf rename to src/test/parse-config-input/cloudinit-snapshot.conf diff --git a/test/parse-config-input/duplicate-sections.conf b/src/test/parse-config-input/duplicate-sections.conf similarity index 100% rename from test/parse-config-input/duplicate-sections.conf rename to src/test/parse-config-input/duplicate-sections.conf diff --git a/test/parse-config-input/fleecing-section.conf b/src/test/parse-config-input/fleecing-section.conf similarity index 100% rename from test/parse-config-input/fleecing-section.conf rename to src/test/parse-config-input/fleecing-section.conf diff --git a/test/parse-config-input/locked.conf b/src/test/parse-config-input/locked.conf similarity index 100% rename from test/parse-config-input/locked.conf rename to src/test/parse-config-input/locked.conf diff --git a/test/parse-config-input/plain.conf b/src/test/parse-config-input/plain.conf similarity index 100% rename from test/parse-config-input/plain.conf rename to src/test/parse-config-input/plain.conf diff --git a/test/parse-config-input/regular-vm-efi.conf b/src/test/parse-config-input/regular-vm-efi.conf similarity index 100% rename from test/parse-config-input/regular-vm-efi.conf rename to src/test/parse-config-input/regular-vm-efi.conf diff --git a/test/parse-config-input/sections.conf b/src/test/parse-config-input/sections.conf similarity index 100% rename from test/parse-config-input/sections.conf rename to src/test/parse-config-input/sections.conf diff --git a/test/parse-config-input/snapshots.conf b/src/test/parse-config-input/snapshots.conf similarity index 100% rename from test/parse-config-input/snapshots.conf rename to src/test/parse-config-input/snapshots.conf diff --git a/test/parse-config-input/unknown-sections.conf b/src/test/parse-config-input/unknown-sections.conf similarity index 100% rename from test/parse-config-input/unknown-sections.conf rename to src/test/parse-config-input/unknown-sections.conf diff --git a/test/parse-config-input/verify-snapshot.conf b/src/test/parse-config-input/verify-snapshot.conf similarity index 100% rename from test/parse-config-input/verify-snapshot.conf rename to src/test/parse-config-input/verify-snapshot.conf diff --git a/test/restore-config-expected/139.conf b/src/test/restore-config-expected/139.conf similarity index 100% rename from test/restore-config-expected/139.conf rename to src/test/restore-config-expected/139.conf diff --git a/test/restore-config-expected/142.conf b/src/test/restore-config-expected/142.conf similarity index 100% rename from test/restore-config-expected/142.conf rename to src/test/restore-config-expected/142.conf diff --git a/test/restore-config-expected/1422.conf b/src/test/restore-config-expected/1422.conf similarity index 100% rename from test/restore-config-expected/1422.conf rename to src/test/restore-config-expected/1422.conf diff --git a/test/restore-config-expected/179.conf b/src/test/restore-config-expected/179.conf similarity index 100% rename from test/restore-config-expected/179.conf rename to src/test/restore-config-expected/179.conf diff --git a/test/restore-config-input/139.conf b/src/test/restore-config-input/139.conf similarity index 100% rename from test/restore-config-input/139.conf rename to src/test/restore-config-input/139.conf diff --git a/test/restore-config-input/142.conf b/src/test/restore-config-input/142.conf similarity index 100% rename from test/restore-config-input/142.conf rename to src/test/restore-config-input/142.conf diff --git a/test/restore-config-input/1422.conf b/src/test/restore-config-input/1422.conf similarity index 100% rename from test/restore-config-input/1422.conf rename to src/test/restore-config-input/1422.conf diff --git a/test/restore-config-input/179.conf b/src/test/restore-config-input/179.conf similarity index 100% rename from test/restore-config-input/179.conf rename to src/test/restore-config-input/179.conf diff --git a/test/run_config2command_tests.pl b/src/test/run_config2command_tests.pl similarity index 100% rename from test/run_config2command_tests.pl rename to src/test/run_config2command_tests.pl diff --git a/test/run_parse_config_tests.pl b/src/test/run_parse_config_tests.pl similarity index 100% rename from test/run_parse_config_tests.pl rename to src/test/run_parse_config_tests.pl diff --git a/test/run_pci_addr_checks.pl b/src/test/run_pci_addr_checks.pl similarity index 98% rename from test/run_pci_addr_checks.pl rename to src/test/run_pci_addr_checks.pl index 0bde3248..866c43eb 100755 --- a/test/run_pci_addr_checks.pl +++ b/src/test/run_pci_addr_checks.pl @@ -11,7 +11,7 @@ use Test::More; use PVE::Tools qw(file_get_contents); use PVE::QemuServer::PCI; -my $qemu_cfg_base_path = "../qemu-configs"; +my $qemu_cfg_base_path = "../usr"; # not our format but that what QEMU gets passed with '-readconfig' sub slurp_qemu_config { diff --git a/test/run_qemu_img_convert_tests.pl b/src/test/run_qemu_img_convert_tests.pl similarity index 100% rename from test/run_qemu_img_convert_tests.pl rename to src/test/run_qemu_img_convert_tests.pl diff --git a/test/run_qemu_migrate_tests.pl b/src/test/run_qemu_migrate_tests.pl similarity index 100% rename from test/run_qemu_migrate_tests.pl rename to src/test/run_qemu_migrate_tests.pl diff --git a/test/run_qemu_restore_config_tests.pl b/src/test/run_qemu_restore_config_tests.pl similarity index 100% rename from test/run_qemu_restore_config_tests.pl rename to src/test/run_qemu_restore_config_tests.pl diff --git a/test/run_snapshot_tests.pl b/src/test/run_snapshot_tests.pl similarity index 100% rename from test/run_snapshot_tests.pl rename to src/test/run_snapshot_tests.pl diff --git a/test/snapshot-expected/commit/qemu-server/101.conf b/src/test/snapshot-expected/commit/qemu-server/101.conf similarity index 100% rename from test/snapshot-expected/commit/qemu-server/101.conf rename to src/test/snapshot-expected/commit/qemu-server/101.conf diff --git a/test/snapshot-expected/commit/qemu-server/102.conf b/src/test/snapshot-expected/commit/qemu-server/102.conf similarity index 100% rename from test/snapshot-expected/commit/qemu-server/102.conf rename to src/test/snapshot-expected/commit/qemu-server/102.conf diff --git a/test/snapshot-expected/commit/qemu-server/201.conf b/src/test/snapshot-expected/commit/qemu-server/201.conf similarity index 100% rename from test/snapshot-expected/commit/qemu-server/201.conf rename to src/test/snapshot-expected/commit/qemu-server/201.conf diff --git a/test/snapshot-expected/commit/qemu-server/202.conf b/src/test/snapshot-expected/commit/qemu-server/202.conf similarity index 100% rename from test/snapshot-expected/commit/qemu-server/202.conf rename to src/test/snapshot-expected/commit/qemu-server/202.conf diff --git a/test/snapshot-expected/commit/qemu-server/203.conf b/src/test/snapshot-expected/commit/qemu-server/203.conf similarity index 100% rename from test/snapshot-expected/commit/qemu-server/203.conf rename to src/test/snapshot-expected/commit/qemu-server/203.conf diff --git a/test/snapshot-expected/create/qemu-server/101.conf b/src/test/snapshot-expected/create/qemu-server/101.conf similarity index 100% rename from test/snapshot-expected/create/qemu-server/101.conf rename to src/test/snapshot-expected/create/qemu-server/101.conf diff --git a/test/snapshot-expected/create/qemu-server/102.conf b/src/test/snapshot-expected/create/qemu-server/102.conf similarity index 100% rename from test/snapshot-expected/create/qemu-server/102.conf rename to src/test/snapshot-expected/create/qemu-server/102.conf diff --git a/test/snapshot-expected/create/qemu-server/103.conf b/src/test/snapshot-expected/create/qemu-server/103.conf similarity index 100% rename from test/snapshot-expected/create/qemu-server/103.conf rename to src/test/snapshot-expected/create/qemu-server/103.conf diff --git a/test/snapshot-expected/create/qemu-server/104.conf b/src/test/snapshot-expected/create/qemu-server/104.conf similarity index 100% rename from test/snapshot-expected/create/qemu-server/104.conf rename to src/test/snapshot-expected/create/qemu-server/104.conf diff --git a/test/snapshot-expected/create/qemu-server/105.conf b/src/test/snapshot-expected/create/qemu-server/105.conf similarity index 100% rename from test/snapshot-expected/create/qemu-server/105.conf rename to src/test/snapshot-expected/create/qemu-server/105.conf diff --git a/test/snapshot-expected/create/qemu-server/106.conf b/src/test/snapshot-expected/create/qemu-server/106.conf similarity index 100% rename from test/snapshot-expected/create/qemu-server/106.conf rename to src/test/snapshot-expected/create/qemu-server/106.conf diff --git a/test/snapshot-expected/create/qemu-server/201.conf b/src/test/snapshot-expected/create/qemu-server/201.conf similarity index 100% rename from test/snapshot-expected/create/qemu-server/201.conf rename to src/test/snapshot-expected/create/qemu-server/201.conf diff --git a/test/snapshot-expected/create/qemu-server/202.conf b/src/test/snapshot-expected/create/qemu-server/202.conf similarity index 100% rename from test/snapshot-expected/create/qemu-server/202.conf rename to src/test/snapshot-expected/create/qemu-server/202.conf diff --git a/test/snapshot-expected/create/qemu-server/203.conf b/src/test/snapshot-expected/create/qemu-server/203.conf similarity index 100% rename from test/snapshot-expected/create/qemu-server/203.conf rename to src/test/snapshot-expected/create/qemu-server/203.conf diff --git a/test/snapshot-expected/create/qemu-server/301.conf b/src/test/snapshot-expected/create/qemu-server/301.conf similarity index 100% rename from test/snapshot-expected/create/qemu-server/301.conf rename to src/test/snapshot-expected/create/qemu-server/301.conf diff --git a/test/snapshot-expected/create/qemu-server/302.conf b/src/test/snapshot-expected/create/qemu-server/302.conf similarity index 100% rename from test/snapshot-expected/create/qemu-server/302.conf rename to src/test/snapshot-expected/create/qemu-server/302.conf diff --git a/test/snapshot-expected/create/qemu-server/303.conf b/src/test/snapshot-expected/create/qemu-server/303.conf similarity index 100% rename from test/snapshot-expected/create/qemu-server/303.conf rename to src/test/snapshot-expected/create/qemu-server/303.conf diff --git a/test/snapshot-expected/delete/qemu-server/101.conf b/src/test/snapshot-expected/delete/qemu-server/101.conf similarity index 100% rename from test/snapshot-expected/delete/qemu-server/101.conf rename to src/test/snapshot-expected/delete/qemu-server/101.conf diff --git a/test/snapshot-expected/delete/qemu-server/102.conf b/src/test/snapshot-expected/delete/qemu-server/102.conf similarity index 100% rename from test/snapshot-expected/delete/qemu-server/102.conf rename to src/test/snapshot-expected/delete/qemu-server/102.conf diff --git a/test/snapshot-expected/delete/qemu-server/103.conf b/src/test/snapshot-expected/delete/qemu-server/103.conf similarity index 100% rename from test/snapshot-expected/delete/qemu-server/103.conf rename to src/test/snapshot-expected/delete/qemu-server/103.conf diff --git a/test/snapshot-expected/delete/qemu-server/104.conf b/src/test/snapshot-expected/delete/qemu-server/104.conf similarity index 100% rename from test/snapshot-expected/delete/qemu-server/104.conf rename to src/test/snapshot-expected/delete/qemu-server/104.conf diff --git a/test/snapshot-expected/delete/qemu-server/105.conf b/src/test/snapshot-expected/delete/qemu-server/105.conf similarity index 100% rename from test/snapshot-expected/delete/qemu-server/105.conf rename to src/test/snapshot-expected/delete/qemu-server/105.conf diff --git a/test/snapshot-expected/delete/qemu-server/106.conf b/src/test/snapshot-expected/delete/qemu-server/106.conf similarity index 100% rename from test/snapshot-expected/delete/qemu-server/106.conf rename to src/test/snapshot-expected/delete/qemu-server/106.conf diff --git a/test/snapshot-expected/delete/qemu-server/201.conf b/src/test/snapshot-expected/delete/qemu-server/201.conf similarity index 100% rename from test/snapshot-expected/delete/qemu-server/201.conf rename to src/test/snapshot-expected/delete/qemu-server/201.conf diff --git a/test/snapshot-expected/delete/qemu-server/202.conf b/src/test/snapshot-expected/delete/qemu-server/202.conf similarity index 100% rename from test/snapshot-expected/delete/qemu-server/202.conf rename to src/test/snapshot-expected/delete/qemu-server/202.conf diff --git a/test/snapshot-expected/delete/qemu-server/203.conf b/src/test/snapshot-expected/delete/qemu-server/203.conf similarity index 100% rename from test/snapshot-expected/delete/qemu-server/203.conf rename to src/test/snapshot-expected/delete/qemu-server/203.conf diff --git a/test/snapshot-expected/delete/qemu-server/204.conf b/src/test/snapshot-expected/delete/qemu-server/204.conf similarity index 100% rename from test/snapshot-expected/delete/qemu-server/204.conf rename to src/test/snapshot-expected/delete/qemu-server/204.conf diff --git a/test/snapshot-expected/prepare/qemu-server/101.conf b/src/test/snapshot-expected/prepare/qemu-server/101.conf similarity index 100% rename from test/snapshot-expected/prepare/qemu-server/101.conf rename to src/test/snapshot-expected/prepare/qemu-server/101.conf diff --git a/test/snapshot-expected/prepare/qemu-server/102.conf b/src/test/snapshot-expected/prepare/qemu-server/102.conf similarity index 100% rename from test/snapshot-expected/prepare/qemu-server/102.conf rename to src/test/snapshot-expected/prepare/qemu-server/102.conf diff --git a/test/snapshot-expected/prepare/qemu-server/103.conf b/src/test/snapshot-expected/prepare/qemu-server/103.conf similarity index 100% rename from test/snapshot-expected/prepare/qemu-server/103.conf rename to src/test/snapshot-expected/prepare/qemu-server/103.conf diff --git a/test/snapshot-expected/prepare/qemu-server/104.conf b/src/test/snapshot-expected/prepare/qemu-server/104.conf similarity index 100% rename from test/snapshot-expected/prepare/qemu-server/104.conf rename to src/test/snapshot-expected/prepare/qemu-server/104.conf diff --git a/test/snapshot-expected/prepare/qemu-server/200.conf b/src/test/snapshot-expected/prepare/qemu-server/200.conf similarity index 100% rename from test/snapshot-expected/prepare/qemu-server/200.conf rename to src/test/snapshot-expected/prepare/qemu-server/200.conf diff --git a/test/snapshot-expected/prepare/qemu-server/201.conf b/src/test/snapshot-expected/prepare/qemu-server/201.conf similarity index 100% rename from test/snapshot-expected/prepare/qemu-server/201.conf rename to src/test/snapshot-expected/prepare/qemu-server/201.conf diff --git a/test/snapshot-expected/prepare/qemu-server/202.conf b/src/test/snapshot-expected/prepare/qemu-server/202.conf similarity index 100% rename from test/snapshot-expected/prepare/qemu-server/202.conf rename to src/test/snapshot-expected/prepare/qemu-server/202.conf diff --git a/test/snapshot-expected/prepare/qemu-server/300.conf b/src/test/snapshot-expected/prepare/qemu-server/300.conf similarity index 100% rename from test/snapshot-expected/prepare/qemu-server/300.conf rename to src/test/snapshot-expected/prepare/qemu-server/300.conf diff --git a/test/snapshot-expected/rollback/qemu-server/101.conf b/src/test/snapshot-expected/rollback/qemu-server/101.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/101.conf rename to src/test/snapshot-expected/rollback/qemu-server/101.conf diff --git a/test/snapshot-expected/rollback/qemu-server/102.conf b/src/test/snapshot-expected/rollback/qemu-server/102.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/102.conf rename to src/test/snapshot-expected/rollback/qemu-server/102.conf diff --git a/test/snapshot-expected/rollback/qemu-server/103.conf b/src/test/snapshot-expected/rollback/qemu-server/103.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/103.conf rename to src/test/snapshot-expected/rollback/qemu-server/103.conf diff --git a/test/snapshot-expected/rollback/qemu-server/104.conf b/src/test/snapshot-expected/rollback/qemu-server/104.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/104.conf rename to src/test/snapshot-expected/rollback/qemu-server/104.conf diff --git a/test/snapshot-expected/rollback/qemu-server/105.conf b/src/test/snapshot-expected/rollback/qemu-server/105.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/105.conf rename to src/test/snapshot-expected/rollback/qemu-server/105.conf diff --git a/test/snapshot-expected/rollback/qemu-server/106.conf b/src/test/snapshot-expected/rollback/qemu-server/106.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/106.conf rename to src/test/snapshot-expected/rollback/qemu-server/106.conf diff --git a/test/snapshot-expected/rollback/qemu-server/201.conf b/src/test/snapshot-expected/rollback/qemu-server/201.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/201.conf rename to src/test/snapshot-expected/rollback/qemu-server/201.conf diff --git a/test/snapshot-expected/rollback/qemu-server/202.conf b/src/test/snapshot-expected/rollback/qemu-server/202.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/202.conf rename to src/test/snapshot-expected/rollback/qemu-server/202.conf diff --git a/test/snapshot-expected/rollback/qemu-server/203.conf b/src/test/snapshot-expected/rollback/qemu-server/203.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/203.conf rename to src/test/snapshot-expected/rollback/qemu-server/203.conf diff --git a/test/snapshot-expected/rollback/qemu-server/204.conf b/src/test/snapshot-expected/rollback/qemu-server/204.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/204.conf rename to src/test/snapshot-expected/rollback/qemu-server/204.conf diff --git a/test/snapshot-expected/rollback/qemu-server/205.conf b/src/test/snapshot-expected/rollback/qemu-server/205.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/205.conf rename to src/test/snapshot-expected/rollback/qemu-server/205.conf diff --git a/test/snapshot-expected/rollback/qemu-server/206.conf b/src/test/snapshot-expected/rollback/qemu-server/206.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/206.conf rename to src/test/snapshot-expected/rollback/qemu-server/206.conf diff --git a/test/snapshot-expected/rollback/qemu-server/207.conf b/src/test/snapshot-expected/rollback/qemu-server/207.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/207.conf rename to src/test/snapshot-expected/rollback/qemu-server/207.conf diff --git a/test/snapshot-expected/rollback/qemu-server/301.conf b/src/test/snapshot-expected/rollback/qemu-server/301.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/301.conf rename to src/test/snapshot-expected/rollback/qemu-server/301.conf diff --git a/test/snapshot-expected/rollback/qemu-server/302.conf b/src/test/snapshot-expected/rollback/qemu-server/302.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/302.conf rename to src/test/snapshot-expected/rollback/qemu-server/302.conf diff --git a/test/snapshot-expected/rollback/qemu-server/303.conf b/src/test/snapshot-expected/rollback/qemu-server/303.conf similarity index 100% rename from test/snapshot-expected/rollback/qemu-server/303.conf rename to src/test/snapshot-expected/rollback/qemu-server/303.conf diff --git a/test/snapshot-input/commit/qemu-server/101.conf b/src/test/snapshot-input/commit/qemu-server/101.conf similarity index 100% rename from test/snapshot-input/commit/qemu-server/101.conf rename to src/test/snapshot-input/commit/qemu-server/101.conf diff --git a/test/snapshot-input/commit/qemu-server/102.conf b/src/test/snapshot-input/commit/qemu-server/102.conf similarity index 100% rename from test/snapshot-input/commit/qemu-server/102.conf rename to src/test/snapshot-input/commit/qemu-server/102.conf diff --git a/test/snapshot-input/commit/qemu-server/201.conf b/src/test/snapshot-input/commit/qemu-server/201.conf similarity index 100% rename from test/snapshot-input/commit/qemu-server/201.conf rename to src/test/snapshot-input/commit/qemu-server/201.conf diff --git a/test/snapshot-input/commit/qemu-server/202.conf b/src/test/snapshot-input/commit/qemu-server/202.conf similarity index 100% rename from test/snapshot-input/commit/qemu-server/202.conf rename to src/test/snapshot-input/commit/qemu-server/202.conf diff --git a/test/snapshot-input/commit/qemu-server/203.conf b/src/test/snapshot-input/commit/qemu-server/203.conf similarity index 100% rename from test/snapshot-input/commit/qemu-server/203.conf rename to src/test/snapshot-input/commit/qemu-server/203.conf diff --git a/test/snapshot-input/create/qemu-server/101.conf b/src/test/snapshot-input/create/qemu-server/101.conf similarity index 100% rename from test/snapshot-input/create/qemu-server/101.conf rename to src/test/snapshot-input/create/qemu-server/101.conf diff --git a/test/snapshot-input/create/qemu-server/102.conf b/src/test/snapshot-input/create/qemu-server/102.conf similarity index 100% rename from test/snapshot-input/create/qemu-server/102.conf rename to src/test/snapshot-input/create/qemu-server/102.conf diff --git a/test/snapshot-input/create/qemu-server/103.conf b/src/test/snapshot-input/create/qemu-server/103.conf similarity index 100% rename from test/snapshot-input/create/qemu-server/103.conf rename to src/test/snapshot-input/create/qemu-server/103.conf diff --git a/test/snapshot-input/create/qemu-server/104.conf b/src/test/snapshot-input/create/qemu-server/104.conf similarity index 100% rename from test/snapshot-input/create/qemu-server/104.conf rename to src/test/snapshot-input/create/qemu-server/104.conf diff --git a/test/snapshot-input/create/qemu-server/105.conf b/src/test/snapshot-input/create/qemu-server/105.conf similarity index 100% rename from test/snapshot-input/create/qemu-server/105.conf rename to src/test/snapshot-input/create/qemu-server/105.conf diff --git a/test/snapshot-input/create/qemu-server/106.conf b/src/test/snapshot-input/create/qemu-server/106.conf similarity index 100% rename from test/snapshot-input/create/qemu-server/106.conf rename to src/test/snapshot-input/create/qemu-server/106.conf diff --git a/test/snapshot-input/create/qemu-server/201.conf b/src/test/snapshot-input/create/qemu-server/201.conf similarity index 100% rename from test/snapshot-input/create/qemu-server/201.conf rename to src/test/snapshot-input/create/qemu-server/201.conf diff --git a/test/snapshot-input/create/qemu-server/202.conf b/src/test/snapshot-input/create/qemu-server/202.conf similarity index 100% rename from test/snapshot-input/create/qemu-server/202.conf rename to src/test/snapshot-input/create/qemu-server/202.conf diff --git a/test/snapshot-input/create/qemu-server/203.conf b/src/test/snapshot-input/create/qemu-server/203.conf similarity index 100% rename from test/snapshot-input/create/qemu-server/203.conf rename to src/test/snapshot-input/create/qemu-server/203.conf diff --git a/test/snapshot-input/create/qemu-server/301.conf b/src/test/snapshot-input/create/qemu-server/301.conf similarity index 100% rename from test/snapshot-input/create/qemu-server/301.conf rename to src/test/snapshot-input/create/qemu-server/301.conf diff --git a/test/snapshot-input/create/qemu-server/302.conf b/src/test/snapshot-input/create/qemu-server/302.conf similarity index 100% rename from test/snapshot-input/create/qemu-server/302.conf rename to src/test/snapshot-input/create/qemu-server/302.conf diff --git a/test/snapshot-input/create/qemu-server/303.conf b/src/test/snapshot-input/create/qemu-server/303.conf similarity index 100% rename from test/snapshot-input/create/qemu-server/303.conf rename to src/test/snapshot-input/create/qemu-server/303.conf diff --git a/test/snapshot-input/delete/qemu-server/101.conf b/src/test/snapshot-input/delete/qemu-server/101.conf similarity index 100% rename from test/snapshot-input/delete/qemu-server/101.conf rename to src/test/snapshot-input/delete/qemu-server/101.conf diff --git a/test/snapshot-input/delete/qemu-server/102.conf b/src/test/snapshot-input/delete/qemu-server/102.conf similarity index 100% rename from test/snapshot-input/delete/qemu-server/102.conf rename to src/test/snapshot-input/delete/qemu-server/102.conf diff --git a/test/snapshot-input/delete/qemu-server/103.conf b/src/test/snapshot-input/delete/qemu-server/103.conf similarity index 100% rename from test/snapshot-input/delete/qemu-server/103.conf rename to src/test/snapshot-input/delete/qemu-server/103.conf diff --git a/test/snapshot-input/delete/qemu-server/104.conf b/src/test/snapshot-input/delete/qemu-server/104.conf similarity index 100% rename from test/snapshot-input/delete/qemu-server/104.conf rename to src/test/snapshot-input/delete/qemu-server/104.conf diff --git a/test/snapshot-input/delete/qemu-server/105.conf b/src/test/snapshot-input/delete/qemu-server/105.conf similarity index 100% rename from test/snapshot-input/delete/qemu-server/105.conf rename to src/test/snapshot-input/delete/qemu-server/105.conf diff --git a/test/snapshot-input/delete/qemu-server/106.conf b/src/test/snapshot-input/delete/qemu-server/106.conf similarity index 100% rename from test/snapshot-input/delete/qemu-server/106.conf rename to src/test/snapshot-input/delete/qemu-server/106.conf diff --git a/test/snapshot-input/delete/qemu-server/201.conf b/src/test/snapshot-input/delete/qemu-server/201.conf similarity index 100% rename from test/snapshot-input/delete/qemu-server/201.conf rename to src/test/snapshot-input/delete/qemu-server/201.conf diff --git a/test/snapshot-input/delete/qemu-server/202.conf b/src/test/snapshot-input/delete/qemu-server/202.conf similarity index 100% rename from test/snapshot-input/delete/qemu-server/202.conf rename to src/test/snapshot-input/delete/qemu-server/202.conf diff --git a/test/snapshot-input/delete/qemu-server/203.conf b/src/test/snapshot-input/delete/qemu-server/203.conf similarity index 100% rename from test/snapshot-input/delete/qemu-server/203.conf rename to src/test/snapshot-input/delete/qemu-server/203.conf diff --git a/test/snapshot-input/delete/qemu-server/204.conf b/src/test/snapshot-input/delete/qemu-server/204.conf similarity index 100% rename from test/snapshot-input/delete/qemu-server/204.conf rename to src/test/snapshot-input/delete/qemu-server/204.conf diff --git a/test/snapshot-input/prepare/qemu-server/101.conf b/src/test/snapshot-input/prepare/qemu-server/101.conf similarity index 100% rename from test/snapshot-input/prepare/qemu-server/101.conf rename to src/test/snapshot-input/prepare/qemu-server/101.conf diff --git a/test/snapshot-input/prepare/qemu-server/102.conf b/src/test/snapshot-input/prepare/qemu-server/102.conf similarity index 100% rename from test/snapshot-input/prepare/qemu-server/102.conf rename to src/test/snapshot-input/prepare/qemu-server/102.conf diff --git a/test/snapshot-input/prepare/qemu-server/103.conf b/src/test/snapshot-input/prepare/qemu-server/103.conf similarity index 100% rename from test/snapshot-input/prepare/qemu-server/103.conf rename to src/test/snapshot-input/prepare/qemu-server/103.conf diff --git a/test/snapshot-input/prepare/qemu-server/104.conf b/src/test/snapshot-input/prepare/qemu-server/104.conf similarity index 100% rename from test/snapshot-input/prepare/qemu-server/104.conf rename to src/test/snapshot-input/prepare/qemu-server/104.conf diff --git a/test/snapshot-input/prepare/qemu-server/200.conf b/src/test/snapshot-input/prepare/qemu-server/200.conf similarity index 100% rename from test/snapshot-input/prepare/qemu-server/200.conf rename to src/test/snapshot-input/prepare/qemu-server/200.conf diff --git a/test/snapshot-input/prepare/qemu-server/201.conf b/src/test/snapshot-input/prepare/qemu-server/201.conf similarity index 100% rename from test/snapshot-input/prepare/qemu-server/201.conf rename to src/test/snapshot-input/prepare/qemu-server/201.conf diff --git a/test/snapshot-input/prepare/qemu-server/202.conf b/src/test/snapshot-input/prepare/qemu-server/202.conf similarity index 100% rename from test/snapshot-input/prepare/qemu-server/202.conf rename to src/test/snapshot-input/prepare/qemu-server/202.conf diff --git a/test/snapshot-input/prepare/qemu-server/300.conf b/src/test/snapshot-input/prepare/qemu-server/300.conf similarity index 100% rename from test/snapshot-input/prepare/qemu-server/300.conf rename to src/test/snapshot-input/prepare/qemu-server/300.conf diff --git a/test/snapshot-input/rollback/qemu-server/101.conf b/src/test/snapshot-input/rollback/qemu-server/101.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/101.conf rename to src/test/snapshot-input/rollback/qemu-server/101.conf diff --git a/test/snapshot-input/rollback/qemu-server/102.conf b/src/test/snapshot-input/rollback/qemu-server/102.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/102.conf rename to src/test/snapshot-input/rollback/qemu-server/102.conf diff --git a/test/snapshot-input/rollback/qemu-server/103.conf b/src/test/snapshot-input/rollback/qemu-server/103.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/103.conf rename to src/test/snapshot-input/rollback/qemu-server/103.conf diff --git a/test/snapshot-input/rollback/qemu-server/104.conf b/src/test/snapshot-input/rollback/qemu-server/104.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/104.conf rename to src/test/snapshot-input/rollback/qemu-server/104.conf diff --git a/test/snapshot-input/rollback/qemu-server/105.conf b/src/test/snapshot-input/rollback/qemu-server/105.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/105.conf rename to src/test/snapshot-input/rollback/qemu-server/105.conf diff --git a/test/snapshot-input/rollback/qemu-server/106.conf b/src/test/snapshot-input/rollback/qemu-server/106.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/106.conf rename to src/test/snapshot-input/rollback/qemu-server/106.conf diff --git a/test/snapshot-input/rollback/qemu-server/201.conf b/src/test/snapshot-input/rollback/qemu-server/201.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/201.conf rename to src/test/snapshot-input/rollback/qemu-server/201.conf diff --git a/test/snapshot-input/rollback/qemu-server/202.conf b/src/test/snapshot-input/rollback/qemu-server/202.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/202.conf rename to src/test/snapshot-input/rollback/qemu-server/202.conf diff --git a/test/snapshot-input/rollback/qemu-server/203.conf b/src/test/snapshot-input/rollback/qemu-server/203.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/203.conf rename to src/test/snapshot-input/rollback/qemu-server/203.conf diff --git a/test/snapshot-input/rollback/qemu-server/204.conf b/src/test/snapshot-input/rollback/qemu-server/204.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/204.conf rename to src/test/snapshot-input/rollback/qemu-server/204.conf diff --git a/test/snapshot-input/rollback/qemu-server/205.conf b/src/test/snapshot-input/rollback/qemu-server/205.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/205.conf rename to src/test/snapshot-input/rollback/qemu-server/205.conf diff --git a/test/snapshot-input/rollback/qemu-server/206.conf b/src/test/snapshot-input/rollback/qemu-server/206.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/206.conf rename to src/test/snapshot-input/rollback/qemu-server/206.conf diff --git a/test/snapshot-input/rollback/qemu-server/207.conf b/src/test/snapshot-input/rollback/qemu-server/207.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/207.conf rename to src/test/snapshot-input/rollback/qemu-server/207.conf diff --git a/test/snapshot-input/rollback/qemu-server/301.conf b/src/test/snapshot-input/rollback/qemu-server/301.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/301.conf rename to src/test/snapshot-input/rollback/qemu-server/301.conf diff --git a/test/snapshot-input/rollback/qemu-server/302.conf b/src/test/snapshot-input/rollback/qemu-server/302.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/302.conf rename to src/test/snapshot-input/rollback/qemu-server/302.conf diff --git a/test/snapshot-input/rollback/qemu-server/303.conf b/src/test/snapshot-input/rollback/qemu-server/303.conf similarity index 100% rename from test/snapshot-input/rollback/qemu-server/303.conf rename to src/test/snapshot-input/rollback/qemu-server/303.conf diff --git a/test/snapshot-test.pm b/src/test/snapshot-test.pm similarity index 100% rename from test/snapshot-test.pm rename to src/test/snapshot-test.pm diff --git a/test/test.vmdk b/src/test/test.vmdk similarity index 100% rename from test/test.vmdk rename to src/test/test.vmdk diff --git a/test/test_get_replicatable_volumes.pl b/src/test/test_get_replicatable_volumes.pl similarity index 100% rename from test/test_get_replicatable_volumes.pl rename to src/test/test_get_replicatable_volumes.pl diff --git a/src/usr/Makefile b/src/usr/Makefile new file mode 100644 index 00000000..77dca818 --- /dev/null +++ b/src/usr/Makefile @@ -0,0 +1,27 @@ +PACKAGE ?= qemu-server +DESTDIR= +PREFIX=/usr +LIBDIR=$(DESTDIR)/$(PREFIX)/lib +LIBEXECDIR=$(DESTDIR)/$(PREFIX)/libexec/$(PACKAGE) +SHAREDIR=$(DESTDIR)/$(PREFIX)/share/$(PACKAGE) +VARLIBDIR=$(DESTDIR)/var/lib/qemu-server + +.PHONY: install +install: pve-usb.cfg pve-q35.cfg pve-q35-4.0.cfg bootsplash.jpg modules-load.conf pve-bridge pve-bridge-hotplug pve-bridgedown + install -d $(SHAREDIR) + install -m 0644 pve-usb.cfg $(SHAREDIR) + install -m 0644 pve-q35.cfg $(SHAREDIR) + install -m 0644 pve-q35-4.0.cfg $(SHAREDIR) + install -m 0644 -D bootsplash.jpg $(SHAREDIR) + install -D -m 0644 modules-load.conf $(DESTDIR)/etc/modules-load.d/qemu-server.conf + install -d $(LIBEXECDIR) + install -m 0755 pve-bridge $(LIBEXECDIR)/pve-bridge + install -m 0755 pve-bridge-hotplug $(LIBEXECDIR)/pve-bridge-hotplug + install -m 0755 pve-bridgedown $(LIBEXECDIR)/pve-bridgedown + install -d $(VARLIBDIR) + install -m 0755 pve-bridge $(VARLIBDIR)/pve-bridge + install -m 0755 pve-bridge-hotplug $(VARLIBDIR)/pve-bridge-hotplug + install -m 0755 pve-bridgedown $(VARLIBDIR)/pve-bridgedown + +.PHONY: clean +clean: diff --git a/bootsplash.jpg b/src/usr/bootsplash.jpg similarity index 100% rename from bootsplash.jpg rename to src/usr/bootsplash.jpg diff --git a/bootsplash.xcf b/src/usr/bootsplash.xcf similarity index 100% rename from bootsplash.xcf rename to src/usr/bootsplash.xcf diff --git a/modules-load.conf b/src/usr/modules-load.conf similarity index 100% rename from modules-load.conf rename to src/usr/modules-load.conf diff --git a/vm-network-scripts/pve-bridge b/src/usr/pve-bridge similarity index 100% rename from vm-network-scripts/pve-bridge rename to src/usr/pve-bridge diff --git a/vm-network-scripts/pve-bridge-hotplug b/src/usr/pve-bridge-hotplug similarity index 100% rename from vm-network-scripts/pve-bridge-hotplug rename to src/usr/pve-bridge-hotplug diff --git a/vm-network-scripts/pve-bridgedown b/src/usr/pve-bridgedown similarity index 100% rename from vm-network-scripts/pve-bridgedown rename to src/usr/pve-bridgedown diff --git a/qemu-configs/pve-q35-4.0.cfg b/src/usr/pve-q35-4.0.cfg similarity index 100% rename from qemu-configs/pve-q35-4.0.cfg rename to src/usr/pve-q35-4.0.cfg diff --git a/qemu-configs/pve-q35.cfg b/src/usr/pve-q35.cfg similarity index 100% rename from qemu-configs/pve-q35.cfg rename to src/usr/pve-q35.cfg diff --git a/qemu-configs/pve-usb.cfg b/src/usr/pve-usb.cfg similarity index 100% rename from qemu-configs/pve-usb.cfg rename to src/usr/pve-usb.cfg diff --git a/vm-network-scripts/Makefile b/vm-network-scripts/Makefile deleted file mode 100644 index 61733e2d..00000000 --- a/vm-network-scripts/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -DESTDIR= -LIBEXECDIR=$(DESTDIR)/usr/libexec/qemu-server -# Remove with version 9 -VARLIBDIR=$(DESTDIR)/var/lib/qemu-server - -.PHONY: install -install: pve-bridge pve-bridge-hotplug pve-bridgedown - install -d ${LIBEXECDIR} - install -m 0755 pve-bridge ${LIBEXECDIR}/pve-bridge - install -m 0755 pve-bridge-hotplug ${LIBEXECDIR}/pve-bridge-hotplug - install -m 0755 pve-bridgedown ${LIBEXECDIR}/pve-bridgedown - install -d ${VARLIBDIR} - install -m 0755 pve-bridge ${VARLIBDIR}/pve-bridge - install -m 0755 pve-bridge-hotplug ${VARLIBDIR}/pve-bridge-hotplug - install -m 0755 pve-bridgedown ${VARLIBDIR}/pve-bridgedown - -.PHONY: clean -clean: