From patchwork Mon May 2 07:54:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 746842 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p427sOQO030319 for ; Mon, 2 May 2011 07:54:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755045Ab1EBHyV (ORCPT ); Mon, 2 May 2011 03:54:21 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:43740 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754540Ab1EBHyV (ORCPT ); Mon, 2 May 2011 03:54:21 -0400 Received: by ywj3 with SMTP id 3so1827175ywj.19 for ; Mon, 02 May 2011 00:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer; bh=RLJMMo2T3zcrNeW9wDLRQ6XXEjcR4tTgoJmkH867JrY=; b=bYbh+GStwbA9oqql36wniuqbtCg4y9qT/W09u+HUrAFRVBHGO0PS23uji/tLcXPEMs fiwH0WVoBLTjJAGeZMMN4upcIXbG3FBoazSBqbGD8SQdvhTblBbpRX08aceQSf6rODm+ q+yvC5dpM8M+FP/wLx8WNAAj10EuqPBNPsO6c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=B9c2yKYi0YZBw0Z9Jg9qTB1kF250igVJNXHo1bTFSsbJVpmwGDTUO7q67vxFlzjEQo B2wWNUO0LEuo7IkUEmXXb+ENg1JUKqbgUulkMREAxRxpo0yz8QW5RohVMpRcWB0wU5e6 34G1vw+/gtmm/o2ahMO7OOF4F1vnmSe8+HM7U= Received: by 10.236.154.168 with SMTP id h28mr168118yhk.295.1304322860392; Mon, 02 May 2011 00:54:20 -0700 (PDT) Received: from localhost.localdomain (93-34-184-88.ip51.fastwebnet.it [93.34.184.88]) by mx.google.com with ESMTPS id t16sm3488849anm.16.2011.05.02.00.54.18 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 May 2011 00:54:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Subject: [PATCH uq/master 2/4] kvm: use qemu_free consistently Date: Mon, 2 May 2011 09:54:04 +0200 Message-Id: <1304322846-24376-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4.4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 02 May 2011 07:54:39 +0000 (UTC) Signed-off-by: Paolo Bonzini --- kvm-all.c | 4 ++-- target-i386/kvm.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 1d7e8ea..d0c36cb 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1167,7 +1167,7 @@ int kvm_insert_breakpoint(CPUState *current_env, target_ulong addr, bp->use_count = 1; err = kvm_arch_insert_sw_breakpoint(current_env, bp); if (err) { - free(bp); + qemu_free(bp); return err; } @@ -1291,7 +1291,7 @@ int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset) sigmask->len = 8; memcpy(sigmask->sigset, sigset, sizeof(*sigset)); r = kvm_vcpu_ioctl(env, KVM_SET_SIGNAL_MASK, sigmask); - free(sigmask); + qemu_free(sigmask); return r; } diff --git a/target-i386/kvm.c b/target-i386/kvm.c index a13599d..d0c2b86 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -552,7 +552,7 @@ static int kvm_get_supported_msrs(KVMState *s) } } - free(kvm_msr_list); + qemu_free(kvm_msr_list); } return ret;