diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-09-10 04:15:42 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-09-10 04:15:42 +0000 |
| commit | 3e58e613625fd250d7f46047b31eeec09d17bcf9 (patch) | |
| tree | fe6e117fc65a22222cd7797a6295cdac0967d2f9 | |
| parent | eaab04d5b852e788a589e36f7c74aa14847c7db5 (diff) | |
| download | packages-3e58e613625fd250d7f46047b31eeec09d17bcf9.tar.gz packages-3e58e613625fd250d7f46047b31eeec09d17bcf9.tar.bz2 packages-3e58e613625fd250d7f46047b31eeec09d17bcf9.tar.xz packages-3e58e613625fd250d7f46047b31eeec09d17bcf9.zip | |
user/qemu: default to 4 KB page size for pseries KVM since that's our kernel default
| -rw-r--r-- | user/qemu/APKBUILD | 4 | ||||
| -rw-r--r-- | user/qemu/spapr-page-size.patch | 30 |
2 files changed, 33 insertions, 1 deletions
diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD index 41a6647bf..3ca4dd226 100644 --- a/user/qemu/APKBUILD +++ b/user/qemu/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qemu pkgver=3.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="Machine emulator and virtualisation software" url="https://www.qemu.org/" arch="all" @@ -152,6 +152,7 @@ source="https://download.qemu.org/$pkgname-$pkgver.tar.xz signal-fixes.patch sysinfo-header.patch fix-lm32-underlinking.patch + spapr-page-size.patch $pkgname-guest-agent.confd $pkgname-guest-agent.initd @@ -404,6 +405,7 @@ fb0130fa4e8771b23ae337ea3e5e29fd5f7dcfe7f9f7a68968f5b059bb4dd1336b0d04c118840d55 c6436b1cc986788baccd5fe0f9d23c7db9026f6b723260611cf894bd94ee830140a17ee5859efe0dad0ca3bfe9caae1269bc5c9ab4c6e696f35c7857c1b5c86b signal-fixes.patch 698f6b134f4ca87f4de62caf7a656841a40a451b8686ca95928f67a296e58a7493d432d9baa5f6360917865aa4929600baf1699993b0600923a066ca9d45d1da sysinfo-header.patch 2828cc612539aa93b5789de7de6d4f85d3cf82311484c0fe91fdd3efeb972057e2baa2a3809ed633d6caa1785642d49196cb282b095d7553c510c47ce7d6a702 fix-lm32-underlinking.patch +6e1e63ca1e82e1b3fbad7a1f8472be4bf329c78f11461598dfee434fcd0f604dac8643caf77555e8263338c7084694c232d4ad7e73797c574e8f104761023559 spapr-page-size.patch d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f qemu-guest-agent.confd 1cd24c2444c5935a763c501af2b0da31635aad9cf62e55416d6477fcec153cddbe7de205d99616def11b085e0dd366ba22463d2270f831d884edbc307c7864a6 qemu-guest-agent.initd 9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2 80-kvm.rules diff --git a/user/qemu/spapr-page-size.patch b/user/qemu/spapr-page-size.patch new file mode 100644 index 000000000..2ea81ab80 --- /dev/null +++ b/user/qemu/spapr-page-size.patch @@ -0,0 +1,30 @@ +From 3a9eba6700a9f6fc307bb08b9fe672cc36804fb5 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Sun, 9 Sep 2018 19:58:37 -0500 +Subject: [PATCH] =?UTF-8?q?spapr:=20Default=20to=204=20KiB=20page=20size?= + =?UTF-8?q?=20for=20Ad=C3=A9lie?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Not upstream eligible, most likely. +--- + hw/ppc/spapr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c +index 4edb6c7d16..8628673994 100644 +--- a/hw/ppc/spapr.c ++++ b/hw/ppc/spapr.c +@@ -3882,7 +3882,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) + smc->default_caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_BROKEN; + smc->default_caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_BROKEN; + smc->default_caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_BROKEN; +- smc->default_caps.caps[SPAPR_CAP_HPT_MAXPAGESIZE] = 16; /* 64kiB */ ++ smc->default_caps.caps[SPAPR_CAP_HPT_MAXPAGESIZE] = 12; /* 4kiB */ + spapr_caps_add_properties(smc, &error_abort); + smc->irq = &spapr_irq_xics; + } +-- +2.18.0 + |