From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Hogan Subject: Re: [PATCH v4 08/10] hw/mips: malta: Add KVM support Date: Thu, 20 Mar 2014 10:17:33 +0000 Message-ID: <532AC03D.2070509@imgtec.com> References: <1394801281-18997-1-git-send-email-james.hogan@imgtec.com> <1394801281-18997-9-git-send-email-james.hogan@imgtec.com> <5329C825.3010202@redhat.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="VKFKmRJDCvCAQqtpTjnbnEo0i8dFKLh7n" Cc: , , Aurelien Jarno , Gleb Natapov , Sanjay Lal , Peter Maydell To: Paolo Bonzini Return-path: Received: from [217.156.133.130] ([217.156.133.130]:64917 "EHLO imgpgp01.kl.imgtec.org" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754993AbaCTKRq (ORCPT ); Thu, 20 Mar 2014 06:17:46 -0400 In-Reply-To: <5329C825.3010202@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: --VKFKmRJDCvCAQqtpTjnbnEo0i8dFKLh7n Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable On 19/03/14 16:39, Paolo Bonzini wrote: > Il 14/03/2014 13:47, James Hogan ha scritto: >> int prom_index =3D 0; >> + uint64_t (*xlate_to_phys) (void *opaque, uint64_t addr); >> + uint64_t (*xlate_to_kseg0) (void *opaque, uint64_t addr); >> + >> >> #ifdef TARGET_WORDS_BIGENDIAN >> big_endian =3D 1; >> @@ -781,7 +787,15 @@ static int64_t load_kernel (void) >> big_endian =3D 0; >> #endif >> >> - if (load_elf(loaderparams.kernel_filename, >> cpu_mips_kseg0_to_phys, NULL, >> + if (kvm_enabled()) { >> + xlate_to_phys =3D cpu_mips_kvm_um_kseg0_to_phys; >> + xlate_to_kseg0 =3D cpu_mips_kvm_um_phys_to_kseg0; >> + } else { >> + xlate_to_phys =3D cpu_mips_kseg0_to_phys; >> + xlate_to_kseg0 =3D cpu_mips_phys_to_kseg0; >> + } >> + >> + if (load_elf(loaderparams.kernel_filename, xlate_to_phys, NULL, >> (uint64_t *)&kernel_entry, NULL, (uint64_t >> *)&kernel_high, >> big_endian, ELF_MACHINE, 1) < 0) { >> fprintf(stderr, "qemu: could not load kernel '%s'\n", >> @@ -820,7 +834,7 @@ static int64_t load_kernel (void) >> prom_set(prom_buf, prom_index++, "%s", >> loaderparams.kernel_filename); >> if (initrd_size > 0) { >> prom_set(prom_buf, prom_index++, "rd_start=3D0x%" PRIx64 " >> rd_size=3D%li %s", >> - cpu_mips_phys_to_kseg0(NULL, initrd_offset), >> initrd_size, >> + xlate_to_kseg0(NULL, initrd_offset), initrd_size, >> loaderparams.kernel_cmdline); >> } else { >> prom_set(prom_buf, prom_index++, "%s", >> loaderparams.kernel_cmdline); >> @@ -829,12 +843,13 @@ static int64_t load_kernel (void) >> prom_set(prom_buf, prom_index++, "memsize"); >> prom_set(prom_buf, prom_index++, "%i", >> MIN(loaderparams.ram_size, 256 << 20)); >> + >> prom_set(prom_buf, prom_index++, "modetty0"); >> prom_set(prom_buf, prom_index++, "38400n8r"); >> prom_set(prom_buf, prom_index++, NULL); >> >> rom_add_blob_fixed("prom", prom_buf, prom_size, >> - cpu_mips_kseg0_to_phys(NULL, ENVP_ADDR)); >> + xlate_to_phys(NULL, ENVP_ADDR)); >> >=20 > Why do you need the function pointers? Can > cpu_mips_kseg0_to_phys/cpu_mips_phys_to_kseg0 just use kvm_enabled()? Maybe because of its use as an argument to load_elf, which presumably calls it multiple times. Although looking at glue(load_elf, SZ) I think it's only used for each load section so I doubt it would make a difference. I'll change it. Cheers James --VKFKmRJDCvCAQqtpTjnbnEo0i8dFKLh7n Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAEBAgAGBQJTKsA9AAoJEGwLaZPeOHZ6u2oP/25/MFkRkd7z76uAyFDL2hAW YnjKNQ+mtA6AvesyZ3lrD88zb2DCUnGYukkKpBpV8AGTQ/rSHsITjSsWGXnIp1YZ Jh087+2Z02XxTpAeV4eFfKUNzzLEX4dwvXdz4uXSeZXaKqp5gRyXsVgcYl52F4m7 Kkd7SOLfbBOo7N1X7VkHj+VCs0tg1b779JY+zHWz6DPg4enafIHwLYvj8/NS9IJo +KdZd2uyD4S5CCulRaOesuTjyttYtY36xPpSlQLuCk4jnNuG+0msKe5qy7z9hzi1 z3GuDJhEsg1onn4cgQifpfd+ldqJRHqcRnu33E+hCEaT1tzvSwMxtaD4weqAOjC5 GRZpeXgao0nthoOPV8mHai+2/cmNdtS6xd5Z3fLxUiDAgiU9BjyM90/hACaJCm6u wEg7ZkFPu69rJSJxEAEqppGXJThb8cjwptl76BOa1Fee27ItcRZ4JfEomUN/TXOk cPA6phyW4ahxsSnhfqz8W4++elaxIa/cdnqAJ8FfPfPQKCluZVMSSLAXj2wx2qcH RfxXTyKgDCc6S4/jZdzksyw1eUAaeBZoViee6Nwb2WJRXTCW7siYpfShOwAHdNh7 G6FoRrSrwSlO58/TWNHfuLb1P93Q1Sx30Tg6/ngff2r34XlSdM3GxkR5KWotxMpC W53Fd3fr5AzYEFSMkWYH =4n5J -----END PGP SIGNATURE----- --VKFKmRJDCvCAQqtpTjnbnEo0i8dFKLh7n-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQaQu-0000u0-DP for qemu-devel@nongnu.org; Thu, 20 Mar 2014 06:42:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQaQo-0005Kn-BP for qemu-devel@nongnu.org; Thu, 20 Mar 2014 06:42:44 -0400 Received: from [217.156.133.130] (port=56052 helo=imgpgp01.kl.imgtec.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQaQo-0005Ki-3C for qemu-devel@nongnu.org; Thu, 20 Mar 2014 06:42:38 -0400 Message-ID: <532AC03D.2070509@imgtec.com> Date: Thu, 20 Mar 2014 10:17:33 +0000 From: James Hogan MIME-Version: 1.0 References: <1394801281-18997-1-git-send-email-james.hogan@imgtec.com> <1394801281-18997-9-git-send-email-james.hogan@imgtec.com> <5329C825.3010202@redhat.com> In-Reply-To: <5329C825.3010202@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="VKFKmRJDCvCAQqtpTjnbnEo0i8dFKLh7n" Subject: Re: [Qemu-devel] [PATCH v4 08/10] hw/mips: malta: Add KVM support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: Peter Maydell , kvm@vger.kernel.org, Gleb Natapov , qemu-devel@nongnu.org, Sanjay Lal , Aurelien Jarno --VKFKmRJDCvCAQqtpTjnbnEo0i8dFKLh7n Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable On 19/03/14 16:39, Paolo Bonzini wrote: > Il 14/03/2014 13:47, James Hogan ha scritto: >> int prom_index =3D 0; >> + uint64_t (*xlate_to_phys) (void *opaque, uint64_t addr); >> + uint64_t (*xlate_to_kseg0) (void *opaque, uint64_t addr); >> + >> >> #ifdef TARGET_WORDS_BIGENDIAN >> big_endian =3D 1; >> @@ -781,7 +787,15 @@ static int64_t load_kernel (void) >> big_endian =3D 0; >> #endif >> >> - if (load_elf(loaderparams.kernel_filename, >> cpu_mips_kseg0_to_phys, NULL, >> + if (kvm_enabled()) { >> + xlate_to_phys =3D cpu_mips_kvm_um_kseg0_to_phys; >> + xlate_to_kseg0 =3D cpu_mips_kvm_um_phys_to_kseg0; >> + } else { >> + xlate_to_phys =3D cpu_mips_kseg0_to_phys; >> + xlate_to_kseg0 =3D cpu_mips_phys_to_kseg0; >> + } >> + >> + if (load_elf(loaderparams.kernel_filename, xlate_to_phys, NULL, >> (uint64_t *)&kernel_entry, NULL, (uint64_t >> *)&kernel_high, >> big_endian, ELF_MACHINE, 1) < 0) { >> fprintf(stderr, "qemu: could not load kernel '%s'\n", >> @@ -820,7 +834,7 @@ static int64_t load_kernel (void) >> prom_set(prom_buf, prom_index++, "%s", >> loaderparams.kernel_filename); >> if (initrd_size > 0) { >> prom_set(prom_buf, prom_index++, "rd_start=3D0x%" PRIx64 " >> rd_size=3D%li %s", >> - cpu_mips_phys_to_kseg0(NULL, initrd_offset), >> initrd_size, >> + xlate_to_kseg0(NULL, initrd_offset), initrd_size, >> loaderparams.kernel_cmdline); >> } else { >> prom_set(prom_buf, prom_index++, "%s", >> loaderparams.kernel_cmdline); >> @@ -829,12 +843,13 @@ static int64_t load_kernel (void) >> prom_set(prom_buf, prom_index++, "memsize"); >> prom_set(prom_buf, prom_index++, "%i", >> MIN(loaderparams.ram_size, 256 << 20)); >> + >> prom_set(prom_buf, prom_index++, "modetty0"); >> prom_set(prom_buf, prom_index++, "38400n8r"); >> prom_set(prom_buf, prom_index++, NULL); >> >> rom_add_blob_fixed("prom", prom_buf, prom_size, >> - cpu_mips_kseg0_to_phys(NULL, ENVP_ADDR)); >> + xlate_to_phys(NULL, ENVP_ADDR)); >> >=20 > Why do you need the function pointers? Can > cpu_mips_kseg0_to_phys/cpu_mips_phys_to_kseg0 just use kvm_enabled()? Maybe because of its use as an argument to load_elf, which presumably calls it multiple times. Although looking at glue(load_elf, SZ) I think it's only used for each load section so I doubt it would make a difference. I'll change it. Cheers James --VKFKmRJDCvCAQqtpTjnbnEo0i8dFKLh7n Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAEBAgAGBQJTKsA9AAoJEGwLaZPeOHZ6u2oP/25/MFkRkd7z76uAyFDL2hAW YnjKNQ+mtA6AvesyZ3lrD88zb2DCUnGYukkKpBpV8AGTQ/rSHsITjSsWGXnIp1YZ Jh087+2Z02XxTpAeV4eFfKUNzzLEX4dwvXdz4uXSeZXaKqp5gRyXsVgcYl52F4m7 Kkd7SOLfbBOo7N1X7VkHj+VCs0tg1b779JY+zHWz6DPg4enafIHwLYvj8/NS9IJo +KdZd2uyD4S5CCulRaOesuTjyttYtY36xPpSlQLuCk4jnNuG+0msKe5qy7z9hzi1 z3GuDJhEsg1onn4cgQifpfd+ldqJRHqcRnu33E+hCEaT1tzvSwMxtaD4weqAOjC5 GRZpeXgao0nthoOPV8mHai+2/cmNdtS6xd5Z3fLxUiDAgiU9BjyM90/hACaJCm6u wEg7ZkFPu69rJSJxEAEqppGXJThb8cjwptl76BOa1Fee27ItcRZ4JfEomUN/TXOk cPA6phyW4ahxsSnhfqz8W4++elaxIa/cdnqAJ8FfPfPQKCluZVMSSLAXj2wx2qcH RfxXTyKgDCc6S4/jZdzksyw1eUAaeBZoViee6Nwb2WJRXTCW7siYpfShOwAHdNh7 G6FoRrSrwSlO58/TWNHfuLb1P93Q1Sx30Tg6/ngff2r34XlSdM3GxkR5KWotxMpC W53Fd3fr5AzYEFSMkWYH =4n5J -----END PGP SIGNATURE----- --VKFKmRJDCvCAQqtpTjnbnEo0i8dFKLh7n--