Ensure that all changes of previous commit are constrained to rr runs

Author: cirosantilli

run

@@ -818,8 +818,15 @@ Extra options to append at the end of the emulator command line.
                         driveif = 'none'
                         rrid = ',id=img-direct'
                         rrid2 = ',id=img-direct2'
-                        root = 'root=/dev/sda'
+                        if self.env['is_arm']:
+                            root = 'root=/dev/vda'
+                        else:
+                            root = 'root=/dev/sda'
                         snapshot = ',snapshot'
+                        if self.env['is_arm']:
+                            hd_dev = 'virtio-blk-device'
+                        else:
+                            hd_dev = 'ide-hd'
                     else:
                         driveif = 'virtio'
                         root = 'root=/dev/vda'
@@ -847,10 +854,6 @@ Extra options to append at the end of the emulator command line.
                             ),
                             LF,
                         ])
-                        hd_dev = 'ide-hd'
-                        if self.env['is_arm']:
-                            hd_dev = 'virtio-blk-device'
-                            root = 'root=/dev/vda'
                         if rr:
                             extra_emulator_args.extend([
                             '-drive', 'driver=blkreplay,if=none,image=img-direct,id=img-blkreplay', LF,