qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Alex Williamson <alex.williamson@redhat.com>
To: qemu-devel@nongnu.org
Cc: mst@redhat.com
Subject: [Qemu-devel] [PATCH 2/3] scripts/update-linux-headers: Update handling of __aligned_u64
Date: Tue, 01 May 2018 10:25:59 -0600	[thread overview]
Message-ID: <20180501162559.28517.6261.stgit@gimli.home> (raw)
In-Reply-To: <20180501161509.28517.344.stgit@gimli.home>

We'll currently replace any 'u64' with a 'uint64_t' including when
it's embedded in an '__aligned_u64', creating a '__aligned_uint64_t'
which doesn't exist.  Add another sed entry to find these and convert
them back to their original form.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
 scripts/update-linux-headers.sh |    1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index a017b53d8765..dd74cc8d5223 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -56,6 +56,7 @@ cp_portable() {
         -e 's/__s\([0-9][0-9]*\)/int\1_t/g' \
         -e 's/__le\([0-9][0-9]*\)/uint\1_t/g' \
         -e 's/__be\([0-9][0-9]*\)/uint\1_t/g' \
+        -e 's/__aligned_uint\([0-9][0-9]*\)_t/__aligned_u\1/g' \
         -e 's/"\(input-event-codes\.h\)"/"standard-headers\/linux\/\1"/' \
         -e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \
         -e 's/__bitwise//' \

  parent reply	other threads:[~2018-05-01 16:26 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-01 16:25 [Qemu-devel] [PATCH 0/3] Update linux-headers to v4.17-rc3 Alex Williamson
2018-05-01 16:25 ` [Qemu-devel] [PATCH 1/3] virtio-gpu-3d: Define VIRTIO_GPU_CAPSET_VIRGL2 elsewhere Alex Williamson
2018-05-01 16:25 ` Alex Williamson [this message]
2018-05-01 16:26 ` [Qemu-devel] [PATCH 3/3] linux-headers: Update to v4.17-rc3 Alex Williamson
2018-05-01 20:25 ` [Qemu-devel] [PATCH 0/3] Update linux-headers " David Airlie
2018-05-02 17:42   ` Alex Williamson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180501162559.28517.6261.stgit@gimli.home \
    --to=alex.williamson@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).