[{"id":1770836,"web_url":"http://patchwork.ozlabs.org/comment/1770836/","msgid":"<20170918212316.GC27153@umbus>","list_archive_url":null,"date":"2017-09-18T21:23:16","subject":"Re: [Qemu-devel] [PATCH 3/4] ppc/kvm: change kvmppc_get_htab_fd()\n\tto return -errno on error","submitter":{"id":47,"url":"http://patchwork.ozlabs.org/api/people/47/","name":"David Gibson","email":"david@gibson.dropbear.id.au"},"content":"On Fri, Sep 15, 2017 at 03:16:10PM +0200, Greg Kurz wrote:\n> When kvmppc_get_htab_fd() fails, its return value is propagated up to\n> qemu_savevm_state_iterate() or to qemu_savevm_state_complete_precopy().\n> All savevm handlers expect to receive a negative errno on error.\n> \n> Let's patch kvmppc_get_htab_fd() accordingly.\n> \n> While here, let's change htab_load() in the spapr code to also\n> propagate the error, since it doesn't make sense to abort() if\n> we couldn't get the htab fd from KVM.\n> \n> Signed-off-by: Greg Kurz \n\nApplied to ppc-for-2.11.\n\n> ---\n> hw/ppc/spapr.c | 5 +++--\n> target/ppc/kvm.c | 10 ++++++++--\n> 2 files changed, 11 insertions(+), 4 deletions(-)\n> \n> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c\n> index 841117f6d185..1ae79326d1ac 100644\n> --- a/hw/ppc/spapr.c\n> +++ b/hw/ppc/spapr.c\n> @@ -1218,7 +1218,7 @@ static int get_htab_fd(sPAPRMachineState *spapr)\n> spapr->htab_fd = kvmppc_get_htab_fd(false);\n> if (spapr->htab_fd < 0) {\n> error_report(\"Unable to open fd for reading hash table from KVM: %s\",\n> - strerror(errno));\n> + strerror(spapr->htab_fd));\n> }\n> \n> return spapr->htab_fd;\n> @@ -1962,7 +1962,8 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id)\n> fd = kvmppc_get_htab_fd(true);\n> if (fd < 0) {\n> error_report(\"Unable to open fd to restore KVM hash table: %s\",\n> - strerror(errno));\n> + strerror(fd));\n> + return fd;\n> }\n> }\n> \n> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c\n> index 00d7029b8d7a..09d7dea79e2d 100644\n> --- a/target/ppc/kvm.c\n> +++ b/target/ppc/kvm.c\n> @@ -2556,13 +2556,19 @@ int kvmppc_get_htab_fd(bool write)\n> .flags = write ? KVM_GET_HTAB_WRITE : 0,\n> .start_index = 0,\n> };\n> + int ret;\n> \n> if (!cap_htab_fd) {\n> fprintf(stderr, \"KVM version doesn't support saving the hash table\\n\");\n> - return -1;\n> + return -ENOTSUP;\n> + }\n> +\n> + ret = kvm_vm_ioctl(kvm_state, KVM_PPC_GET_HTAB_FD, &s);\n> + if (ret < 0) {\n> + return -errno;\n> }\n> \n> - return kvm_vm_ioctl(kvm_state, KVM_PPC_GET_HTAB_FD, &s);\n> + return ret;\n> }\n> \n> int kvmppc_save_htab(QEMUFile *f, int fd, size_t bufsize, int64_t max_ns)\n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=gibson.dropbear.id.au\n\theader.i=@gibson.dropbear.id.au header.b=\"Ehv4aoyz\"; \n\tdkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxK8K1c8Lz9s82\n\tfor ;\n\tTue, 19 Sep 2017 20:37:53 +1000 (AEST)","from localhost ([::1]:41363 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duFuY-0001bl-EO\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 06:37:50 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51046)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duFtS-0001A6-HC\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 06:36:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duFtQ-0002mi-BA\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 06:36:42 -0400","from ozlabs.org ([103.22.144.67]:42593)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1duFtQ-0002ie-00; Tue, 19 Sep 2017 06:36:40 -0400","by ozlabs.org (Postfix, from userid 1007)\n\tid 3xxK6p0sQQz9t2l; Tue, 19 Sep 2017 20:36:33 +1000 (AEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n\td=gibson.dropbear.id.au; s=201602; t=1505817394;\n\tbh=O6wisdVz/W0CFy33gL9pfZeAALP2pfgsxMJUt5oPLno=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Ehv4aoyzYLyKgyH5BszJqTyCUIK39HvDiSgRJgP3i2iOIzIEqGB2zb57lwG6KcxC8\n\tPmBrIZD79wys24Ody0aWhyVhMKI0+f9Z/1P+NCAB09JnumGgKvOOWttHQh9XnRkXms\n\tFDGkAM52nFqDRJ+MLuzaKkcM3y3i08ezC8GLEBZ4=","Date":"Tue, 19 Sep 2017 07:23:16 +1000","From":"David Gibson ","To":"Greg Kurz ","Message-ID":"<20170918212316.GC27153@umbus>","References":"<150548133297.5945.7401220081077343726.stgit@bahia.lan>\n\t<150548137066.5945.3950849052176752689.stgit@bahia.lan>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"eHhjakXzOLJAF9wJ\"","Content-Disposition":"inline","In-Reply-To":"<150548137066.5945.3950849052176752689.stgit@bahia.lan>","User-Agent":"Mutt/1.8.3 (2017-05-23)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"103.22.144.67","Subject":"Re: [Qemu-devel] [PATCH 3/4] ppc/kvm: change kvmppc_get_htab_fd()\n\tto return -errno on error","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Alexey Kardashevskiy , Thomas Huth ,\n\tqemu-ppc@nongnu.org, qemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]