Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806814/?format=api
{ "id": 806814, "url": "http://patchwork.ozlabs.org/api/patches/806814/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-24-git-send-email-mdroth@linux.vnet.ibm.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1503965694-10794-24-git-send-email-mdroth@linux.vnet.ibm.com>", "list_archive_url": null, "date": "2017-08-29T00:13:58", "name": "[23/79] block/vhdx: Make vhdx_create() always set errp", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "7188bb376446f940a46d7a6493e42877827a4ece", "submitter": { "id": 5549, "url": "http://patchwork.ozlabs.org/api/people/5549/?format=api", "name": "Michael Roth", "email": "mdroth@linux.vnet.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-24-git-send-email-mdroth@linux.vnet.ibm.com/mbox/", "series": [ { "id": 281, "url": "http://patchwork.ozlabs.org/api/series/281/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=281", "date": "2017-08-29T00:13:45", "name": "Patch Round-up for stable 2.9.1, freeze on 2017-09-04", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/281/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/806814/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806814/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=<UNKNOWN>)", "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 3xh8SH5zsrz9sP5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Aug 2017 10:20:59 +1000 (AEST)", "from localhost ([::1]:41902 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dmUH1-00059C-LP\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 20:20:55 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:47641)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUCF-0000zH-U5\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:01 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUCC-0005DX-KZ\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:15:59 -0400", "from mx0b-001b2d01.pphosted.com ([148.163.158.5]:54429\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <mdroth@linux.vnet.ibm.com>)\n\tid 1dmUCC-0005Cq-DT\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:15:56 -0400", "from pps.filterd (m0098419.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0EUPG087789\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:15:56 -0400", "from e18.ny.us.ibm.com (e18.ny.us.ibm.com [129.33.205.208])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cmvhgaqrq-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:15:55 -0400", "from localhost\n\tby e18.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <qemu-devel@nongnu.org> from <mdroth@linux.vnet.ibm.com>;\n\tMon, 28 Aug 2017 20:15:53 -0400", "from b01cxnp22033.gho.pok.ibm.com (9.57.198.23)\n\tby e18.ny.us.ibm.com (146.89.104.205) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 20:15:52 -0400", "from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com\n\t[9.57.199.111])\n\tby b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP\n\tid v7T0FpnK23920732; Tue, 29 Aug 2017 00:15:51 GMT", "from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id EDE8AAC03F;\n\tMon, 28 Aug 2017 20:16:15 -0400 (EDT)", "from localhost (unknown [9.80.85.217])\n\tby b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP id BCA07AC043;\n\tMon, 28 Aug 2017 20:16:15 -0400 (EDT)" ], "From": "Michael Roth <mdroth@linux.vnet.ibm.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 28 Aug 2017 19:13:58 -0500", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>", "References": "<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>", "X-TM-AS-GCONF": "00", "x-cbid": "17082900-0044-0000-0000-000003847046", "X-IBM-SpamModules-Scores": "", "X-IBM-SpamModules-Versions": "BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909028; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:15:53", "X-IBM-AV-DETECTION": "SAVI=unused REMOTE=unused XFE=unused", "x-cbparentid": "17082900-0045-0000-0000-000007B288B9", "Message-Id": "<1503965694-10794-24-git-send-email-mdroth@linux.vnet.ibm.com>", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]", "X-Received-From": "148.163.158.5", "Subject": "[Qemu-devel] [PATCH 23/79] block/vhdx: Make vhdx_create() always\n\tset errp", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "qemu-stable@nongnu.org, Max Reitz <mreitz@redhat.com>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "From: Max Reitz <mreitz@redhat.com>\n\nThis patch makes vhdx_create() always set errp in case of an error. It\nalso adds errp parameters to vhdx_create_bat() and\nvhdx_create_new_region_table() so we can pass on the error object\ngenerated by blk_truncate() as of a future commit.\n\nSigned-off-by: Max Reitz <mreitz@redhat.com>\nReviewed-by: Kevin Wolf <kwolf@redhat.com>\nMessage-id: 20170328205129.15138-2-mreitz@redhat.com\nReviewed-by: Stefan Hajnoczi <stefanha@redhat.com>\nSigned-off-by: Max Reitz <mreitz@redhat.com>\n(cherry picked from commit 55b9392b98e500399f2da1edc1d110bbfd40fb05)\n* prereq for 698bdfa\nSigned-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>\n---\n block/vhdx.c | 23 +++++++++++++++++++----\n 1 file changed, 19 insertions(+), 4 deletions(-)", "diff": "diff --git a/block/vhdx.c b/block/vhdx.c\nindex 052a753..d25bcd9 100644\n--- a/block/vhdx.c\n+++ b/block/vhdx.c\n@@ -1586,7 +1586,7 @@ exit:\n static int vhdx_create_bat(BlockBackend *blk, BDRVVHDXState *s,\n uint64_t image_size, VHDXImageType type,\n bool use_zero_blocks, uint64_t file_offset,\n- uint32_t length)\n+ uint32_t length, Error **errp)\n {\n int ret = 0;\n uint64_t data_file_offset;\n@@ -1609,14 +1609,19 @@ static int vhdx_create_bat(BlockBackend *blk, BDRVVHDXState *s,\n * is the furthest thing we have written yet */\n ret = blk_truncate(blk, data_file_offset);\n if (ret < 0) {\n+ error_setg_errno(errp, -ret,\n+ \"Failed to resize the underlying file\");\n goto exit;\n }\n } else if (type == VHDX_TYPE_FIXED) {\n ret = blk_truncate(blk, data_file_offset + image_size);\n if (ret < 0) {\n+ error_setg_errno(errp, -ret,\n+ \"Failed to resize the underlying file\");\n goto exit;\n }\n } else {\n+ error_setg(errp, \"Unsupported image type\");\n ret = -ENOTSUP;\n goto exit;\n }\n@@ -1627,6 +1632,7 @@ static int vhdx_create_bat(BlockBackend *blk, BDRVVHDXState *s,\n /* for a fixed file, the default BAT entry is not zero */\n s->bat = g_try_malloc0(length);\n if (length && s->bat == NULL) {\n+ error_setg(errp, \"Failed to allocate memory for the BAT\");\n ret = -ENOMEM;\n goto exit;\n }\n@@ -1646,6 +1652,7 @@ static int vhdx_create_bat(BlockBackend *blk, BDRVVHDXState *s,\n }\n ret = blk_pwrite(blk, file_offset, s->bat, length, 0);\n if (ret < 0) {\n+ error_setg_errno(errp, -ret, \"Failed to write the BAT\");\n goto exit;\n }\n }\n@@ -1671,7 +1678,8 @@ static int vhdx_create_new_region_table(BlockBackend *blk,\n uint32_t log_size,\n bool use_zero_blocks,\n VHDXImageType type,\n- uint64_t *metadata_offset)\n+ uint64_t *metadata_offset,\n+ Error **errp)\n {\n int ret = 0;\n uint32_t offset = 0;\n@@ -1740,7 +1748,7 @@ static int vhdx_create_new_region_table(BlockBackend *blk,\n /* The region table gives us the data we need to create the BAT,\n * so do that now */\n ret = vhdx_create_bat(blk, s, image_size, type, use_zero_blocks,\n- bat_file_offset, bat_length);\n+ bat_file_offset, bat_length, errp);\n if (ret < 0) {\n goto exit;\n }\n@@ -1749,12 +1757,14 @@ static int vhdx_create_new_region_table(BlockBackend *blk,\n ret = blk_pwrite(blk, VHDX_REGION_TABLE_OFFSET, buffer,\n VHDX_HEADER_BLOCK_SIZE, 0);\n if (ret < 0) {\n+ error_setg_errno(errp, -ret, \"Failed to write first region table\");\n goto exit;\n }\n \n ret = blk_pwrite(blk, VHDX_REGION_TABLE2_OFFSET, buffer,\n VHDX_HEADER_BLOCK_SIZE, 0);\n if (ret < 0) {\n+ error_setg_errno(errp, -ret, \"Failed to write second region table\");\n goto exit;\n }\n \n@@ -1825,6 +1835,7 @@ static int vhdx_create(const char *filename, QemuOpts *opts, Error **errp)\n ret = -ENOTSUP;\n goto exit;\n } else {\n+ error_setg(errp, \"Invalid subformat '%s'\", type);\n ret = -EINVAL;\n goto exit;\n }\n@@ -1879,12 +1890,14 @@ static int vhdx_create(const char *filename, QemuOpts *opts, Error **errp)\n ret = blk_pwrite(blk, VHDX_FILE_ID_OFFSET, &signature, sizeof(signature),\n 0);\n if (ret < 0) {\n+ error_setg_errno(errp, -ret, \"Failed to write file signature\");\n goto delete_and_exit;\n }\n if (creator) {\n ret = blk_pwrite(blk, VHDX_FILE_ID_OFFSET + sizeof(signature),\n creator, creator_items * sizeof(gunichar2), 0);\n if (ret < 0) {\n+ error_setg_errno(errp, -ret, \"Failed to write creator field\");\n goto delete_and_exit;\n }\n }\n@@ -1893,13 +1906,14 @@ static int vhdx_create(const char *filename, QemuOpts *opts, Error **errp)\n /* Creates (B),(C) */\n ret = vhdx_create_new_headers(blk, image_size, log_size);\n if (ret < 0) {\n+ error_setg_errno(errp, -ret, \"Failed to write image headers\");\n goto delete_and_exit;\n }\n \n /* Creates (D),(E),(G) explicitly. (F) created as by-product */\n ret = vhdx_create_new_region_table(blk, image_size, block_size, 512,\n log_size, use_zero_blocks, image_type,\n- &metadata_offset);\n+ &metadata_offset, errp);\n if (ret < 0) {\n goto delete_and_exit;\n }\n@@ -1908,6 +1922,7 @@ static int vhdx_create(const char *filename, QemuOpts *opts, Error **errp)\n ret = vhdx_create_new_metadata(blk, image_size, block_size, 512,\n metadata_offset, image_type);\n if (ret < 0) {\n+ error_setg_errno(errp, -ret, \"Failed to initialize metadata\");\n goto delete_and_exit;\n }\n \n", "prefixes": [ "23/79" ] }