proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-04-28 04:26:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move qemu-configs to own directory

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-09-24 18:11:22 +02:00
parent 8752e5a3ec
commit 30680751dc
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -65,9 +65,6 @@ install: ${PKGSOURCES}
install -d ${DESTDIR}/${MAN8DIR}
install -d ${DESTDIR}/usr/share/man/man5
install -d ${DESTDIR}/usr/share/${PACKAGE}
install -m 0644 pve-usb.cfg ${DESTDIR}/usr/share/${PACKAGE}
install -m 0644 pve-q35.cfg ${DESTDIR}/usr/share/${PACKAGE}
install -m 0644 pve-q35-4.0.cfg ${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
@ -75,6 +72,7 @@ install: ${PKGSOURCES}
install -m 0644 -D bootsplash.jpg ${DESTDIR}/usr/share/${PACKAGE}
$(MAKE) -C PVE install
$(MAKE) -C qmeventd install
$(MAKE) -C qemu-configs install
install -m 0755 qm ${DESTDIR}${SBINDIR}
install -m 0755 qmrestore ${DESTDIR}${SBINDIR}
install -m 0755 pve-bridge ${DESTDIR}${VARLIBDIR}/pve-bridge

12
qemu-configs/Makefile Normal file
View File

@ -0,0 +1,12 @@
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:

0
pve-q35-4.0.cfg → qemu-configs/pve-q35-4.0.cfg
View File

0
pve-q35.cfg → qemu-configs/pve-q35.cfg
View File

0
pve-usb.cfg → qemu-configs/pve-usb.cfg
View File

8
test/run_pci_addr_checks.pl
View File

@ -11,6 +11,8 @@ use Test::More;
use PVE::Tools qw(file_get_contents);
use PVE::QemuServer::PCI;
my $qemu_cfg_base_path = "../qemu-configs";
# not our format but that what QEMU gets passed with '-readconfig'
sub slurp_qemu_config {
my ($fn) = @_;
@ -112,19 +114,19 @@ while (my ($id, $what) = each %$pcie_map) {
check_conflict($id, $what);
}
my $pve_qm_cfg = slurp_qemu_config('../pve-q35.cfg');
my $pve_qm_cfg = slurp_qemu_config("$qemu_cfg_base_path/pve-q35.cfg");
my $pve_qm_cfg_map = extract_qemu_config_addrs($pve_qm_cfg);
while (my ($id, $what) = each %$pve_qm_cfg_map) {
check_conflict($id, $what);
}
# FIXME: restart with clean conflict $addr_map with only get_pci*_addr_map ones?
my $pve_qm4_cfg = slurp_qemu_config('../pve-q35-4.0.cfg');
my $pve_qm4_cfg = slurp_qemu_config("$qemu_cfg_base_path/pve-q35-4.0.cfg");
my $pve_qm4_cfg_map = extract_qemu_config_addrs($pve_qm4_cfg);
while (my ($id, $what) = each %$pve_qm4_cfg_map) {
check_conflict($id, $what, 1);
}
my $pve_qm_usb_cfg = slurp_qemu_config('../pve-usb.cfg');
my $pve_qm_usb_cfg = slurp_qemu_config("$qemu_cfg_base_path/pve-usb.cfg");
my $pve_qm_usb_cfg_map = extract_qemu_config_addrs($pve_qm_usb_cfg);
while (my ($id, $what) = each %$pve_qm_usb_cfg_map) {
check_conflict($id, $what, 1);