On 2011-07-04 20:37, Marcelo Tosatti wrote: > On Thu, Jun 23, 2011 at 10:23:10AM +0200, Jan Kiszka wrote: >> From: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> >> >> Bit-wise or the feature flags and drop the obsolete #ifdef. >> >> Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> >> --- >> hw/kvmclock.c | 7 ++----- >> 1 files changed, 2 insertions(+), 5 deletions(-) > > Applied, thanks. Please note that this stable-relevant bug fix is still stuck in uq/master. It should be able to break migration from older versions as the kvmclock vmstate is generated/expected incorrectly even if the feature is disabled. Jan
Attachment:
signature.asc
Description: OpenPGP digital signature
