diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2015-02-13 01:43:41 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2015-02-13 01:45:46 -0500 |
| commit | 53aceb49f9b7e1d42064ffff4f4df7e9882b182d (patch) | |
| tree | 26b649ff3465cb64eb558e2b640f0045d62590c2 | |
| parent | d2dbdac336e8ea1296fd08c4eb8a28daacec1817 (diff) | |
tools/lguest: fix features_accepted logic in example launcher.
We were clearing the lower bits when setting the upper bits.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
| -rw-r--r-- | tools/lguest/lguest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lguest/lguest.c b/tools/lguest/lguest.c index 60cabafdf615..b3e73f258910 100644 --- a/tools/lguest/lguest.c +++ b/tools/lguest/lguest.c | |||
| @@ -1721,7 +1721,7 @@ static void emulate_mmio_write(struct device *d, u32 off, u32 val, u32 mask) | |||
| 1721 | d->features_accepted |= val; | 1721 | d->features_accepted |= val; |
| 1722 | } else { | 1722 | } else { |
| 1723 | assert(d->mmio->cfg.guest_feature_select == 1); | 1723 | assert(d->mmio->cfg.guest_feature_select == 1); |
| 1724 | d->features_accepted &= ((u64)0xFFFFFFFF << 32); | 1724 | d->features_accepted &= 0xFFFFFFFF; |
| 1725 | d->features_accepted |= ((u64)val) << 32; | 1725 | d->features_accepted |= ((u64)val) << 32; |
| 1726 | } | 1726 | } |
| 1727 | if (d->features_accepted & ~d->features) | 1727 | if (d->features_accepted & ~d->features) |
