From nobody Sat May 4 17:39:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264718; cv=none; d=zoho.com; s=zohoarc; b=mGNcDPsqXF3xDDBRzpKPxQnb7+Nt2Bv0rks8bNBE23rHSqrRFu4umAy9a2CSywAO6fT2zfDPqleC4i/3g+t8MKti1JW8vJ3ndJfyBU9PXP5Y8kGn8sGjqZQ/EZ2WhiVh0QKjaXsrIELzOD8AZbJQrMCUC9Z/AExvSz9IGyMvRp8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264718; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=s2VORvYpXzDmq+pVd9Zwp8LUzbuylAos0sk8Od+qroI=; b=kxJknzQLNTqmQ4fpxPuecCuqyVwRsUPNkV8O8BjHKJETgpGcK0Umj380KB9/cC7FUATAinmvfBnRsS/gWoQwDoIx3CbryQLJ6mFf1S5WYqYWA9dvyL9QfO26JYvvJ7kmJCCDcbgO+EdxekXAyAj8dv2cLZRyMMyo7fb52VZi5PU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264718921599.3226875453904; Tue, 16 Jul 2019 01:11:58 -0700 (PDT) Received: from localhost ([::1]:46126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIZ3-0000ua-7N for importer@patchew.org; Tue, 16 Jul 2019 04:11:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59760) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYV-0007sJ-Ms for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYU-00038L-Dn for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:23 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:53999) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYU-00037i-6x for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:22 -0400 Received: by mail-wm1-x336.google.com with SMTP id x15so17659935wmj.3 for ; Tue, 16 Jul 2019 01:11:22 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=s2VORvYpXzDmq+pVd9Zwp8LUzbuylAos0sk8Od+qroI=; b=IImjpVp53nxxXA496kh9MAUu6SKssJAonAL8l/Lzb/7TPPiCgG8LRYZ8HdCSUzKTaf 4OqRd8FMzQIopyIElB3V6wRArsHSrp9qE2Et5K6emylBjpD5IrTZbTGNGm2NUxbsYpMZ OtQej6WzNg6BHJkapPHnl22q5JRYLH0oV9eSnAkJyEtsD35Pko1zfVj04c9UfjkMzcdT aZtGyjvMXmSqO1sf+8vxKYs6Ll/+WmS97loqXl9Toan8AZLu9qkhQbQQ4AAH3IXml9Xe FvKV0IcTjD1SVewkR0yZFPz6g5cAdYF/+NEvS82FtaZZKxCO1TcKYwp9BOjcRV+8aBxO XILA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=s2VORvYpXzDmq+pVd9Zwp8LUzbuylAos0sk8Od+qroI=; b=KSDn8ZmIl5gZXE8Up2eut432wUnfQ9M4tR62ni9He77WVJhJc8AYsQs97ASRVQ/1nB EdoKgm2gf+DhOC/T2HIe/37I/+flxW9q7rShvubJLHuhE91JuhUBXUuz6KocpWWt+ffj E0J1UQ9pVY0doWIqJWoOz193bsyrBiUkqXM2GG1YvEaT9DQKCan7TljBmlxYeluCD4pl FL45IxSqknJ/n1Ckzb3qo+dq/u4jAn6rcytv+XpfrdQC8ICU+Qf0bBvw5y2XqVYUs3Jh 5WAjfmPoGOOQuoYk+dsosuaTlnLr5zAS0I/hpiIh4a24Y2S/3nRGycSkp4oc9xLvHHyc Hydg== X-Gm-Message-State: APjAAAVUao9c8Q+e0SLJNKNUYA9ljyCK27xoyHvMlTy6hGZv+tosOpxY K1bV9fy0BGnUddYHDCfe6G36imfrAMI= X-Google-Smtp-Source: APXvYqwzQ97h5vi3QX8wv3yRppLlNVLVp4LXyJMr5t8LmW7ae/maxVSn28qefUu325KJ96LNXOQSFw== X-Received: by 2002:a1c:d108:: with SMTP id i8mr30585909wmg.28.1563264680696; Tue, 16 Jul 2019 01:11:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:10:59 +0200 Message-Id: <1563264677-39718-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 Subject: [Qemu-devel] [PULL 01/19] scsi-disk: pass sense correctly for guest-recoverable errors X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Shinichiro Kawasaki Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shinichiro Kawasaki When an error was passed down to the guest because it was recoverable, the sense length was not copied from the SG_IO data. As a result, the guest saw the CHECK CONDITION status but not the sense data. Signed-off-by: Shinichiro Kawasaki Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index ed7295b..5d3fb3c 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -62,6 +62,7 @@ typedef struct SCSIDiskClass { DMAIOFunc *dma_readv; DMAIOFunc *dma_writev; bool (*need_fua_emulation)(SCSICommand *cmd); + void (*update_sense)(SCSIRequest *r); } SCSIDiskClass; =20 typedef struct SCSIDiskReq { @@ -438,6 +439,7 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int er= ror, bool acct_failed) { bool is_read =3D (r->req.cmd.mode =3D=3D SCSI_XFER_FROM_DEV); SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); + SCSIDiskClass *sdc =3D (SCSIDiskClass *) object_get_class(OBJECT(s)); BlockErrorAction action =3D blk_get_error_action(s->qdev.conf.blk, is_read, error); =20 @@ -456,6 +458,7 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int er= ror, bool acct_failed) if (error =3D=3D ECANCELED || error =3D=3D EAGAIN || error =3D= =3D ENOTCONN || error =3D=3D 0) { /* These errors are handled by guest. */ + sdc->update_sense(&r->req); scsi_req_complete(&r->req, *r->status); return true; } @@ -2894,6 +2897,12 @@ static int scsi_block_parse_cdb(SCSIDevice *d, SCSIC= ommand *cmd, } } =20 +static void scsi_block_update_sense(SCSIRequest *req) +{ + SCSIDiskReq *r =3D DO_UPCAST(SCSIDiskReq, req, req); + SCSIBlockReq *br =3D DO_UPCAST(SCSIBlockReq, req, r); + r->req.sense_len =3D MIN(br->io_header.sb_len_wr, sizeof(r->req.sense)= ); +} #endif =20 static @@ -3059,6 +3068,7 @@ static void scsi_block_class_initfn(ObjectClass *klas= s, void *data) sc->parse_cdb =3D scsi_block_parse_cdb; sdc->dma_readv =3D scsi_block_dma_readv; sdc->dma_writev =3D scsi_block_dma_writev; + sdc->update_sense =3D scsi_block_update_sense; sdc->need_fua_emulation =3D scsi_block_no_fua; dc->desc =3D "SCSI block device passthrough"; dc->props =3D scsi_block_properties; --=20 1.8.3.1 From nobody Sat May 4 17:39:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264723; cv=none; d=zoho.com; s=zohoarc; b=VB1pJQ0+n7m/JaTgonMgVeWkhQ37ac0Fiv5taqIojEZBLnsot4g6SJxnmfb5klQboh2SJFy5HV6hpbgNUyyvbS0iSr/FA+tC9Y043f1w5sjbIhH4ufNz149q8evjCCFT6o+ZLX1dX0/x3KW0HR6vj18XHe/iIfm9hk5FlA+/i+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264723; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=LYTPu7psuc85Dpnmvnd3GNUHtSt1nCg5qgokDKUHd0w=; b=NXQ1Bcie02PmDBfXOJKc8kN3HmYBc+B7bb4Yu2iqSvrqfJ653qvAcz2awsBT/PiJTvwcuQ7YBkxEccKwc0bLWXmXGN+YmZnUiwMEw1KuPtWwSYxmnoc1z4fHQICLm+fluhYbB8mZb6MfoBcMEqu0EgVjbWLSVlMbRkHPGzrGGWk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264723339119.10540470331273; Tue, 16 Jul 2019 01:12:03 -0700 (PDT) Received: from localhost ([::1]:46128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIZ2-0000w4-Md for importer@patchew.org; Tue, 16 Jul 2019 04:11:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59788) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYW-0007sP-He for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYV-000396-8d for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:24 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:53992) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYV-00038I-1j for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:23 -0400 Received: by mail-wm1-x32e.google.com with SMTP id x15so17659981wmj.3 for ; Tue, 16 Jul 2019 01:11:22 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=LYTPu7psuc85Dpnmvnd3GNUHtSt1nCg5qgokDKUHd0w=; b=KcC1zqWOmSIa9mrjwskY+NScdT6DFe904LAly52ad/Fy4HJYMO0qMISHaZGSDuFm9N WIXYSrStySxEjL0hEexS8tPuATh/VHCZP591GqPfgm/DY8q6oPfnvszhO6Kk6ychnIP3 3Vqo56C3A++nEksYynPJeM7nW0LWV+V3rZaKF1rZuP9wHYTCsu0H3D6qnRWBTokNHBwV EQonMnFIQVilOXW/S3Bsn+R2u57iy/2yNwD0DqTY7FgDxOgsogXso7I5dOJUUBkOVDOg CkqR0DHnKeHngVnnqVDYoY1hA2kxl8P9iR/EfH6r57qzsqs0pdZLT+Ix32GtfqjUUWfC yVpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=LYTPu7psuc85Dpnmvnd3GNUHtSt1nCg5qgokDKUHd0w=; b=EmsTteQ1ypypjfdemPOf9elrEP0YnsoHbyKVT0C1Je6yP28KZs7uWZNtpT+jpBJr/y Tw4tO0xAFNaduLIXTaK9IcLUw4Au9sFc7/Ac2lXHbFSvdJcHas46yXWIr2Ys+ypgZi9N OhflAB/aRTXp8FCKWZLQLIW+1B+ztYUNcFe8XdRGIG6ZjGynug3x1tHzyQMHPY9T44x3 1D6smPfsVRRvxrGQ2ijSP4UXZwVaNAICdnNWzIF9aeNr0oonhL97SqsdRWZmH92cV36Y PNmK2VK+R/iFigWTiOmVPzZ3rE0v6ct41GSJqxw+LQf5eSWkdptQ/6SPm2WPTp+TNiOU TQNA== X-Gm-Message-State: APjAAAXTtgo+KUNKtVNnbyUYaOfQT9As+2Vd43DaWojewC/1OqhFoG1Z /ghSzCHwdzUvbxa2HvPmTCLZFZ1DO+g= X-Google-Smtp-Source: APXvYqx+emaMxBnLfy5JGSCS+C7DEBwdtW9UJYGl48s6Om1ouENMcjf1wl4eXhwSJi72v34wFbOvjA== X-Received: by 2002:a1c:9e90:: with SMTP id h138mr30270024wme.67.1563264681704; Tue, 16 Jul 2019 01:11:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:00 +0200 Message-Id: <1563264677-39718-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e Subject: [Qemu-devel] [PULL 02/19] scsi: explicitly list guest-recoverable sense codes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It's not really possible to fit all sense codes into errno codes, especially in such a way that sense codes can be properly categorized as either guest-recoverable or host-handled. Create a new function that checks for guest recoverable sense, then scsi_sense_buf_to_errno only needs to be called for host handled sense codes. Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 5 ++--- include/scsi/utils.h | 1 + scsi/utils.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 5d3fb3c..8e95e3e 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -454,14 +454,13 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int = error, bool acct_failed) * pause the host. */ assert(r->status && *r->status); - error =3D scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.= sense)); - if (error =3D=3D ECANCELED || error =3D=3D EAGAIN || error =3D= =3D ENOTCONN || - error =3D=3D 0) { + if (scsi_sense_buf_is_guest_recoverable(r->req.sense, sizeof(r= ->req.sense))) { /* These errors are handled by guest. */ sdc->update_sense(&r->req); scsi_req_complete(&r->req, *r->status); return true; } + error =3D scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.= sense)); break; case ENOMEDIUM: scsi_check_condition(r, SENSE_CODE(NO_MEDIUM)); diff --git a/include/scsi/utils.h b/include/scsi/utils.h index 9351b21..fbc5588 100644 --- a/include/scsi/utils.h +++ b/include/scsi/utils.h @@ -106,6 +106,7 @@ extern const struct SCSISense sense_code_SPACE_ALLOC_FA= ILED; =20 int scsi_sense_to_errno(int key, int asc, int ascq); int scsi_sense_buf_to_errno(const uint8_t *sense, size_t sense_size); +bool scsi_sense_buf_is_guest_recoverable(const uint8_t *sense, size_t sens= e_size); =20 int scsi_convert_sense(uint8_t *in_buf, int in_len, uint8_t *buf, int len, bool fixed); diff --git a/scsi/utils.c b/scsi/utils.c index 8738522..ad243a9 100644 --- a/scsi/utils.c +++ b/scsi/utils.c @@ -336,6 +336,38 @@ int scsi_convert_sense(uint8_t *in_buf, int in_len, } } =20 +static bool scsi_sense_is_guest_recoverable(int key, int asc, int ascq) +{ + switch (key) { + case NO_SENSE: + case RECOVERED_ERROR: + case UNIT_ATTENTION: + case ABORTED_COMMAND: + return true; + case NOT_READY: + case ILLEGAL_REQUEST: + case DATA_PROTECT: + /* Parse ASCQ */ + break; + default: + return false; + } + + switch ((asc << 8) | ascq) { + case 0x1a00: /* PARAMETER LIST LENGTH ERROR */ + case 0x2000: /* INVALID OPERATION CODE */ + case 0x2400: /* INVALID FIELD IN CDB */ + case 0x2500: /* LOGICAL UNIT NOT SUPPORTED */ + case 0x2600: /* INVALID FIELD IN PARAMETER LIST */ + + case 0x0401: /* NOT READY, IN PROGRESS OF BECOMING READY */ + case 0x0402: /* NOT READY, INITIALIZING COMMAND REQUIRED */ + return true; + default: + return false; + } +} + int scsi_sense_to_errno(int key, int asc, int ascq) { switch (key) { @@ -391,6 +423,17 @@ int scsi_sense_buf_to_errno(const uint8_t *in_buf, siz= e_t in_len) return scsi_sense_to_errno(sense.key, sense.asc, sense.ascq); } =20 +bool scsi_sense_buf_is_guest_recoverable(const uint8_t *in_buf, size_t in_= len) +{ + SCSISense sense; + if (in_len < 1) { + return false; + } + + sense =3D scsi_parse_sense_buf(in_buf, in_len); + return scsi_sense_is_guest_recoverable(sense.key, sense.asc, sense.asc= q); +} + const char *scsi_command_name(uint8_t cmd) { static const char *names[] =3D { --=20 1.8.3.1 From nobody Sat May 4 17:39:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264765; cv=none; d=zoho.com; s=zohoarc; b=CQIWQEUvdoxJPzVnMs/vjXNRHckdy1oQJOiYkoO7fvvxmNq2tv0Boyxit8TSLwCGDi5OCSUb1qL+m1lAsubzsjeUOYtkW8gEHJ8TAU95x7NxTOi84TGCEQ2PlYV9xKi5sdohOSKBR2DKJvWPPn2GjhsbQ2aneAm1ID7nWndjZ4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264765; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=R2KY92Z7mdmQFY2AfwkaNFzZ9VI1hZbFTT8NYQ7db68=; b=YxD7WCDPZZq8yxfK76A5w/hRhcF7Q/w/hQZNo+OkRPFyIMSSm3wMSND1exBZkMluBcNNo1r13Dm5IAdig8GnOgGTWGMXBjN1oYOjwHnqpLtl7TVWZYLHgQIYBlxgfqiboso6jmeQgqMHzd0RadsJbEaANVbOSWxRNCis/uE3aBA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264765920219.5785682123086; Tue, 16 Jul 2019 01:12:45 -0700 (PDT) Received: from localhost ([::1]:46154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIZo-0004Nx-9p for importer@patchew.org; Tue, 16 Jul 2019 04:12:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59805) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYX-0007sb-JR for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYW-0003AL-LX for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:25 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:46503) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYW-00039b-Ed for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:24 -0400 Received: by mail-wr1-x42c.google.com with SMTP id z1so19805124wru.13 for ; Tue, 16 Jul 2019 01:11:24 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=R2KY92Z7mdmQFY2AfwkaNFzZ9VI1hZbFTT8NYQ7db68=; b=sWENDNk/wQyoH9tX8MtQ07aEekkeiyHTvpDbXxUMNBqyUMfAqIZtzGNlBUJLUHlS7u za+fuA8VvfsnkJfgn1xj4PQkpNCdkCT/aAuMMVlFVDicoL1K9CMkuVrn08NwBnQY/dJZ 5N2pZG1zleGgAaUOPVn7NCHHXVmVSfmBWxcbOE/oznnr5SKFUQ2OWUtD/pdwn8w37lZL KOlAAqgRRG17OPJV7JmFfQN25vsv5upQXctwg+SKCZr1dewVUlGPGcvwwCRT7xgajb3w yl9o+YjLrLh2cVsIgl1W0lcd7O+2IOSIPheDIpToJjpuc2bfLWOifunnOO++UINKEuB5 slFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=R2KY92Z7mdmQFY2AfwkaNFzZ9VI1hZbFTT8NYQ7db68=; b=Je/PZQeIsdyMz5IyjZ6l/M80jAiv80yTKOdnxutsJO9WaRgzKJaZWR9sFSsiFCb0xe GM5SkFN2iXz4SDafwIoLxJjh7GNUk7A+ZUOUGzxDYOFqeuJ99bevj5eMGkBWgajR9dwf SlcJl9dsZp320/tz/r1uigsjxcjlL9zrtYKSnE2LRMC+GrtHWZeKvK3JJvF5oZfSnaPr 1Gvbi6WaELvfG+GflwI1hlU4mKu0+lUyjTnnxuInmQ6cnd/sFUzn/ziGianFcQJIHHkT 6OnG2bcogUcoyohKNge/qjZrXrh5M5oGNb7UX4WITzaPwBpLGBF5qpBqktw6qoI8CYDT +OcA== X-Gm-Message-State: APjAAAW1LuNMtsQmBFqZlqf7GoopDtquk0Fnqsuu72urL0Jr0L6qjfVU WIsGBqhEW0MG0CUkXyYHro7OTfuXyq8= X-Google-Smtp-Source: APXvYqy0zvEn3aDOSukVbm4Qf3shFAraLKyKx5BLID/w+L9t02epQpmnLB48sa692GwVuAB/RVX2YA== X-Received: by 2002:adf:cf02:: with SMTP id o2mr15163612wrj.352.1563264683110; Tue, 16 Jul 2019 01:11:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:01 +0200 Message-Id: <1563264677-39718-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c Subject: [Qemu-devel] [PULL 03/19] scsi: add guest-recoverable ZBC errors X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When running basic operations on zoned storage from the guest via scsi-block, the following ASCs are reported for write or read commands due to unexpected zone status or write pointer status: 21h 04h: UNALIGNED WRITE COMMAND 21h 05h: WRITE BOUNDARY VIOLATION 21h 06h: ATTEMPT TO READ INVALID DATA 55h 0Eh: INSUFFICIENT ZONE RESOURCES Reporting these ASCs to the guest, the user applications can handle them to manage zone/write pointer status, or help the user application developers to understand the failure reason and fix bugs. Reported-by: Shinichiro Kawasaki Signed-off-by: Paolo Bonzini --- scsi/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scsi/utils.c b/scsi/utils.c index ad243a9..873d49c 100644 --- a/scsi/utils.c +++ b/scsi/utils.c @@ -360,6 +360,11 @@ static bool scsi_sense_is_guest_recoverable(int key, i= nt asc, int ascq) case 0x2500: /* LOGICAL UNIT NOT SUPPORTED */ case 0x2600: /* INVALID FIELD IN PARAMETER LIST */ =20 + case 0x2104: /* UNALIGNED WRITE COMMAND */ + case 0x2105: /* WRITE BOUNDARY VIOLATION */ + case 0x2106: /* ATTEMPT TO READ INVALID DATA */ + case 0x550e: /* INSUFFICIENT ZONE RESOURCES */ + case 0x0401: /* NOT READY, IN PROGRESS OF BECOMING READY */ case 0x0402: /* NOT READY, INITIALIZING COMMAND REQUIRED */ return true; --=20 1.8.3.1 From nobody Sat May 4 17:39:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264761; cv=none; d=zoho.com; s=zohoarc; b=MsoRKj8w/eL4mu9s5cJHXdHx9Za1ARAFRgbehnuEsCYLdRX1UegfvkzKhksr3/j2kxE/q7C7lhmBcD9zx8GB3RuXFDQIARMoJ+dQV/KUgOCKMf7vtEa9Gpj0sdsFzvMet7g8nZ8Mix9Yj1Q1iT9FuW/f0XYHN21DWZF4TxkL7a0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264761; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=6MMWJOB60+c75PU76TA7zzCHcU/JiW0qA1hZwYycJq8=; b=PaYhdW+kacKKWlum/nPAT1m28cvjO049H/dY30Ip0XYwU+GVy9kakNhwUyL9S2VMgxZVm2Dpub+FRlpqbNrvky099J6P3JMtxNOkvzFrAUopImTCcLq7I+RBRHjTfNVSIwgNb7xuX3NsXOE9QxXC22LJGAyAiwbNbt6QQ8lCdwE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264761608370.6211551632339; Tue, 16 Jul 2019 01:12:41 -0700 (PDT) Received: from localhost ([::1]:46150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIZk-00045P-4d for importer@patchew.org; Tue, 16 Jul 2019 04:12:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59830) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYZ-0007vw-0p for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYY-0003BI-1M for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:26 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:33683) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYX-0003AW-QV for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:25 -0400 Received: by mail-wr1-x42a.google.com with SMTP id n9so19911502wru.0 for ; Tue, 16 Jul 2019 01:11:25 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=6MMWJOB60+c75PU76TA7zzCHcU/JiW0qA1hZwYycJq8=; b=FznEp5iytJIqBQagO4RHcCJddED8oQyL4M5BKqbd0IdXC+UrbxWjaWpRJjwyCdQXX0 NQQxMTFOVui3vjBdT5zHKjEryO/I5G0GLj6Z16mWjYKYIxrFyQUWuahSwH20rGZwqCpF xaFnD6YCGMwd0FfdwzqMrnbv0l2vNGsoCrVxoNVYV5jFL9TLOrqX7WWjjKdWlIfJ4qQg mkLeC4arzRbWbZMcw+z8KcMrhjipkR4v5E9Y93ExhP3IyTICbQomBW5BAiq8Tc65l072 t0z+rSNM0azodDNDwnonL0XsvozdTGL7oe7dOcLzt2xvsa+9AthaZl8uCmacbLZzsNST rz1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=6MMWJOB60+c75PU76TA7zzCHcU/JiW0qA1hZwYycJq8=; b=ET5zvGtITFyRVF2zdSjmtHcXME353vGFP7CMgaZ4e32Ok7paXoEf0yT2pn0zGbdilP 99gG3XooDbBVBqVlc5laZamZSXyO5WwfrIapjAj6joWxl+rtGBKJQb+WSlEr9pxaP55S KONd7jVFSO2/w5c9m79DtVhh455UU1sMbnFOdrOdPqUbm6IU4HV1gk5uxdfNP5PHy9aK xa+wvg5Fuq+5W6MamVEHC5ly5Nvba4Hfmuv91Bp4ZhsdRnzBD2bRJgEADkwVg2YKNuF+ K387W41LF21BhD3C22JP68fBj7W6Q0uG1HybuB9l2y03zikWPMoZFv/C8dLLl2BdjMq5 wn2g== X-Gm-Message-State: APjAAAXNQCzTuWOuOMiDaXOwshvqA36uKmW7i3OUU9fUGWRx/Qyipd4Z kK0TQB/YY59HAuHMc+DTDnEW+f3cNEM= X-Google-Smtp-Source: APXvYqxEGXlnDoXf+3RGVJ2KWxmNd+ZfU4CsF8SkTsGMAfBOJZeno9EL5nQiNTMhLh1FV7QUu0Tftg== X-Received: by 2002:adf:fb52:: with SMTP id c18mr33761352wrs.216.1563264684383; Tue, 16 Jul 2019 01:11:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:02 +0200 Message-Id: <1563264677-39718-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PULL 04/19] iscsi: fix busy/timeout/task set full X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In this case, do_retry was set without calling aio_co_wake, thus never waking up the coroutine. Signed-off-by: Paolo Bonzini --- block/iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index 267f160..6e238bf 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -272,7 +272,7 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int st= atus, timer_mod(&iTask->retry_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + retry_t= ime); iTask->do_retry =3D 1; - return; + goto out; } } iTask->err_code =3D iscsi_translate_sense(&task->sense); --=20 1.8.3.1 From nobody Sat May 4 17:39:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264727; cv=none; d=zoho.com; s=zohoarc; b=ZTMvUO/p6Wr0jDEmuQuzNvYgYHsMEjWiqKyjrE3X+ZQpSf43unp/84B9Y080am7AoKzrz+p0pJq2j+UY7zOXZ5RKebWeE1E3TL571wNzLgJHitiv7FbXwmoLJy+cNbtCz/cSF1a/R7Vy21AjFlJ2nBcP1MK+DGug72ZpWL3QLyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264727; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=r1wkf8U1qfQTsGxOWIZL15/KtvIQEJQr6zmWVqZkLeU=; b=lTufDtf8FMpdKK1GKjBfyulo+pJUeIprzGDuO2AR+Gq5//lYLkMfh+ddl6XprR/VHFOG8oJgJQBQkP8MGXZVY5ILpnkPmoyvgnN2rvtWtKjcfDH8NS9zhhI3Ro/s67EpBHps9o0lTI3DZJVAXY3q7hVNOzqvrgwStdmZz7DyhOQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264727931301.65177285941; Tue, 16 Jul 2019 01:12:07 -0700 (PDT) Received: from localhost ([::1]:46132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIZC-0001gT-9R for importer@patchew.org; Tue, 16 Jul 2019 04:12:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59849) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYa-00081P-2z for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYY-0003C8-Qd for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:27 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:42478) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYY-0003B7-JA for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:26 -0400 Received: by mail-wr1-x430.google.com with SMTP id x1so4841493wrr.9 for ; Tue, 16 Jul 2019 01:11:26 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=r1wkf8U1qfQTsGxOWIZL15/KtvIQEJQr6zmWVqZkLeU=; b=mmenWa5unZ/YyOVUxIdECz3wcqpbXC7zK27A+VKBBvj5yajLDLhC52ZG2wU93ZSoOC fEf+WwxlFTVW/t+Q2fb3lKGbn9CmqOb0VzfSXOH6Mu1H8ajYLeJvVzJNqABEJIW1GcVV 09pCytZA4+H/HrAObeXuj7NJQ+9/9golh9yKGJwjhANGxhd4LAaA6Rj+lmLzJ3FKBHJE ZieyvY5jx79YpG3h5zNYSH4/rC3tB1ysQc3KKjrfQRX8AZQ1mE+FteHR/nukyZDcdh4i laAveWviWeHxWrr6zxIsBNiJiYmJRZD4GvIumDFy0C4PhgWr3kmky54/i4lOihoRhW10 Gmfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=r1wkf8U1qfQTsGxOWIZL15/KtvIQEJQr6zmWVqZkLeU=; b=DFAZQqhrlRi+ssX7fwpiwC9VI1baigkyom9I8vqJpV9NvFMq9M14c6g5ve/sWdzpIg b5LtVTBl68RD9Lnvm+Vf8KbLQ+s3qa7n9HlNMpMouqk1M0JPZVzYs3qZvyIfZ2VZODrF PEOZq1ch4sNWMo4uMvrV0weFq7kdXdYKyAWTp8vGOu6lwODM5BmINxmNGsBiaf1fyYGC OyYaVfKquC6kL1Yi8evP+aoRGU1NI6Wu4jxE97gDAPHb75ituSBkrMMUEO7r/GZqz4Yh 8tz1g6ibdidS9x9JY6mHjWSfMRVPVZ40zj3IM1NJBQBEiqdpxjXBfCeiEKvED6GWuGX7 v2xQ== X-Gm-Message-State: APjAAAW1nzqs1JAXA608xqy/16OSttkKyKOaAEKJ87B5nDeKcdlP9+9l vJQctUW4+ZxViKMuz5nPo7hCK6/bBYU= X-Google-Smtp-Source: APXvYqyZAvKiRNSaANjWU0TrTxm2fLe/ytiOTwcBc1dlZhn4BKgZVOt1tLGZYc7fugZjzXYCUxXqbw== X-Received: by 2002:adf:f046:: with SMTP id t6mr36365525wro.307.1563264685292; Tue, 16 Jul 2019 01:11:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:03 +0200 Message-Id: <1563264677-39718-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 Subject: [Qemu-devel] [PULL 05/19] iscsi: base all handling of check condition on scsi_sense_to_errno X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Now that scsi-disk is not using scsi_sense_to_errno to separate guest-recov= erable sense codes, we can modify it to simplify iscsi's own sense handling. Signed-off-by: Paolo Bonzini --- block/iscsi.c | 29 ++++++++++++++--------------- scsi/utils.c | 5 ++--- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 6e238bf..506bf5f 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -225,9 +225,9 @@ static inline unsigned exp_random(double mean) =20 static int iscsi_translate_sense(struct scsi_sense *sense) { - return - scsi_sense_to_errno(sense->key, - (sense->ascq & 0xFF00) >> 8, - sense->ascq & 0xFF); + return scsi_sense_to_errno(sense->key, + (sense->ascq & 0xFF00) >> 8, + sense->ascq & 0xFF); } =20 /* Called (via iscsi_service) with QemuMutex held. */ @@ -244,13 +244,6 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int s= tatus, =20 if (status !=3D SCSI_STATUS_GOOD) { if (iTask->retries++ < ISCSI_CMD_RETRIES) { - if (status =3D=3D SCSI_STATUS_CHECK_CONDITION - && task->sense.key =3D=3D SCSI_SENSE_UNIT_ATTENTION) { - error_report("iSCSI CheckCondition: %s", - iscsi_get_error(iscsi)); - iTask->do_retry =3D 1; - goto out; - } if (status =3D=3D SCSI_STATUS_BUSY || status =3D=3D SCSI_STATUS_TIMEOUT || status =3D=3D SCSI_STATUS_TASK_SET_FULL) { @@ -272,14 +265,20 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int = status, timer_mod(&iTask->retry_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + retry_t= ime); iTask->do_retry =3D 1; - goto out; + } + } else if (status =3D=3D SCSI_STATUS_CHECK_CONDITION) { + int error =3D iscsi_translate_sense(&task->sense); + if (error =3D=3D EAGAIN) { + error_report("iSCSI CheckCondition: %s", + iscsi_get_error(iscsi)); + iTask->do_retry =3D 1; + } else { + iTask->err_code =3D -error; + iTask->err_str =3D g_strdup(iscsi_get_error(iscsi)); } } - iTask->err_code =3D iscsi_translate_sense(&task->sense); - iTask->err_str =3D g_strdup(iscsi_get_error(iscsi)); } =20 -out: if (iTask->co) { aio_bh_schedule_oneshot(iTask->iscsilun->aio_context, iscsi_co_generic_bh_cb, iTask); @@ -974,7 +973,7 @@ iscsi_aio_ioctl_cb(struct iscsi_context *iscsi, int sta= tus, if (status < 0) { error_report("Failed to ioctl(SG_IO) to iSCSI lun. %s", iscsi_get_error(iscsi)); - acb->status =3D iscsi_translate_sense(&acb->task->sense); + acb->status =3D -iscsi_translate_sense(&acb->task->sense); } =20 acb->ioh->driver_status =3D 0; diff --git a/scsi/utils.c b/scsi/utils.c index 873d49c..c50e81f 100644 --- a/scsi/utils.c +++ b/scsi/utils.c @@ -379,8 +379,7 @@ int scsi_sense_to_errno(int key, int asc, int ascq) case NO_SENSE: case RECOVERED_ERROR: case UNIT_ATTENTION: - /* These sense keys are not errors */ - return 0; + return EAGAIN; case ABORTED_COMMAND: /* COMMAND ABORTED */ return ECANCELED; case NOT_READY: @@ -409,7 +408,7 @@ int scsi_sense_to_errno(int key, int asc, int ascq) case 0x2700: /* WRITE PROTECTED */ return EACCES; case 0x0401: /* NOT READY, IN PROGRESS OF BECOMING READY */ - return EAGAIN; + return EINPROGRESS; case 0x0402: /* NOT READY, INITIALIZING COMMAND REQUIRED */ return ENOTCONN; default: --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264811; cv=none; d=zoho.com; s=zohoarc; b=nVcyg+UrlExj2mThw7GkephaCbu4y33lbPOSsAieKViiqMX9l4FDcrGuzv1xEkSluKcwNg2yhMQsRlY3xJsov2tbxtZ9ZiqCTbumpSUZyLVLoWZb5EOLoAMGK6DNCJ8eXYPGRkPjKj1V9tkcmSkKgwaI9zOhuBUv4mpRUZH6ua0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264811; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=+32n/IoD0ak6GwOMjZAOIGkFQH5HbXPvE/EKhfKdV7c=; b=eEuVkmAPdiWd/bZKthuJXuPM4Vfro7pj1HPWDLB/FN4jE7Xlkqz2tLu9ouVaPFSfCi2kLJ94LoQ1Wk4ALNSzy/D3oBHzq/gPb4NfsHUHMqM3sxLlzSBo5pHEWy52xs1WhETtawiZ5w25GFgMK15iFHCq7Wgu5pQQcaP3/Mj0If0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264811439960.3873376878543; Tue, 16 Jul 2019 01:13:31 -0700 (PDT) Received: from localhost ([::1]:46176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIaX-0007fA-Pc for importer@patchew.org; Tue, 16 Jul 2019 04:13:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59857) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYa-00083Y-M8 for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYZ-0003DF-Gm for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:28 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:36702) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYZ-0003C0-9K for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:27 -0400 Received: by mail-wr1-x430.google.com with SMTP id n4so19888468wrs.3 for ; Tue, 16 Jul 2019 01:11:27 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+32n/IoD0ak6GwOMjZAOIGkFQH5HbXPvE/EKhfKdV7c=; b=CWIZzN3lQxMNN8dfzRaWUSRbf4CoOynaCGlRUE7gIRtGPw/fw2L4UMWfIIsMNifG4z /9ZWsgGdoWqd/f9cCgWlsVQEyN3aA6EUX0d7pjVIDQGEchv4aZTLsRwIMG/9kxdOtO5b RNUVrHGuaFV48hq3AEAUgnkj5XYvuREXwM3SAKFhiHY86tA/rF9rmnvbiAsp1yDScor1 9FFeNCt3HPsGL7Tm+C+3iXfcA8y+ofV5Yd42f8eQGDOek1srSi4HrPEi2QicQtDwqDAn XhZIcysnooKSGJdblMOSwSGGBH8/v2BPzxDESfvELvVaFg3r3E8Q6WhBrOTg1KG1W2+L NX0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+32n/IoD0ak6GwOMjZAOIGkFQH5HbXPvE/EKhfKdV7c=; b=sUxF1FGEhJEWaca1a4mx+rTY8gN4ZGfDomg7AU1Vp/thmHaAnupXjZ0S+hRH2PHwQT XRXR/VCvIJuaq3Hb9+3QjmmJDmGF5N/Z98vurNVm9vOlrmLvOUK266sCx77RY97kqYBM 50MceO7KpT68Widn1AFT+NjW4SzS5obX41RXA88noepGpLP5a4xU5wuWZJTSUwM4Ppqe EXRQ+WBldrRKItfVBRI80PqF5k036aADSd6XX+vpx4Ii0/d60iqHNRM6WE4mV0Q18s2W LnHtVxysbRmeCVLD2AhJqKpMYt4kUXSSNlRrHA3N/RvM+ZZIFrjGL7iAn70dhQ/sAlSa v/dA== X-Gm-Message-State: APjAAAWKNkw/QAKc6ZxkNFG/fK0ml8DNCYVBt/2K89SvhbkFsutTA+ZH t/XdBNJprXDQ8qpvN+LbPwvQOTNNRPw= X-Google-Smtp-Source: APXvYqzuxUElIQeV4zbI6LsxnHIjeH9D3JwfdFkuPwNZLUKiloXEqM4rs/Rg4tKa1Bc8tPHrYolPhQ== X-Received: by 2002:adf:aac8:: with SMTP id i8mr24008157wrc.56.1563264686180; Tue, 16 Jul 2019 01:11:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:04 +0200 Message-Id: <1563264677-39718-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 Subject: [Qemu-devel] [PULL 06/19] build-sys: remove slirp cflags from main-loop.o X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Left over from c2d63650d962612cfa1b21302782d4cd12142c74. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20190712172743.17632-1-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- util/Makefile.objs | 1 - 1 file changed, 1 deletion(-) diff --git a/util/Makefile.objs b/util/Makefile.objs index 3817820..68af3cd 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -3,7 +3,6 @@ util-obj-y +=3D bufferiszero.o util-obj-y +=3D lockcnt.o util-obj-y +=3D aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o util-obj-y +=3D main-loop.o iohandler.o -main-loop.o-cflags :=3D $(SLIRP_CFLAGS) util-obj-$(call lnot,$(CONFIG_ATOMIC64)) +=3D atomic64.o util-obj-$(CONFIG_POSIX) +=3D aio-posix.o util-obj-$(CONFIG_POSIX) +=3D compatfd.o --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264775; cv=none; d=zoho.com; s=zohoarc; b=ZJE8SbVuyN6qcHr93MDLVRzeO3mod29VzHbyXqUzZ7duVQOckSZ8u0g4rixHxUHp62X8TP+E7wfoHLu7mgw7HHdtzQPk1GWwv/mhdrq2iJ8GHRvfkkpGosAzPTxoRxHjFDBz8crw9y/5gRPpbia/ShSi8ImslMsSfAz+qCzylOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264775; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Uzf2A9RIPGCOKfkWZQp0qQsgDZ85Q4jENmEVZz/U6uE=; b=ZKT4vCkPqJKHG7c/1jsrIcKeBomZUI3eKsmj4kOZuadGBBG/5CBEN6wfW03qx3WamX4OWiVMnX2h28uNhTpA0Xie9W68fzQAXFq4NDlM37EAIPFAJBBVydLkEeDMK2LMA5InliDIQOo0nzWRr2CwsDWUjDgEEPnkxF5HNfACzK4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264775065284.8320447506113; Tue, 16 Jul 2019 01:12:55 -0700 (PDT) Received: from localhost ([::1]:46156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIZx-0004zy-JY for importer@patchew.org; Tue, 16 Jul 2019 04:12:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59894) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYc-0008AM-6D for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYa-0003F8-TD for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:30 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:46510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYa-0003Dr-Iy for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:28 -0400 Received: by mail-wr1-x433.google.com with SMTP id z1so19805354wru.13 for ; Tue, 16 Jul 2019 01:11:28 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Uzf2A9RIPGCOKfkWZQp0qQsgDZ85Q4jENmEVZz/U6uE=; b=G7G7Vr+1TGUVJbCd3aYKeTfbPQv/GD4WFbonGf8+VxcKVRTWLSWMvUruKojcl/FM4R +qB+VlIqRIG2+Ur0qxVjpTjLrmFwWjPtkhOxvyxJVaA7iC1Svs4pyp/BxgKCQFCT1Lf5 m8J9Vt69Nr+iMfm/PwGLrvq7PymgQo7RLLHmH33ik77wa/Z8Tn5qrMRe8CUdBiQoHXxl V8LtCA1OSVque5vj7Vhiey/MsIBeUTwW1+fURxOwFGb8GMPH3rY3pAIr8mVLmnKE7jxb DQ4PUzn7Vf0jchg/HGqpwp7+zRpKR9cPPp45RzhpTf4wMSTHeCjD5drwCKUzvehegbpQ c2eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Uzf2A9RIPGCOKfkWZQp0qQsgDZ85Q4jENmEVZz/U6uE=; b=sAwgdrFxfr4aYFmDD6RTXPaFySyvqaYFrzRB4k4EUEUS6fVchff8VnIjDLrp3yMSub iLXtwV3cRz3BcioqpmdtfbpgMAPOR6zYfnsyLwH7UqJJydKzNENWJKsD70A2STWa48g5 /GwOmNC54jf/VhJwMTzBrE3HWuAFJaLlSib85sNy8KqzBGr+EvtxrQYldwW8paA/nGOQ 4SweZCXDVlZgDz2nPeCRSakSC+tXj9/ANQeQW+aweHMHqPBXLV1Sf65CSjHlA/k016VF zuJLMbK0vyNptEB0pCNJd8Q0Jm+Ee+28TI6NmazkZluFU2F/7A2Dx2BWLG4vFhX1GCub I56g== X-Gm-Message-State: APjAAAWQN9FLXm8p2C/X5xYoBFtlXRiOfL7hn6+KFoLgnr72XivnbqlL V2tICtnhZ7GaEM2Uu84L2JXxHKkKBio= X-Google-Smtp-Source: APXvYqwhcLaOnj8WcBudDA4aNk3/isetR7YFIDpEDTjZaEXY5qKLlIVYWuRkNjrdSggUUv6rKEOg5Q== X-Received: by 2002:adf:c803:: with SMTP id d3mr10741302wrh.130.1563264687081; Tue, 16 Jul 2019 01:11:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:05 +0200 Message-Id: <1563264677-39718-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PULL 07/19] rdmacm-mux: fix strcpy string warning X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau ../contrib/rdmacm-mux/main.c: In function =E2=80=98parse_args=E2=80=99: ../contrib/rdmacm-mux/main.c:118:13: error: =E2=80=98strncpy=E2=80=99 speci= fied bound 3835 equals destination size [-Werror=3Dstringop-truncation] 118 | strncpy(unix_socket_path, optarg, SOCKET_PATH_MAX); Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20190712165154.11504-1-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- contrib/rdmacm-mux/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c index 30c7052..de53048 100644 --- a/contrib/rdmacm-mux/main.c +++ b/contrib/rdmacm-mux/main.c @@ -115,7 +115,7 @@ static void parse_args(int argc, char *argv[]) =20 case 's': /* This is temporary, final name will build below */ - strncpy(unix_socket_path, optarg, SOCKET_PATH_MAX); + strncpy(unix_socket_path, optarg, SOCKET_PATH_MAX - 1); break; =20 case 'p': --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264808; cv=none; d=zoho.com; s=zohoarc; b=MIIbUZxKXNsZb5Pm7ImBgdRYqY1b1vIm+0PXqQRh8FwlLs6aPmJfWfV6sAhW+wvZoRBtZfi9BEahrUm5YkzYyYhHoU7jSSuGPrxOaCeeIayVnadLU3rlcSXc2Ck4OHIAMiI4HFv1LTlSZ2QotG+2+F++pS9t5AXB7KwOqzK6QcQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264808; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=/JvRa5GldjixJBnlluCiYqlWEcL01lxJeEtUkaaqEzk=; b=ZZeWwIbIupx3i80rShQzQTxUWVgX+Q3KZbOXXWfYuB699cB8iYTdWWT98gnymubksIcft1vQ6Hf3TL3/YUb5xpUdk43fh9YVj2riCsA2nRSYppLaFEfrsjvGpRecgCwLAtExh8sgPucyGQr+Fkam4Shzmj+nh7D7SMnbwjPM5l4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264808162452.94166113649544; Tue, 16 Jul 2019 01:13:28 -0700 (PDT) Received: from localhost ([::1]:46174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIaT-0007NU-5m for importer@patchew.org; Tue, 16 Jul 2019 04:13:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59916) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYd-0008Gc-O9 for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYb-0003FV-E4 for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:30 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:46512) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYb-0003Ez-7X for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:29 -0400 Received: by mail-wr1-x435.google.com with SMTP id z1so19805401wru.13 for ; Tue, 16 Jul 2019 01:11:29 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/JvRa5GldjixJBnlluCiYqlWEcL01lxJeEtUkaaqEzk=; b=OKUVPUgKZTo4u1BWebllav6gIIhEBKN6Yya9Dv2JPx1uJUuOD8aMHIvua667orrbW9 GLQSWUq9XWKgNhEMSv8Vz5zgUwRyc4DRxrGwZQ53vEJkPZne7esLpg8tm4p50XZJx39e xkdvHnJW6zDbWy2HwjKIqUg7H2nXpYzUeAcDx4hOIcxZwY6U3vRXdpDTADuvYAdxAkbx qSeFkbLiK/6EOfzCQuiZRFr0zb46W4zbaT7CYjYhaPPz4N3ZY3koAGDOw4gX6AlD5QHO rvHz1D6BKSU2iBSaKI2oO0yaxB32NHaKGLpN923Vvq8WrEnQrO93JvxmeHsyf/hgxrxV /HuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=/JvRa5GldjixJBnlluCiYqlWEcL01lxJeEtUkaaqEzk=; b=Ryf0cNOBpFjV5iGt7dMxF+x4roArUVPEraYdoYSBCafvFHTwutKm0EORsoQW7PIq93 RuyjvpzP+tuw04tdLlSgywgrXq6ssOEkxh4yRluTblVtJXDg7B+lUU6tp+ltOrJ7rNnj 8eKU1YYyWcEJag4Ya2gACC9VKYwdeD8AmA0JgJ/haGxxN88r0ebfnbjGUHvwA8hwpWea VUypXosRbgpm7Q9+k+k0d+OVjk/LHQLxjelcA/PJbHIIv6ehFCbw3ZcHPC1Es8ZSjWtp KO4f20h19oOTe7cf61hIE6QqgZbr5GX8N+z9b0edCKfj2FPEC9TO/OeRcWwLySd0nkpx u/2A== X-Gm-Message-State: APjAAAV3C3giiNunNv+Dy0zcvuoSuPZNZVqM2st2es/orvY0ZN+q72ph IhlmjglsZm180r+ScojFrq7Kvt15RiY= X-Google-Smtp-Source: APXvYqys2ogiTSny6pr60z+BWmAdxkzpcMNJPTtrmor7E1OyFDu9A49FopB7plNbrDAdqMTgr1SKFw== X-Received: by 2002:adf:c003:: with SMTP id z3mr13448564wre.243.1563264687917; Tue, 16 Jul 2019 01:11:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:06 +0200 Message-Id: <1563264677-39718-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 Subject: [Qemu-devel] [PULL 08/19] hw/i386: turn off vmport if CONFIG_VMPORT is disabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julio Montes Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julio Montes vmport device is not included when CONFIG_VMPORT is disabled, hence QEMU fails with the following error: `Unknown device 'vmport' for bus 'ISA': unknown.` v2: imply VMPORT (Paolo Bonzini ) Signed-off-by: Julio Montes Message-Id: <20190712160257.18270-1-julio.montes@intel.com> Signed-off-by: Paolo Bonzini --- hw/i386/Kconfig | 4 ++-- hw/i386/pc.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 4ddf2a9..b9c96ac 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -51,6 +51,7 @@ config PC_ACPI config I440FX bool imply E1000_PCI + imply VMPORT select PC_PCI select PC_ACPI select ACPI_SMBUS @@ -58,7 +59,6 @@ config I440FX select IDE_PIIX select DIMM select SMBIOS - select VMPORT select VMMOUSE select FW_CFG_DMA =20 @@ -77,6 +77,7 @@ config Q35 imply VTD imply AMD_IOMMU imply E1000E_PCI_EXPRESS + imply VMPORT select PC_PCI select PC_ACPI select PCI_EXPRESS_Q35 @@ -84,7 +85,6 @@ config Q35 select AHCI_ICH9 select DIMM select SMBIOS - select VMPORT select VMMOUSE select FW_CFG_DMA =20 diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c33ce47..549c437 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -83,6 +83,7 @@ #include "hw/mem/memory-device.h" #include "sysemu/replay.h" #include "qapi/qmp/qerror.h" +#include "config-devices.h" =20 /* debug PC/ISA interrupts */ //#define DEBUG_IRQ @@ -2793,7 +2794,11 @@ static void pc_machine_initfn(Object *obj) =20 pcms->max_ram_below_4g =3D 0; /* use default */ pcms->smm =3D ON_OFF_AUTO_AUTO; +#ifdef CONFIG_VMPORT pcms->vmport =3D ON_OFF_AUTO_AUTO; +#else + pcms->vmport =3D ON_OFF_AUTO_OFF; +#endif /* CONFIG_VMPORT */ /* acpi build is enabled by default if machine supports it */ pcms->acpi_build_enabled =3D PC_MACHINE_GET_CLASS(pcms)->has_acpi_buil= d; pcms->smbus_enabled =3D true; --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264818; cv=none; d=zoho.com; s=zohoarc; b=DqDvdG7ki8VNbaFfdqHMY0m7WlFHEaKCCPjLP7Hv8IUtMPrloRT8cf/GUskcwSiY+0feOEXGGXzXpxy7pY5yHyFHj5jmGdE9tUx8xVQBQcV8JnrEtO7yAYMCFkFMwinpKrpRJiHcejitW5dWliMj1g5WOuccBatk+BllMX87dsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264818; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=UxGATMBNQig2wIfjWLxzWQxLyakGvI3IHTSyhIIbcuE=; b=fpsjHL8FCRIgKSc8K6S5G3j65wxN+2cpHY4vZ6mdc3zS8+Z5pT6g38S0D8tQ/7K/c3wMpeDBVrWVjo3pHDKBhNWfaxk+kd1+DIq++ilp50FcjkElYyw2vLyv9XnIOsc4JDUKzrPonCpCrRH7/vnGGdhPRZFUJiTY2SdlfNE5fW8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264818546285.45345856569554; Tue, 16 Jul 2019 01:13:38 -0700 (PDT) Received: from localhost ([::1]:46183 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIae-0008CB-EH for importer@patchew.org; Tue, 16 Jul 2019 04:13:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59915) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYd-0008GS-Lq for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYc-0003GM-CX for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:31 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:36696) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYc-0003Fb-68 for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:30 -0400 Received: by mail-wr1-x429.google.com with SMTP id n4so19888599wrs.3 for ; Tue, 16 Jul 2019 01:11:30 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=UxGATMBNQig2wIfjWLxzWQxLyakGvI3IHTSyhIIbcuE=; b=ZtI3N8WmcsSjB326JXV4NX2p6ACeFbGi0divP59eJUfFp1+xOSyhpD5cakMdPq4SqM al/7nxnUbcLrD5jbEn1P55QHkIOmVPiPcN5AaSmevXhCjWiZCvlvaT52Ydfcregl1uee OYfD8dCq+UjjkKP8mEJJx5IMW6eAZEMGzQlqzqwIoOK391+6Fb0k14kRg9mcewsmAVJu qQBzDQttLPWnfBqhYLiJn5sKf3QR8nxHSakYFT9GNC1oxTlotAS5DXJEPsrpYsDVvNiJ rFFrxOURjwfAmrYhkiIgYORGAPpWvAetzDuGO2M0MH7oQ8PEWPuFgKoxvBKgD+dpMOZ8 GD/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=UxGATMBNQig2wIfjWLxzWQxLyakGvI3IHTSyhIIbcuE=; b=PUqP5JzuDSQCbvKynnqmMhJP6fGGXoq959HYQOmsosBZWJ89K4+TEpT0+BIftIe7oH Hdhk3GGrMyqPaxV8Xu86ijods+dxb3wLg+thY+nuIxpev2w+mASMMdj4EMDr8vEOjBsS G2A7yeOoI9QIdK80gNdbYUKmZw/uWk0hZaEnDrmdKhuWGBjAyVc82xVZgijS6igeF0wl DPccY3ukLh5lV4TQ2zEoW0nQsJqV/R9oS3i4bX4mTpX9O1uzDzjpIHzplGskSgryMLe9 Q7Fsu0muJ2jpFsB6JhcxWkyokTZzvs05/jPz51BEcZZeHjqh8hlGzE6/3GjKcsbKuYb8 5mRQ== X-Gm-Message-State: APjAAAXqbxBzkYyaUSD49DSrjiRzrkgeSkvQxdKUQGQMj8CdmuEokveT 6J31p+Vf0SSF+x3BhrP0QICKicWSEc8= X-Google-Smtp-Source: APXvYqyTYIdM/xOg9NHClSKz7NNh9HpbCGsybjuvAR7Zi5HR94sIeJUx7WuxfUK4sgvQEQtF4DbXQg== X-Received: by 2002:a5d:46cf:: with SMTP id g15mr35592887wrs.93.1563264688886; Tue, 16 Jul 2019 01:11:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:07 +0200 Message-Id: <1563264677-39718-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PULL 09/19] memory: unref the memory region in simplify flatview X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: King Wang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: King Wang The memory region reference is increased when insert a range into flatview range array, then decreased by destroy flatview. If some flat range merged by flatview_simplify, the memory region reference can not be decreased by destroy flatview any more. In this case, start virtual machine by the command line: qemu-system-x86_64 -name guest=3Dubuntu,debug-threads=3Don -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff -cpu host -m 16384 -realtime mlock=3Doff -smp 8,sockets=3D2,cores=3D4,threads=3D1 -object memory-backend-file,id=3Dram-node0,prealloc=3Dyes,mem-path=3D/dev/h= ugepages,share=3Dyes,size=3D8589934592 -numa node,nodeid=3D0,cpus=3D0-3,memdev=3Dram-node0 -object memory-backend-file,id=3Dram-node1,prealloc=3Dyes,mem-path=3D/dev/h= ugepages,share=3Dyes,size=3D8589934592 -numa node,nodeid=3D1,cpus=3D4-7,memdev=3Dram-node1 -no-user-config -nodefaults -rtc base=3Dutc -no-shutdown -boot strict=3Don -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x3 -drive file=3Dubuntu.qcow2,format=3Dqcow2,if=3Dnone,id=3Ddrive-virtio-disk0= ,cache=3Dnone,aio=3Dnative -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virt= io-disk0,id=3Dvirtio-disk0,bootindex=3D1 -chardev pty,id=3Dcharserial0 -device isa-serial,chardev=3Dcharserial0,id=3Dserial0 -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 -vnc 0.0.0.0:0 -device VGA,id=3Dvideo0,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x5 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 -msg timestamp=3Don And run the script in guest OS: while true do setpci -s 00:06.0 04.b=3D03 setpci -s 00:06.0 04.b=3D07 done I found the reference of node0 HostMemoryBackendFile is a big one. (gdb) p numa_info[0]->node_memdev->parent.ref $6 =3D 1636278 (gdb) Signed-off-by: King Wang Message-Id: <20190712065241.11784-1-king.wang@huawei.com> Signed-off-by: Paolo Bonzini --- memory.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/memory.c b/memory.c index 480f3d9..d8d42bd 100644 --- a/memory.c +++ b/memory.c @@ -321,7 +321,7 @@ static bool can_merge(FlatRange *r1, FlatRange *r2) /* Attempt to simplify a view by merging adjacent ranges */ static void flatview_simplify(FlatView *view) { - unsigned i, j; + unsigned i, j, k; =20 i =3D 0; while (i < view->nr) { @@ -332,6 +332,9 @@ static void flatview_simplify(FlatView *view) ++j; } ++i; + for (k =3D i; k < j; k++) { + memory_region_unref(view->ranges[k].mr); + } memmove(&view->ranges[i], &view->ranges[j], (view->nr - j) * sizeof(view->ranges[j])); view->nr -=3D j - i; --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264856; cv=none; d=zoho.com; s=zohoarc; b=M/vLvuWNekX8H0dZPVHdij9IqpPm9IMHZiA3NQ1nc4GcTTyIIn9nWWbtlpnwNQHVzTeu36T9FT/8QCAZXn1wbzBZ97OEKae2G1U/uNLGmgwpII006OMKti2fLKQiN5Ot8CRM8i2aeahqbrV51o6ut10+hjlWMcUXEhNMZVRO+ww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264856; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=KaySmgI0vFG3f8nxtwM3Mu8yasXrk6fOBut/kewGAmc=; b=YhAy1msrpZ6Aaf+S9xsZLY5brxhOZmAxUJTOG3GHM0tggjqePoPPoVh+IIpl1S6J3BxEv1Y2gdsOZvzkaWcsJ4a4sYz/tvO2vaGHu9UzbXHUQgh0gChciaOtIu3HrML/+duFIvWVyu/m5pcyXTWcUkYYQ7VOoB+OG0O5xXsk4tg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264856243884.8808139854037; Tue, 16 Jul 2019 01:14:16 -0700 (PDT) Received: from localhost ([::1]:46204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIbG-0002eI-Sz for importer@patchew.org; Tue, 16 Jul 2019 04:14:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59947) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYe-0008Kq-OY for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYd-0003Gw-8v for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:32 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:36922) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYd-0003GQ-2W for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:31 -0400 Received: by mail-wr1-x434.google.com with SMTP id n9so19863188wrr.4 for ; Tue, 16 Jul 2019 01:11:30 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=KaySmgI0vFG3f8nxtwM3Mu8yasXrk6fOBut/kewGAmc=; b=nRn8ESDnqePtSElQ3Nb2VF4u2UZDuqSh8zBpMK2Hat/ONmlIcoiXlAdQBuxAdMEZFx +3BBE7MNGIiz7XpGX/J8f8d10WTQ9RI1PYHr7rwU46Iiej0SyQPSJSzBDWDeZ+sXA0/Z gzCRmyNYm0XDqXFoY+IOdgbLdAo6XbbSmLaTQjyVwqBJ43n25b91z3kxRmL2rr+IurUL 0PVtc16HDleLWdfLaVBnWxhCA8vB8Wyoh2Zr+mUOrb7dvq6WMQBwpPeTUXdHAxM2nezf X+V8nwMhyrQPF2HMuJEKFerJEBnk0Mmgr2Lwd2ZIclQMc7QHIyRXjsMKKKMsxl8eAYa1 W6lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=KaySmgI0vFG3f8nxtwM3Mu8yasXrk6fOBut/kewGAmc=; b=QaolWuP26KyI6WYhLzAMxuYPOHFG42zD8NqW1f2LshbehYikISJssqYVSoAB3Du+Cq xcONrK+B0vwW602mntxTPIjGfjzM7vEPwED9PBPvXieDD6a/8ylxfDb+kRS3CtippBG3 7qZpQ7EfR1OQ3em00DOd/ZTOI3a6vzUrbyxqQKSrLdwAra9wJO/sIu0LPX+WI7OT/4xE YS2AMk0ILoAENu9x1NfwNnnA/U1QFg9GAvTzVB6gQsKHTFKbwL/QtpQd21lbX50Vriqv 5gGz/s72o45u8s/O16Yi6Sl2kKkGKxSn6BZXBX3+SLke4ZR6iAowuaQEHnrYXCUksR/i 4Psw== X-Gm-Message-State: APjAAAXcW1s/h0aQ/yNMNw71rYBVtgypv2OTLz7DXlK3DjKp5r4ux7ou QlEsITz1sODPFf8wl4pNOWscEKK+pkg= X-Google-Smtp-Source: APXvYqwLoXgk9zyx0VvuTplgvTkUHIuYxE9wrSEipffh1JiDdXkatkgJAx+ah2RUFJgEVVSFA5U0Qg== X-Received: by 2002:a5d:498a:: with SMTP id r10mr34548306wrq.28.1563264689819; Tue, 16 Jul 2019 01:11:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:08 +0200 Message-Id: <1563264677-39718-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 10/19] Fix broken build with WHPX enabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Weil Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefan Weil Signed-off-by: Stefan Weil Message-Id: <20190712132611.20411-1-sw@weilnetz.de> Signed-off-by: Paolo Bonzini --- target/i386/whpx-all.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index 31d4732..ed95105 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -1396,7 +1396,7 @@ static int whpx_accel_init(MachineState *ms) } =20 memset(&prop, 0, sizeof(WHV_PARTITION_PROPERTY)); - prop.ProcessorCount =3D smp_cpus; + prop.ProcessorCount =3D ms->smp.cpus; hr =3D whp_dispatch.WHvSetPartitionProperty( whpx->partition, WHvPartitionPropertyCodeProcessorCount, @@ -1405,7 +1405,7 @@ static int whpx_accel_init(MachineState *ms) =20 if (FAILED(hr)) { error_report("WHPX: Failed to set partition core count to %d," - " hr=3D%08lx", smp_cores, hr); + " hr=3D%08lx", ms->smp.cores, hr); ret =3D -EINVAL; goto error; } --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264849; cv=none; d=zoho.com; s=zohoarc; b=CB973i1ELq8ieXnChR373atA0Jjqe0X5jSWXbk3/KPF7whgUTDAcPpdOMBI/xHHZDln01mq556W2cw5VtpONMMghd9pjYtcOUEKKVFSAzHYYrKyl1gd7AO/RmT39J3CQsYjDyC+BsUuOGxfzwMHXgcXs/kHP1Edg+pfQzrlZ2/M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264849; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=4hRVM+k2vb0KY/USDpjU+G8mA47ikDVkV4soPANDuFE=; b=GeGRjpMdB57+QkV3rzVWWIv5KZzBjVcIXemyqdd1lxItkzZDjaeWIzr7e8fZRO6f5Dfcq0x8LzHHe4cJnB5gSBfUe9Y4cHjGQNwNpGcd0SEcOlQrC02C2A8cO+WvUlz4Xxj69BIoVquV/M1udrBhGh0LTUTKNLR5QFvjjx3Otfs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156326484957948.670147691589705; Tue, 16 Jul 2019 01:14:09 -0700 (PDT) Received: from localhost ([::1]:46200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIbA-0002CV-2s for importer@patchew.org; Tue, 16 Jul 2019 04:14:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59998) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYh-000056-4o for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYe-0003I1-Do for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:34 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:52474) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYe-0003H9-60 for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:32 -0400 Received: by mail-wm1-x331.google.com with SMTP id s3so17662748wms.2 for ; Tue, 16 Jul 2019 01:11:32 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4hRVM+k2vb0KY/USDpjU+G8mA47ikDVkV4soPANDuFE=; b=aN22qr0Cnq9KG2bwQGY2l4oHqrReUKiaJUSfiRTSRCq1rf2zgLHwt86Ik1CsxItlgq JyasKJSJNPr6+5ikue8zkNS2Wh1Djlt5masDLc0HulRCnzab2kgT7k3lzy9/KcZgfMLx ovztYLxdNNRkJHDPRrKc1JTpHUvHlzohGAhoYCxHEG5QNTSAZQeoWgmGfAxwsTfK5W+p +e6B3JXopUWkrGJodgI0HIIKkviWWBewcuP9AaYUYcYyopgk7ocPOMBKn6ELZqFa0rg8 +wQsZggxTCnNquZude7hpcnsFmGqtLYw68z6kPQ9tc4VHr+UXc1JfsN+ay2omOeP08Mr xjIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4hRVM+k2vb0KY/USDpjU+G8mA47ikDVkV4soPANDuFE=; b=RSOzN0fm7Vt/a4jhZ87HnVw7lcpWms57I6A4xVJ7eflezb1sX7OuoFFOOGOFRVWhqw BRG6jdA5mo5OyVzaQr4olYmyPINW3VFQOrW1tyG/34CK2Dcq2ZwxdFVuS3DPiEgEf2r9 Jc4JJhLPv/v6+5O6AduqRW0ukV+vd0ZA2rC0EiWRG9kOAkYw69JKudV8W+COupQ04QvT ljRyD7NfFUNvBd5wikDfDQApfQfx9ui3KnUcOV9bb4UA2jA8QjXMuCUZ5djN8J5HK514 33YtoIs8M8sxekI9+KnyK2u2c/ZDhp9GWrt0WgpfjRAwcUPiYTFvcWezB+j7eE76/OPK M+5Q== X-Gm-Message-State: APjAAAUz2jhyBrrg4nifcKxG4l4ImBl3KK3NB0l1Hs4ZTh0Nqhike0L+ lVH6jqep7EhlHc/aMFcr1upxplp4Ugs= X-Google-Smtp-Source: APXvYqzdyLvdVRzbhgEm0GZBzJjPCQj9mkhxAeU3XHSGfcPEFVdV1RzJyXQuIlmOlY+1pp4Z3Z5EAw== X-Received: by 2002:a1c:6643:: with SMTP id a64mr29964000wmc.154.1563264690770; Tue, 16 Jul 2019 01:11:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:09 +0200 Message-Id: <1563264677-39718-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 Subject: [Qemu-devel] [PULL 11/19] util: merge main-loop.c and iohandler.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) main-loop.c has a dependency on iohandler.c, and everything breaks if that dependency is instead satisfied by stubs/iohandler.c. Just put everything in the same file to avoid strange dependencies on the order of files in util-obj-y. Signed-off-by: Paolo Bonzini Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <1562952875-53702-1-git-send-email-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- util/Makefile.objs | 2 +- util/iohandler.c | 135 -------------------------------------------------= ---- util/main-loop.c | 110 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 136 deletions(-) delete mode 100644 util/iohandler.c diff --git a/util/Makefile.objs b/util/Makefile.objs index 68af3cd..41bf59d 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -2,7 +2,7 @@ util-obj-y =3D osdep.o cutils.o unicode.o qemu-timer-common= .o util-obj-y +=3D bufferiszero.o util-obj-y +=3D lockcnt.o util-obj-y +=3D aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o -util-obj-y +=3D main-loop.o iohandler.o +util-obj-y +=3D main-loop.o util-obj-$(call lnot,$(CONFIG_ATOMIC64)) +=3D atomic64.o util-obj-$(CONFIG_POSIX) +=3D aio-posix.o util-obj-$(CONFIG_POSIX) +=3D compatfd.o diff --git a/util/iohandler.c b/util/iohandler.c deleted file mode 100644 index bece882..0000000 --- a/util/iohandler.c +++ /dev/null @@ -1,135 +0,0 @@ -/* - * QEMU System Emulator - managing I/O handler - * - * Copyright (c) 2003-2008 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN - * THE SOFTWARE. - */ - -#include "qemu/osdep.h" -#include "qapi/error.h" -#include "qemu/queue.h" -#include "block/aio.h" -#include "qemu/main-loop.h" - -#ifndef _WIN32 -#include -#endif - -/* This context runs on top of main loop. We can't reuse qemu_aio_context - * because iohandlers mustn't be polled by aio_poll(qemu_aio_context). */ -static AioContext *iohandler_ctx; - -static void iohandler_init(void) -{ - if (!iohandler_ctx) { - iohandler_ctx =3D aio_context_new(&error_abort); - } -} - -AioContext *iohandler_get_aio_context(void) -{ - iohandler_init(); - return iohandler_ctx; -} - -GSource *iohandler_get_g_source(void) -{ - iohandler_init(); - return aio_get_g_source(iohandler_ctx); -} - -void qemu_set_fd_handler(int fd, - IOHandler *fd_read, - IOHandler *fd_write, - void *opaque) -{ - iohandler_init(); - aio_set_fd_handler(iohandler_ctx, fd, false, - fd_read, fd_write, NULL, opaque); -} - -void event_notifier_set_handler(EventNotifier *e, - EventNotifierHandler *handler) -{ - iohandler_init(); - aio_set_event_notifier(iohandler_ctx, e, false, - handler, NULL); -} - -/* reaping of zombies. right now we're not passing the status to - anyone, but it would be possible to add a callback. */ -#ifndef _WIN32 -typedef struct ChildProcessRecord { - int pid; - QLIST_ENTRY(ChildProcessRecord) next; -} ChildProcessRecord; - -static QLIST_HEAD(, ChildProcessRecord) child_watches =3D - QLIST_HEAD_INITIALIZER(child_watches); - -static QEMUBH *sigchld_bh; - -static void sigchld_handler(int signal) -{ - qemu_bh_schedule(sigchld_bh); -} - -static void sigchld_bh_handler(void *opaque) -{ - ChildProcessRecord *rec, *next; - - QLIST_FOREACH_SAFE(rec, &child_watches, next, next) { - if (waitpid(rec->pid, NULL, WNOHANG) =3D=3D rec->pid) { - QLIST_REMOVE(rec, next); - g_free(rec); - } - } -} - -static void qemu_init_child_watch(void) -{ - struct sigaction act; - sigchld_bh =3D qemu_bh_new(sigchld_bh_handler, NULL); - - memset(&act, 0, sizeof(act)); - act.sa_handler =3D sigchld_handler; - act.sa_flags =3D SA_NOCLDSTOP; - sigaction(SIGCHLD, &act, NULL); -} - -int qemu_add_child_watch(pid_t pid) -{ - ChildProcessRecord *rec; - - if (!sigchld_bh) { - qemu_init_child_watch(); - } - - QLIST_FOREACH(rec, &child_watches, next) { - if (rec->pid =3D=3D pid) { - return 1; - } - } - rec =3D g_malloc0(sizeof(ChildProcessRecord)); - rec->pid =3D pid; - QLIST_INSERT_HEAD(&child_watches, rec, next); - return 0; -} -#endif diff --git a/util/main-loop.c b/util/main-loop.c index a9f4e8d..e3eaa55 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -32,6 +32,11 @@ #include "qemu/main-loop.h" #include "block/aio.h" #include "qemu/error-report.h" +#include "qemu/queue.h" + +#ifndef _WIN32 +#include +#endif =20 #ifndef _WIN32 =20 @@ -525,3 +530,108 @@ QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque) { return aio_bh_new(qemu_aio_context, cb, opaque); } + +/* + * Functions to operate on the I/O handler AioContext. + * This context runs on top of main loop. We can't reuse qemu_aio_context + * because iohandlers mustn't be polled by aio_poll(qemu_aio_context). + */ +static AioContext *iohandler_ctx; + +static void iohandler_init(void) +{ + if (!iohandler_ctx) { + iohandler_ctx =3D aio_context_new(&error_abort); + } +} + +AioContext *iohandler_get_aio_context(void) +{ + iohandler_init(); + return iohandler_ctx; +} + +GSource *iohandler_get_g_source(void) +{ + iohandler_init(); + return aio_get_g_source(iohandler_ctx); +} + +void qemu_set_fd_handler(int fd, + IOHandler *fd_read, + IOHandler *fd_write, + void *opaque) +{ + iohandler_init(); + aio_set_fd_handler(iohandler_ctx, fd, false, + fd_read, fd_write, NULL, opaque); +} + +void event_notifier_set_handler(EventNotifier *e, + EventNotifierHandler *handler) +{ + iohandler_init(); + aio_set_event_notifier(iohandler_ctx, e, false, + handler, NULL); +} + +/* reaping of zombies. right now we're not passing the status to + anyone, but it would be possible to add a callback. */ +#ifndef _WIN32 +typedef struct ChildProcessRecord { + int pid; + QLIST_ENTRY(ChildProcessRecord) next; +} ChildProcessRecord; + +static QLIST_HEAD(, ChildProcessRecord) child_watches =3D + QLIST_HEAD_INITIALIZER(child_watches); + +static QEMUBH *sigchld_bh; + +static void sigchld_handler(int signal) +{ + qemu_bh_schedule(sigchld_bh); +} + +static void sigchld_bh_handler(void *opaque) +{ + ChildProcessRecord *rec, *next; + + QLIST_FOREACH_SAFE(rec, &child_watches, next, next) { + if (waitpid(rec->pid, NULL, WNOHANG) =3D=3D rec->pid) { + QLIST_REMOVE(rec, next); + g_free(rec); + } + } +} + +static void qemu_init_child_watch(void) +{ + struct sigaction act; + sigchld_bh =3D qemu_bh_new(sigchld_bh_handler, NULL); + + memset(&act, 0, sizeof(act)); + act.sa_handler =3D sigchld_handler; + act.sa_flags =3D SA_NOCLDSTOP; + sigaction(SIGCHLD, &act, NULL); +} + +int qemu_add_child_watch(pid_t pid) +{ + ChildProcessRecord *rec; + + if (!sigchld_bh) { + qemu_init_child_watch(); + } + + QLIST_FOREACH(rec, &child_watches, next) { + if (rec->pid =3D=3D pid) { + return 1; + } + } + rec =3D g_malloc0(sizeof(ChildProcessRecord)); + rec->pid =3D pid; + QLIST_INSERT_HEAD(&child_watches, rec, next); + return 0; +} +#endif --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264849; cv=none; d=zoho.com; s=zohoarc; b=KNug+Zn0HrpvFFuGp/995vDPRZf4XCfnm9OfzhbhP92zWTBQws+sS3yIrMOAD91w9d0xPAgf8y+PmaGpfUEmcIGTU7TNkM8kjyyv1gpemgEjg0AnpPAdf26ozHt05EIKN8KvwHtahLq8tIRfn76nytIEziQvm0DLypkFACCeTI8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264849; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=eMIawS30YngPpRftqQLfFq60155CmM2qHe8aA4uFf00=; b=LD+FakBpAwBuTo6j9YUTmU3JRgjx697WG9Pyt0lgFPC2zOSqDrj2JvxOjU98eMKVCJzinNTIM4czNYEYHFPe2ISVTcHJb1xZtZRW0PfiVYHpN1vn1pT0/vUyBYLm+RXrJ7JEg4LfGawGjiHFFcjUyuXP3LsFRLOWK3/eLgRfXcE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264849649845.0564814110315; Tue, 16 Jul 2019 01:14:09 -0700 (PDT) Received: from localhost ([::1]:46202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIbA-0002GB-7N for importer@patchew.org; Tue, 16 Jul 2019 04:14:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60016) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYh-00006v-NV for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYf-0003JX-Ka for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:35 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:38083) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYf-0003IO-Db for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:33 -0400 Received: by mail-wm1-x330.google.com with SMTP id s15so17666572wmj.3 for ; Tue, 16 Jul 2019 01:11:33 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eMIawS30YngPpRftqQLfFq60155CmM2qHe8aA4uFf00=; b=obr/niMoaXWIinTfq6TKFcDpWMPOiBQK9HRo/5bjlt7VLa6FlTbrYfQ9DIwr8T2MFh oUNrqyt/vomzm0LBEt4DlNREfRQKGvey3JfhGugamKDA2p9VIQVT9YcOe72pNhttAX+s w3HDWsAFqOBGjHbCIePL8rnuUMCdmyAEWU1TQaRpvW9l9twdWSE4T4F+vJV0eicRTi6V ZLlm1Ir9+NIQKab6yJ9qTEM0pXPUjvD5LGU68h4mW9EivUCT8K3y2KcqxKhizImhahmT Yy71O5Ra7n2/+moNB4Q9ELicUw2VbJHu1eH+v4zw6cypjjuUKsa2PePvfDiV3/jO8eua cY/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eMIawS30YngPpRftqQLfFq60155CmM2qHe8aA4uFf00=; b=aeLL5Pi34xkyKXCTsJzGc0UKB/GT5CNBYFWkBpnrqCiVNIWlYIClR1UBy9dDvciCCD cJOs1WF0HSKOFPMoECClLwToVOgd5BGDA4NTm1FqvZhp8JyIY9SZdtv3eDVAyzlMU/VL aDRFrveCWbpTgvxDr26/t1u5YgDW4Fztu554EWbCfKOO2v+krbe2tw8xp1j8GV8fWUVh aLg6OlGQ6INschNhAbbZUouI4W6cMYfCK+iIX5e3l2PP6P78W7P/jrCJWhyVPBRtSQej VyGGBaF4YpgL2tsNYJ8sYOOQfcf82XDurM5hc7X+/L654tNdKXzJwE2vgkPxvawcL/Ks ChNQ== X-Gm-Message-State: APjAAAW2Mi9Vo9/7MwzgLi24M1PGFX5AOYijoUaSLct/t7wtjd8Q1Eh1 sZrBz0t3ZpCgy3UqkI3FUTlG4HNqWqI= X-Google-Smtp-Source: APXvYqwaq3/eP2Db738+rHSmBgPPGuc1ZsjblSQ9Iij1DeDFgIQ/7/eN88u0hM/t88i7/0et8SCs/g== X-Received: by 2002:a05:600c:2503:: with SMTP id d3mr29993713wma.41.1563264692099; Tue, 16 Jul 2019 01:11:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:10 +0200 Message-Id: <1563264677-39718-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PULL 12/19] hw/lm32/Kconfig: Milkymist One provides a USB 1.1 Controller X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Milkymist SoftUSB block provides the OHCI USB standard (missed in 0858746b835). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190714124755.14356-1-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/lm32/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig index 3d09c2d..ed2e306 100644 --- a/hw/lm32/Kconfig +++ b/hw/lm32/Kconfig @@ -11,3 +11,4 @@ config MILKYMIST select PFLASH_CFI01 select FRAMEBUFFER select SD + select USB_OHCI --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264768; cv=none; d=zoho.com; s=zohoarc; b=LJqcTyEHlmnWNUDQSWMIpF/6X1t43iKoX4AT4BN2By9Xi1jF+YMIgX55z0dYEqJCEA9+eOFu14mPa8OXrwwIs03OwZtoZxXxgeT0a2ephhVwzC1LOnsmzW75Elq2iE8heVTebc4bCFy6+i3/DomK3SGVlESMK2BHCW3cNyRHXrI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264768; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=KIJAmLbllmYJ3+/5atxAnv6JwBGCasb1tyGUjSZJRAI=; b=KxIDLahEHmaEbmqWwRqDxO+i7Tpk/DnpKzbnGXIolxDLvbv62pQFNPgk5+sZgB55J8gzUsfvFqxcOJAwIyFqOjPU0vaOnerif6jQxz4qr7AWlHPPx12D/d5SqlmqIJZtLevxHashqOi2rJyBmwtHDse8jjNgDpVWENnA79h0Ltw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264768238898.9432220431402; Tue, 16 Jul 2019 01:12:48 -0700 (PDT) Received: from localhost ([::1]:46152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIZq-0004NA-BS for importer@patchew.org; Tue, 16 Jul 2019 04:12:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60102) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYk-0000IG-81 for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYi-0003MC-MP for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:38 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:40710) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYi-0003Jh-D7 for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:36 -0400 Received: by mail-wm1-x334.google.com with SMTP id v19so17670155wmj.5 for ; Tue, 16 Jul 2019 01:11:36 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=KIJAmLbllmYJ3+/5atxAnv6JwBGCasb1tyGUjSZJRAI=; b=WUIUjWobFWPjdMXAG844rOO9ELRCyAlMZbq2nq2qN4/NtmCl/pVVP6HQ2xWi48FvaY 87mgputi8vcvt15JtSVQdNObZtjFBNBob+tjmJMg2WGeghrQ2TDutgYT9UdeYiS9xwfj MEXub1Sr/NUfTXwWZCZlpjNrZRXAlK6RXst4KkLZulFnZ6QWVNAYaEd6zZyDm9jWD/BF S40kB32h96R5D5bV/ToI/iWGdQADcMr17Hs67ZlEcqAYvy++INOljNZUPlaEsi087qUC uSjOl8FWG8bLBxkdf718tQH7uljfKUWAVVwLOLe4Imsl5tdz5W/9R5jxCbDww6aZgZgq 5s1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=KIJAmLbllmYJ3+/5atxAnv6JwBGCasb1tyGUjSZJRAI=; b=rDb8Ci6Qb0ocT2ZvpVrLzVcUBCXTBImPryutQ4fbMh3s2rKs9Qqj+2Ml9l9UfJuTQ0 5S0xJ5a6aHMFDNP5s0Afqm2eXm2Vya9IrCcbuLUbHD3img0rH8mVg9Vmo3EuWZqAvHk/ Xo5XJz9R0RnPRKoGejUqxb3QsyIdUIbUFnwunPBWSIwSkDNAezxi0jSfeG3q3jRXbnSS LsqHCLe45Sn/IlUu00Yg7tJaNxH2JHG6r54A9zXyPsugsPb7ctue3EIgzdQln2hJCJsS N2kMDRI6+KPZAw3Kt2H9uQk42ZCXvfIUqtCZrT9dClI/omesfRN+XtOtLGboR77FXZ9M L5IQ== X-Gm-Message-State: APjAAAUMZChlqIv2eOhZW2LIL1zduFqSNgyUgquFZFuSPYQtuf9bhVPx 5Qvwagt7ekTdoi039/UmljsvUVlmVNw= X-Google-Smtp-Source: APXvYqz4bqiP/CMEMBtqgqbGL1b5TlG1SKKmAlthyM5kmj6xKAR7/IEo6ld1aV8j90HntX7TD6iFOQ== X-Received: by 2002:a7b:c7d8:: with SMTP id z24mr29407803wmk.10.1563264693198; Tue, 16 Jul 2019 01:11:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:11 +0200 Message-Id: <1563264677-39718-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PULL 13/19] checkpatch: detect doubly-encoded UTF-8 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Copy and pasting from Thunderbird's "view source" window results in double encoding of multibyte UTF-8 sequences. The appearance of those sequences is very peculiar, so detect it and give an error despite the (low) possibility of false positives. As the major offender, I am also adding the same check to my applypatch-msg and commit-msg hooks, but this will also cause patchew to croak loudly when this mistake happens. Signed-off-by: Paolo Bonzini Message-Id: <1558099140-53240-1-git-send-email-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/checkpatch.pl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 2f81371..d24c944 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -262,6 +262,19 @@ our $UTF8 =3D qr{ | $NON_ASCII_UTF8 }x; =20 +# some readers default to ISO-8859-1 when showing email source. detect +# when UTF-8 is incorrectly interpreted as ISO-8859-1 and reencoded back. +# False positives are possible but very unlikely. +our $UTF8_MOJIBAKE =3D qr{ + \xC3[\x82-\x9F] \xC2[\x80-\xBF] # c2-df 80-bf + | \xC3\xA0 \xC2[\xA0-\xBF] \xC2[\x80-\xBF] # e0 a0-bf 80-bf + | \xC3[\xA1-\xAC\xAE\xAF] (?: \xC2[\x80-\xBF]){2} # e1-ec/ee/ef 80-bf 80= -bf + | \xC3\xAD \xC2[\x80-\x9F] \xC2[\x80-\xBF] # ed 80-9f 80-bf + | \xC3\xB0 \xC2[\x90-\xBF] (?: \xC2[\x80-\xBF]){2} # f0 90-bf 80-bf 80-bf + | \xC3[\xB1-\xB3] (?: \xC2[\x80-\xBF]){3} # f1-f3 80-bf 80-bf 80= -bf + | \xC3\xB4 \xC2[\x80-\x8F] (?: \xC2[\x80-\xBF]){2} # f4 80-b8 80-bf 80-bf +}x; + # There are still some false positives, but this catches most # common cases. our $typeTypedefs =3D qr{(?x: @@ -1506,6 +1519,9 @@ sub process { ERROR("Invalid UTF-8, patch and commit message should be encoded in UTF= -8\n" . $hereptr); } =20 + if ($rawline =3D~ m/$UTF8_MOJIBAKE/) { + ERROR("Doubly-encoded UTF-8\n" . $herecurr); + } # Check if it's the start of a commit log # (not a header line and we haven't seen the patch filename) if ($in_header_lines && $realfile =3D~ /^$/ && --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264888; cv=none; d=zoho.com; s=zohoarc; b=kMdGVfdjKOyHRHqCtFH513XyX144wBrSDqSKHbFzUHWib82m1MxCPSqMoR4tZCO2zDPVwrN6ihlu/om5c5rrC6BShnKya8kpL7G0RtCAJf1IrrgcKmkrp3Lx6Fwlic4rmNSuL1S4Bx6mXdrBmAP9jfiT9twcdowkyUHGzBPbSzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264888; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=8Qfy8a0GAVN3cZj53fYSGM9mBcfsB1yLOHRsBKNqTiU=; b=B9bVAH0OobOrWuS6xlSwCWRH475IF0QuawHLYmPCieNA+t8S+xW+U8HmcOIi3A+NZ+KKu+vQvV0iQ8vnPHqX82NZJdOSMBBwQfT8AumDh1FiaF2dzDHuZmbqdfbHN83FnBj+qc+i6yXGlMv1XqPzT0+s5jsItJ+fOBUAWn5pclg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264888018728.3293037795675; Tue, 16 Jul 2019 01:14:48 -0700 (PDT) Received: from localhost ([::1]:46222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIbl-0004mu-B1 for importer@patchew.org; Tue, 16 Jul 2019 04:14:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60105) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYk-0000IZ-AE for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYi-0003Ls-GX for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:38 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:38900) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYi-0003Kl-8f for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:36 -0400 Received: by mail-wm1-x344.google.com with SMTP id s15so17666721wmj.3 for ; Tue, 16 Jul 2019 01:11:36 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=8Qfy8a0GAVN3cZj53fYSGM9mBcfsB1yLOHRsBKNqTiU=; b=uLP6Nq5R+E+B5kGnDaycxGgK6koWwtR7zCMbDFrQp+hz/diqzJ3Vd3/3x6u5Npfs61 y0eO2GwyMBvri266zyD6YavIVgzWasl6n+5ZenTjJvTExrMRgHeFN0LQo7Y+NyxornfB GfuSID8nymaniWexvBomqdLYbZ3AWUwutevRdgx0R6yMw9Z3i5xyQe9Qqyl98m1RPYfc v74uo0s4egHPiiW3Dk3thmoKiUWvHTSb6NF8ZSDiIyuRYnJwxpFzOVOt/JCFfMmNdp9g yt4iCjFl3vSAiV7r8TOIccxveiWfKruweGIUnrFbDAMnyafKR0tH/T3YimeAjD7MoH4e 29BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=8Qfy8a0GAVN3cZj53fYSGM9mBcfsB1yLOHRsBKNqTiU=; b=d2qs/9oSU1S75MyqhZWFm8jP7VaF/dZ0lJ8i1o11e7EkJ6vatKPw1itPINSHK+zpgA 5OatpDllWVBXr1SY0f7vw95RU3n2AvxVwpmZQaB9MkCOzxlaV9wIOVh7WFY73S8OssDy 5zfXL63p4ohVl9PB+ZpMCTHGl4iCuBXouCfsXGadV1DAunXgJ+Qvz1+UQ50I0krrMzO5 AKr4H9sVYCpX9d4N68CPmwIGa9Yi/LHDB7ZbsAl/3XhQKWsrh4mvRuUcSTFLFAIFVB44 yH6FQdxutReVs9JmMRSJc3qDtZ8q4Qmnwk8FUokp7yyM7NX450TA5tT32e8VTI+QRSMp WVgg== X-Gm-Message-State: APjAAAWidZl8sBLGhUecUYypGtx0RH06ddkn6mnY8VcI9yY1i01m+IVH pC3BTAoDoQr1GEjlAXKiE28p2zE/Geo= X-Google-Smtp-Source: APXvYqz6oZIlQl9LCX+0+0LTUTSf5jMUydYg88xTmfhY/l2MmjknCsaWw03bdPVPD8yxCmwqNYhpug== X-Received: by 2002:a1c:20c3:: with SMTP id g186mr17436015wmg.15.1563264694251; Tue, 16 Jul 2019 01:11:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:12 +0200 Message-Id: <1563264677-39718-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PULL 14/19] target/i386: sev: Do not unpin ram device memory region X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Williamson , Brijesh Singh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Alex Williamson The commit referenced below skipped pinning ram device memory when ram blocks are added, we need to do the same when they're removed. Cc: Brijesh Singh Cc: Paolo Bonzini Fixes: cedc0ad539af ("target/i386: sev: Do not pin the ram device memory re= gion") Signed-off-by: Alex Williamson Message-Id: <156320087103.2556.10983987500488190423.stgit@gimli.home> Reviewed-by: Singh, Brijesh Signed-off-by: Paolo Bonzini --- target/i386/sev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/target/i386/sev.c b/target/i386/sev.c index 6dbdc3c..5ba1384 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -161,6 +161,17 @@ sev_ram_block_removed(RAMBlockNotifier *n, void *host,= size_t size) { int r; struct kvm_enc_region range; + ram_addr_t offset; + MemoryRegion *mr; + + /* + * The RAM device presents a memory region that should be treated + * as IO region and should not have been pinned. + */ + mr =3D memory_region_from_host(host, &offset); + if (mr && memory_region_is_ram_device(mr)) { + return; + } =20 range.addr =3D (__u64)(unsigned long)host; range.size =3D size; --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264897; cv=none; d=zoho.com; s=zohoarc; b=lI6X0AM/uAXhjt3wST5/KwG8MRlPSSaoyYVdDQegXi8ZWM0TCT2fQG/beJe2t7rnL8xwAfNS/ugABSJk14ACyr4fWtqhJUpSq+oMHWtjAZwiu+nFxzFODT1eX25uUJ8zM0GafH2CW5fnvisXDZKq/tMw+Uf5priiLfvHzWESBDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264897; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=tYkWxfQocQcN4T6E1ktela7goxtlWdSVxpbi0ybM8Vc=; b=OFREj8POCtbPrY5ch9tcT2lE7UAdigkRqAXuMfVU4cw5Srr5o7lmwQMDMW5swcZFxVjZRaovOjhUn2O/A6yx60tJe4OpHN4a/Sp4bZh8goEdgQdiTs/jDUgfX7UUT+X3wWG/8WEzi8s9y2t4suv3vXfMVfCjudzbWRLSMJDsLmA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156326489704830.91606613240674; Tue, 16 Jul 2019 01:14:57 -0700 (PDT) Received: from localhost ([::1]:46228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIbu-0005QO-GB for importer@patchew.org; Tue, 16 Jul 2019 04:14:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60093) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYk-0000HV-1p for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYi-0003M0-Iy for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:37 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:37351) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYi-0003Kp-Ap for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:36 -0400 Received: by mail-wm1-x333.google.com with SMTP id f17so17655287wme.2 for ; Tue, 16 Jul 2019 01:11:36 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tYkWxfQocQcN4T6E1ktela7goxtlWdSVxpbi0ybM8Vc=; b=ZxNAqCLSLenzrnbhdYFkfhEVqNVdYP93iRmmJPABl34bIqqWbc8IuCIOBq0PEtAUIG rM8t0knCQSUtOYAAfX30UEA/tSCXpN1kfBXgqpB+ub5Tts3w6pUnfrY/3/vkc7XghbTU 7ddnGbCLj6nQQJW088/1h+TzSZeRnY/M9tPaL5bKSoLwNR1HD8yYG7bz/chiLhg/WmvZ sgfRikyejospHBFaOhRNmz7FR699dcYYxRFIJI890G+psCBG7dcY79aK+1L7X9pme0Lw txy5IP3A86liJM3kAsvjhfrT6iZKIkC93/LfJgCNDZyZdxSjJDbUt0OyRcOlgDw8oZfA IYZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tYkWxfQocQcN4T6E1ktela7goxtlWdSVxpbi0ybM8Vc=; b=tj3+B/KE44LHk061y4MSXfL14wg9K5eHAkeT21amZx6a4hRLMqz6IlJDMyKxKp2Cc2 SxoN/DW85uOl0fvtT032/lR0/tcN0+Kv6jl6n7wfEiNIWX/3no+8WWE3kiN0whSno67L JOKl8wbgJX3GAUDAUhk4WhsGy2Hwf1tZCWg4wbD2URehPyFWSugS7mTEIpegtbYlaEoy BknG6tT2vA44R+86ZJYJGWViuUeYrCwiWWrx1eBEnkyIyCCJ62hnx1KPju7Hy/BaxER8 VhQp3JQvL3l2/eGAdu/DC0DjfRfSvlXMkDnkqkiiTiSExtrzwNFOx1t0FMBnJcR1uGlU ISGA== X-Gm-Message-State: APjAAAUhL+9Ln2HDaHhb7xR5ldO7gREpTePmm0XiDNWu7Fchd1bx4f87 seIlxZ/lUsl/J98r0iBUezkaK8nhUEw= X-Google-Smtp-Source: APXvYqx+qJp+GwXKxpc/EQlA8LVrkxXJqC8kmmig1xa65GIDldhueeG6+VlxB5n8uPzEMOZVjyuPwQ== X-Received: by 2002:a1c:a5c2:: with SMTP id o185mr28528112wme.172.1563264695019; Tue, 16 Jul 2019 01:11:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:13 +0200 Message-Id: <1563264677-39718-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 Subject: [Qemu-devel] [PULL 15/19] hw/usb/Kconfig: Add CONFIG_USB_EHCI_PCI X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The USB_EHCI entry currently include PCI code. Since the EHCI implementation is already split in sysbus/PCI, add a new USB_EHCI_PCI. There are no logical changes, but the Kconfig dependencies tree is cleaner. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/usb/Kconfig | 9 ++++++--- hw/usb/Makefile.objs | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 564305e..495c6f2 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -19,13 +19,16 @@ config USB_OHCI_PCI =20 config USB_EHCI bool - default y if PCI_DEVICES - depends on PCI select USB =20 +config USB_EHCI_PCI + bool + default y if PCI_DEVICES + select USB_EHCI + config USB_EHCI_SYSBUS bool - select USB + select USB_EHCI =20 config USB_XHCI bool diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 81688f6..303ac08 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -6,8 +6,9 @@ common-obj-$(CONFIG_USB) +=3D desc.o desc-msos.o common-obj-$(CONFIG_USB_UHCI) +=3D hcd-uhci.o common-obj-$(CONFIG_USB_OHCI) +=3D hcd-ohci.o common-obj-$(CONFIG_USB_OHCI_PCI) +=3D hcd-ohci-pci.o -common-obj-$(CONFIG_USB_EHCI) +=3D hcd-ehci.o hcd-ehci-pci.o -common-obj-$(CONFIG_USB_EHCI_SYSBUS) +=3D hcd-ehci.o hcd-ehci-sysbus.o +common-obj-$(CONFIG_USB_EHCI) +=3D hcd-ehci.o +common-obj-$(CONFIG_USB_EHCI_PCI) +=3D hcd-ehci-pci.o +common-obj-$(CONFIG_USB_EHCI_SYSBUS) +=3D hcd-ehci-sysbus.o common-obj-$(CONFIG_USB_XHCI) +=3D hcd-xhci.o common-obj-$(CONFIG_USB_XHCI_NEC) +=3D hcd-xhci-nec.o common-obj-$(CONFIG_USB_MUSB) +=3D hcd-musb.o --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264940; cv=none; d=zoho.com; s=zohoarc; b=KdAurGkD6r3nBDRKAnamS1neLvgic/hPi6NcVbCNal1ZJGobabsNxLAlNXBK/FDLq1Tnu4tNqroMof7TiZILR9khYpSXvWKlsEDtcWinnqfiAODqOaVKsR9fSAorRzk7Ppoin3p+M18MRrGye845MbU29F9firwgf1yy9KDq/Oc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264940; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=M6lsGMl+nf2V5Rsu715+jo/F0NLVYFfe6LEKAl/IYr0=; b=UHwm9tKmka7HkkVekPKF9k06xWUEQDRclQm+kyp9LBmDF79aG3Q5P1Fwt0iHQ8h4+cqT1tRLEKYBXV3eSkhwvX0NvDRsA3TBMFlAkthqzo998Y7v8DsSumjBdG8Vtmbdfgct31BbD87pdTcwDZU1XC0YLNNZao6D4sEG+bHPD94= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264940158347.45854280153833; Tue, 16 Jul 2019 01:15:40 -0700 (PDT) Received: from localhost ([::1]:46254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIca-0008Jo-Ms for importer@patchew.org; Tue, 16 Jul 2019 04:15:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60111) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYk-0000Ji-Hi for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYj-0003My-CK for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:38 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:42484) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYj-0003M4-4l for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:37 -0400 Received: by mail-wr1-x435.google.com with SMTP id x1so4842042wrr.9 for ; Tue, 16 Jul 2019 01:11:37 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M6lsGMl+nf2V5Rsu715+jo/F0NLVYFfe6LEKAl/IYr0=; b=I1GYy5rS1/RgdW1mKn+ddrtlAJ6e25MD2A6560TtYHDv1sVMVHcy3Ximv2SGQHaXaF Ren6b9kmYY8dj6b6dyAtNJcpSCvD/qDRHzoAItgOSyv29RxeJVoN8l+ysZs5j9f5Evpy 8xwP9tcbDzIf1eg4jBSbgWnbucgtmO0S1YrI/Aqqs6m8UudyJASkuH8rhfOiwoUvTfV4 AnF/vZC312CTAmH4Ik5Fbg9nf0Y4t//NmsnXwQwINnueTyrC4G/YcALXl0nYtrT1EwAW o58eX7Pi/9BoLFRzh24Lc2ql5Po9TLf4wcK3Y6ZPEyQYPAvvObVZmBFiTSQIa/nOnaVi Bx4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=M6lsGMl+nf2V5Rsu715+jo/F0NLVYFfe6LEKAl/IYr0=; b=iebRbngW8RxnvFkCld0ooaxSjIUr2LylEBpigZm+6DQ0/WIvDp+6lU6SPIBtD1CccM oIXPk5ZNZFrGYTsWMiV1+j5ettxewJ0js21u2pxvTdqKs3uCuKmc5SFAveaagQ8BLmmM yH6GXsxwguvd1Le5TIR6Tws2MCAxFMrRnqaZovfRiB6V4cd0h05Ce3uRxQtSqzSkVmDv b2Og/osqd/YPAPACff4m3aMTrPeviWCPTNAO7Wz5rOJVMrQoaSNl+H0qsu2RYB9j8BDH Wha46WFQAbhFIQPo0L0nP16J/kDpeKh0UHInH+0joUas9NossceOF9sG8KDL/LgC1cGu PqDw== X-Gm-Message-State: APjAAAWN5RPja9aBp5eAYsvR8AuI40Wa1ZsfpW/dMfnGke/jzZkVluCp NDCZRKiK/SXfn3laivENVqKtA1NpIRI= X-Google-Smtp-Source: APXvYqz4VCrSaQiaJ/T+kXJ9ZTamS+hhncOzdCedJoONSn2EDmj84M1UwTRq9wgrxoxv9Xby8d1ihA== X-Received: by 2002:adf:f046:: with SMTP id t6mr36367130wro.307.1563264695955; Tue, 16 Jul 2019 01:11:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:14 +0200 Message-Id: <1563264677-39718-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 Subject: [Qemu-devel] [PULL 16/19] hw/usb/Kconfig: USB_XHCI_NEC requires USB_XHCI X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 TYPE_NEC_XHCI is child of TYPE_XHCI. Add the missing Kconfig dependency. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/usb/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 495c6f2..555e093 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -40,7 +40,7 @@ config USB_XHCI_NEC bool default y if PCI_DEVICES depends on PCI - select USB + select USB_XHCI =20 config USB_MUSB bool --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264955; cv=none; d=zoho.com; s=zohoarc; b=WZE9uHk48u3OdEvDDq0X7YEcio82n9nMzBonvtUWKZc7ngToMEAdrmq5Oq+R/9+BRwt+vngHzIKGx6kR3Q2lsvzdRm4S8hfO5KsK8J52qnJZtD6dFPThxJqmjq2C3LBQa7zi1P43gwP/NpuSQjgfN7SoLhoOiTIrLkhrCilW9OU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264955; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=tshHt4G4q3ui9I+sSPWIHYaUh996kXUQlnNfLEsgFxI=; b=edN9yU57Emmh95VsGJVWa5LRedHAii0Vo73tyMn8az8/4cfUMbrmhwdgZlLNtrQLT7WCMKIhEahD4iRCk7hz04TafDcDCVnKqN2z7SbWakq384wGYe7yKoK+6r5Y1vL9S/SfxdEhBdLAmIC+Zn324DkTSWwts3bPIDnsPNNdAaA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264955932301.37292705543325; Tue, 16 Jul 2019 01:15:55 -0700 (PDT) Received: from localhost ([::1]:46262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIcr-0001Ci-Oh for importer@patchew.org; Tue, 16 Jul 2019 04:15:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60157) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYl-0000QQ-SE for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYk-0003Og-Je for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:39 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:36915) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYk-0003NO-Ay for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:38 -0400 Received: by mail-wr1-x42b.google.com with SMTP id n9so19863628wrr.4 for ; Tue, 16 Jul 2019 01:11:38 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=tshHt4G4q3ui9I+sSPWIHYaUh996kXUQlnNfLEsgFxI=; b=uudvgFcLoiJhMg66r/ipDm2wNJ8LS5780ZUojRKsbhyeCTzzvrLvleKtzkJkRnTpuo leVZn2Du4MrtQUuARq+wCW4h3KQ0+kS6ZvSPLUwR6cEI8sISIyH4RWbH4ALWiivfGWgP KmQWOhGInXsCmx5i48QW2sKJX/iLf+DK5H+fuMCV+JDI1FKL7qKiqtbdClzAYtr1TZbz xy/DXxBXsMQeDWEPnTPTgRdrskrbR3YtZseyLkYhKxEcOqI2YQmcZGvlPVZar/v+6TeS mU9J7TWmlkRMhpC/ibEQ064tY/cwDWtsn8/bWHOTsz8opKz6kECTqvRXLTnvHt2MycVm QoHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=tshHt4G4q3ui9I+sSPWIHYaUh996kXUQlnNfLEsgFxI=; b=iY/FEozESIl2CyjL2AVQ0jTrnrxFAfGdJFh5xCPtrlyWVlxpynA0DbY42aAro3SGwy 0Tcjs+pI3/+s73gJeb486osOorL6SrbGc4Z6N0DwP1L8MkgsGqEOk13MTXJR8ISvSuP7 anfzynJPNC/f1QpVejv+MWpcbr/jprG4OrZdE3gli7UR33ZLiJkFmNrpOLGw1/hStk5h S/JVeh59kXdyi5JPm4hUZ1LL75Am1SOoWVEPJO2Ihhv8vuzMBNYJJ9LYa/hVCGDEqasp vjIAjEhiqTEboSemV07JLzgFtGqDLru2kqiqAC1PZSccHnhB0hkYhhJ7esrNiArFUj5/ PElw== X-Gm-Message-State: APjAAAWAAkIUiZWsXUGmgw9dMYQzD8JmAZ/yY3VmG6RqPG4A/a2UireF wQEBd3Gdri9J0HtyBva6Gp1AxcvZ+D0= X-Google-Smtp-Source: APXvYqyify96jxUU6RUYUOnHZ2DlBSpp0zWcDdZ1v5YeOMnpv6KNRYh26/iayet3J9NiPvwMVDuYLA== X-Received: by 2002:adf:df10:: with SMTP id y16mr9909120wrl.302.1563264697043; Tue, 16 Jul 2019 01:11:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:15 +0200 Message-Id: <1563264677-39718-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL 17/19] Makefile: do not repeat $(CONFIG_SOFTMMU) in hw/Makefile.objs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The device directories must be included only for softmmu builds. Instead of repeating $(CONFIG_SOFTMMU), use an "if". Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 61 +++++++++++++++++++++++++++++-----------------------= ---- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d770926..ece6cc3 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,42 +1,45 @@ +devices-dirs-y =3D core/ +ifeq ($(CONFIG_SOFTMMU), y) devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$= (CONFIG_XEN))) +=3D 9pfs/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D acpi/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D adc/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D audio/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D block/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D bt/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D char/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D cpu/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D display/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D dma/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D gpio/ +devices-dirs-y +=3D acpi/ +devices-dirs-y +=3D adc/ +devices-dirs-y +=3D audio/ +devices-dirs-y +=3D block/ +devices-dirs-y +=3D bt/ +devices-dirs-y +=3D char/ +devices-dirs-y +=3D cpu/ +devices-dirs-y +=3D display/ +devices-dirs-y +=3D dma/ +devices-dirs-y +=3D gpio/ devices-dirs-$(CONFIG_HYPERV) +=3D hyperv/ devices-dirs-$(CONFIG_I2C) +=3D i2c/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D ide/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D input/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D intc/ +devices-dirs-y +=3D ide/ +devices-dirs-y +=3D input/ +devices-dirs-y +=3D intc/ devices-dirs-$(CONFIG_IPACK) +=3D ipack/ devices-dirs-$(CONFIG_IPMI) +=3D ipmi/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D isa/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D misc/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D net/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D rdma/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D nvram/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D pci/ +devices-dirs-y +=3D isa/ +devices-dirs-y +=3D misc/ +devices-dirs-y +=3D net/ +devices-dirs-y +=3D rdma/ +devices-dirs-y +=3D nvram/ +devices-dirs-y +=3D pci/ devices-dirs-$(CONFIG_PCI) +=3D pci-bridge/ pci-host/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D pcmcia/ +devices-dirs-y +=3D pcmcia/ devices-dirs-$(CONFIG_SCSI) +=3D scsi/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D sd/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D ssi/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D timer/ +devices-dirs-y +=3D sd/ +devices-dirs-y +=3D ssi/ +devices-dirs-y +=3D timer/ devices-dirs-$(CONFIG_TPM) +=3D tpm/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D usb/ +devices-dirs-y +=3D usb/ devices-dirs-$(CONFIG_VFIO) +=3D vfio/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D virtio/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D watchdog/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D xen/ +devices-dirs-y +=3D virtio/ +devices-dirs-y +=3D watchdog/ +devices-dirs-y +=3D xen/ devices-dirs-$(CONFIG_MEM_DEVICE) +=3D mem/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D smbios/ devices-dirs-y +=3D semihosting/ -devices-dirs-y +=3D core/ +devices-dirs-y +=3D smbios/ +endif + common-obj-y +=3D $(devices-dirs-y) obj-y +=3D $(devices-dirs-y) --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264934; cv=none; d=zoho.com; s=zohoarc; b=NKtsv+6PHKlp8HAHCmHCq7DEGEwPDU13FCBu0edyIwPRWp2ddoyN1QkjAMvwiQJBFv7+FavyCwtfyN/313ndVXpsayPctKTMbi0LJsk1YRvzptXIMmb/24JWq5yHisgMeZvCGc14r3QETuQFouC0M3mYWLcpwSE0tQJLdlH+/8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264934; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=RxYfAEyw36ihWSXQYKfqSMDy1K9OXWQsSR7Cb5/oOMk=; b=c9xtnkP0ReWFl4433XEO/rukARqAJroUnBggJgJhHM5xVKmZy18LdOIB/fccJaT1Gz0928jfPHFmG6dK6cEQuA/QJxSMCaCNpZVvavoa/6C7AXQe7CyBzwQ30rOw6DgHvum/9gt8teYu6AAhDKXtTJ+KvnQf9Xs+6u4j6iwBLr0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264934529855.3022110021615; Tue, 16 Jul 2019 01:15:34 -0700 (PDT) Received: from localhost ([::1]:46248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIcX-00085S-5F for importer@patchew.org; Tue, 16 Jul 2019 04:15:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60180) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYm-0000Te-OZ for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYl-0003PS-IJ for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:40 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:36710) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYl-0003Om-AK for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:39 -0400 Received: by mail-wr1-x436.google.com with SMTP id n4so19889071wrs.3 for ; Tue, 16 Jul 2019 01:11:39 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=RxYfAEyw36ihWSXQYKfqSMDy1K9OXWQsSR7Cb5/oOMk=; b=P38yAFSv5K/JbiR8xVivWxMeA0VBNqFwpnB4XxjB79eT8JIOjFjnEjcj/hK6pHlzB8 33IH9kRkduh76GBphjHvSswlV8Z3pyMc7al7k7T9Gx1yMRyu16wumUxiVjfNRT3JNxi1 avx9Nvv1dVpLtwhWei8jGeYh4Hw8n6xLESk5jifPKD3f4D510buvNAOgJz7RoDkt/UXm qkryCOfcfpiVc/2P5ZOUkEWVrLWp8PLp5dU/Qlq+evSmfWJ7/fdCnbrMFGHWKW6tusF0 yfYsc/FdqDLMF6MxsFW0ExJqcIS4TGEMInwgwEToEjLqbetHMAJvzSkRZmOeT6k2CoZn Nl2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=RxYfAEyw36ihWSXQYKfqSMDy1K9OXWQsSR7Cb5/oOMk=; b=mu6P+tfK8qmSQRYdxymbJ4Iii+0LndFJM6aLlY0XPN6tmWHA02hhPxzRQJzQ7tDPEC 1NB9io4i1nzZKG56y/fgqCT27vUuld6tOigSHL3Pot5FtMsd3rwRG4tS5DUbjfCNOagy eEyx0qpcjdD1ugsf8L5JkLtjqEqHlnHkRcbwzP23kFWh/cGDorIb1WVwJx5W2lsyMAWA dfPhRjiZDo8rsX6PR7XoZR0Io6fX3JuDwRlHfGougqAj6YY2LTllixwe5vba7fq/8XQT A2FpXFIbKZvhoE9j4Sp20G175/M2Cbth83j8GWG5xNezD6eFGjSMnsFa/1aVXdi614JW xR/w== X-Gm-Message-State: APjAAAVbazQAuZIlH+10qAFHgMJ5ZrcKs5DEcPfAQ3pIWpwYfkClqqIB LUJQeysCRYZUfqwnuaxlP1kwa+Xc+t4= X-Google-Smtp-Source: APXvYqyaA3zXsqo2WJY9n1bQWzk7u/tJap957e/mlY9Q0Pfms836SlRK3likuMcw6mlZGH6VZLisxQ== X-Received: by 2002:adf:c803:: with SMTP id d3mr10742907wrh.130.1563264697972; Tue, 16 Jul 2019 01:11:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:16 +0200 Message-Id: <1563264677-39718-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 Subject: [Qemu-devel] [PULL 18/19] create_config: remove $(CONFIG_SOFTMMU) hack X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" CONFIG_TPM is defined to a rather weird $(CONFIG_SOFTMMU) so that it expands to the right thing in hw/Makefile.objs. This however is not needed anymore and it has a corresponding hack in create_config to turn it into "#define CONFIG_TPM 1". Clean up. Signed-off-by: Paolo Bonzini --- configure | 2 +- scripts/create_config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4983c8b..eb635c3 100755 --- a/configure +++ b/configure @@ -7159,7 +7159,7 @@ if test "$live_block_migration" =3D "yes" ; then fi =20 if test "$tpm" =3D "yes"; then - echo 'CONFIG_TPM=3D$(CONFIG_SOFTMMU)' >> $config_host_mak + echo 'CONFIG_TPM=3Dy' >> $config_host_mak fi =20 echo "TRACE_BACKENDS=3D$trace_backends" >> $config_host_mak diff --git a/scripts/create_config b/scripts/create_config index 00e86c8..6d8f08b 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -54,7 +54,7 @@ case $line in done echo " NULL" ;; - CONFIG_*=3D'$(CONFIG_SOFTMMU)'|CONFIG_*=3Dy) # configuration + CONFIG_*=3Dy) # configuration name=3D${line%=3D*} echo "#define $name 1" ;; --=20 1.8.3.1 From nobody Sat May 4 17:39:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563264916; cv=none; d=zoho.com; s=zohoarc; b=JziqNBInbDFmY35U++IJBHxxGvHpveRi9n8lcmlf2lKkM3phgpJrgbMcEhKJJjlXHAhoeOSa8WagJeWAarcz38hYJH6VuVcsLt69Pq5YnuSz3aM3T34DAUwN/bO6vXD8mg02kuySixp/V50CjCLM5iwOgMj1MBUxJzHC0OxGclU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563264916; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=4z2hHvRDYhdwl8/3C9+GCvMIElrn7WkJD5Frbj4tMvU=; b=nly2p5asuuDE3pKVwUcI7CRpEPWYGki7ExcwutnHlvwjy/zMtfdlTuo1OcGfJh+f4hKjTzqZYWpweorpuM86/JDnmrNZ/JwBleBBEKKuzexfDEvKqAvUM5gA+vqb2ZKX23febwjYrOViGG/hXYhQumaYNPYUChHkHBpmCdLWvls= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563264916287864.6112408927238; Tue, 16 Jul 2019 01:15:16 -0700 (PDT) Received: from localhost ([::1]:46240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIcE-0006nQ-M6 for importer@patchew.org; Tue, 16 Jul 2019 04:15:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60203) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYn-0000Wq-HZ for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYm-0003QR-Ex for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:41 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54374) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYm-0003PN-7D for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:40 -0400 Received: by mail-wm1-x342.google.com with SMTP id p74so17633316wme.4 for ; Tue, 16 Jul 2019 01:11:40 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=4z2hHvRDYhdwl8/3C9+GCvMIElrn7WkJD5Frbj4tMvU=; b=PO0oBgHWgjyGzP64SHHOFaYWX0l4+2NCWX+3Fsd8G55Xpp4E8CPInxYkeTrI/RtDtG 41bnjYhz0ZafOGNtm+IVQ2XGf3IkNwup1qxJj+u4MG+0a21Ku8HNDqhbMGx7K9yMDp7e zb4k07TK7Z2dNee9BHpExOYQBZyBgoyeclzR6ydxH4PQmIgMlRvHAOmSx7F56G4prIss wnZpSVIXNPToLWTrNpHyVF+ldAMMNbPZiJewg3spgunptmvVs22lv7gsDuJ4G7IBlgqe XfeyLhHmnvkohiNbCLSIDPjR9NUofLdvBeW0wEidJxw5yh15hPLBXFjqR9Xd7JLLznCe NNGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=4z2hHvRDYhdwl8/3C9+GCvMIElrn7WkJD5Frbj4tMvU=; b=Z+dubIC6VBCm5y4nARIUrDcYMno9iP2YkxSMV4oYr744gM7n4p4v3SPfnukPT1qTdS EbsrMJW7kJ0W2YqR3haVWqViNNEr1ZHpCrR3Md5REvBoagnz3lINrqgtLW933Qi8nSUu t/f8hEoRk7S1vlgmbMMq5KmjZjtBTWqpgp1Ai42YYdgBGtbWLsfR1F1c3vpjV9SfCPDy GUFuGoI4swq0z/9dCCDLRl+8c6gocCHYzCRTsJ1zxmggxtlm25udMS91jf2CVdS1ss74 /az1VurCTujpTde7ypYWTHGjy4+2nZYxDjRMRHfeHdLAJE9boHJ9VTT3F1UKyQg1zD6u axpA== X-Gm-Message-State: APjAAAWMTh+hRI8Z8NYEgcZkXGj95lUzp2CevFTDSGm9Mt7kpPDqTCfL PkF+mKY6kta4gZMW5PiAe7nvn2EkV5s= X-Google-Smtp-Source: APXvYqwGyMAm3RQJr69wadoJberq1UVX/K7BYE+p+WeY0cF8kFEn+wTZ/LZto6++oN95AtSJS2iOMw== X-Received: by 2002:a1c:9696:: with SMTP id y144mr29068800wmd.73.1563264698898; Tue, 16 Jul 2019 01:11:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:17 +0200 Message-Id: <1563264677-39718-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PULL 19/19] vl: make sure char-pty message displayed by moving setbuf to the beginning X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Yang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Wei Yang Recently we found a behavior change after commit 6ade45f2ac93611 ('char-pty: Print "char device redirected" message to stdout'). When we redirect output to a file, the message "char device redirected to PTY_NAME (label LABEL)" would not be seen at the beginning of the file. Instead, the message is displayed after QEMU quit. This will block test automation. The reason is this message is printed after we set line buffer mode. So move this to the beginning. Signed-off-by: Wei Yang Signed-off-by: Paolo Bonzini --- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 5089fce..a5808f9 100644 --- a/vl.c +++ b/vl.c @@ -2890,6 +2890,8 @@ int main(int argc, char **argv, char **envp) char *dir, **dirs; BlockdevOptionsQueue bdo_queue =3D QSIMPLEQ_HEAD_INITIALIZER(bdo_queue= ); =20 + os_set_line_buffering(); + error_init(argv[0]); module_call_init(MODULE_INIT_TRACE); =20 @@ -4246,8 +4248,6 @@ int main(int argc, char **argv, char **envp) semihosting_arg_fallback(kernel_filename, kernel_cmdline); } =20 - os_set_line_buffering(); - /* spice needs the timers to be initialized by this point */ qemu_spice_init(); =20 --=20 1.8.3.1