From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH] remove KVM_CAP_USER_MEMORY reference from qemu-kvm.c Date: Wed, 10 Sep 2008 21:23:18 +0200 Message-ID: <48C81EA6.10307@web.de> References: <1220902221-7536-1-git-send-email-gcosta@redhat.com> <1220902221-7536-2-git-send-email-gcosta@redhat.com> <1220902221-7536-3-git-send-email-gcosta@redhat.com> <1220902221-7536-4-git-send-email-gcosta@redhat.com> <1220902221-7536-5-git-send-email-gcosta@redhat.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig9A0AAC11A540147D0C09CE5F" Cc: kvm@vger.kernel.org, avi@qumranet.com, aliguori@us.ibm.com, Glauber Costa To: Glauber Costa Return-path: Received: from fmmailgate02.web.de ([217.72.192.227]:32924 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751852AbYIJTXY (ORCPT ); Wed, 10 Sep 2008 15:23:24 -0400 In-Reply-To: <1220902221-7536-5-git-send-email-gcosta@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig9A0AAC11A540147D0C09CE5F Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Glauber Costa wrote: > From: Glauber Costa >=20 > kvm_cpu_register_physical_memory() is its only user. Remove it. >=20 > Signed-off-by: Glauber Costa > --- > qemu/qemu-kvm.c | 52 +++++++++++++++++++++--------------------------= ----- > 1 files changed, 21 insertions(+), 31 deletions(-) >=20 > diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c > index 8d366e5..f0ef21e 100644 > --- a/qemu/qemu-kvm.c > +++ b/qemu/qemu-kvm.c > @@ -775,42 +775,32 @@ void kvm_cpu_register_physical_memory(target_phys= _addr_t start_addr, > unsigned long size, > unsigned long phys_offset) > { > -#ifdef KVM_CAP_USER_MEMORY > int r =3D 0; > - > - r =3D kvm_check_extension(kvm_context, KVM_CAP_USER_MEMORY); > - if (r) { > - if (!(phys_offset & ~TARGET_PAGE_MASK)) { > - r =3D kvm_is_allocated_mem(kvm_context, start_addr, si= ze); > - if (r) > - return; > - r =3D kvm_is_intersecting_mem(kvm_context, start_addr); > - if (r) > - kvm_create_mem_hole(kvm_context, start_addr, size); > - r =3D kvm_register_userspace_phys_mem(kvm_context, start_a= ddr, > - phys_ram_base + phys_o= ffset, > - size, 0); > - } > - if (phys_offset & IO_MEM_ROM) { > - phys_offset &=3D ~IO_MEM_ROM; > - r =3D kvm_is_intersecting_mem(kvm_context, start_addr); > - if (r) > - kvm_create_mem_hole(kvm_context, start_addr, size); > - r =3D kvm_register_userspace_phys_mem(kvm_context, start_a= ddr, > - phys_ram_base + phys_o= ffset, > - size, 0); > - } > - if (r < 0) { > - printf("kvm_cpu_register_physical_memory: failed\n"); > - exit(1); > - } > - return; > + if (!(phys_offset & ~TARGET_PAGE_MASK)) { > + r =3D kvm_is_allocated_mem(kvm_context, start_addr, size); > + if (r) > + return; > + r =3D kvm_is_intersecting_mem(kvm_context, start_addr); > + if (r) > + kvm_create_mem_hole(kvm_context, start_addr, size); > + r =3D kvm_register_userspace_phys_mem(kvm_context, start_addr,= > + phys_ram_base + phys_offse= t, > + size, 0); > } > -#endif > if (phys_offset & IO_MEM_ROM) { At this chance: Shouldn't this become 'else if'? > phys_offset &=3D ~IO_MEM_ROM; > - memcpy(phys_ram_base + start_addr, phys_ram_base + phys_offset= , size); > + r =3D kvm_is_intersecting_mem(kvm_context, start_addr); > + if (r) > + kvm_create_mem_hole(kvm_context, start_addr, size); > + r =3D kvm_register_userspace_phys_mem(kvm_context, start_addr,= > + phys_ram_base + phys_offse= t, > + size, 0); > + } > + if (r < 0) { > + printf("kvm_cpu_register_physical_memory: failed\n"); > + exit(1); > } > + return; > } > =20 > int kvm_setup_guest_memory(void *area, unsigned long size) Jan --------------enig9A0AAC11A540147D0C09CE5F Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAkjIHqkACgkQniDOoMHTA+kGEwCfRu3RTxd9Dg9Q3PQHWTSc0yj+ CxEAnRTeynwndPW+0Bh2cvo1aPFD6CdW =banw -----END PGP SIGNATURE----- --------------enig9A0AAC11A540147D0C09CE5F--