From patchwork Wed Sep 3 06:35:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 36539 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 726A820C87 for ; Wed, 3 Sep 2014 06:37:02 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id y10sf47693776pdj.0 for ; Tue, 02 Sep 2014 23:36:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=8ZB4X90NURWRp37sDna065v1VU7+Svn9wNKhOX6CV1Y=; b=iiF2jMwusxkkS0SH2/orVkmM+0UWPAGc5Y/2DbRs34knjYh6NGojWPuJv6vRD3WTeO rXnRp4wLmxz8Xq259E6HxgLf2pM32y7MM8RPwCbb5PNtmqZqY5XLlm2OiM5G6ER7NBKY sOwmeL6UxGGUtuwsxWnUY0IYn6VQRIO8IE47Sn6w0BB33JgKm3z6xVb4Nuar9s43146H HiJdWIc2w8PJkc8IaYkYpBLSrOZXRCdsXNJIoSfpU/G2yhzbM4grhRFRIB+/26+SLRYR ax2iFsGEsZzILKm/5WH1UOp5NaSQb7z5GlAJnxqjJQT6ZcO6aBphDRxiamqiSm/x1hw/ 7IUw== X-Gm-Message-State: ALoCoQnnzoZkB80b4yQqW93UBMexuTqFAUqsG+4tph1axze4Xqhq08s2ZFM0NTMTKj5mROTITQ/T X-Received: by 10.70.96.197 with SMTP id du5mr21954693pdb.3.1409726218020; Tue, 02 Sep 2014 23:36:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.100.180 with SMTP id s49ls2498089qge.42.gmail; Tue, 02 Sep 2014 23:36:57 -0700 (PDT) X-Received: by 10.220.182.1 with SMTP id ca1mr33512726vcb.21.1409726217838; Tue, 02 Sep 2014 23:36:57 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id fd7si3232530vcb.71.2014.09.02.23.36.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Sep 2014 23:36:57 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id id10so8299134vcb.16 for ; Tue, 02 Sep 2014 23:36:57 -0700 (PDT) X-Received: by 10.220.97.5 with SMTP id j5mr33886158vcn.16.1409726217754; Tue, 02 Sep 2014 23:36:57 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp634525vcb; Tue, 2 Sep 2014 23:36:57 -0700 (PDT) X-Received: by 10.140.92.235 with SMTP id b98mr58128956qge.97.1409726217195; Tue, 02 Sep 2014 23:36:57 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 8si8067189qaw.108.2014.09.02.23.36.57 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 02 Sep 2014 23:36:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:42616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP4Bc-0002k1-MB for patch@linaro.org; Wed, 03 Sep 2014 02:36:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP4AX-0001Sd-2E for qemu-devel@nongnu.org; Wed, 03 Sep 2014 02:35:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XP4AL-0005bX-PM for qemu-devel@nongnu.org; Wed, 03 Sep 2014 02:35:49 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:60538) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP4AL-0005bC-EG; Wed, 03 Sep 2014 02:35:37 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 645E14075F; Wed, 3 Sep 2014 10:35:36 +0400 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 451E46DF; Wed, 3 Sep 2014 10:35:36 +0400 (MSK) Received: (nullmailer pid 1622 invoked by uid 1000); Wed, 03 Sep 2014 06:35:36 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Wed, 3 Sep 2014 10:35:35 +0400 Message-Id: <1409726135-1547-11-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1409726135-1547-1-git-send-email-mjt@tls.msk.ru> References: <1409726135-1547-1-git-send-email-mjt@tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Peter Maydell , Michael Tokarev Subject: [Qemu-devel] [PULL 10/10] slirp: Honour vlan/stack in hostfwd_remove commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mjt@tls.msk.ru X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Maydell The hostfwd_add and hostfwd_remove monitor commands allow the user to optionally specify a vlan/stack tuple. hostfwd_add honours this, but hostfwd_remove does not (it looks up the tuple but then ignores the SlirpState it has looked up and always uses the first stack in the list anyway). Correct this to honour what the user requested. Signed-off-by: Peter Maydell Signed-off-by: Michael Tokarev --- net/slirp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index 647039e..c171119 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -345,8 +345,7 @@ void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict) host_port = atoi(p); - err = slirp_remove_hostfwd(QTAILQ_FIRST(&slirp_stacks)->slirp, is_udp, - host_addr, host_port); + err = slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_port); monitor_printf(mon, "host forwarding rule for %s %s\n", src_str, err ? "not found" : "removed");